diff --git a/internal/cmd/pdatagen/internal/pdata/one_of_field.go b/internal/cmd/pdatagen/internal/pdata/one_of_field.go index 014d368e3ce..f97bcf5bc22 100644 --- a/internal/cmd/pdatagen/internal/pdata/one_of_field.go +++ b/internal/cmd/pdatagen/internal/pdata/one_of_field.go @@ -21,9 +21,9 @@ func (ms {{ .structName }}) {{ .typeFuncName }}() {{ .typeName }} { return {{ .typeName }}Empty } -{{ range .values }} +{{ range .values -}} {{ .GenerateAccessors $.baseStruct $.OneOfField }} -{{ end }}` +{{- end }}` const oneOfAccessorTestTemplate = `func Test{{ .structName }}_{{ .typeFuncName }}(t *testing.T) { tv := New{{ .structName }}() @@ -32,21 +32,21 @@ const oneOfAccessorTestTemplate = `func Test{{ .structName }}_{{ .typeFuncName } {{ range .values -}} {{ .GenerateTests $.baseStruct $.OneOfField }} -{{ end }} +{{- end }} ` const oneOfTestFailingUnmarshalProtoValuesTemplate = ` - {{- range .fields }} + {{ range .fields -}} {{ .GenTestFailingUnmarshalProtoValues }} {{- end }}` const oneOfTestValuesTemplate = ` - {{- range .fields }} + {{ range .fields -}} {{ .GenTestEncodingValues }} {{- end }}` const oneOfPoolOrigTemplate = ` - {{- range .fields }} + {{ range .fields -}} {{ .GenPool }} {{- end }}` @@ -58,36 +58,36 @@ func (m *{{ .protoName }}) Get{{ .originFieldName }}() any { return nil } -{{- range .fields }} +{{ range .fields -}} {{ .GenOneOfMessages }} {{- end }}` const oneOfDeleteOrigTemplate = `switch ov := orig.{{ .originFieldName }}.(type) { {{ range .fields -}} case *{{ $.protoName }}_{{ .GetName }}: - {{ .GenDelete }}{{- end }} - } -` + {{ .GenDelete }} + {{ end -}} +}` const oneOfCopyOrigTemplate = `switch t := src.{{ .originFieldName }}.(type) { -{{- range .fields }} + {{ range .fields -}} case *{{ $.protoName }}_{{ .GetName }}: {{ .GenCopy }} -{{- end }} + {{ end -}} default: dest.{{ .originFieldName }} = nil }` const oneOfMarshalJSONTemplate = `switch orig := orig.{{ .originFieldName }}.(type) { - {{- range .fields }} + {{ range .fields -}} case *{{ $.protoName }}_{{ .GetName }}: {{ .GenMarshalJSON }} - {{- end }} + {{ end -}} }` const oneOfUnmarshalJSONTemplate = ` - {{- range .fields }} - {{ .GenUnmarshalJSON }} + {{ range .fields -}} + {{ .GenUnmarshalJSON }} {{- end }}` const oneOfSizeProtoTemplate = `switch orig := orig.{{ .originFieldName }}.(type) { @@ -101,16 +101,16 @@ const oneOfSizeProtoTemplate = `switch orig := orig.{{ .originFieldName }}.(type }` const oneOfMarshalProtoTemplate = `switch orig := orig.{{ .originFieldName }}.(type) { - {{- range .fields }} + {{ range .fields -}} case *{{ $.protoName }}_{{ .GetName }}: {{ .GenMarshalProto }} - {{- end }} + {{ end -}} }` const oneOfUnmarshalProtoTemplate = ` {{- range .fields }} {{ .GenUnmarshalProto }} - {{- end }}` + {{ end }}` type OneOfField struct { originFieldName string diff --git a/internal/cmd/pdatagen/internal/proto/delete.go b/internal/cmd/pdatagen/internal/proto/delete.go index 9ddc23d2c41..2748f270a48 100644 --- a/internal/cmd/pdatagen/internal/proto/delete.go +++ b/internal/cmd/pdatagen/internal/proto/delete.go @@ -12,15 +12,15 @@ const deleteOther = `{{ if ne .oneOfGroup "" -}} ov.{{ .fieldName }} = {{ .defaultValue }} ProtoPool{{ .oneOfMessageName }}.Put(ov) } -{{ end }}` +{{- end -}}` const deleteMessage = `{{ if .repeated -}} for i := range orig.{{ .fieldName }} { {{ if .nullable -}} Delete{{ .messageName }}(orig.{{ .fieldName }}[i], true) - {{- else -}} + {{ else -}} Delete{{ .messageName }}(&orig.{{ .fieldName }}[i], false) - {{- end }} + {{- end -}} } {{- else if ne .oneOfGroup "" -}} Delete{{ .messageName }}(ov.{{ .fieldName }}, true) @@ -30,7 +30,7 @@ const deleteMessage = `{{ if .repeated -}} Delete{{ .messageName }}(orig.{{ .fieldName }}, true) {{- else -}} Delete{{ .messageName }}(&orig.{{ .fieldName }}, false) -{{- end }} +{{- end -}} ` func (pf *Field) GenDelete() string { diff --git a/internal/cmd/pdatagen/internal/proto/proto_size.go b/internal/cmd/pdatagen/internal/proto/proto_size.go index c5492ad5be0..7d5ab2b69e9 100644 --- a/internal/cmd/pdatagen/internal/proto/proto_size.go +++ b/internal/cmd/pdatagen/internal/proto/proto_size.go @@ -15,9 +15,9 @@ const sizeProtoI8 = `{{ if .repeated -}} l *= 8 n+= {{ .protoTagSize }} + proto.Sov(uint64(l)) + l } -{{- else if ne .oneOfGroup "" -}} +{{- else if ne .oneOfGroup "" }} n+= {{ add .protoTagSize 8 }} -{{- else -}} +{{- else }} {{- if not .nullable -}} if orig.{{ .fieldName }} != {{ .defaultValue }} { {{- else -}} @@ -33,9 +33,9 @@ const sizeProtoI4 = `{{ if .repeated -}} l *= 4 n+= + {{ .protoTagSize }} + proto.Sov(uint64(l)) + l } -{{- else if ne .oneOfGroup "" -}} +{{- else if ne .oneOfGroup "" }} n+= {{ add .protoTagSize 4 }} -{{- else -}} +{{- else }} {{- if not .nullable -}} if orig.{{ .fieldName }} != {{ .defaultValue }} { {{- else -}} @@ -50,7 +50,7 @@ const sizeProtoBool = `{{ if .repeated -}} if l > 0 { n+= + {{ .protoTagSize }} + proto.Sov(uint64(l)) + l } -{{- else if ne .oneOfGroup "" -}} +{{- else if ne .oneOfGroup "" }} n+= {{ add .protoTagSize 1 }} {{- else -}} {{- if not .nullable -}} @@ -62,7 +62,7 @@ const sizeProtoBool = `{{ if .repeated -}} } {{- end }}` -const sizeProtoVarint = `{{ if .repeated -}} +const sizeProtoVarint = `{{ if .repeated }} if len(orig.{{ .fieldName }}) > 0 { l = 0 for _, e := range orig.{{ .fieldName }} { @@ -70,9 +70,9 @@ const sizeProtoVarint = `{{ if .repeated -}} } n+= {{ .protoTagSize }} + proto.Sov(uint64(l)) + l } -{{- else if ne .oneOfGroup "" -}} +{{- else if ne .oneOfGroup "" }} n+= {{ .protoTagSize }} + proto.Sov(uint64(orig.{{ .fieldName }})) -{{- else -}} +{{- else }} {{- if not .nullable -}} if orig.{{ .fieldName }} != {{ .defaultValue }} { {{- else -}} diff --git a/internal/cmd/pdatagen/internal/proto/templates/message.go.tmpl b/internal/cmd/pdatagen/internal/proto/templates/message.go.tmpl index 0ac4aadadbe..69beb12e664 100644 --- a/internal/cmd/pdatagen/internal/proto/templates/message.go.tmpl +++ b/internal/cmd/pdatagen/internal/proto/templates/message.go.tmpl @@ -53,7 +53,9 @@ func Delete{{ .messageName }}(orig *{{ .messageName }}, nullable bool) { return } - {{ range .fields }}{{ .GenDelete }}{{ end }} + {{- range .fields }} + {{ .GenDelete }} + {{- end }} orig.Reset() if nullable { protoPool{{ .messageName }}.Put(orig) diff --git a/pdata/internal/generated_proto_anyvalue.go b/pdata/internal/generated_proto_anyvalue.go index def08cd2cf1..103c4c5b443 100644 --- a/pdata/internal/generated_proto_anyvalue.go +++ b/pdata/internal/generated_proto_anyvalue.go @@ -170,7 +170,6 @@ func DeleteAnyValue(orig *AnyValue, nullable bool) { orig.Reset() return } - switch ov := orig.Value.(type) { case *AnyValue_StringValue: if UseProtoPooling.IsEnabled() { @@ -205,9 +204,7 @@ func DeleteAnyValue(orig *AnyValue, nullable bool) { ov.BytesValue = nil ProtoPoolAnyValue_BytesValue.Put(ov) } - } - orig.Reset() if nullable { protoPoolAnyValue.Put(orig) @@ -409,7 +406,6 @@ func (orig *AnyValue) UnmarshalJSON(iter *json.Iterator) { ov.StringValue = iter.ReadString() orig.Value = ov } - case "boolValue", "bool_value": { var ov *AnyValue_BoolValue @@ -421,7 +417,6 @@ func (orig *AnyValue) UnmarshalJSON(iter *json.Iterator) { ov.BoolValue = iter.ReadBool() orig.Value = ov } - case "intValue", "int_value": { var ov *AnyValue_IntValue @@ -433,7 +428,6 @@ func (orig *AnyValue) UnmarshalJSON(iter *json.Iterator) { ov.IntValue = iter.ReadInt64() orig.Value = ov } - case "doubleValue", "double_value": { var ov *AnyValue_DoubleValue @@ -445,7 +439,6 @@ func (orig *AnyValue) UnmarshalJSON(iter *json.Iterator) { ov.DoubleValue = iter.ReadFloat64() orig.Value = ov } - case "arrayValue", "array_value": { var ov *AnyValue_ArrayValue @@ -458,7 +451,6 @@ func (orig *AnyValue) UnmarshalJSON(iter *json.Iterator) { ov.ArrayValue.UnmarshalJSON(iter) orig.Value = ov } - case "kvlistValue", "kvlist_value": { var ov *AnyValue_KvlistValue @@ -471,7 +463,6 @@ func (orig *AnyValue) UnmarshalJSON(iter *json.Iterator) { ov.KvlistValue.UnmarshalJSON(iter) orig.Value = ov } - case "bytesValue", "bytes_value": { var ov *AnyValue_BytesValue @@ -502,10 +493,13 @@ func (orig *AnyValue) SizeProto() int { l = len(orig.StringValue) n += 1 + proto.Sov(uint64(l)) + l case *AnyValue_BoolValue: + n += 2 case *AnyValue_IntValue: + n += 1 + proto.Sov(uint64(orig.IntValue)) case *AnyValue_DoubleValue: + n += 9 case *AnyValue_ArrayValue: if orig.ArrayValue != nil { @@ -741,6 +735,7 @@ func (orig *AnyValue) UnmarshalProto(buf []byte) error { copy(ov.BytesValue, buf[startPos:pos]) } orig.Value = ov + default: pos, err = proto.ConsumeUnknown(buf, pos, wireType) if err != nil { diff --git a/pdata/internal/generated_proto_anyvalue_test.go b/pdata/internal/generated_proto_anyvalue_test.go index d13a653e629..be14c6a4c30 100644 --- a/pdata/internal/generated_proto_anyvalue_test.go +++ b/pdata/internal/generated_proto_anyvalue_test.go @@ -192,24 +192,18 @@ func genTestFailingUnmarshalProtoValuesAnyValue() map[string][]byte { "StringValue/wrong_wire_type": {0xc}, "StringValue/missing_value": {0xa}, - - "BoolValue/wrong_wire_type": {0x14}, - "BoolValue/missing_value": {0x10}, - - "IntValue/wrong_wire_type": {0x1c}, - "IntValue/missing_value": {0x18}, - + "BoolValue/wrong_wire_type": {0x14}, + "BoolValue/missing_value": {0x10}, + "IntValue/wrong_wire_type": {0x1c}, + "IntValue/missing_value": {0x18}, "DoubleValue/wrong_wire_type": {0x24}, "DoubleValue/missing_value": {0x21}, - - "ArrayValue/wrong_wire_type": {0x2c}, - "ArrayValue/missing_value": {0x2a}, - + "ArrayValue/wrong_wire_type": {0x2c}, + "ArrayValue/missing_value": {0x2a}, "KvlistValue/wrong_wire_type": {0x34}, "KvlistValue/missing_value": {0x32}, - - "BytesValue/wrong_wire_type": {0x3c}, - "BytesValue/missing_value": {0x3a}, + "BytesValue/wrong_wire_type": {0x3c}, + "BytesValue/missing_value": {0x3a}, } } @@ -217,18 +211,12 @@ func genTestEncodingValuesAnyValue() map[string]*AnyValue { return map[string]*AnyValue{ "empty": NewAnyValue(), "StringValue/default": {Value: &AnyValue_StringValue{StringValue: ""}}, - "StringValue/test": {Value: &AnyValue_StringValue{StringValue: "test_stringvalue"}}, - "BoolValue/default": {Value: &AnyValue_BoolValue{BoolValue: false}}, - "BoolValue/test": {Value: &AnyValue_BoolValue{BoolValue: true}}, - "IntValue/default": {Value: &AnyValue_IntValue{IntValue: int64(0)}}, - "IntValue/test": {Value: &AnyValue_IntValue{IntValue: int64(13)}}, - "DoubleValue/default": {Value: &AnyValue_DoubleValue{DoubleValue: float64(0)}}, - "DoubleValue/test": {Value: &AnyValue_DoubleValue{DoubleValue: float64(3.1415926)}}, - "ArrayValue/default": {Value: &AnyValue_ArrayValue{ArrayValue: &ArrayValue{}}}, - "ArrayValue/test": {Value: &AnyValue_ArrayValue{ArrayValue: GenTestArrayValue()}}, - "KvlistValue/default": {Value: &AnyValue_KvlistValue{KvlistValue: &KeyValueList{}}}, - "KvlistValue/test": {Value: &AnyValue_KvlistValue{KvlistValue: GenTestKeyValueList()}}, - "BytesValue/default": {Value: &AnyValue_BytesValue{BytesValue: nil}}, - "BytesValue/test": {Value: &AnyValue_BytesValue{BytesValue: []byte{1, 2, 3}}}, + "StringValue/test": {Value: &AnyValue_StringValue{StringValue: "test_stringvalue"}}, "BoolValue/default": {Value: &AnyValue_BoolValue{BoolValue: false}}, + "BoolValue/test": {Value: &AnyValue_BoolValue{BoolValue: true}}, "IntValue/default": {Value: &AnyValue_IntValue{IntValue: int64(0)}}, + "IntValue/test": {Value: &AnyValue_IntValue{IntValue: int64(13)}}, "DoubleValue/default": {Value: &AnyValue_DoubleValue{DoubleValue: float64(0)}}, + "DoubleValue/test": {Value: &AnyValue_DoubleValue{DoubleValue: float64(3.1415926)}}, "ArrayValue/default": {Value: &AnyValue_ArrayValue{ArrayValue: &ArrayValue{}}}, + "ArrayValue/test": {Value: &AnyValue_ArrayValue{ArrayValue: GenTestArrayValue()}}, "KvlistValue/default": {Value: &AnyValue_KvlistValue{KvlistValue: &KeyValueList{}}}, + "KvlistValue/test": {Value: &AnyValue_KvlistValue{KvlistValue: GenTestKeyValueList()}}, "BytesValue/default": {Value: &AnyValue_BytesValue{BytesValue: nil}}, + "BytesValue/test": {Value: &AnyValue_BytesValue{BytesValue: []byte{1, 2, 3}}}, } } diff --git a/pdata/internal/generated_proto_arrayvalue.go b/pdata/internal/generated_proto_arrayvalue.go index a4367eac263..f973831cf8e 100644 --- a/pdata/internal/generated_proto_arrayvalue.go +++ b/pdata/internal/generated_proto_arrayvalue.go @@ -43,11 +43,9 @@ func DeleteArrayValue(orig *ArrayValue, nullable bool) { orig.Reset() return } - for i := range orig.Values { DeleteAnyValue(&orig.Values[i], false) } - orig.Reset() if nullable { protoPoolArrayValue.Put(orig) diff --git a/pdata/internal/generated_proto_exemplar.go b/pdata/internal/generated_proto_exemplar.go index 0a7372a702b..e4419248c42 100644 --- a/pdata/internal/generated_proto_exemplar.go +++ b/pdata/internal/generated_proto_exemplar.go @@ -93,10 +93,10 @@ func DeleteExemplar(orig *Exemplar, nullable bool) { orig.Reset() return } - for i := range orig.FilteredAttributes { DeleteKeyValue(&orig.FilteredAttributes[i], false) } + switch ov := orig.Value.(type) { case *Exemplar_AsDouble: if UseProtoPooling.IsEnabled() { @@ -108,11 +108,9 @@ func DeleteExemplar(orig *Exemplar, nullable bool) { ov.AsInt = int64(0) ProtoPoolExemplar_AsInt.Put(ov) } - } DeleteTraceID(&orig.TraceId, false) DeleteSpanID(&orig.SpanId, false) - orig.Reset() if nullable { protoPoolExemplar.Put(orig) @@ -278,7 +276,6 @@ func (orig *Exemplar) UnmarshalJSON(iter *json.Iterator) { ov.AsDouble = iter.ReadFloat64() orig.Value = ov } - case "asInt", "as_int": { var ov *Exemplar_AsInt @@ -319,8 +316,10 @@ func (orig *Exemplar) SizeProto() int { _ = orig break case *Exemplar_AsDouble: + n += 9 case *Exemplar_AsInt: + n += 9 } l = orig.TraceId.SizeProto() diff --git a/pdata/internal/generated_proto_exemplar_test.go b/pdata/internal/generated_proto_exemplar_test.go index bd50bfa99e3..3e2c23c9333 100644 --- a/pdata/internal/generated_proto_exemplar_test.go +++ b/pdata/internal/generated_proto_exemplar_test.go @@ -196,13 +196,12 @@ func genTestFailingUnmarshalProtoValuesExemplar() map[string][]byte { "AsDouble/wrong_wire_type": {0x1c}, "AsDouble/missing_value": {0x19}, - - "AsInt/wrong_wire_type": {0x34}, - "AsInt/missing_value": {0x31}, - "TraceId/wrong_wire_type": {0x2c}, - "TraceId/missing_value": {0x2a}, - "SpanId/wrong_wire_type": {0x24}, - "SpanId/missing_value": {0x22}, + "AsInt/wrong_wire_type": {0x34}, + "AsInt/missing_value": {0x31}, + "TraceId/wrong_wire_type": {0x2c}, + "TraceId/missing_value": {0x2a}, + "SpanId/wrong_wire_type": {0x24}, + "SpanId/missing_value": {0x22}, } } @@ -212,10 +211,9 @@ func genTestEncodingValuesExemplar() map[string]*Exemplar { "FilteredAttributes/test": {FilteredAttributes: []KeyValue{{}, *GenTestKeyValue()}}, "TimeUnixNano/test": {TimeUnixNano: uint64(13)}, "AsDouble/default": {Value: &Exemplar_AsDouble{AsDouble: float64(0)}}, - "AsDouble/test": {Value: &Exemplar_AsDouble{AsDouble: float64(3.1415926)}}, - "AsInt/default": {Value: &Exemplar_AsInt{AsInt: int64(0)}}, - "AsInt/test": {Value: &Exemplar_AsInt{AsInt: int64(13)}}, - "TraceId/test": {TraceId: *GenTestTraceID()}, - "SpanId/test": {SpanId: *GenTestSpanID()}, + "AsDouble/test": {Value: &Exemplar_AsDouble{AsDouble: float64(3.1415926)}}, "AsInt/default": {Value: &Exemplar_AsInt{AsInt: int64(0)}}, + "AsInt/test": {Value: &Exemplar_AsInt{AsInt: int64(13)}}, + "TraceId/test": {TraceId: *GenTestTraceID()}, + "SpanId/test": {SpanId: *GenTestSpanID()}, } } diff --git a/pdata/internal/generated_proto_exponentialhistogram.go b/pdata/internal/generated_proto_exponentialhistogram.go index 7d1446d4b6f..5d5e07793d2 100644 --- a/pdata/internal/generated_proto_exponentialhistogram.go +++ b/pdata/internal/generated_proto_exponentialhistogram.go @@ -45,7 +45,6 @@ func DeleteExponentialHistogram(orig *ExponentialHistogram, nullable bool) { orig.Reset() return } - for i := range orig.DataPoints { DeleteExponentialHistogramDataPoint(orig.DataPoints[i], true) } diff --git a/pdata/internal/generated_proto_exponentialhistogramdatapoint.go b/pdata/internal/generated_proto_exponentialhistogramdatapoint.go index 8abfa0c0095..9a1199cce82 100644 --- a/pdata/internal/generated_proto_exponentialhistogramdatapoint.go +++ b/pdata/internal/generated_proto_exponentialhistogramdatapoint.go @@ -62,12 +62,13 @@ func DeleteExponentialHistogramDataPoint(orig *ExponentialHistogramDataPoint, nu orig.Reset() return } - for i := range orig.Attributes { DeleteKeyValue(&orig.Attributes[i], false) } + DeleteExponentialHistogramDataPointBuckets(&orig.Positive, false) DeleteExponentialHistogramDataPointBuckets(&orig.Negative, false) + for i := range orig.Exemplars { DeleteExemplar(&orig.Exemplars[i], false) } diff --git a/pdata/internal/generated_proto_exponentialhistogramdatapointbuckets.go b/pdata/internal/generated_proto_exponentialhistogramdatapointbuckets.go index 3342ae19978..2501481c672 100644 --- a/pdata/internal/generated_proto_exponentialhistogramdatapointbuckets.go +++ b/pdata/internal/generated_proto_exponentialhistogramdatapointbuckets.go @@ -167,6 +167,7 @@ func (orig *ExponentialHistogramDataPointBuckets) SizeProto() int { if orig.Offset != int32(0) { n += 1 + proto.Soz(uint64(orig.Offset)) } + if len(orig.BucketCounts) > 0 { l = 0 for _, e := range orig.BucketCounts { diff --git a/pdata/internal/generated_proto_exportlogsservicerequest.go b/pdata/internal/generated_proto_exportlogsservicerequest.go index 1c849ec22db..7fb48b36a21 100644 --- a/pdata/internal/generated_proto_exportlogsservicerequest.go +++ b/pdata/internal/generated_proto_exportlogsservicerequest.go @@ -44,11 +44,9 @@ func DeleteExportLogsServiceRequest(orig *ExportLogsServiceRequest, nullable boo orig.Reset() return } - for i := range orig.ResourceLogs { DeleteResourceLogs(orig.ResourceLogs[i], true) } - orig.Reset() if nullable { protoPoolExportLogsServiceRequest.Put(orig) diff --git a/pdata/internal/generated_proto_exportlogsserviceresponse.go b/pdata/internal/generated_proto_exportlogsserviceresponse.go index 7b78c73604d..5570fe93d33 100644 --- a/pdata/internal/generated_proto_exportlogsserviceresponse.go +++ b/pdata/internal/generated_proto_exportlogsserviceresponse.go @@ -43,9 +43,7 @@ func DeleteExportLogsServiceResponse(orig *ExportLogsServiceResponse, nullable b orig.Reset() return } - DeleteExportLogsPartialSuccess(&orig.PartialSuccess, false) - orig.Reset() if nullable { protoPoolExportLogsServiceResponse.Put(orig) diff --git a/pdata/internal/generated_proto_exportmetricsservicerequest.go b/pdata/internal/generated_proto_exportmetricsservicerequest.go index f4a4a0fa7b2..76cc8020ca9 100644 --- a/pdata/internal/generated_proto_exportmetricsservicerequest.go +++ b/pdata/internal/generated_proto_exportmetricsservicerequest.go @@ -44,11 +44,9 @@ func DeleteExportMetricsServiceRequest(orig *ExportMetricsServiceRequest, nullab orig.Reset() return } - for i := range orig.ResourceMetrics { DeleteResourceMetrics(orig.ResourceMetrics[i], true) } - orig.Reset() if nullable { protoPoolExportMetricsServiceRequest.Put(orig) diff --git a/pdata/internal/generated_proto_exportmetricsserviceresponse.go b/pdata/internal/generated_proto_exportmetricsserviceresponse.go index 19e69384ed6..ae78a10f9b8 100644 --- a/pdata/internal/generated_proto_exportmetricsserviceresponse.go +++ b/pdata/internal/generated_proto_exportmetricsserviceresponse.go @@ -43,9 +43,7 @@ func DeleteExportMetricsServiceResponse(orig *ExportMetricsServiceResponse, null orig.Reset() return } - DeleteExportMetricsPartialSuccess(&orig.PartialSuccess, false) - orig.Reset() if nullable { protoPoolExportMetricsServiceResponse.Put(orig) diff --git a/pdata/internal/generated_proto_exportprofilesservicerequest.go b/pdata/internal/generated_proto_exportprofilesservicerequest.go index 5906ce52093..ba9ecbc4eed 100644 --- a/pdata/internal/generated_proto_exportprofilesservicerequest.go +++ b/pdata/internal/generated_proto_exportprofilesservicerequest.go @@ -45,12 +45,10 @@ func DeleteExportProfilesServiceRequest(orig *ExportProfilesServiceRequest, null orig.Reset() return } - for i := range orig.ResourceProfiles { DeleteResourceProfiles(orig.ResourceProfiles[i], true) } DeleteProfilesDictionary(&orig.Dictionary, false) - orig.Reset() if nullable { protoPoolExportProfilesServiceRequest.Put(orig) diff --git a/pdata/internal/generated_proto_exportprofilesserviceresponse.go b/pdata/internal/generated_proto_exportprofilesserviceresponse.go index 0153c060994..e8fea55ea3a 100644 --- a/pdata/internal/generated_proto_exportprofilesserviceresponse.go +++ b/pdata/internal/generated_proto_exportprofilesserviceresponse.go @@ -43,9 +43,7 @@ func DeleteExportProfilesServiceResponse(orig *ExportProfilesServiceResponse, nu orig.Reset() return } - DeleteExportProfilesPartialSuccess(&orig.PartialSuccess, false) - orig.Reset() if nullable { protoPoolExportProfilesServiceResponse.Put(orig) diff --git a/pdata/internal/generated_proto_exporttraceservicerequest.go b/pdata/internal/generated_proto_exporttraceservicerequest.go index e64316f8f3c..2a4ff9ef34f 100644 --- a/pdata/internal/generated_proto_exporttraceservicerequest.go +++ b/pdata/internal/generated_proto_exporttraceservicerequest.go @@ -44,11 +44,9 @@ func DeleteExportTraceServiceRequest(orig *ExportTraceServiceRequest, nullable b orig.Reset() return } - for i := range orig.ResourceSpans { DeleteResourceSpans(orig.ResourceSpans[i], true) } - orig.Reset() if nullable { protoPoolExportTraceServiceRequest.Put(orig) diff --git a/pdata/internal/generated_proto_exporttraceserviceresponse.go b/pdata/internal/generated_proto_exporttraceserviceresponse.go index 86be1a0fdaf..f3d35d4b9be 100644 --- a/pdata/internal/generated_proto_exporttraceserviceresponse.go +++ b/pdata/internal/generated_proto_exporttraceserviceresponse.go @@ -43,9 +43,7 @@ func DeleteExportTraceServiceResponse(orig *ExportTraceServiceResponse, nullable orig.Reset() return } - DeleteExportTracePartialSuccess(&orig.PartialSuccess, false) - orig.Reset() if nullable { protoPoolExportTraceServiceResponse.Put(orig) diff --git a/pdata/internal/generated_proto_gauge.go b/pdata/internal/generated_proto_gauge.go index e39eb2e7958..996d6624253 100644 --- a/pdata/internal/generated_proto_gauge.go +++ b/pdata/internal/generated_proto_gauge.go @@ -43,11 +43,9 @@ func DeleteGauge(orig *Gauge, nullable bool) { orig.Reset() return } - for i := range orig.DataPoints { DeleteNumberDataPoint(orig.DataPoints[i], true) } - orig.Reset() if nullable { protoPoolGauge.Put(orig) diff --git a/pdata/internal/generated_proto_histogram.go b/pdata/internal/generated_proto_histogram.go index ceaf27aed23..09fab65bb80 100644 --- a/pdata/internal/generated_proto_histogram.go +++ b/pdata/internal/generated_proto_histogram.go @@ -44,7 +44,6 @@ func DeleteHistogram(orig *Histogram, nullable bool) { orig.Reset() return } - for i := range orig.DataPoints { DeleteHistogramDataPoint(orig.DataPoints[i], true) } diff --git a/pdata/internal/generated_proto_histogramdatapoint.go b/pdata/internal/generated_proto_histogramdatapoint.go index 7306f55eb5e..6d1bbde5243 100644 --- a/pdata/internal/generated_proto_histogramdatapoint.go +++ b/pdata/internal/generated_proto_histogramdatapoint.go @@ -56,10 +56,10 @@ func DeleteHistogramDataPoint(orig *HistogramDataPoint, nullable bool) { orig.Reset() return } - for i := range orig.Attributes { DeleteKeyValue(&orig.Attributes[i], false) } + for i := range orig.Exemplars { DeleteExemplar(&orig.Exemplars[i], false) } diff --git a/pdata/internal/generated_proto_keyvalue.go b/pdata/internal/generated_proto_keyvalue.go index 7c3140e5d19..1641a0967ac 100644 --- a/pdata/internal/generated_proto_keyvalue.go +++ b/pdata/internal/generated_proto_keyvalue.go @@ -45,7 +45,6 @@ func DeleteKeyValue(orig *KeyValue, nullable bool) { } DeleteAnyValue(&orig.Value, false) - orig.Reset() if nullable { protoPoolKeyValue.Put(orig) diff --git a/pdata/internal/generated_proto_keyvaluelist.go b/pdata/internal/generated_proto_keyvaluelist.go index 1cb1fef73c8..9e01d808a20 100644 --- a/pdata/internal/generated_proto_keyvaluelist.go +++ b/pdata/internal/generated_proto_keyvaluelist.go @@ -43,11 +43,9 @@ func DeleteKeyValueList(orig *KeyValueList, nullable bool) { orig.Reset() return } - for i := range orig.Values { DeleteKeyValue(&orig.Values[i], false) } - orig.Reset() if nullable { protoPoolKeyValueList.Put(orig) diff --git a/pdata/internal/generated_proto_link.go b/pdata/internal/generated_proto_link.go index 26962ad2712..6df8aa77f84 100644 --- a/pdata/internal/generated_proto_link.go +++ b/pdata/internal/generated_proto_link.go @@ -44,10 +44,8 @@ func DeleteLink(orig *Link, nullable bool) { orig.Reset() return } - DeleteTraceID(&orig.TraceId, false) DeleteSpanID(&orig.SpanId, false) - orig.Reset() if nullable { protoPoolLink.Put(orig) diff --git a/pdata/internal/generated_proto_location.go b/pdata/internal/generated_proto_location.go index 42440cc2668..d7a85745eb0 100644 --- a/pdata/internal/generated_proto_location.go +++ b/pdata/internal/generated_proto_location.go @@ -205,6 +205,7 @@ func (orig *Location) SizeProto() int { l = orig.Lines[i].SizeProto() n += 1 + proto.Sov(uint64(l)) + l } + if len(orig.AttributeIndices) > 0 { l = 0 for _, e := range orig.AttributeIndices { diff --git a/pdata/internal/generated_proto_logrecord.go b/pdata/internal/generated_proto_logrecord.go index aa91ffb463a..91582afc544 100644 --- a/pdata/internal/generated_proto_logrecord.go +++ b/pdata/internal/generated_proto_logrecord.go @@ -60,6 +60,7 @@ func DeleteLogRecord(orig *LogRecord, nullable bool) { for i := range orig.Attributes { DeleteKeyValue(&orig.Attributes[i], false) } + DeleteTraceID(&orig.TraceId, false) DeleteSpanID(&orig.SpanId, false) diff --git a/pdata/internal/generated_proto_logsdata.go b/pdata/internal/generated_proto_logsdata.go index 8b7cf668f93..747684f1c6b 100644 --- a/pdata/internal/generated_proto_logsdata.go +++ b/pdata/internal/generated_proto_logsdata.go @@ -45,11 +45,9 @@ func DeleteLogsData(orig *LogsData, nullable bool) { orig.Reset() return } - for i := range orig.ResourceLogs { DeleteResourceLogs(orig.ResourceLogs[i], true) } - orig.Reset() if nullable { protoPoolLogsData.Put(orig) diff --git a/pdata/internal/generated_proto_logsrequest.go b/pdata/internal/generated_proto_logsrequest.go index 39852fcae83..94b915df049 100644 --- a/pdata/internal/generated_proto_logsrequest.go +++ b/pdata/internal/generated_proto_logsrequest.go @@ -45,7 +45,6 @@ func DeleteLogsRequest(orig *LogsRequest, nullable bool) { orig.Reset() return } - DeleteRequestContext(orig.RequestContext, true) DeleteLogsData(&orig.LogsData, false) diff --git a/pdata/internal/generated_proto_mapping.go b/pdata/internal/generated_proto_mapping.go index b6387fc00b6..e1772794ebf 100644 --- a/pdata/internal/generated_proto_mapping.go +++ b/pdata/internal/generated_proto_mapping.go @@ -200,6 +200,7 @@ func (orig *Mapping) SizeProto() int { if orig.FilenameStrindex != int32(0) { n += 1 + proto.Sov(uint64(orig.FilenameStrindex)) } + if len(orig.AttributeIndices) > 0 { l = 0 for _, e := range orig.AttributeIndices { diff --git a/pdata/internal/generated_proto_metric.go b/pdata/internal/generated_proto_metric.go index ca95732900e..6e5fa339f8a 100644 --- a/pdata/internal/generated_proto_metric.go +++ b/pdata/internal/generated_proto_metric.go @@ -162,12 +162,10 @@ func DeleteMetric(orig *Metric, nullable bool) { DeleteSummary(ov.Summary, true) ov.Summary = nil ProtoPoolMetric_Summary.Put(ov) - } for i := range orig.Metadata { DeleteKeyValue(&orig.Metadata[i], false) } - orig.Reset() if nullable { protoPoolMetric.Put(orig) @@ -384,7 +382,6 @@ func (orig *Metric) UnmarshalJSON(iter *json.Iterator) { ov.Gauge.UnmarshalJSON(iter) orig.Data = ov } - case "sum": { var ov *Metric_Sum @@ -397,7 +394,6 @@ func (orig *Metric) UnmarshalJSON(iter *json.Iterator) { ov.Sum.UnmarshalJSON(iter) orig.Data = ov } - case "histogram": { var ov *Metric_Histogram @@ -410,7 +406,6 @@ func (orig *Metric) UnmarshalJSON(iter *json.Iterator) { ov.Histogram.UnmarshalJSON(iter) orig.Data = ov } - case "exponentialHistogram", "exponential_histogram": { var ov *Metric_ExponentialHistogram @@ -423,7 +418,6 @@ func (orig *Metric) UnmarshalJSON(iter *json.Iterator) { ov.ExponentialHistogram.UnmarshalJSON(iter) orig.Data = ov } - case "summary": { var ov *Metric_Summary diff --git a/pdata/internal/generated_proto_metric_test.go b/pdata/internal/generated_proto_metric_test.go index e538a3c9885..9b770447fa3 100644 --- a/pdata/internal/generated_proto_metric_test.go +++ b/pdata/internal/generated_proto_metric_test.go @@ -196,41 +196,33 @@ func genTestFailingUnmarshalProtoValuesMetric() map[string][]byte { "Unit/wrong_wire_type": {0x1c}, "Unit/missing_value": {0x1a}, - "Gauge/wrong_wire_type": {0x2c}, - "Gauge/missing_value": {0x2a}, - - "Sum/wrong_wire_type": {0x3c}, - "Sum/missing_value": {0x3a}, - - "Histogram/wrong_wire_type": {0x4c}, - "Histogram/missing_value": {0x4a}, - + "Gauge/wrong_wire_type": {0x2c}, + "Gauge/missing_value": {0x2a}, + "Sum/wrong_wire_type": {0x3c}, + "Sum/missing_value": {0x3a}, + "Histogram/wrong_wire_type": {0x4c}, + "Histogram/missing_value": {0x4a}, "ExponentialHistogram/wrong_wire_type": {0x54}, "ExponentialHistogram/missing_value": {0x52}, - - "Summary/wrong_wire_type": {0x5c}, - "Summary/missing_value": {0x5a}, - "Metadata/wrong_wire_type": {0x64}, - "Metadata/missing_value": {0x62}, + "Summary/wrong_wire_type": {0x5c}, + "Summary/missing_value": {0x5a}, + "Metadata/wrong_wire_type": {0x64}, + "Metadata/missing_value": {0x62}, } } func genTestEncodingValuesMetric() map[string]*Metric { return map[string]*Metric{ - "empty": NewMetric(), - "Name/test": {Name: "test_name"}, - "Description/test": {Description: "test_description"}, - "Unit/test": {Unit: "test_unit"}, - "Gauge/default": {Data: &Metric_Gauge{Gauge: &Gauge{}}}, - "Gauge/test": {Data: &Metric_Gauge{Gauge: GenTestGauge()}}, - "Sum/default": {Data: &Metric_Sum{Sum: &Sum{}}}, - "Sum/test": {Data: &Metric_Sum{Sum: GenTestSum()}}, - "Histogram/default": {Data: &Metric_Histogram{Histogram: &Histogram{}}}, - "Histogram/test": {Data: &Metric_Histogram{Histogram: GenTestHistogram()}}, - "ExponentialHistogram/default": {Data: &Metric_ExponentialHistogram{ExponentialHistogram: &ExponentialHistogram{}}}, - "ExponentialHistogram/test": {Data: &Metric_ExponentialHistogram{ExponentialHistogram: GenTestExponentialHistogram()}}, - "Summary/default": {Data: &Metric_Summary{Summary: &Summary{}}}, - "Summary/test": {Data: &Metric_Summary{Summary: GenTestSummary()}}, - "Metadata/test": {Metadata: []KeyValue{{}, *GenTestKeyValue()}}, + "empty": NewMetric(), + "Name/test": {Name: "test_name"}, + "Description/test": {Description: "test_description"}, + "Unit/test": {Unit: "test_unit"}, + "Gauge/default": {Data: &Metric_Gauge{Gauge: &Gauge{}}}, + "Gauge/test": {Data: &Metric_Gauge{Gauge: GenTestGauge()}}, "Sum/default": {Data: &Metric_Sum{Sum: &Sum{}}}, + "Sum/test": {Data: &Metric_Sum{Sum: GenTestSum()}}, "Histogram/default": {Data: &Metric_Histogram{Histogram: &Histogram{}}}, + "Histogram/test": {Data: &Metric_Histogram{Histogram: GenTestHistogram()}}, "ExponentialHistogram/default": {Data: &Metric_ExponentialHistogram{ExponentialHistogram: &ExponentialHistogram{}}}, + "ExponentialHistogram/test": {Data: &Metric_ExponentialHistogram{ExponentialHistogram: GenTestExponentialHistogram()}}, "Summary/default": {Data: &Metric_Summary{Summary: &Summary{}}}, + "Summary/test": {Data: &Metric_Summary{Summary: GenTestSummary()}}, + "Metadata/test": {Metadata: []KeyValue{{}, *GenTestKeyValue()}}, } } diff --git a/pdata/internal/generated_proto_metricsdata.go b/pdata/internal/generated_proto_metricsdata.go index ad560d67b4b..aa7900f672a 100644 --- a/pdata/internal/generated_proto_metricsdata.go +++ b/pdata/internal/generated_proto_metricsdata.go @@ -45,11 +45,9 @@ func DeleteMetricsData(orig *MetricsData, nullable bool) { orig.Reset() return } - for i := range orig.ResourceMetrics { DeleteResourceMetrics(orig.ResourceMetrics[i], true) } - orig.Reset() if nullable { protoPoolMetricsData.Put(orig) diff --git a/pdata/internal/generated_proto_metricsrequest.go b/pdata/internal/generated_proto_metricsrequest.go index 820ce7b2eb5..c2cca74a1bc 100644 --- a/pdata/internal/generated_proto_metricsrequest.go +++ b/pdata/internal/generated_proto_metricsrequest.go @@ -45,7 +45,6 @@ func DeleteMetricsRequest(orig *MetricsRequest, nullable bool) { orig.Reset() return } - DeleteRequestContext(orig.RequestContext, true) DeleteMetricsData(&orig.MetricsData, false) diff --git a/pdata/internal/generated_proto_numberdatapoint.go b/pdata/internal/generated_proto_numberdatapoint.go index b3a698c2385..e7f01f60f96 100644 --- a/pdata/internal/generated_proto_numberdatapoint.go +++ b/pdata/internal/generated_proto_numberdatapoint.go @@ -91,10 +91,10 @@ func DeleteNumberDataPoint(orig *NumberDataPoint, nullable bool) { orig.Reset() return } - for i := range orig.Attributes { DeleteKeyValue(&orig.Attributes[i], false) } + switch ov := orig.Value.(type) { case *NumberDataPoint_AsDouble: if UseProtoPooling.IsEnabled() { @@ -106,7 +106,6 @@ func DeleteNumberDataPoint(orig *NumberDataPoint, nullable bool) { ov.AsInt = int64(0) ProtoPoolNumberDataPoint_AsInt.Put(ov) } - } for i := range orig.Exemplars { DeleteExemplar(&orig.Exemplars[i], false) @@ -290,7 +289,6 @@ func (orig *NumberDataPoint) UnmarshalJSON(iter *json.Iterator) { ov.AsDouble = iter.ReadFloat64() orig.Value = ov } - case "asInt", "as_int": { var ov *NumberDataPoint_AsInt @@ -336,8 +334,10 @@ func (orig *NumberDataPoint) SizeProto() int { _ = orig break case *NumberDataPoint_AsDouble: + n += 9 case *NumberDataPoint_AsInt: + n += 9 } for i := range orig.Exemplars { diff --git a/pdata/internal/generated_proto_numberdatapoint_test.go b/pdata/internal/generated_proto_numberdatapoint_test.go index 5c94d8fca72..ba205c15531 100644 --- a/pdata/internal/generated_proto_numberdatapoint_test.go +++ b/pdata/internal/generated_proto_numberdatapoint_test.go @@ -196,9 +196,8 @@ func genTestFailingUnmarshalProtoValuesNumberDataPoint() map[string][]byte { "TimeUnixNano/wrong_wire_type": {0x1c}, "TimeUnixNano/missing_value": {0x19}, - "AsDouble/wrong_wire_type": {0x24}, - "AsDouble/missing_value": {0x21}, - + "AsDouble/wrong_wire_type": {0x24}, + "AsDouble/missing_value": {0x21}, "AsInt/wrong_wire_type": {0x34}, "AsInt/missing_value": {0x31}, "Exemplars/wrong_wire_type": {0x2c}, @@ -215,10 +214,9 @@ func genTestEncodingValuesNumberDataPoint() map[string]*NumberDataPoint { "StartTimeUnixNano/test": {StartTimeUnixNano: uint64(13)}, "TimeUnixNano/test": {TimeUnixNano: uint64(13)}, "AsDouble/default": {Value: &NumberDataPoint_AsDouble{AsDouble: float64(0)}}, - "AsDouble/test": {Value: &NumberDataPoint_AsDouble{AsDouble: float64(3.1415926)}}, - "AsInt/default": {Value: &NumberDataPoint_AsInt{AsInt: int64(0)}}, - "AsInt/test": {Value: &NumberDataPoint_AsInt{AsInt: int64(13)}}, - "Exemplars/test": {Exemplars: []Exemplar{{}, *GenTestExemplar()}}, - "Flags/test": {Flags: uint32(13)}, + "AsDouble/test": {Value: &NumberDataPoint_AsDouble{AsDouble: float64(3.1415926)}}, "AsInt/default": {Value: &NumberDataPoint_AsInt{AsInt: int64(0)}}, + "AsInt/test": {Value: &NumberDataPoint_AsInt{AsInt: int64(13)}}, + "Exemplars/test": {Exemplars: []Exemplar{{}, *GenTestExemplar()}}, + "Flags/test": {Flags: uint32(13)}, } } diff --git a/pdata/internal/generated_proto_profile.go b/pdata/internal/generated_proto_profile.go index 4c33cd12072..db4bd569a0f 100644 --- a/pdata/internal/generated_proto_profile.go +++ b/pdata/internal/generated_proto_profile.go @@ -55,12 +55,13 @@ func DeleteProfile(orig *Profile, nullable bool) { orig.Reset() return } - DeleteValueType(&orig.SampleType, false) for i := range orig.Samples { DeleteSample(orig.Samples[i], true) } + DeleteValueType(&orig.PeriodType, false) + DeleteProfileID(&orig.ProfileId, false) orig.Reset() @@ -291,6 +292,7 @@ func (orig *Profile) SizeProto() int { if l > 0 { n += 1 + proto.Sov(uint64(l)) + l } + if len(orig.AttributeIndices) > 0 { l = 0 for _, e := range orig.AttributeIndices { diff --git a/pdata/internal/generated_proto_profilesdata.go b/pdata/internal/generated_proto_profilesdata.go index f3d1c1a16d9..45a876f6deb 100644 --- a/pdata/internal/generated_proto_profilesdata.go +++ b/pdata/internal/generated_proto_profilesdata.go @@ -46,12 +46,10 @@ func DeleteProfilesData(orig *ProfilesData, nullable bool) { orig.Reset() return } - for i := range orig.ResourceProfiles { DeleteResourceProfiles(orig.ResourceProfiles[i], true) } DeleteProfilesDictionary(&orig.Dictionary, false) - orig.Reset() if nullable { protoPoolProfilesData.Put(orig) diff --git a/pdata/internal/generated_proto_profilesdictionary.go b/pdata/internal/generated_proto_profilesdictionary.go index 556fc7f8158..8b8bef11c57 100644 --- a/pdata/internal/generated_proto_profilesdictionary.go +++ b/pdata/internal/generated_proto_profilesdictionary.go @@ -49,7 +49,6 @@ func DeleteProfilesDictionary(orig *ProfilesDictionary, nullable bool) { orig.Reset() return } - for i := range orig.MappingTable { DeleteMapping(orig.MappingTable[i], true) } @@ -62,13 +61,13 @@ func DeleteProfilesDictionary(orig *ProfilesDictionary, nullable bool) { for i := range orig.LinkTable { DeleteLink(orig.LinkTable[i], true) } + for i := range orig.AttributeTable { DeleteKeyValueAndUnit(orig.AttributeTable[i], true) } for i := range orig.StackTable { DeleteStack(orig.StackTable[i], true) } - orig.Reset() if nullable { protoPoolProfilesDictionary.Put(orig) diff --git a/pdata/internal/generated_proto_profilesrequest.go b/pdata/internal/generated_proto_profilesrequest.go index bab36486f81..b8956807f7d 100644 --- a/pdata/internal/generated_proto_profilesrequest.go +++ b/pdata/internal/generated_proto_profilesrequest.go @@ -45,7 +45,6 @@ func DeleteProfilesRequest(orig *ProfilesRequest, nullable bool) { orig.Reset() return } - DeleteRequestContext(orig.RequestContext, true) DeleteProfilesData(&orig.ProfilesData, false) diff --git a/pdata/internal/generated_proto_requestcontext.go b/pdata/internal/generated_proto_requestcontext.go index 4921ea97f09..0dd5d7e8cd3 100644 --- a/pdata/internal/generated_proto_requestcontext.go +++ b/pdata/internal/generated_proto_requestcontext.go @@ -119,7 +119,6 @@ func DeleteRequestContext(orig *RequestContext, nullable bool) { orig.Reset() return } - DeleteSpanContext(orig.SpanContext, true) for i := range orig.ClientMetadata { DeleteKeyValue(&orig.ClientMetadata[i], false) @@ -141,9 +140,7 @@ func DeleteRequestContext(orig *RequestContext, nullable bool) { DeleteUnixAddr(ov.Unix, true) ov.Unix = nil ProtoPoolRequestContext_Unix.Put(ov) - } - orig.Reset() if nullable { protoPoolRequestContext.Put(orig) @@ -338,7 +335,6 @@ func (orig *RequestContext) UnmarshalJSON(iter *json.Iterator) { ov.IP.UnmarshalJSON(iter) orig.ClientAddress = ov } - case "tCP": { var ov *RequestContext_TCP @@ -351,7 +347,6 @@ func (orig *RequestContext) UnmarshalJSON(iter *json.Iterator) { ov.TCP.UnmarshalJSON(iter) orig.ClientAddress = ov } - case "uDP": { var ov *RequestContext_UDP @@ -364,7 +359,6 @@ func (orig *RequestContext) UnmarshalJSON(iter *json.Iterator) { ov.UDP.UnmarshalJSON(iter) orig.ClientAddress = ov } - case "unix": { var ov *RequestContext_Unix @@ -618,6 +612,7 @@ func (orig *RequestContext) UnmarshalProto(buf []byte) error { return err } orig.ClientAddress = ov + default: pos, err = proto.ConsumeUnknown(buf, pos, wireType) if err != nil { diff --git a/pdata/internal/generated_proto_requestcontext_test.go b/pdata/internal/generated_proto_requestcontext_test.go index dd85497a1a3..8231e29267b 100644 --- a/pdata/internal/generated_proto_requestcontext_test.go +++ b/pdata/internal/generated_proto_requestcontext_test.go @@ -194,15 +194,12 @@ func genTestFailingUnmarshalProtoValuesRequestContext() map[string][]byte { "ClientMetadata/wrong_wire_type": {0x14}, "ClientMetadata/missing_value": {0x12}, - "IP/wrong_wire_type": {0x1c}, - "IP/missing_value": {0x1a}, - - "TCP/wrong_wire_type": {0x24}, - "TCP/missing_value": {0x22}, - - "UDP/wrong_wire_type": {0x2c}, - "UDP/missing_value": {0x2a}, - + "IP/wrong_wire_type": {0x1c}, + "IP/missing_value": {0x1a}, + "TCP/wrong_wire_type": {0x24}, + "TCP/missing_value": {0x22}, + "UDP/wrong_wire_type": {0x2c}, + "UDP/missing_value": {0x2a}, "Unix/wrong_wire_type": {0x34}, "Unix/missing_value": {0x32}, } @@ -214,12 +211,9 @@ func genTestEncodingValuesRequestContext() map[string]*RequestContext { "SpanContext/test": {SpanContext: GenTestSpanContext()}, "ClientMetadata/test": {ClientMetadata: []KeyValue{{}, *GenTestKeyValue()}}, "IP/default": {ClientAddress: &RequestContext_IP{IP: &IPAddr{}}}, - "IP/test": {ClientAddress: &RequestContext_IP{IP: GenTestIPAddr()}}, - "TCP/default": {ClientAddress: &RequestContext_TCP{TCP: &TCPAddr{}}}, - "TCP/test": {ClientAddress: &RequestContext_TCP{TCP: GenTestTCPAddr()}}, - "UDP/default": {ClientAddress: &RequestContext_UDP{UDP: &UDPAddr{}}}, - "UDP/test": {ClientAddress: &RequestContext_UDP{UDP: GenTestUDPAddr()}}, - "Unix/default": {ClientAddress: &RequestContext_Unix{Unix: &UnixAddr{}}}, - "Unix/test": {ClientAddress: &RequestContext_Unix{Unix: GenTestUnixAddr()}}, + "IP/test": {ClientAddress: &RequestContext_IP{IP: GenTestIPAddr()}}, "TCP/default": {ClientAddress: &RequestContext_TCP{TCP: &TCPAddr{}}}, + "TCP/test": {ClientAddress: &RequestContext_TCP{TCP: GenTestTCPAddr()}}, "UDP/default": {ClientAddress: &RequestContext_UDP{UDP: &UDPAddr{}}}, + "UDP/test": {ClientAddress: &RequestContext_UDP{UDP: GenTestUDPAddr()}}, "Unix/default": {ClientAddress: &RequestContext_Unix{Unix: &UnixAddr{}}}, + "Unix/test": {ClientAddress: &RequestContext_Unix{Unix: GenTestUnixAddr()}}, } } diff --git a/pdata/internal/generated_proto_resource.go b/pdata/internal/generated_proto_resource.go index f23bbfc0db9..c1b1986d471 100644 --- a/pdata/internal/generated_proto_resource.go +++ b/pdata/internal/generated_proto_resource.go @@ -45,14 +45,13 @@ func DeleteResource(orig *Resource, nullable bool) { orig.Reset() return } - for i := range orig.Attributes { DeleteKeyValue(&orig.Attributes[i], false) } + for i := range orig.EntityRefs { DeleteEntityRef(orig.EntityRefs[i], true) } - orig.Reset() if nullable { protoPoolResource.Put(orig) diff --git a/pdata/internal/generated_proto_resourcelogs.go b/pdata/internal/generated_proto_resourcelogs.go index 23fc5e14aaf..f7f64566672 100644 --- a/pdata/internal/generated_proto_resourcelogs.go +++ b/pdata/internal/generated_proto_resourcelogs.go @@ -46,15 +46,14 @@ func DeleteResourceLogs(orig *ResourceLogs, nullable bool) { orig.Reset() return } - DeleteResource(&orig.Resource, false) for i := range orig.ScopeLogs { DeleteScopeLogs(orig.ScopeLogs[i], true) } + for i := range orig.DeprecatedScopeLogs { DeleteScopeLogs(orig.DeprecatedScopeLogs[i], true) } - orig.Reset() if nullable { protoPoolResourceLogs.Put(orig) diff --git a/pdata/internal/generated_proto_resourcemetrics.go b/pdata/internal/generated_proto_resourcemetrics.go index 8cfa263ad47..dc61ce32cbd 100644 --- a/pdata/internal/generated_proto_resourcemetrics.go +++ b/pdata/internal/generated_proto_resourcemetrics.go @@ -46,15 +46,14 @@ func DeleteResourceMetrics(orig *ResourceMetrics, nullable bool) { orig.Reset() return } - DeleteResource(&orig.Resource, false) for i := range orig.ScopeMetrics { DeleteScopeMetrics(orig.ScopeMetrics[i], true) } + for i := range orig.DeprecatedScopeMetrics { DeleteScopeMetrics(orig.DeprecatedScopeMetrics[i], true) } - orig.Reset() if nullable { protoPoolResourceMetrics.Put(orig) diff --git a/pdata/internal/generated_proto_resourceprofiles.go b/pdata/internal/generated_proto_resourceprofiles.go index 5114d7a894b..85bf7b3b1a6 100644 --- a/pdata/internal/generated_proto_resourceprofiles.go +++ b/pdata/internal/generated_proto_resourceprofiles.go @@ -45,7 +45,6 @@ func DeleteResourceProfiles(orig *ResourceProfiles, nullable bool) { orig.Reset() return } - DeleteResource(&orig.Resource, false) for i := range orig.ScopeProfiles { DeleteScopeProfiles(orig.ScopeProfiles[i], true) diff --git a/pdata/internal/generated_proto_resourcespans.go b/pdata/internal/generated_proto_resourcespans.go index f008db67057..fd29e905728 100644 --- a/pdata/internal/generated_proto_resourcespans.go +++ b/pdata/internal/generated_proto_resourcespans.go @@ -46,15 +46,14 @@ func DeleteResourceSpans(orig *ResourceSpans, nullable bool) { orig.Reset() return } - DeleteResource(&orig.Resource, false) for i := range orig.ScopeSpans { DeleteScopeSpans(orig.ScopeSpans[i], true) } + for i := range orig.DeprecatedScopeSpans { DeleteScopeSpans(orig.DeprecatedScopeSpans[i], true) } - orig.Reset() if nullable { protoPoolResourceSpans.Put(orig) diff --git a/pdata/internal/generated_proto_sample.go b/pdata/internal/generated_proto_sample.go index eb844f703b3..5d4169bcc47 100644 --- a/pdata/internal/generated_proto_sample.go +++ b/pdata/internal/generated_proto_sample.go @@ -214,6 +214,7 @@ func (orig *Sample) SizeProto() int { if orig.StackIndex != int32(0) { n += 1 + proto.Sov(uint64(orig.StackIndex)) } + if len(orig.Values) > 0 { l = 0 for _, e := range orig.Values { @@ -221,6 +222,7 @@ func (orig *Sample) SizeProto() int { } n += 1 + proto.Sov(uint64(l)) + l } + if len(orig.AttributeIndices) > 0 { l = 0 for _, e := range orig.AttributeIndices { diff --git a/pdata/internal/generated_proto_scopelogs.go b/pdata/internal/generated_proto_scopelogs.go index e7406f26e88..6e4c8ed34fc 100644 --- a/pdata/internal/generated_proto_scopelogs.go +++ b/pdata/internal/generated_proto_scopelogs.go @@ -45,7 +45,6 @@ func DeleteScopeLogs(orig *ScopeLogs, nullable bool) { orig.Reset() return } - DeleteInstrumentationScope(&orig.Scope, false) for i := range orig.LogRecords { DeleteLogRecord(orig.LogRecords[i], true) diff --git a/pdata/internal/generated_proto_scopemetrics.go b/pdata/internal/generated_proto_scopemetrics.go index 1fac11cbe03..42f048a42af 100644 --- a/pdata/internal/generated_proto_scopemetrics.go +++ b/pdata/internal/generated_proto_scopemetrics.go @@ -45,7 +45,6 @@ func DeleteScopeMetrics(orig *ScopeMetrics, nullable bool) { orig.Reset() return } - DeleteInstrumentationScope(&orig.Scope, false) for i := range orig.Metrics { DeleteMetric(orig.Metrics[i], true) diff --git a/pdata/internal/generated_proto_scopeprofiles.go b/pdata/internal/generated_proto_scopeprofiles.go index b5ef9eb78c0..f75741d3623 100644 --- a/pdata/internal/generated_proto_scopeprofiles.go +++ b/pdata/internal/generated_proto_scopeprofiles.go @@ -45,7 +45,6 @@ func DeleteScopeProfiles(orig *ScopeProfiles, nullable bool) { orig.Reset() return } - DeleteInstrumentationScope(&orig.Scope, false) for i := range orig.Profiles { DeleteProfile(orig.Profiles[i], true) diff --git a/pdata/internal/generated_proto_scopespans.go b/pdata/internal/generated_proto_scopespans.go index c6a5540c7d6..73c373034f5 100644 --- a/pdata/internal/generated_proto_scopespans.go +++ b/pdata/internal/generated_proto_scopespans.go @@ -45,7 +45,6 @@ func DeleteScopeSpans(orig *ScopeSpans, nullable bool) { orig.Reset() return } - DeleteInstrumentationScope(&orig.Scope, false) for i := range orig.Spans { DeleteSpan(orig.Spans[i], true) diff --git a/pdata/internal/generated_proto_span.go b/pdata/internal/generated_proto_span.go index a3384464b3e..94f5adbd8ac 100644 --- a/pdata/internal/generated_proto_span.go +++ b/pdata/internal/generated_proto_span.go @@ -60,21 +60,24 @@ func DeleteSpan(orig *Span, nullable bool) { orig.Reset() return } - DeleteTraceID(&orig.TraceId, false) DeleteSpanID(&orig.SpanId, false) + DeleteSpanID(&orig.ParentSpanId, false) + for i := range orig.Attributes { DeleteKeyValue(&orig.Attributes[i], false) } + for i := range orig.Events { DeleteSpanEvent(orig.Events[i], true) } + for i := range orig.Links { DeleteSpanLink(orig.Links[i], true) } - DeleteStatus(&orig.Status, false) + DeleteStatus(&orig.Status, false) orig.Reset() if nullable { protoPoolSpan.Put(orig) diff --git a/pdata/internal/generated_proto_spancontext.go b/pdata/internal/generated_proto_spancontext.go index 210cdcff258..3b8185f0f59 100644 --- a/pdata/internal/generated_proto_spancontext.go +++ b/pdata/internal/generated_proto_spancontext.go @@ -47,7 +47,6 @@ func DeleteSpanContext(orig *SpanContext, nullable bool) { orig.Reset() return } - DeleteTraceID(&orig.TraceID, false) DeleteSpanID(&orig.SpanID, false) diff --git a/pdata/internal/generated_proto_spanlink.go b/pdata/internal/generated_proto_spanlink.go index 32d3adf4c4b..7e8298c6d31 100644 --- a/pdata/internal/generated_proto_spanlink.go +++ b/pdata/internal/generated_proto_spanlink.go @@ -51,9 +51,9 @@ func DeleteSpanLink(orig *SpanLink, nullable bool) { orig.Reset() return } - DeleteTraceID(&orig.TraceId, false) DeleteSpanID(&orig.SpanId, false) + for i := range orig.Attributes { DeleteKeyValue(&orig.Attributes[i], false) } diff --git a/pdata/internal/generated_proto_stack.go b/pdata/internal/generated_proto_stack.go index df0a00c0401..be7a4ce48a7 100644 --- a/pdata/internal/generated_proto_stack.go +++ b/pdata/internal/generated_proto_stack.go @@ -157,6 +157,7 @@ func (orig *Stack) SizeProto() int { var n int var l int _ = l + if len(orig.LocationIndices) > 0 { l = 0 for _, e := range orig.LocationIndices { diff --git a/pdata/internal/generated_proto_sum.go b/pdata/internal/generated_proto_sum.go index c7e8895bafd..f419344b54d 100644 --- a/pdata/internal/generated_proto_sum.go +++ b/pdata/internal/generated_proto_sum.go @@ -45,7 +45,6 @@ func DeleteSum(orig *Sum, nullable bool) { orig.Reset() return } - for i := range orig.DataPoints { DeleteNumberDataPoint(orig.DataPoints[i], true) } diff --git a/pdata/internal/generated_proto_summary.go b/pdata/internal/generated_proto_summary.go index 8d40bd16603..5523e5af8b3 100644 --- a/pdata/internal/generated_proto_summary.go +++ b/pdata/internal/generated_proto_summary.go @@ -43,11 +43,9 @@ func DeleteSummary(orig *Summary, nullable bool) { orig.Reset() return } - for i := range orig.DataPoints { DeleteSummaryDataPoint(orig.DataPoints[i], true) } - orig.Reset() if nullable { protoPoolSummary.Put(orig) diff --git a/pdata/internal/generated_proto_summarydatapoint.go b/pdata/internal/generated_proto_summarydatapoint.go index 870c745c4fc..85a76e85974 100644 --- a/pdata/internal/generated_proto_summarydatapoint.go +++ b/pdata/internal/generated_proto_summarydatapoint.go @@ -51,10 +51,10 @@ func DeleteSummaryDataPoint(orig *SummaryDataPoint, nullable bool) { orig.Reset() return } - for i := range orig.Attributes { DeleteKeyValue(&orig.Attributes[i], false) } + for i := range orig.QuantileValues { DeleteSummaryDataPointValueAtQuantile(orig.QuantileValues[i], true) } diff --git a/pdata/internal/generated_proto_tracesdata.go b/pdata/internal/generated_proto_tracesdata.go index f63549f1cbc..2b54b6247a5 100644 --- a/pdata/internal/generated_proto_tracesdata.go +++ b/pdata/internal/generated_proto_tracesdata.go @@ -45,11 +45,9 @@ func DeleteTracesData(orig *TracesData, nullable bool) { orig.Reset() return } - for i := range orig.ResourceSpans { DeleteResourceSpans(orig.ResourceSpans[i], true) } - orig.Reset() if nullable { protoPoolTracesData.Put(orig) diff --git a/pdata/internal/generated_proto_tracesrequest.go b/pdata/internal/generated_proto_tracesrequest.go index 5027298a988..b8bb39687fd 100644 --- a/pdata/internal/generated_proto_tracesrequest.go +++ b/pdata/internal/generated_proto_tracesrequest.go @@ -45,7 +45,6 @@ func DeleteTracesRequest(orig *TracesRequest, nullable bool) { orig.Reset() return } - DeleteRequestContext(orig.RequestContext, true) DeleteTracesData(&orig.TracesData, false) diff --git a/pdata/pmetric/generated_exemplar.go b/pdata/pmetric/generated_exemplar.go index e0681f6d17f..12c9984abc6 100644 --- a/pdata/pmetric/generated_exemplar.go +++ b/pdata/pmetric/generated_exemplar.go @@ -95,9 +95,7 @@ func (ms Exemplar) SetDoubleValue(v float64) { } ov.AsDouble = v ms.orig.Value = ov -} - -// IntValue returns the int associated with this Exemplar. +} // IntValue returns the int associated with this Exemplar. func (ms Exemplar) IntValue() int64 { return ms.orig.GetAsInt() } diff --git a/pdata/pmetric/generated_exemplar_test.go b/pdata/pmetric/generated_exemplar_test.go index fedeff3200f..141e5bef675 100644 --- a/pdata/pmetric/generated_exemplar_test.go +++ b/pdata/pmetric/generated_exemplar_test.go @@ -72,7 +72,6 @@ func TestExemplar_DoubleValue(t *testing.T) { sharedState.MarkReadOnly() assert.Panics(t, func() { newExemplar(internal.NewExemplar(), sharedState).SetDoubleValue(float64(3.1415926)) }) } - func TestExemplar_IntValue(t *testing.T) { ms := NewExemplar() assert.Equal(t, int64(0), ms.IntValue()) diff --git a/pdata/pmetric/generated_metric.go b/pdata/pmetric/generated_metric.go index 04eebe8e09a..792d38da8fd 100644 --- a/pdata/pmetric/generated_metric.go +++ b/pdata/pmetric/generated_metric.go @@ -130,10 +130,7 @@ func (ms Metric) SetEmptyGauge() Gauge { ov.Gauge = internal.NewGauge() ms.orig.Data = ov return newGauge(ov.Gauge, ms.state) -} - -// Sum returns the sum associated with this Metric. -// +} // Sum returns the sum associated with this Metric. // Calling this function when Type() != MetricTypeSum returns an invalid // zero-initialized instance of Sum. Note that using such Sum instance can cause panic. // @@ -162,10 +159,7 @@ func (ms Metric) SetEmptySum() Sum { ov.Sum = internal.NewSum() ms.orig.Data = ov return newSum(ov.Sum, ms.state) -} - -// Histogram returns the histogram associated with this Metric. -// +} // Histogram returns the histogram associated with this Metric. // Calling this function when Type() != MetricTypeHistogram returns an invalid // zero-initialized instance of Histogram. Note that using such Histogram instance can cause panic. // @@ -194,10 +188,7 @@ func (ms Metric) SetEmptyHistogram() Histogram { ov.Histogram = internal.NewHistogram() ms.orig.Data = ov return newHistogram(ov.Histogram, ms.state) -} - -// ExponentialHistogram returns the exponentialhistogram associated with this Metric. -// +} // ExponentialHistogram returns the exponentialhistogram associated with this Metric. // Calling this function when Type() != MetricTypeExponentialHistogram returns an invalid // zero-initialized instance of ExponentialHistogram. Note that using such ExponentialHistogram instance can cause panic. // @@ -226,10 +217,7 @@ func (ms Metric) SetEmptyExponentialHistogram() ExponentialHistogram { ov.ExponentialHistogram = internal.NewExponentialHistogram() ms.orig.Data = ov return newExponentialHistogram(ov.ExponentialHistogram, ms.state) -} - -// Summary returns the summary associated with this Metric. -// +} // Summary returns the summary associated with this Metric. // Calling this function when Type() != MetricTypeSummary returns an invalid // zero-initialized instance of Summary. Note that using such Summary instance can cause panic. // diff --git a/pdata/pmetric/generated_metric_test.go b/pdata/pmetric/generated_metric_test.go index 70f91cb3dab..cce7e34316e 100644 --- a/pdata/pmetric/generated_metric_test.go +++ b/pdata/pmetric/generated_metric_test.go @@ -88,7 +88,6 @@ func TestMetric_Gauge(t *testing.T) { sharedState.MarkReadOnly() assert.Panics(t, func() { newMetric(internal.NewMetric(), sharedState).SetEmptyGauge() }) } - func TestMetric_Sum(t *testing.T) { ms := NewMetric() ms.SetEmptySum() @@ -100,7 +99,6 @@ func TestMetric_Sum(t *testing.T) { sharedState.MarkReadOnly() assert.Panics(t, func() { newMetric(internal.NewMetric(), sharedState).SetEmptySum() }) } - func TestMetric_Histogram(t *testing.T) { ms := NewMetric() ms.SetEmptyHistogram() @@ -112,7 +110,6 @@ func TestMetric_Histogram(t *testing.T) { sharedState.MarkReadOnly() assert.Panics(t, func() { newMetric(internal.NewMetric(), sharedState).SetEmptyHistogram() }) } - func TestMetric_ExponentialHistogram(t *testing.T) { ms := NewMetric() ms.SetEmptyExponentialHistogram() @@ -124,7 +121,6 @@ func TestMetric_ExponentialHistogram(t *testing.T) { sharedState.MarkReadOnly() assert.Panics(t, func() { newMetric(internal.NewMetric(), sharedState).SetEmptyExponentialHistogram() }) } - func TestMetric_Summary(t *testing.T) { ms := NewMetric() ms.SetEmptySummary() diff --git a/pdata/pmetric/generated_numberdatapoint.go b/pdata/pmetric/generated_numberdatapoint.go index e61eba8a8c5..8dc926bbef4 100644 --- a/pdata/pmetric/generated_numberdatapoint.go +++ b/pdata/pmetric/generated_numberdatapoint.go @@ -103,9 +103,7 @@ func (ms NumberDataPoint) SetDoubleValue(v float64) { } ov.AsDouble = v ms.orig.Value = ov -} - -// IntValue returns the int associated with this NumberDataPoint. +} // IntValue returns the int associated with this NumberDataPoint. func (ms NumberDataPoint) IntValue() int64 { return ms.orig.GetAsInt() } diff --git a/pdata/pmetric/generated_numberdatapoint_test.go b/pdata/pmetric/generated_numberdatapoint_test.go index e1c70248a19..710a426876c 100644 --- a/pdata/pmetric/generated_numberdatapoint_test.go +++ b/pdata/pmetric/generated_numberdatapoint_test.go @@ -82,7 +82,6 @@ func TestNumberDataPoint_DoubleValue(t *testing.T) { newNumberDataPoint(internal.NewNumberDataPoint(), sharedState).SetDoubleValue(float64(3.1415926)) }) } - func TestNumberDataPoint_IntValue(t *testing.T) { ms := NewNumberDataPoint() assert.Equal(t, int64(0), ms.IntValue())