diff --git a/cmd/pdatagen/internal/common_structs.go b/cmd/pdatagen/internal/common_structs.go index e7689927c6b..94097e7fe6d 100644 --- a/cmd/pdatagen/internal/common_structs.go +++ b/cmd/pdatagen/internal/common_structs.go @@ -32,7 +32,7 @@ var commonFile = &File{ }, } -var instrumentationLibrary = &messagePtrStruct{ +var instrumentationLibrary = &messageValueStruct{ structName: "InstrumentationLibrary", description: "// InstrumentationLibrary is a message representing the instrumentation library information.", originFullName: "otlpcommon.InstrumentationLibrary", @@ -66,7 +66,7 @@ var attributeMap = &sliceStruct{ var attributeKeyValue = &messagePtrStruct{} -var instrumentationLibraryField = &messagePtrField{ +var instrumentationLibraryField = &messageValueField{ fieldName: "InstrumentationLibrary", originFieldName: "InstrumentationLibrary", returnMessage: instrumentationLibrary, diff --git a/consumer/pdata/generated_common.go b/consumer/pdata/generated_common.go index 5006f9a14fa..45ff2b07b32 100644 --- a/consumer/pdata/generated_common.go +++ b/consumer/pdata/generated_common.go @@ -30,33 +30,23 @@ import ( // Important: zero-initialized instance is not valid for use. type InstrumentationLibrary struct { // orig points to the pointer otlpcommon.InstrumentationLibrary field contained somewhere else. - // We use pointer-to-pointer to be able to modify it in InitEmpty func. - orig **otlpcommon.InstrumentationLibrary + orig *otlpcommon.InstrumentationLibrary } -func newInstrumentationLibrary(orig **otlpcommon.InstrumentationLibrary) InstrumentationLibrary { - return InstrumentationLibrary{orig} +func newInstrumentationLibrary(orig *otlpcommon.InstrumentationLibrary) InstrumentationLibrary { + return InstrumentationLibrary{orig: orig} } -// NewInstrumentationLibrary creates a new "nil" InstrumentationLibrary. -// To initialize the struct call "InitEmpty". +// NewInstrumentationLibrary creates a new empty InstrumentationLibrary. // // This must be used only in testing code since no "Set" method available. func NewInstrumentationLibrary() InstrumentationLibrary { - orig := (*otlpcommon.InstrumentationLibrary)(nil) - return newInstrumentationLibrary(&orig) + return newInstrumentationLibrary(&otlpcommon.InstrumentationLibrary{}) } -// InitEmpty overwrites the current value with empty. +// Deprecated: This function will be removed soon. func (ms InstrumentationLibrary) InitEmpty() { - *ms.orig = &otlpcommon.InstrumentationLibrary{} -} - -// IsNil returns true if the underlying data are nil. -// -// Important: All other functions will cause a runtime error if this returns "true". -func (ms InstrumentationLibrary) IsNil() bool { - return *ms.orig == nil + *ms.orig = otlpcommon.InstrumentationLibrary{} } // Name returns the name associated with this InstrumentationLibrary. @@ -89,13 +79,6 @@ func (ms InstrumentationLibrary) SetVersion(v string) { // CopyTo copies all properties from the current struct to the dest. func (ms InstrumentationLibrary) CopyTo(dest InstrumentationLibrary) { - if ms.IsNil() { - *dest.orig = nil - return - } - if dest.IsNil() { - dest.InitEmpty() - } dest.SetName(ms.Name()) dest.SetVersion(ms.Version()) } diff --git a/consumer/pdata/generated_common_test.go b/consumer/pdata/generated_common_test.go index 238a5cad569..e8deabe406b 100644 --- a/consumer/pdata/generated_common_test.go +++ b/consumer/pdata/generated_common_test.go @@ -25,17 +25,8 @@ import ( otlpcommon "go.opentelemetry.io/collector/internal/data/opentelemetry-proto-gen/common/v1" ) -func TestInstrumentationLibrary_InitEmpty(t *testing.T) { - ms := NewInstrumentationLibrary() - assert.True(t, ms.IsNil()) - ms.InitEmpty() - assert.False(t, ms.IsNil()) -} - func TestInstrumentationLibrary_CopyTo(t *testing.T) { ms := NewInstrumentationLibrary() - NewInstrumentationLibrary().CopyTo(ms) - assert.True(t, ms.IsNil()) generateTestInstrumentationLibrary().CopyTo(ms) assert.EqualValues(t, generateTestInstrumentationLibrary(), ms) } @@ -178,7 +169,6 @@ func TestAnyValueArray_Append(t *testing.T) { func generateTestInstrumentationLibrary() InstrumentationLibrary { tv := NewInstrumentationLibrary() - tv.InitEmpty() fillTestInstrumentationLibrary(tv) return tv } diff --git a/consumer/pdata/generated_log.go b/consumer/pdata/generated_log.go index 3ffb1ad822a..4efff33d6cf 100644 --- a/consumer/pdata/generated_log.go +++ b/consumer/pdata/generated_log.go @@ -354,9 +354,6 @@ func (ms InstrumentationLibraryLogs) IsNil() bool { } // InstrumentationLibrary returns the instrumentationlibrary associated with this InstrumentationLibraryLogs. -// If no instrumentationlibrary available, it creates an empty message and associates it with this InstrumentationLibraryLogs. -// -// Empty initialized InstrumentationLibraryLogs will return "nil" InstrumentationLibrary. // // Important: This causes a runtime error if IsNil() returns "true". func (ms InstrumentationLibraryLogs) InstrumentationLibrary() InstrumentationLibrary { diff --git a/consumer/pdata/generated_log_test.go b/consumer/pdata/generated_log_test.go index 502171f2474..e9360a7f6c5 100644 --- a/consumer/pdata/generated_log_test.go +++ b/consumer/pdata/generated_log_test.go @@ -310,9 +310,6 @@ func TestInstrumentationLibraryLogs_CopyTo(t *testing.T) { func TestInstrumentationLibraryLogs_InstrumentationLibrary(t *testing.T) { ms := NewInstrumentationLibraryLogs() ms.InitEmpty() - assert.True(t, ms.InstrumentationLibrary().IsNil()) - ms.InstrumentationLibrary().InitEmpty() - assert.False(t, ms.InstrumentationLibrary().IsNil()) fillTestInstrumentationLibrary(ms.InstrumentationLibrary()) assert.EqualValues(t, generateTestInstrumentationLibrary(), ms.InstrumentationLibrary()) } @@ -596,7 +593,6 @@ func generateTestInstrumentationLibraryLogs() InstrumentationLibraryLogs { } func fillTestInstrumentationLibraryLogs(tv InstrumentationLibraryLogs) { - tv.InstrumentationLibrary().InitEmpty() fillTestInstrumentationLibrary(tv.InstrumentationLibrary()) fillTestLogSlice(tv.Logs()) } diff --git a/consumer/pdata/generated_metrics.go b/consumer/pdata/generated_metrics.go index bca1c4c7894..ae4c4e58ee0 100644 --- a/consumer/pdata/generated_metrics.go +++ b/consumer/pdata/generated_metrics.go @@ -353,9 +353,6 @@ func (ms InstrumentationLibraryMetrics) IsNil() bool { } // InstrumentationLibrary returns the instrumentationlibrary associated with this InstrumentationLibraryMetrics. -// If no instrumentationlibrary available, it creates an empty message and associates it with this InstrumentationLibraryMetrics. -// -// Empty initialized InstrumentationLibraryMetrics will return "nil" InstrumentationLibrary. // // Important: This causes a runtime error if IsNil() returns "true". func (ms InstrumentationLibraryMetrics) InstrumentationLibrary() InstrumentationLibrary { diff --git a/consumer/pdata/generated_metrics_test.go b/consumer/pdata/generated_metrics_test.go index 8ff0e45fb15..bd6b72f535d 100644 --- a/consumer/pdata/generated_metrics_test.go +++ b/consumer/pdata/generated_metrics_test.go @@ -310,9 +310,6 @@ func TestInstrumentationLibraryMetrics_CopyTo(t *testing.T) { func TestInstrumentationLibraryMetrics_InstrumentationLibrary(t *testing.T) { ms := NewInstrumentationLibraryMetrics() ms.InitEmpty() - assert.True(t, ms.InstrumentationLibrary().IsNil()) - ms.InstrumentationLibrary().InitEmpty() - assert.False(t, ms.InstrumentationLibrary().IsNil()) fillTestInstrumentationLibrary(ms.InstrumentationLibrary()) assert.EqualValues(t, generateTestInstrumentationLibrary(), ms.InstrumentationLibrary()) } @@ -2178,7 +2175,6 @@ func generateTestInstrumentationLibraryMetrics() InstrumentationLibraryMetrics { } func fillTestInstrumentationLibraryMetrics(tv InstrumentationLibraryMetrics) { - tv.InstrumentationLibrary().InitEmpty() fillTestInstrumentationLibrary(tv.InstrumentationLibrary()) fillTestMetricSlice(tv.Metrics()) } diff --git a/consumer/pdata/generated_trace.go b/consumer/pdata/generated_trace.go index 41dc04e8613..56723a26fe3 100644 --- a/consumer/pdata/generated_trace.go +++ b/consumer/pdata/generated_trace.go @@ -354,9 +354,6 @@ func (ms InstrumentationLibrarySpans) IsNil() bool { } // InstrumentationLibrary returns the instrumentationlibrary associated with this InstrumentationLibrarySpans. -// If no instrumentationlibrary available, it creates an empty message and associates it with this InstrumentationLibrarySpans. -// -// Empty initialized InstrumentationLibrarySpans will return "nil" InstrumentationLibrary. // // Important: This causes a runtime error if IsNil() returns "true". func (ms InstrumentationLibrarySpans) InstrumentationLibrary() InstrumentationLibrary { diff --git a/consumer/pdata/generated_trace_test.go b/consumer/pdata/generated_trace_test.go index fbb008aefd4..862bac61461 100644 --- a/consumer/pdata/generated_trace_test.go +++ b/consumer/pdata/generated_trace_test.go @@ -310,9 +310,6 @@ func TestInstrumentationLibrarySpans_CopyTo(t *testing.T) { func TestInstrumentationLibrarySpans_InstrumentationLibrary(t *testing.T) { ms := NewInstrumentationLibrarySpans() ms.InitEmpty() - assert.True(t, ms.InstrumentationLibrary().IsNil()) - ms.InstrumentationLibrary().InitEmpty() - assert.False(t, ms.InstrumentationLibrary().IsNil()) fillTestInstrumentationLibrary(ms.InstrumentationLibrary()) assert.EqualValues(t, generateTestInstrumentationLibrary(), ms.InstrumentationLibrary()) } @@ -1030,7 +1027,6 @@ func generateTestInstrumentationLibrarySpans() InstrumentationLibrarySpans { } func fillTestInstrumentationLibrarySpans(tv InstrumentationLibrarySpans) { - tv.InstrumentationLibrary().InitEmpty() fillTestInstrumentationLibrary(tv.InstrumentationLibrary()) fillTestSpanSlice(tv.Spans()) } diff --git a/consumer/pdata/metric_test.go b/consumer/pdata/metric_test.go index a84127863a7..531ca8d6bb3 100644 --- a/consumer/pdata/metric_test.go +++ b/consumer/pdata/metric_test.go @@ -888,8 +888,8 @@ func generateTestProtoResource() otlpresource.Resource { } } -func generateTestProtoInstrumentationLibrary() *otlpcommon.InstrumentationLibrary { - return &otlpcommon.InstrumentationLibrary{ +func generateTestProtoInstrumentationLibrary() otlpcommon.InstrumentationLibrary { + return otlpcommon.InstrumentationLibrary{ Name: "test", Version: "", } diff --git a/consumer/simple/metrics.go b/consumer/simple/metrics.go index 1e195e0dfdd..bac3ae98a32 100644 --- a/consumer/simple/metrics.go +++ b/consumer/simple/metrics.go @@ -189,7 +189,6 @@ func (mb *Metrics) getMetricsSlice() pdata.MetricSlice { ilm.InitEmpty() il := ilm.InstrumentationLibrary() - il.InitEmpty() il.SetName(mb.InstrumentationLibraryName) il.SetVersion(mb.InstrumentationLibraryVersion) diff --git a/consumer/simple/metrics_test.go b/consumer/simple/metrics_test.go index fa294300a11..ffe8b026e1e 100644 --- a/consumer/simple/metrics_test.go +++ b/consumer/simple/metrics_test.go @@ -488,7 +488,6 @@ func BenchmarkPdataMetrics(b *testing.B) { metrics.Resize(6) il := ilm.InstrumentationLibrary() - il.InitEmpty() il.SetName("example") il.SetVersion("0.1") diff --git a/exporter/loggingexporter/logging_exporter.go b/exporter/loggingexporter/logging_exporter.go index c31fdf06b4c..8afaa4460ff 100644 --- a/exporter/loggingexporter/logging_exporter.go +++ b/exporter/loggingexporter/logging_exporter.go @@ -360,9 +360,7 @@ func (s *loggingExporter) pushTraceData( buf.logEntry("* Nil InstrumentationLibrarySpans") continue } - if !ils.InstrumentationLibrary().IsNil() { - buf.logInstrumentationLibrary(ils.InstrumentationLibrary()) - } + buf.logInstrumentationLibrary(ils.InstrumentationLibrary()) spans := ils.Spans() for k := 0; k < spans.Len(); k++ { @@ -424,9 +422,7 @@ func (s *loggingExporter) pushMetricsData( buf.logEntry("* Nil InstrumentationLibraryMetrics") continue } - if !ilm.InstrumentationLibrary().IsNil() { - buf.logInstrumentationLibrary(ilm.InstrumentationLibrary()) - } + buf.logInstrumentationLibrary(ilm.InstrumentationLibrary()) metrics := ilm.Metrics() for k := 0; k < metrics.Len(); k++ { buf.logEntry("Metric #%d", k) @@ -535,9 +531,7 @@ func (s *loggingExporter) pushLogData( buf.logEntry("* Nil InstrumentationLibraryLogs") continue } - if !ils.InstrumentationLibrary().IsNil() { - buf.logInstrumentationLibrary(ils.InstrumentationLibrary()) - } + buf.logInstrumentationLibrary(ils.InstrumentationLibrary()) logs := ils.Logs() for j := 0; j < logs.Len(); j++ { diff --git a/internal/data/opentelemetry-proto-gen/logs/v1/logs.pb.go b/internal/data/opentelemetry-proto-gen/logs/v1/logs.pb.go index bda13e8d427..e70e57c9b21 100644 --- a/internal/data/opentelemetry-proto-gen/logs/v1/logs.pb.go +++ b/internal/data/opentelemetry-proto-gen/logs/v1/logs.pb.go @@ -211,7 +211,7 @@ func (m *ResourceLogs) GetInstrumentationLibraryLogs() []*InstrumentationLibrary type InstrumentationLibraryLogs struct { // The instrumentation library information for the logs in this message. // If this field is not set then no library info is known. - InstrumentationLibrary *v11.InstrumentationLibrary `protobuf:"bytes,1,opt,name=instrumentation_library,json=instrumentationLibrary,proto3" json:"instrumentation_library,omitempty"` + InstrumentationLibrary v11.InstrumentationLibrary `protobuf:"bytes,1,opt,name=instrumentation_library,json=instrumentationLibrary,proto3" json:"instrumentation_library"` // A list of log records. Logs []*LogRecord `protobuf:"bytes,2,rep,name=logs,proto3" json:"logs,omitempty"` } @@ -249,11 +249,11 @@ func (m *InstrumentationLibraryLogs) XXX_DiscardUnknown() { var xxx_messageInfo_InstrumentationLibraryLogs proto.InternalMessageInfo -func (m *InstrumentationLibraryLogs) GetInstrumentationLibrary() *v11.InstrumentationLibrary { +func (m *InstrumentationLibraryLogs) GetInstrumentationLibrary() v11.InstrumentationLibrary { if m != nil { return m.InstrumentationLibrary } - return nil + return v11.InstrumentationLibrary{} } func (m *InstrumentationLibraryLogs) GetLogs() []*LogRecord { @@ -407,60 +407,61 @@ func init() { } var fileDescriptor_d1c030a3ec7e961e = []byte{ - // 848 bytes of a gzipped FileDescriptorProto + // 851 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x96, 0xdf, 0x6e, 0x22, 0x37, 0x14, 0xc6, 0x71, 0x42, 0x20, 0x71, 0x08, 0xeb, 0xba, 0xd9, 0xec, 0x94, 0x54, 0x04, 0xa5, 0xed, 0x96, 0xa6, 0x5a, 0x50, 0x06, 0xaa, 0x56, 0xbb, 0x57, 0x10, 0x86, 0x68, 0x14, 0x42, 0x22, 0x43, 0xd2, 0x3f, 0x37, 0xa3, 0x01, 0x5c, 0x34, 0x12, 0xd8, 0x68, 0xc6, 0x44, 0xe1, 0x2d, 0xaa, 0xbe, - 0x52, 0x6f, 0xd2, 0xbb, 0xbd, 0xaa, 0xaa, 0x5e, 0xac, 0xaa, 0xe4, 0x41, 0x5a, 0xd9, 0x33, 0xb0, - 0x0b, 0x1a, 0x67, 0x95, 0xab, 0x78, 0xce, 0xef, 0x7c, 0xdf, 0x39, 0x3e, 0xb1, 0x2d, 0xe0, 0x4b, - 0x3e, 0xa1, 0x4c, 0xd0, 0x11, 0x1d, 0x53, 0xe1, 0xcf, 0xca, 0x13, 0x9f, 0x0b, 0x5e, 0x1e, 0xf1, - 0x61, 0x50, 0xbe, 0x39, 0x56, 0x7f, 0x4b, 0x2a, 0x84, 0xf7, 0x97, 0xf2, 0xc2, 0x60, 0x49, 0xf1, - 0x9b, 0xe3, 0xdc, 0xee, 0x90, 0x0f, 0x79, 0x28, 0x95, 0xab, 0x90, 0xe6, 0x8e, 0xe2, 0xac, 0xfb, - 0x7c, 0x3c, 0xe6, 0x4c, 0x9a, 0x87, 0xab, 0x28, 0xb7, 0x14, 0x97, 0xeb, 0xd3, 0x80, 0x4f, 0xfd, - 0x3e, 0x95, 0xd9, 0xf3, 0x75, 0x98, 0x7f, 0xf8, 0x17, 0x80, 0x19, 0x12, 0x85, 0x5a, 0x7c, 0x18, - 0xe0, 0x33, 0xb8, 0x39, 0x4f, 0x31, 0x40, 0x01, 0x14, 0xb7, 0xcd, 0x6f, 0x4a, 0x71, 0x2d, 0x2f, - 0x7c, 0x6e, 0x8e, 0x4b, 0x73, 0x83, 0x7a, 0xf2, 0xee, 0xdd, 0x41, 0x82, 0x2c, 0x0c, 0xf0, 0x0c, - 0x7e, 0xee, 0xb1, 0x40, 0xf8, 0xd3, 0x31, 0x65, 0xc2, 0x15, 0x1e, 0x67, 0xce, 0xc8, 0xeb, 0xf9, - 0xae, 0x3f, 0x73, 0xe4, 0x96, 0x8d, 0xb5, 0xc2, 0x7a, 0x71, 0xdb, 0xfc, 0xbe, 0xf4, 0xc8, 0x4c, - 0x4a, 0xf6, 0xb2, 0x41, 0x2b, 0xd4, 0xcb, 0x5e, 0x49, 0xce, 0xd3, 0xb2, 0xc3, 0x3b, 0x00, 0x73, - 0x7a, 0x29, 0x66, 0xf0, 0x85, 0xa6, 0xb3, 0x68, 0xd7, 0xdf, 0xc5, 0x36, 0x15, 0xcd, 0x5a, 0xdb, - 0x16, 0xd9, 0x8b, 0x6f, 0x09, 0xbf, 0x86, 0xc9, 0x0f, 0x76, 0xfc, 0xf2, 0xd1, 0x1d, 0xb7, 0xf8, - 0x90, 0xd0, 0x3e, 0xf7, 0x07, 0x44, 0x69, 0x0e, 0xff, 0x4c, 0xc2, 0xad, 0x45, 0x0c, 0x7f, 0x09, - 0xb3, 0xc2, 0x1b, 0x53, 0x67, 0xca, 0xbc, 0x5b, 0x87, 0xb9, 0x8c, 0xab, 0x86, 0x53, 0x24, 0x23, - 0xa3, 0x57, 0xcc, 0xbb, 0x6d, 0xbb, 0x8c, 0xe3, 0x2e, 0x7c, 0x16, 0xd0, 0x1b, 0xea, 0x7b, 0x62, - 0xe6, 0xb0, 0xe9, 0xb8, 0x47, 0x7d, 0x63, 0xad, 0x00, 0x8a, 0x59, 0xf3, 0xdb, 0x47, 0x4b, 0x77, - 0x22, 0x4d, 0x5b, 0x49, 0x48, 0x36, 0x58, 0xfa, 0xc6, 0x5f, 0xc0, 0x9d, 0x85, 0xab, 0xa0, 0xb7, - 0xc2, 0x58, 0x2f, 0x80, 0xe2, 0x16, 0xc9, 0xcc, 0x83, 0x5d, 0x7a, 0x2b, 0x30, 0x86, 0x49, 0xe6, - 0x8e, 0xa9, 0x91, 0x54, 0x4c, 0xad, 0xf1, 0x1b, 0x98, 0xec, 0xf1, 0xc1, 0xcc, 0xd8, 0x50, 0xb3, - 0xfd, 0xfa, 0x23, 0xb3, 0xad, 0xb1, 0xd9, 0xb5, 0x3b, 0x9a, 0x52, 0xa2, 0x44, 0xf8, 0x1c, 0x42, - 0x57, 0x08, 0xdf, 0xeb, 0x4d, 0x05, 0x0d, 0x8c, 0x94, 0x9a, 0xe0, 0xc7, 0x2c, 0xce, 0x68, 0x68, - 0x11, 0x1d, 0xc9, 0x0f, 0x0c, 0xf0, 0x0f, 0xd0, 0x18, 0xf8, 0x7c, 0x32, 0xa1, 0x03, 0xe7, 0x7d, - 0xd4, 0xe9, 0xf3, 0x29, 0x13, 0x46, 0xba, 0x00, 0x8a, 0x3b, 0x64, 0x2f, 0xe2, 0xb5, 0x05, 0x3e, - 0x91, 0x14, 0xef, 0xc2, 0x8d, 0x5f, 0x47, 0xee, 0x30, 0x30, 0x36, 0x0b, 0xa0, 0x98, 0x26, 0xe1, - 0x07, 0xbe, 0x86, 0x9b, 0xc2, 0x77, 0xfb, 0xd4, 0xf1, 0x06, 0xc6, 0x56, 0x01, 0x14, 0x33, 0xf5, - 0x37, 0xb2, 0xe6, 0x3f, 0xef, 0x0e, 0x2a, 0x43, 0xbe, 0xd2, 0xa6, 0x27, 0x2f, 0xee, 0x68, 0x44, - 0xfb, 0x82, 0xfb, 0x65, 0x8f, 0x09, 0xea, 0x33, 0x77, 0x54, 0x1e, 0xb8, 0xc2, 0x2d, 0x75, 0xa5, - 0x87, 0xdd, 0x20, 0x69, 0x65, 0x66, 0x0f, 0x70, 0x07, 0xa6, 0x83, 0x89, 0xcb, 0xa4, 0x2d, 0x54, - 0xb6, 0xaf, 0x23, 0x5b, 0xf3, 0x29, 0xb6, 0x9d, 0x89, 0xcb, 0xec, 0x06, 0x49, 0x49, 0x2b, 0x7b, - 0x70, 0xf4, 0xc7, 0x06, 0xcc, 0x2e, 0xff, 0x93, 0xf1, 0x01, 0xdc, 0xef, 0x58, 0xd7, 0x16, 0xb1, - 0xbb, 0x3f, 0x3b, 0xed, 0xab, 0xf3, 0xba, 0x45, 0x9c, 0xab, 0x76, 0xe7, 0xd2, 0x3a, 0xb1, 0x9b, - 0xb6, 0xd5, 0x40, 0x09, 0xfc, 0x19, 0x7c, 0xbe, 0x9a, 0xd0, 0x25, 0xb5, 0x13, 0x0b, 0x01, 0x9c, - 0x83, 0x7b, 0xb1, 0xc8, 0x44, 0x6b, 0x5a, 0x56, 0x41, 0xeb, 0x5a, 0x56, 0x45, 0xc9, 0xb8, 0x72, - 0x0d, 0xab, 0x7e, 0x75, 0x8a, 0x36, 0xe2, 0x64, 0x0a, 0x99, 0x28, 0xa5, 0x65, 0x15, 0x94, 0xd6, - 0xb2, 0x2a, 0xda, 0xc4, 0x06, 0xdc, 0x5d, 0x65, 0x76, 0xbb, 0x79, 0x81, 0xb6, 0xe2, 0x1a, 0x91, - 0xc4, 0x44, 0x50, 0x87, 0x2a, 0x68, 0x5b, 0x87, 0xaa, 0x28, 0x13, 0x57, 0xea, 0xc7, 0x1a, 0x69, - 0xa3, 0x9d, 0x38, 0x91, 0x24, 0x26, 0xca, 0xea, 0x50, 0x05, 0x3d, 0xd3, 0xa1, 0x2a, 0x42, 0x71, - 0xc8, 0x22, 0xe4, 0x82, 0xa0, 0x4f, 0xe2, 0x86, 0xa1, 0x90, 0x89, 0xb0, 0x96, 0x55, 0xd0, 0xa7, - 0x5a, 0x56, 0x45, 0xbb, 0x71, 0xe5, 0x9a, 0xb5, 0x6e, 0xad, 0x85, 0x9e, 0xc7, 0xc9, 0x14, 0x32, - 0xd1, 0x9e, 0x96, 0x55, 0xd0, 0x0b, 0x2d, 0xab, 0x22, 0xe3, 0xe8, 0x27, 0x98, 0x5d, 0x3c, 0x88, - 0x4d, 0x75, 0x09, 0x0f, 0xe0, 0x7e, 0xeb, 0xe2, 0xd4, 0x21, 0xd6, 0xc9, 0x05, 0x69, 0x38, 0xcd, - 0x56, 0xed, 0x74, 0xe5, 0x10, 0x7f, 0x05, 0x0b, 0xab, 0x09, 0xea, 0xc4, 0xa9, 0x65, 0xc7, 0x39, - 0xaf, 0x75, 0xce, 0xd0, 0x7f, 0xa0, 0xfe, 0x3b, 0xb8, 0xbb, 0xcf, 0x83, 0xb7, 0xf7, 0x79, 0xf0, - 0xef, 0x7d, 0x1e, 0xfc, 0xf6, 0x90, 0x4f, 0xbc, 0x7d, 0xc8, 0x27, 0xfe, 0x7e, 0xc8, 0x27, 0x60, - 0xde, 0xe3, 0x8f, 0xbd, 0x9d, 0x75, 0xf9, 0x46, 0x07, 0x97, 0x32, 0x74, 0x09, 0x7e, 0x39, 0x7b, - 0xc2, 0x1d, 0x2d, 0x2f, 0x25, 0xbe, 0x52, 0xae, 0xaf, 0x86, 0x94, 0xcd, 0x7f, 0x3e, 0xf4, 0x52, - 0x2a, 0x54, 0xf9, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x70, 0xef, 0x23, 0x68, 0x64, 0x08, 0x00, 0x00, + 0x52, 0x6f, 0xb6, 0x37, 0xd5, 0x5e, 0x55, 0x55, 0x2f, 0x56, 0x55, 0xf2, 0x20, 0xad, 0xec, 0x19, + 0xe8, 0x82, 0xc6, 0xac, 0xf6, 0x0a, 0xcf, 0xf9, 0x9d, 0xef, 0x3b, 0xc7, 0x67, 0xc6, 0x16, 0xf0, + 0x39, 0x9f, 0x50, 0x26, 0xe8, 0x88, 0x8e, 0xa9, 0xf0, 0x67, 0xe5, 0x89, 0xcf, 0x05, 0x2f, 0x8f, + 0xf8, 0x30, 0x28, 0xdf, 0x9d, 0xaa, 0xdf, 0x92, 0x0a, 0xe1, 0xc3, 0xa5, 0xbc, 0x30, 0x58, 0x52, + 0xfc, 0xee, 0x34, 0xb7, 0x3f, 0xe4, 0x43, 0x1e, 0x4a, 0xe5, 0x2a, 0xa4, 0xb9, 0x93, 0x38, 0xeb, + 0x3e, 0x1f, 0x8f, 0x39, 0x93, 0xe6, 0xe1, 0x2a, 0xca, 0x2d, 0xc5, 0xe5, 0xfa, 0x34, 0xe0, 0x53, + 0xbf, 0x4f, 0x65, 0xf6, 0x7c, 0x1d, 0xe6, 0x1f, 0xff, 0x09, 0x60, 0x86, 0x44, 0xa1, 0x16, 0x1f, + 0x06, 0xf8, 0x02, 0x6e, 0xcf, 0x53, 0x0c, 0x50, 0x00, 0xc5, 0x5d, 0xf3, 0xab, 0x52, 0x5c, 0xcb, + 0x0b, 0x9f, 0xbb, 0xd3, 0xd2, 0xdc, 0xa0, 0x9e, 0x7c, 0xfd, 0xf6, 0x28, 0x41, 0x16, 0x06, 0x78, + 0x06, 0x3f, 0xf5, 0x58, 0x20, 0xfc, 0xe9, 0x98, 0x32, 0xe1, 0x0a, 0x8f, 0x33, 0x67, 0xe4, 0xf5, + 0x7c, 0xd7, 0x9f, 0x39, 0x72, 0xcb, 0xc6, 0x46, 0x61, 0xb3, 0xb8, 0x6b, 0x7e, 0x5b, 0x5a, 0x33, + 0x93, 0x92, 0xbd, 0x6c, 0xd0, 0x0a, 0xf5, 0xb2, 0x57, 0x92, 0xf3, 0xb4, 0xec, 0xf8, 0x0f, 0x00, + 0x73, 0x7a, 0x29, 0x16, 0xf0, 0x99, 0xa6, 0xb3, 0x68, 0xd7, 0xdf, 0xc4, 0x36, 0x15, 0xcd, 0x5a, + 0xdb, 0x56, 0x34, 0x81, 0x83, 0xf8, 0xc6, 0xf0, 0x4b, 0x98, 0x7c, 0x67, 0xdf, 0xcf, 0xd7, 0xee, + 0xbb, 0xc5, 0x87, 0x84, 0xf6, 0xb9, 0x3f, 0x20, 0x4a, 0x73, 0xfc, 0x7b, 0x12, 0xee, 0x2c, 0x62, + 0xf8, 0x73, 0x98, 0x15, 0xde, 0x98, 0x3a, 0x53, 0xe6, 0xdd, 0x3b, 0xcc, 0x65, 0x5c, 0xb5, 0x9d, + 0x22, 0x19, 0x19, 0xbd, 0x61, 0xde, 0x7d, 0xdb, 0x65, 0x1c, 0x77, 0xe1, 0x93, 0x80, 0xde, 0x51, + 0xdf, 0x13, 0x33, 0x87, 0x4d, 0xc7, 0x3d, 0xea, 0x1b, 0x1b, 0x05, 0x50, 0xcc, 0x9a, 0x5f, 0xaf, + 0x2d, 0xdd, 0x89, 0x34, 0x6d, 0x25, 0x21, 0xd9, 0x60, 0xe9, 0x19, 0x7f, 0x06, 0xf7, 0x16, 0xae, + 0x82, 0xde, 0x0b, 0x63, 0xb3, 0x00, 0x8a, 0x3b, 0x24, 0x33, 0x0f, 0x76, 0xe9, 0xbd, 0xc0, 0x18, + 0x26, 0x99, 0x3b, 0xa6, 0x46, 0x52, 0x31, 0xb5, 0xc6, 0xaf, 0x60, 0xb2, 0xc7, 0x07, 0x33, 0x63, + 0x4b, 0x4d, 0xf8, 0xcb, 0xf7, 0x4c, 0xb8, 0xc6, 0x66, 0xb7, 0xee, 0x68, 0x4a, 0x89, 0x12, 0xe1, + 0x4b, 0x08, 0x5d, 0x21, 0x7c, 0xaf, 0x37, 0x15, 0x34, 0x30, 0x52, 0x6a, 0x82, 0xef, 0xb3, 0xb8, + 0xa0, 0xa1, 0x45, 0xf4, 0x5a, 0xde, 0x31, 0xc0, 0xdf, 0x41, 0x63, 0xe0, 0xf3, 0xc9, 0x84, 0x0e, + 0x9c, 0xff, 0xa3, 0x4e, 0x9f, 0x4f, 0x99, 0x30, 0xd2, 0x05, 0x50, 0xdc, 0x23, 0x07, 0x11, 0xaf, + 0x2d, 0xf0, 0x99, 0xa4, 0x78, 0x1f, 0x6e, 0xfd, 0x3c, 0x72, 0x87, 0x81, 0xb1, 0x5d, 0x00, 0xc5, + 0x34, 0x09, 0x1f, 0xf0, 0x2d, 0xdc, 0x16, 0xbe, 0xdb, 0xa7, 0x8e, 0x37, 0x30, 0x76, 0x0a, 0xa0, + 0x98, 0xa9, 0xbf, 0x92, 0x35, 0xff, 0x7e, 0x7b, 0x54, 0x19, 0xf2, 0x95, 0x36, 0x3d, 0x79, 0x7c, + 0x47, 0x23, 0xda, 0x17, 0xdc, 0x2f, 0x7b, 0x4c, 0x50, 0x9f, 0xb9, 0xa3, 0xf2, 0xc0, 0x15, 0x6e, + 0xa9, 0x2b, 0x3d, 0xec, 0x06, 0x49, 0x2b, 0x33, 0x7b, 0x80, 0x3b, 0x30, 0x1d, 0x4c, 0x5c, 0x26, + 0x6d, 0xa1, 0xb2, 0x7d, 0x19, 0xd9, 0x9a, 0x1f, 0x62, 0xdb, 0x99, 0xb8, 0xcc, 0x6e, 0x90, 0x94, + 0xb4, 0xb2, 0x07, 0x27, 0xbf, 0x6d, 0xc1, 0xec, 0xf2, 0x4b, 0xc6, 0x47, 0xf0, 0xb0, 0x63, 0xdd, + 0x5a, 0xc4, 0xee, 0xfe, 0xe8, 0xb4, 0x6f, 0x2e, 0xeb, 0x16, 0x71, 0x6e, 0xda, 0x9d, 0x6b, 0xeb, + 0xcc, 0x6e, 0xda, 0x56, 0x03, 0x25, 0xf0, 0x27, 0xf0, 0xe9, 0x6a, 0x42, 0x97, 0xd4, 0xce, 0x2c, + 0x04, 0x70, 0x0e, 0x1e, 0xc4, 0x22, 0x13, 0x6d, 0x68, 0x59, 0x05, 0x6d, 0x6a, 0x59, 0x15, 0x25, + 0xe3, 0xca, 0x35, 0xac, 0xfa, 0xcd, 0x39, 0xda, 0x8a, 0x93, 0x29, 0x64, 0xa2, 0x94, 0x96, 0x55, + 0x50, 0x5a, 0xcb, 0xaa, 0x68, 0x1b, 0x1b, 0x70, 0x7f, 0x95, 0xd9, 0xed, 0xe6, 0x15, 0xda, 0x89, + 0x6b, 0x44, 0x12, 0x13, 0x41, 0x1d, 0xaa, 0xa0, 0x5d, 0x1d, 0xaa, 0xa2, 0x4c, 0x5c, 0xa9, 0xef, + 0x6b, 0xa4, 0x8d, 0xf6, 0xe2, 0x44, 0x92, 0x98, 0x28, 0xab, 0x43, 0x15, 0xf4, 0x44, 0x87, 0xaa, + 0x08, 0xc5, 0x21, 0x8b, 0x90, 0x2b, 0x82, 0x3e, 0x8a, 0x1b, 0x86, 0x42, 0x26, 0xc2, 0x5a, 0x56, + 0x41, 0x1f, 0x6b, 0x59, 0x15, 0xed, 0xc7, 0x95, 0x6b, 0xd6, 0xba, 0xb5, 0x16, 0x7a, 0x1a, 0x27, + 0x53, 0xc8, 0x44, 0x07, 0x5a, 0x56, 0x41, 0xcf, 0xb4, 0xac, 0x8a, 0x8c, 0x93, 0x1f, 0x60, 0x76, + 0x71, 0x21, 0x36, 0xd5, 0x21, 0x3c, 0x82, 0x87, 0xad, 0xab, 0x73, 0x87, 0x58, 0x67, 0x57, 0xa4, + 0xe1, 0x34, 0x5b, 0xb5, 0xf3, 0x95, 0x8f, 0xf8, 0x0b, 0x58, 0x58, 0x4d, 0x50, 0x5f, 0x9c, 0x5a, + 0x76, 0x9c, 0xcb, 0x5a, 0xe7, 0x02, 0xfd, 0x0b, 0xea, 0xbf, 0x82, 0xd7, 0x0f, 0x79, 0xf0, 0xe6, + 0x21, 0x0f, 0xfe, 0x79, 0xc8, 0x83, 0x5f, 0x1e, 0xf3, 0x89, 0x37, 0x8f, 0xf9, 0xc4, 0x5f, 0x8f, + 0xf9, 0x04, 0xcc, 0x7b, 0x7c, 0xdd, 0xdd, 0x59, 0x97, 0x77, 0x74, 0x70, 0x2d, 0x43, 0xd7, 0xe0, + 0xa7, 0x8b, 0x0f, 0x38, 0xa3, 0xe5, 0xa5, 0xc4, 0x17, 0xca, 0xf5, 0xc5, 0x90, 0xb2, 0xf9, 0x9f, + 0x88, 0x5e, 0x4a, 0x85, 0x2a, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xb5, 0x3a, 0x93, 0x6f, 0x6a, + 0x08, 0x00, 0x00, } func (m *ResourceLogs) Marshal() (dAtA []byte, err error) { @@ -544,18 +545,16 @@ func (m *InstrumentationLibraryLogs) MarshalToSizedBuffer(dAtA []byte) (int, err dAtA[i] = 0x12 } } - if m.InstrumentationLibrary != nil { - { - size, err := m.InstrumentationLibrary.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintLogs(dAtA, i, uint64(size)) + { + size, err := m.InstrumentationLibrary.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i-- - dAtA[i] = 0xa + i -= size + i = encodeVarintLogs(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -698,10 +697,8 @@ func (m *InstrumentationLibraryLogs) Size() (n int) { } var l int _ = l - if m.InstrumentationLibrary != nil { - l = m.InstrumentationLibrary.Size() - n += 1 + l + sovLogs(uint64(l)) - } + l = m.InstrumentationLibrary.Size() + n += 1 + l + sovLogs(uint64(l)) if len(m.Logs) > 0 { for _, e := range m.Logs { l = e.Size() @@ -938,9 +935,6 @@ func (m *InstrumentationLibraryLogs) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.InstrumentationLibrary == nil { - m.InstrumentationLibrary = &v11.InstrumentationLibrary{} - } if err := m.InstrumentationLibrary.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/internal/data/opentelemetry-proto-gen/metrics/v1/metrics.pb.go b/internal/data/opentelemetry-proto-gen/metrics/v1/metrics.pb.go index 74de9be24dd..963162699df 100644 --- a/internal/data/opentelemetry-proto-gen/metrics/v1/metrics.pb.go +++ b/internal/data/opentelemetry-proto-gen/metrics/v1/metrics.pb.go @@ -180,7 +180,7 @@ func (m *ResourceMetrics) GetInstrumentationLibraryMetrics() []*InstrumentationL type InstrumentationLibraryMetrics struct { // The instrumentation library information for the metrics in this message. // If this field is not set then no library info is known. - InstrumentationLibrary *v11.InstrumentationLibrary `protobuf:"bytes,1,opt,name=instrumentation_library,json=instrumentationLibrary,proto3" json:"instrumentation_library,omitempty"` + InstrumentationLibrary v11.InstrumentationLibrary `protobuf:"bytes,1,opt,name=instrumentation_library,json=instrumentationLibrary,proto3" json:"instrumentation_library"` // A list of metrics that originate from an instrumentation library. Metrics []*Metric `protobuf:"bytes,2,rep,name=metrics,proto3" json:"metrics,omitempty"` } @@ -218,11 +218,11 @@ func (m *InstrumentationLibraryMetrics) XXX_DiscardUnknown() { var xxx_messageInfo_InstrumentationLibraryMetrics proto.InternalMessageInfo -func (m *InstrumentationLibraryMetrics) GetInstrumentationLibrary() *v11.InstrumentationLibrary { +func (m *InstrumentationLibraryMetrics) GetInstrumentationLibrary() v11.InstrumentationLibrary { if m != nil { return m.InstrumentationLibrary } - return nil + return v11.InstrumentationLibrary{} } func (m *InstrumentationLibraryMetrics) GetMetrics() []*Metric { @@ -1740,86 +1740,86 @@ func init() { } var fileDescriptor_3c3112f9fa006917 = []byte{ - // 1257 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0x51, 0x6b, 0x1b, 0x47, - 0x10, 0xd6, 0x49, 0xb6, 0x2c, 0x8f, 0x64, 0xc9, 0x5d, 0x52, 0xe7, 0x30, 0x44, 0x71, 0x94, 0x92, - 0xb8, 0x49, 0x2c, 0x11, 0x87, 0x84, 0xd2, 0x52, 0xa8, 0x6c, 0x2b, 0xb6, 0x1a, 0xd9, 0x51, 0xd7, - 0xb2, 0x4b, 0x4a, 0xe0, 0x38, 0xeb, 0xb6, 0xca, 0xd2, 0xbb, 0x5d, 0xf5, 0x6e, 0xcf, 0xd8, 0xaf, - 0x85, 0xbe, 0x15, 0x5a, 0xe8, 0x53, 0xdb, 0x3f, 0x94, 0xc7, 0x14, 0x0a, 0x29, 0x85, 0x86, 0x92, - 0x40, 0x5f, 0xfa, 0xd4, 0xf7, 0x3e, 0x94, 0xdd, 0xbb, 0xb3, 0x24, 0xfb, 0x6c, 0xc9, 0x4d, 0x0a, - 0x4e, 0xde, 0x66, 0x67, 0x67, 0xbe, 0x9d, 0xf9, 0x66, 0x76, 0x6e, 0x25, 0xb8, 0xc1, 0xbb, 0x84, - 0x09, 0x62, 0x13, 0x87, 0x08, 0x77, 0xbf, 0xd2, 0x75, 0xb9, 0xe0, 0x15, 0x29, 0xd3, 0xb6, 0x57, - 0xd9, 0xbd, 0x19, 0x89, 0x65, 0xb5, 0x81, 0x8a, 0x03, 0xd6, 0x81, 0xb2, 0x1c, 0x99, 0xec, 0xde, - 0x9c, 0x3d, 0xd7, 0xe1, 0x1d, 0x1e, 0x60, 0x48, 0x29, 0x30, 0x98, 0xbd, 0x16, 0x77, 0x46, 0x9b, - 0x3b, 0x0e, 0x67, 0xf2, 0x88, 0x40, 0x0a, 0x6d, 0xcb, 0x71, 0xb6, 0x2e, 0xf1, 0xb8, 0xef, 0xb6, - 0x89, 0xb4, 0x8e, 0xe4, 0xc0, 0xbe, 0xf4, 0xa7, 0x06, 0x05, 0x1c, 0xaa, 0xd6, 0x83, 0x40, 0xd0, - 0x3d, 0xc8, 0x44, 0x56, 0xba, 0x36, 0xa7, 0xcd, 0x67, 0x17, 0xdf, 0x2d, 0xc7, 0x05, 0x7e, 0x00, - 0xb5, 0x7b, 0xb3, 0x1c, 0x61, 0x2c, 0x8d, 0x3d, 0x7e, 0x76, 0x31, 0x81, 0x0f, 0x00, 0xd0, 0xd7, - 0x1a, 0x5c, 0xa4, 0xcc, 0x13, 0xae, 0xef, 0x10, 0x26, 0x4c, 0x41, 0x39, 0x33, 0x6c, 0xba, 0xe3, - 0x9a, 0xee, 0xbe, 0x11, 0x66, 0xae, 0x27, 0xe7, 0x52, 0xf3, 0xd9, 0xc5, 0x0f, 0xcb, 0x27, 0xb3, - 0x53, 0xae, 0x0f, 0xc2, 0x34, 0x02, 0x94, 0x30, 0x6a, 0x7c, 0x81, 0x9e, 0xb4, 0x5d, 0xfa, 0x59, - 0x83, 0x0b, 0x27, 0x02, 0x20, 0x06, 0xe7, 0x8f, 0x09, 0x34, 0x64, 0xe1, 0x76, 0x6c, 0x80, 0x21, - 0xfd, 0xc7, 0xc6, 0x87, 0x67, 0xe2, 0x03, 0x43, 0x1f, 0xc1, 0xc4, 0x20, 0x01, 0x57, 0x86, 0x11, - 0x10, 0x44, 0x8a, 0x23, 0xb7, 0xd2, 0xb7, 0xe3, 0x90, 0x0e, 0x74, 0x08, 0xc1, 0x18, 0x33, 0x9d, - 0xa0, 0x5e, 0x93, 0x58, 0xc9, 0x68, 0x0e, 0xb2, 0x16, 0xf1, 0xda, 0x2e, 0xed, 0xca, 0x63, 0xf5, - 0xa4, 0xda, 0xea, 0x57, 0x49, 0x2f, 0x9f, 0x51, 0xa1, 0xa7, 0x02, 0x2f, 0x29, 0xa3, 0x55, 0x98, - 0xa4, 0x4c, 0x18, 0x1d, 0xd3, 0xef, 0x10, 0x7d, 0x4c, 0x25, 0x3e, 0x3f, 0xbc, 0x32, 0x62, 0x55, - 0xda, 0xaf, 0x25, 0x70, 0x86, 0x86, 0x32, 0x6a, 0x42, 0xce, 0xe2, 0xfe, 0x8e, 0x4d, 0x42, 0xac, - 0x71, 0x85, 0x75, 0x7d, 0x18, 0xd6, 0x8a, 0xf2, 0x89, 0xe0, 0xb2, 0x56, 0x6f, 0x89, 0xaa, 0x30, - 0x21, 0x43, 0xf3, 0x7c, 0x47, 0x4f, 0x2b, 0xb0, 0x2b, 0x23, 0x04, 0xb6, 0xe9, 0x3b, 0x6b, 0x09, - 0x9c, 0xa6, 0x4a, 0x42, 0x1f, 0x03, 0x84, 0x41, 0x49, 0x94, 0x89, 0x13, 0xba, 0xfb, 0x48, 0x48, - 0x01, 0xd0, 0xa4, 0x15, 0x2d, 0xd0, 0x26, 0x4c, 0xc9, 0x70, 0x1e, 0x51, 0x4f, 0xf0, 0x8e, 0x6b, - 0x3a, 0x7a, 0x46, 0xc1, 0xdd, 0x18, 0x21, 0xa8, 0xb5, 0xc8, 0x67, 0x2d, 0x81, 0x73, 0xb4, 0x6f, - 0x8d, 0x1e, 0xc2, 0x74, 0x18, 0x60, 0x0f, 0x77, 0x52, 0xe1, 0x56, 0x46, 0x0b, 0xb3, 0x1f, 0xba, - 0x60, 0x0d, 0xaa, 0xd0, 0x36, 0xe4, 0x7b, 0xe9, 0x3b, 0xb2, 0xb5, 0xb3, 0x0a, 0x7b, 0x61, 0x64, - 0x0a, 0xa4, 0xd3, 0x5a, 0x02, 0x4f, 0x59, 0xfd, 0x8a, 0xa5, 0x34, 0x8c, 0x59, 0xa6, 0x30, 0x4b, - 0x0f, 0x20, 0x13, 0xf5, 0x02, 0x5a, 0x87, 0xac, 0xd4, 0x19, 0x5d, 0x4e, 0x99, 0xf0, 0x74, 0x4d, - 0xf5, 0xf8, 0x28, 0xe4, 0xac, 0x98, 0xc2, 0x6c, 0x4a, 0x27, 0x0c, 0x56, 0x24, 0x7a, 0x25, 0x03, - 0xb2, 0x7d, 0xad, 0x81, 0x9a, 0x71, 0xe8, 0x23, 0x52, 0x14, 0x7f, 0xc0, 0x5f, 0x1a, 0xa4, 0x83, - 0x7e, 0x79, 0xc5, 0xa1, 0x23, 0x0e, 0xe7, 0xcd, 0x4e, 0xc7, 0x25, 0x9d, 0x60, 0xaa, 0x08, 0xe2, - 0x74, 0xb9, 0x6b, 0xda, 0x54, 0xec, 0xab, 0x4b, 0x99, 0x5f, 0xbc, 0x33, 0x0c, 0xba, 0xda, 0x73, - 0x6f, 0xf5, 0xbc, 0xf1, 0x8c, 0x19, 0xab, 0x47, 0x97, 0x20, 0x47, 0x3d, 0xc3, 0xe1, 0x8c, 0x0b, - 0xce, 0x68, 0x5b, 0xdd, 0xef, 0x0c, 0xce, 0x52, 0x6f, 0x3d, 0x52, 0x95, 0xfe, 0xd6, 0x60, 0xf2, - 0xa0, 0xa8, 0xaf, 0x9e, 0xcd, 0x33, 0x99, 0xf3, 0x53, 0x0d, 0x72, 0xfd, 0x97, 0x0f, 0x6d, 0xc7, - 0xa5, 0x7d, 0xfb, 0x34, 0xf7, 0xf7, 0x6c, 0x24, 0x5f, 0xfa, 0x5d, 0x83, 0xc2, 0xa1, 0xeb, 0x8f, - 0x1e, 0xc4, 0x25, 0xf7, 0xde, 0x29, 0x87, 0xc8, 0x19, 0xc9, 0xef, 0x11, 0x4c, 0x0d, 0x4c, 0x20, - 0xf4, 0x69, 0x5c, 0x72, 0x77, 0x4e, 0x35, 0xc5, 0xe2, 0xa7, 0xc0, 0xf7, 0x49, 0xd5, 0x23, 0x07, - 0x9b, 0xe8, 0x1e, 0xa4, 0x6d, 0x73, 0x87, 0xd8, 0xd1, 0x21, 0x0b, 0x43, 0x5e, 0x01, 0x9b, 0xc2, - 0xa5, 0xac, 0x73, 0x8f, 0xec, 0x6f, 0x9b, 0xb6, 0x1f, 0xbd, 0x87, 0x42, 0x08, 0x54, 0x81, 0x73, - 0x9e, 0x30, 0x5d, 0x61, 0x08, 0xea, 0x10, 0xc3, 0x67, 0x74, 0xcf, 0x60, 0x26, 0xe3, 0x8a, 0xb5, - 0x34, 0x7e, 0x4b, 0xed, 0xb5, 0xa8, 0x43, 0xb6, 0x18, 0xdd, 0xdb, 0x30, 0x19, 0x47, 0xef, 0x40, - 0xfe, 0x90, 0x69, 0x4a, 0x99, 0xe6, 0x44, 0xbf, 0xd5, 0x39, 0x18, 0xdf, 0x95, 0xa7, 0xa9, 0xef, - 0xf5, 0x34, 0x0e, 0x16, 0xa8, 0x0e, 0x93, 0x64, 0x8f, 0x38, 0x5d, 0xdb, 0x74, 0x3d, 0x7d, 0x5c, - 0x05, 0x7f, 0x7d, 0x84, 0xde, 0xae, 0x85, 0x3e, 0xb8, 0xe7, 0x5d, 0xfa, 0x21, 0x19, 0xf5, 0xd7, - 0x6b, 0x4c, 0x8c, 0x16, 0x11, 0xd3, 0x38, 0x4a, 0x4c, 0x79, 0xb4, 0xd6, 0x89, 0xe3, 0xe6, 0x9f, - 0x24, 0xbc, 0x1d, 0x3b, 0x12, 0x5e, 0x17, 0x86, 0xda, 0xdc, 0x67, 0x42, 0x31, 0x94, 0xc6, 0xc1, - 0x02, 0x4d, 0x43, 0x4a, 0xbe, 0x8f, 0xc6, 0x55, 0x3b, 0x49, 0x11, 0x5d, 0x86, 0xa9, 0x1d, 0xbf, - 0xfd, 0x05, 0x11, 0x86, 0xb2, 0xf0, 0xf4, 0xf4, 0x5c, 0x4a, 0x82, 0x05, 0xca, 0x65, 0xa5, 0x43, - 0x57, 0xa1, 0x40, 0xf6, 0xba, 0x36, 0x6d, 0x53, 0x61, 0xec, 0x70, 0x9f, 0x59, 0x9e, 0x3e, 0x31, - 0x97, 0x9a, 0xd7, 0x70, 0x3e, 0x52, 0x2f, 0x29, 0xed, 0x60, 0x6b, 0x66, 0x5e, 0xaa, 0x35, 0xbf, - 0x4a, 0x81, 0x7e, 0xdc, 0xd0, 0x7a, 0x33, 0x2a, 0xa0, 0xfd, 0x1f, 0x15, 0x68, 0x1c, 0xad, 0xc0, - 0x4b, 0xdc, 0x81, 0x1f, 0x53, 0x30, 0x13, 0x3f, 0x5c, 0xdf, 0xa8, 0x12, 0x70, 0x28, 0x7c, 0xe9, - 0x9b, 0x4c, 0x50, 0x9b, 0x18, 0x6a, 0x94, 0x04, 0x45, 0xc8, 0x2e, 0xde, 0xfd, 0x6f, 0x5f, 0x9e, - 0xb2, 0xca, 0xb1, 0x2a, 0x3e, 0x09, 0x41, 0x71, 0x3e, 0x82, 0x57, 0x1b, 0xde, 0xec, 0x32, 0x14, - 0x0e, 0x99, 0xa0, 0x59, 0xc8, 0x44, 0x46, 0xea, 0xd7, 0x9e, 0x86, 0x0f, 0xd6, 0xbd, 0x71, 0x97, - 0xec, 0x1b, 0x77, 0xa5, 0x5f, 0x92, 0x90, 0xed, 0xbb, 0x3c, 0xe8, 0x21, 0x14, 0x3e, 0xa7, 0xb6, - 0x20, 0x2e, 0xb1, 0x8c, 0x97, 0x2f, 0x4d, 0x3e, 0xc2, 0x6a, 0x04, 0x25, 0x3a, 0xca, 0x78, 0xf2, - 0xa4, 0xc1, 0x9c, 0xea, 0xff, 0x62, 0x6d, 0xc2, 0x84, 0xd7, 0x35, 0x99, 0x41, 0x2d, 0x55, 0x89, - 0xdc, 0xd2, 0xfb, 0xf2, 0x88, 0xdf, 0x9e, 0x5d, 0x5c, 0xec, 0xf0, 0x43, 0xb1, 0x51, 0x5e, 0x69, - 0x73, 0xdb, 0x26, 0x6d, 0xc1, 0xdd, 0x0a, 0x65, 0x82, 0xb8, 0xcc, 0xb4, 0x2b, 0xf2, 0x43, 0x5e, - 0xde, 0xec, 0x9a, 0xac, 0xbe, 0x82, 0xd3, 0x12, 0xaa, 0x6e, 0xa1, 0x6d, 0xc8, 0x08, 0xd7, 0x6c, - 0x13, 0x89, 0x3a, 0xae, 0x50, 0x3f, 0x08, 0x51, 0x6f, 0x9d, 0x06, 0xb5, 0x25, 0x31, 0xea, 0x2b, - 0x78, 0x42, 0x81, 0xd5, 0xad, 0xd2, 0xd3, 0x24, 0xe4, 0x07, 0x6f, 0xc4, 0xd9, 0x63, 0x56, 0x7b, - 0x1d, 0x99, 0xbd, 0xf6, 0x8d, 0x06, 0x33, 0xf1, 0x0f, 0x44, 0x74, 0x15, 0x2e, 0x57, 0x57, 0x57, - 0x71, 0x6d, 0xb5, 0xda, 0xaa, 0xdf, 0xdf, 0x30, 0x5a, 0xb5, 0xf5, 0xe6, 0x7d, 0x5c, 0x6d, 0xd4, - 0x5b, 0x0f, 0x8c, 0xad, 0x8d, 0xcd, 0x66, 0x6d, 0xb9, 0x7e, 0xb7, 0x5e, 0x5b, 0x99, 0x4e, 0xa0, - 0x4b, 0x70, 0xe1, 0x38, 0xc3, 0x95, 0x5a, 0xa3, 0x55, 0x9d, 0xd6, 0xd0, 0x15, 0x28, 0x1d, 0x67, - 0xb2, 0xbc, 0xb5, 0xbe, 0xd5, 0xa8, 0xb6, 0xea, 0xdb, 0xb5, 0xe9, 0xe4, 0xd2, 0x4f, 0xda, 0xe3, - 0xe7, 0x45, 0xed, 0xc9, 0xf3, 0xa2, 0xf6, 0xc7, 0xf3, 0xa2, 0xf6, 0xdd, 0x8b, 0x62, 0xe2, 0xc9, - 0x8b, 0x62, 0xe2, 0xd7, 0x17, 0xc5, 0x04, 0x5c, 0xa2, 0x7c, 0xc8, 0xcd, 0x5f, 0xca, 0x85, 0xff, - 0x2f, 0x35, 0xe5, 0x46, 0x53, 0xfb, 0x6c, 0xe3, 0x14, 0xd4, 0x54, 0x06, 0x0c, 0x17, 0x14, 0xf6, - 0x42, 0x87, 0xb0, 0xbe, 0x7f, 0x18, 0x77, 0xd2, 0x4a, 0x7b, 0xeb, 0xdf, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x7d, 0x52, 0x68, 0xd0, 0x8a, 0x14, 0x00, 0x00, + // 1259 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0xc1, 0x6b, 0x1b, 0x47, + 0x17, 0xd7, 0x4a, 0xb6, 0x2c, 0x3f, 0xc9, 0x92, 0xbf, 0x21, 0x9f, 0xb3, 0x18, 0xa2, 0x38, 0x4a, + 0x49, 0xdc, 0x24, 0x96, 0x88, 0x43, 0x42, 0x69, 0x29, 0x54, 0xb2, 0x14, 0x5b, 0x8d, 0xec, 0xa8, + 0x2b, 0xd9, 0x25, 0x25, 0xb0, 0xac, 0xb4, 0x53, 0x65, 0xe8, 0xee, 0x8c, 0xba, 0x3b, 0x6b, 0xec, + 0x6b, 0xa1, 0xb7, 0x42, 0x0b, 0x3d, 0xb5, 0xfd, 0x87, 0x72, 0xcc, 0xa1, 0x90, 0x52, 0x68, 0x28, + 0x09, 0xf4, 0xd2, 0x53, 0xef, 0x3d, 0x94, 0x99, 0xdd, 0xb5, 0x24, 0x7b, 0x6d, 0xc9, 0x4d, 0x0a, + 0x76, 0x6e, 0x6f, 0xde, 0xbc, 0xf7, 0x9b, 0xf7, 0x7e, 0xef, 0xcd, 0xdb, 0x91, 0xe0, 0x16, 0xeb, + 0x63, 0xca, 0xb1, 0x85, 0x6d, 0xcc, 0x9d, 0xfd, 0x52, 0xdf, 0x61, 0x9c, 0x95, 0x84, 0x4c, 0xba, + 0x6e, 0x69, 0xf7, 0x76, 0x28, 0x16, 0xe5, 0x06, 0xca, 0x8f, 0x58, 0xfb, 0xca, 0x62, 0x68, 0xb2, + 0x7b, 0x7b, 0xf1, 0x42, 0x8f, 0xf5, 0x98, 0x8f, 0x21, 0x24, 0xdf, 0x60, 0xf1, 0x46, 0xd4, 0x19, + 0x5d, 0x66, 0xdb, 0x8c, 0x8a, 0x23, 0x7c, 0x29, 0xb0, 0x2d, 0x46, 0xd9, 0x3a, 0xd8, 0x65, 0x9e, + 0xd3, 0xc5, 0xc2, 0x3a, 0x94, 0x7d, 0xfb, 0xc2, 0x1f, 0x0a, 0xe4, 0xb4, 0x40, 0xb5, 0xe9, 0x07, + 0x82, 0x1e, 0x40, 0x2a, 0xb4, 0x52, 0x95, 0x25, 0x65, 0x39, 0xbd, 0xfa, 0x6e, 0x31, 0x2a, 0xf0, + 0x03, 0xa8, 0xdd, 0xdb, 0xc5, 0x10, 0xa3, 0x32, 0xf5, 0xf4, 0xc5, 0xe5, 0x98, 0x76, 0x00, 0x80, + 0xbe, 0x56, 0xe0, 0x32, 0xa1, 0x2e, 0x77, 0x3c, 0x1b, 0x53, 0x6e, 0x70, 0xc2, 0xa8, 0x6e, 0x91, + 0x8e, 0x63, 0x38, 0xfb, 0x7a, 0x90, 0xb9, 0x1a, 0x5f, 0x4a, 0x2c, 0xa7, 0x57, 0x3f, 0x2c, 0x9e, + 0xcc, 0x4e, 0xb1, 0x3e, 0x0a, 0xd3, 0xf0, 0x51, 0x82, 0xa8, 0xb5, 0x4b, 0xe4, 0xa4, 0xed, 0xc2, + 0x73, 0x05, 0x2e, 0x9d, 0x08, 0x80, 0x38, 0x5c, 0x3c, 0x26, 0xd0, 0x80, 0x85, 0xbb, 0x91, 0x01, + 0x06, 0xf4, 0x1f, 0x1b, 0x5f, 0xc0, 0xc8, 0x42, 0x74, 0x78, 0xe8, 0x23, 0x98, 0x19, 0xa5, 0xe1, + 0xda, 0x38, 0x1a, 0xfc, 0x78, 0xb5, 0xd0, 0xad, 0xf0, 0xed, 0x34, 0x24, 0x7d, 0x1d, 0x42, 0x30, + 0x45, 0x0d, 0xdb, 0xaf, 0xda, 0xac, 0x26, 0x65, 0xb4, 0x04, 0x69, 0x13, 0xbb, 0x5d, 0x87, 0xf4, + 0xc5, 0xb1, 0x6a, 0x5c, 0x6e, 0x0d, 0xab, 0x84, 0x97, 0x47, 0x09, 0x57, 0x13, 0xbe, 0x97, 0x90, + 0xd1, 0x3a, 0xcc, 0x12, 0xca, 0xf5, 0x9e, 0xe1, 0xf5, 0xb0, 0x3a, 0x25, 0xd3, 0x5f, 0x1e, 0x5f, + 0x1f, 0xbe, 0x2e, 0xec, 0x37, 0x62, 0x5a, 0x8a, 0x04, 0x32, 0x6a, 0x42, 0xc6, 0x64, 0x5e, 0xc7, + 0xc2, 0x01, 0xd6, 0xb4, 0xc4, 0xba, 0x39, 0x0e, 0xab, 0x2a, 0x7d, 0x42, 0xb8, 0xb4, 0x39, 0x58, + 0xa2, 0x32, 0xcc, 0x88, 0xd0, 0x5c, 0xcf, 0x56, 0x93, 0x12, 0xec, 0xda, 0x04, 0x81, 0xb5, 0x3c, + 0x7b, 0x23, 0xa6, 0x25, 0x89, 0x94, 0xd0, 0xc7, 0x00, 0x41, 0x50, 0x02, 0x65, 0xe6, 0x84, 0x1e, + 0x3f, 0x12, 0x92, 0x0f, 0x34, 0x6b, 0x86, 0x0b, 0xd4, 0x82, 0x39, 0x11, 0xce, 0x13, 0xe2, 0x72, + 0xd6, 0x73, 0x0c, 0x5b, 0x4d, 0x49, 0xb8, 0x5b, 0x13, 0x04, 0xb5, 0x11, 0xfa, 0x6c, 0xc4, 0xb4, + 0x0c, 0x19, 0x5a, 0xa3, 0xc7, 0x30, 0x1f, 0x04, 0x38, 0xc0, 0x9d, 0x95, 0xb8, 0xa5, 0xc9, 0xc2, + 0x1c, 0x86, 0xce, 0x99, 0xa3, 0x2a, 0xb4, 0x03, 0xd9, 0x41, 0xfa, 0xb6, 0x68, 0xf0, 0xb4, 0xc4, + 0x5e, 0x99, 0x98, 0x02, 0xe1, 0xb4, 0x11, 0xd3, 0xe6, 0xcc, 0x61, 0x45, 0x25, 0x09, 0x53, 0xa6, + 0xc1, 0x8d, 0xc2, 0x23, 0x48, 0x85, 0xbd, 0x80, 0x36, 0x21, 0x2d, 0x74, 0x7a, 0x9f, 0x11, 0xca, + 0x5d, 0x55, 0x91, 0x3d, 0x3e, 0x09, 0x39, 0x55, 0x83, 0x1b, 0x4d, 0xe1, 0xa4, 0x81, 0x19, 0x8a, + 0x6e, 0x41, 0x87, 0xf4, 0x50, 0x6b, 0xa0, 0x66, 0x14, 0xfa, 0x84, 0x14, 0x45, 0x1f, 0xf0, 0xa7, + 0x02, 0x49, 0xbf, 0x5f, 0xde, 0x70, 0xe8, 0x88, 0xc1, 0x45, 0xa3, 0xd7, 0x73, 0x70, 0xcf, 0x9f, + 0x2d, 0x1c, 0xdb, 0x7d, 0xe6, 0x18, 0x16, 0xe1, 0xfb, 0xf2, 0x52, 0x66, 0x57, 0xef, 0x8d, 0x83, + 0x2e, 0x0f, 0xdc, 0xdb, 0x03, 0x6f, 0x6d, 0xc1, 0x88, 0xd4, 0xa3, 0x2b, 0x90, 0x21, 0xae, 0x6e, + 0x33, 0xca, 0x38, 0xa3, 0xa4, 0x2b, 0xef, 0x77, 0x4a, 0x4b, 0x13, 0x77, 0x33, 0x54, 0x15, 0xfe, + 0x52, 0x60, 0xf6, 0xa0, 0xa8, 0x6f, 0x9e, 0xcd, 0x33, 0x99, 0xf3, 0x73, 0x05, 0x32, 0xc3, 0x97, + 0x0f, 0xed, 0x44, 0xa5, 0x7d, 0xf7, 0x34, 0xf7, 0xf7, 0x6c, 0x24, 0x5f, 0xf8, 0x4d, 0x81, 0xdc, + 0xa1, 0xeb, 0x8f, 0x1e, 0x45, 0x25, 0xf7, 0xde, 0x29, 0x87, 0xc8, 0x19, 0xc9, 0xef, 0x09, 0xcc, + 0x8d, 0x4c, 0x20, 0xf4, 0x69, 0x54, 0x72, 0xf7, 0x4e, 0x35, 0xc5, 0xa2, 0xa7, 0xc0, 0xf7, 0x71, + 0xd9, 0x23, 0x07, 0x9b, 0xe8, 0x01, 0x24, 0x2d, 0xa3, 0x83, 0xad, 0xf0, 0x90, 0x95, 0x31, 0x6f, + 0x81, 0x16, 0x77, 0x08, 0xed, 0x3d, 0xc0, 0xfb, 0x3b, 0x86, 0xe5, 0x85, 0xaf, 0xa2, 0x00, 0x02, + 0x95, 0xe0, 0x82, 0xcb, 0x0d, 0x87, 0xeb, 0x9c, 0xd8, 0x58, 0xf7, 0x28, 0xd9, 0xd3, 0xa9, 0x41, + 0x99, 0x64, 0x2d, 0xa9, 0xfd, 0x4f, 0xee, 0xb5, 0x89, 0x8d, 0xb7, 0x29, 0xd9, 0xdb, 0x32, 0x28, + 0x43, 0xef, 0x40, 0xf6, 0x90, 0x69, 0x42, 0x9a, 0x66, 0xf8, 0xb0, 0xd5, 0x05, 0x98, 0xde, 0x15, + 0xa7, 0xc9, 0xef, 0xf5, 0xbc, 0xe6, 0x2f, 0x50, 0x1d, 0x66, 0xf1, 0x1e, 0xb6, 0xfb, 0x96, 0xe1, + 0xb8, 0xea, 0xb4, 0x0c, 0xfe, 0xe6, 0x04, 0xbd, 0x5d, 0x0b, 0x7c, 0xb4, 0x81, 0x77, 0xe1, 0x87, + 0x78, 0xd8, 0x5f, 0xe7, 0x98, 0x18, 0x25, 0x24, 0xa6, 0x71, 0x94, 0x98, 0xe2, 0x64, 0xad, 0x13, + 0xc5, 0xcd, 0xdf, 0x71, 0xf8, 0x7f, 0xe4, 0x48, 0x38, 0x2f, 0x0c, 0x75, 0x99, 0x47, 0xb9, 0x64, + 0x28, 0xa9, 0xf9, 0x0b, 0x34, 0x0f, 0x09, 0xf1, 0x3e, 0x9a, 0x96, 0xed, 0x24, 0x44, 0x74, 0x15, + 0xe6, 0x3a, 0x5e, 0xf7, 0x0b, 0xcc, 0x75, 0x69, 0xe1, 0xaa, 0xc9, 0xa5, 0x84, 0x00, 0xf3, 0x95, + 0x6b, 0x52, 0x87, 0xae, 0x43, 0x0e, 0xef, 0xf5, 0x2d, 0xd2, 0x25, 0x5c, 0xef, 0x30, 0x8f, 0x9a, + 0xae, 0x3a, 0xb3, 0x94, 0x58, 0x56, 0xb4, 0x6c, 0xa8, 0xae, 0x48, 0xed, 0x68, 0x6b, 0xa6, 0x5e, + 0xab, 0x35, 0xbf, 0x4a, 0x80, 0x7a, 0xdc, 0xd0, 0x7a, 0x3b, 0x2a, 0xa0, 0xfc, 0x17, 0x15, 0x68, + 0x1c, 0xad, 0xc0, 0x6b, 0xdc, 0x81, 0x1f, 0x13, 0xb0, 0x10, 0x3d, 0x5c, 0xdf, 0xaa, 0x12, 0x30, + 0xc8, 0x7d, 0xe9, 0x19, 0x94, 0x13, 0x0b, 0xeb, 0x72, 0x94, 0xf8, 0x45, 0x48, 0xaf, 0xde, 0xff, + 0x77, 0x5f, 0x9e, 0xa2, 0xcc, 0xb1, 0xcc, 0x3f, 0x09, 0x40, 0xb5, 0x6c, 0x08, 0x2f, 0x37, 0xdc, + 0xc5, 0x35, 0xc8, 0x1d, 0x32, 0x41, 0x8b, 0x90, 0x0a, 0x8d, 0xe4, 0xaf, 0x3d, 0x45, 0x3b, 0x58, + 0x0f, 0xc6, 0x5d, 0x7c, 0x68, 0xdc, 0x15, 0x7e, 0x8e, 0x43, 0x7a, 0xe8, 0xf2, 0xa0, 0xc7, 0x90, + 0xfb, 0x9c, 0x58, 0x1c, 0x3b, 0xd8, 0xd4, 0x5f, 0xbf, 0x34, 0xd9, 0x10, 0xab, 0xe1, 0x97, 0xe8, + 0x28, 0xe3, 0xf1, 0x93, 0x06, 0x73, 0x62, 0xf8, 0x8b, 0xd5, 0x82, 0x19, 0xb7, 0x6f, 0x50, 0x9d, + 0x98, 0xb2, 0x12, 0x99, 0xca, 0xfb, 0xe2, 0x88, 0x5f, 0x5f, 0x5c, 0x5e, 0xed, 0xb1, 0x43, 0xb1, + 0x11, 0x56, 0xea, 0x32, 0xcb, 0xc2, 0x5d, 0xce, 0x9c, 0x12, 0xa1, 0x1c, 0x3b, 0xd4, 0xb0, 0x4a, + 0xe2, 0x43, 0x5e, 0x6c, 0xf5, 0x0d, 0x5a, 0xaf, 0x6a, 0x49, 0x01, 0x55, 0x37, 0xd1, 0x0e, 0xa4, + 0xb8, 0x63, 0x74, 0xb1, 0x40, 0x9d, 0x96, 0xa8, 0x1f, 0x04, 0xa8, 0x77, 0x4e, 0x83, 0xda, 0x16, + 0x18, 0xf5, 0xaa, 0x36, 0x23, 0xc1, 0xea, 0x66, 0xe1, 0x79, 0x1c, 0xb2, 0xa3, 0x37, 0xe2, 0xec, + 0x31, 0xab, 0x9c, 0x47, 0x66, 0x6f, 0x7c, 0xa3, 0xc0, 0x42, 0xf4, 0x03, 0x11, 0x5d, 0x87, 0xab, + 0xe5, 0xf5, 0x75, 0xad, 0xb6, 0x5e, 0x6e, 0xd7, 0x1f, 0x6e, 0xe9, 0xed, 0xda, 0x66, 0xf3, 0xa1, + 0x56, 0x6e, 0xd4, 0xdb, 0x8f, 0xf4, 0xed, 0xad, 0x56, 0xb3, 0xb6, 0x56, 0xbf, 0x5f, 0xaf, 0x55, + 0xe7, 0x63, 0xe8, 0x0a, 0x5c, 0x3a, 0xce, 0xb0, 0x5a, 0x6b, 0xb4, 0xcb, 0xf3, 0x0a, 0xba, 0x06, + 0x85, 0xe3, 0x4c, 0xd6, 0xb6, 0x37, 0xb7, 0x1b, 0xe5, 0x76, 0x7d, 0xa7, 0x36, 0x1f, 0xaf, 0xfc, + 0xa4, 0x3c, 0x7d, 0x99, 0x57, 0x9e, 0xbd, 0xcc, 0x2b, 0xbf, 0xbf, 0xcc, 0x2b, 0xdf, 0xbd, 0xca, + 0xc7, 0x9e, 0xbd, 0xca, 0xc7, 0x7e, 0x79, 0x95, 0x8f, 0xc1, 0x15, 0xc2, 0xc6, 0xdc, 0xfc, 0x4a, + 0x26, 0xf8, 0x97, 0xa9, 0x29, 0x36, 0x9a, 0xca, 0x67, 0x5b, 0xa7, 0xa0, 0xa6, 0x34, 0x62, 0xb8, + 0x22, 0xb1, 0x57, 0x7a, 0x98, 0x0e, 0xfd, 0xcf, 0xd8, 0x49, 0x4a, 0xed, 0x9d, 0x7f, 0x02, 0x00, + 0x00, 0xff, 0xff, 0x00, 0x76, 0x79, 0x73, 0x90, 0x14, 0x00, 0x00, } func (m *ResourceMetrics) Marshal() (dAtA []byte, err error) { @@ -1903,18 +1903,16 @@ func (m *InstrumentationLibraryMetrics) MarshalToSizedBuffer(dAtA []byte) (int, dAtA[i] = 0x12 } } - if m.InstrumentationLibrary != nil { - { - size, err := m.InstrumentationLibrary.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintMetrics(dAtA, i, uint64(size)) + { + size, err := m.InstrumentationLibrary.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i-- - dAtA[i] = 0xa + i -= size + i = encodeVarintMetrics(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -3025,10 +3023,8 @@ func (m *InstrumentationLibraryMetrics) Size() (n int) { } var l int _ = l - if m.InstrumentationLibrary != nil { - l = m.InstrumentationLibrary.Size() - n += 1 + l + sovMetrics(uint64(l)) - } + l = m.InstrumentationLibrary.Size() + n += 1 + l + sovMetrics(uint64(l)) if len(m.Metrics) > 0 { for _, e := range m.Metrics { l = e.Size() @@ -3689,9 +3685,6 @@ func (m *InstrumentationLibraryMetrics) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.InstrumentationLibrary == nil { - m.InstrumentationLibrary = &v11.InstrumentationLibrary{} - } if err := m.InstrumentationLibrary.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/internal/data/opentelemetry-proto-gen/trace/v1/trace.pb.go b/internal/data/opentelemetry-proto-gen/trace/v1/trace.pb.go index f5e2d34a652..ca5f6e700a9 100644 --- a/internal/data/opentelemetry-proto-gen/trace/v1/trace.pb.go +++ b/internal/data/opentelemetry-proto-gen/trace/v1/trace.pb.go @@ -246,7 +246,7 @@ func (m *ResourceSpans) GetInstrumentationLibrarySpans() []*InstrumentationLibra type InstrumentationLibrarySpans struct { // The instrumentation library information for the spans in this message. // If this field is not set then no library info is known. - InstrumentationLibrary *v11.InstrumentationLibrary `protobuf:"bytes,1,opt,name=instrumentation_library,json=instrumentationLibrary,proto3" json:"instrumentation_library,omitempty"` + InstrumentationLibrary v11.InstrumentationLibrary `protobuf:"bytes,1,opt,name=instrumentation_library,json=instrumentationLibrary,proto3" json:"instrumentation_library"` // A list of Spans that originate from an instrumentation library. Spans []*Span `protobuf:"bytes,2,rep,name=spans,proto3" json:"spans,omitempty"` } @@ -284,11 +284,11 @@ func (m *InstrumentationLibrarySpans) XXX_DiscardUnknown() { var xxx_messageInfo_InstrumentationLibrarySpans proto.InternalMessageInfo -func (m *InstrumentationLibrarySpans) GetInstrumentationLibrary() *v11.InstrumentationLibrary { +func (m *InstrumentationLibrarySpans) GetInstrumentationLibrary() v11.InstrumentationLibrary { if m != nil { return m.InstrumentationLibrary } - return nil + return v11.InstrumentationLibrary{} } func (m *InstrumentationLibrarySpans) GetSpans() []*Span { @@ -748,84 +748,84 @@ func init() { } var fileDescriptor_5c407ac9c675a601 = []byte{ - // 1225 bytes of a gzipped FileDescriptorProto + // 1227 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0x4f, 0x6f, 0xdb, 0xc6, 0x13, 0x15, 0x6d, 0x49, 0x76, 0xc6, 0xb6, 0xcc, 0xec, 0xcf, 0xc9, 0x8f, 0x71, 0x1a, 0x59, 0x50, 0xdd, 0x44, 0x49, 0x1a, 0xa9, 0x71, 0x50, 0x20, 0xfd, 0x87, 0x96, 0x22, 0xd7, 0x09, 0x61, 0x9a, - 0x14, 0x96, 0x94, 0x9b, 0xf6, 0xc2, 0x32, 0xe6, 0xd6, 0x20, 0x22, 0x2d, 0x05, 0x8a, 0x32, 0x92, - 0x43, 0xbf, 0x43, 0x2f, 0x3d, 0xf4, 0x13, 0x35, 0xe8, 0x29, 0xc7, 0x22, 0x6d, 0x83, 0x22, 0xfe, - 0x1a, 0x3d, 0x14, 0xbb, 0xa4, 0x6c, 0xcb, 0x10, 0xe5, 0x04, 0x45, 0x2e, 0xbd, 0x18, 0xcb, 0x99, - 0x37, 0xef, 0x3d, 0xce, 0xcc, 0xd2, 0x36, 0x34, 0xa2, 0x01, 0x65, 0x09, 0xed, 0xd1, 0x3e, 0x4d, - 0xe2, 0x67, 0xad, 0x41, 0x1c, 0x25, 0x51, 0x2b, 0x89, 0xfd, 0x7d, 0xda, 0x3a, 0xbc, 0x9b, 0x1e, - 0x9a, 0x22, 0x88, 0xde, 0x9b, 0x40, 0xa6, 0xc1, 0x66, 0x0a, 0x38, 0xbc, 0xbb, 0xbe, 0x76, 0x10, - 0x1d, 0x44, 0x69, 0x35, 0x3f, 0xa5, 0xe9, 0xf5, 0x5b, 0xd3, 0xd8, 0xf7, 0xa3, 0x7e, 0x3f, 0x62, - 0x9c, 0x3e, 0x3d, 0x65, 0xd8, 0xe6, 0x34, 0x6c, 0x4c, 0x87, 0xd1, 0x28, 0x4e, 0xcd, 0x8c, 0xcf, - 0x29, 0xbe, 0xfe, 0xbb, 0x04, 0x2b, 0x24, 0x0b, 0x39, 0x03, 0x9f, 0x0d, 0xd1, 0x0e, 0x2c, 0x8e, - 0x31, 0x8a, 0x54, 0x93, 0x1a, 0x4b, 0x5b, 0x37, 0x9b, 0xd3, 0x4c, 0x1f, 0x13, 0x1d, 0xde, 0x6d, - 0x8e, 0x19, 0xda, 0xc5, 0xe7, 0xaf, 0x36, 0x0a, 0xe4, 0x98, 0x00, 0xfd, 0x00, 0xd7, 0x42, 0x36, - 0x4c, 0xe2, 0x51, 0x9f, 0xb2, 0xc4, 0x4f, 0xc2, 0x88, 0x79, 0xbd, 0xf0, 0x71, 0xec, 0xc7, 0xcf, - 0xbc, 0x21, 0x57, 0x53, 0xe6, 0x6a, 0xf3, 0x8d, 0xa5, 0xad, 0x4f, 0x9a, 0xb3, 0xda, 0xd2, 0x34, - 0x26, 0x29, 0xcc, 0x94, 0x41, 0xd8, 0x25, 0x57, 0xc3, 0xfc, 0x64, 0xfd, 0x17, 0x09, 0xae, 0xce, - 0x28, 0x46, 0x0c, 0xfe, 0x9f, 0x63, 0x2f, 0x7b, 0xf5, 0x8f, 0xa7, 0x1a, 0xcb, 0x3a, 0x9e, 0xeb, - 0x8c, 0x5c, 0x9e, 0x6e, 0x0a, 0xdd, 0x87, 0xd2, 0xe9, 0xd7, 0xae, 0xcf, 0x7e, 0x6d, 0xee, 0x91, - 0xa4, 0x05, 0xf5, 0x3f, 0x96, 0xa1, 0xc8, 0x9f, 0xd1, 0x1e, 0x2c, 0x0a, 0x80, 0x17, 0x06, 0xc2, - 0xe3, 0x72, 0xfb, 0x33, 0xde, 0xf3, 0x97, 0xaf, 0x36, 0xee, 0x1d, 0x44, 0x67, 0xf8, 0x42, 0xbe, - 0x26, 0xbd, 0x1e, 0xdd, 0x4f, 0xa2, 0xb8, 0x15, 0xb2, 0x84, 0xc6, 0xcc, 0xef, 0xb5, 0x02, 0x3f, - 0xf1, 0x9b, 0x2e, 0xe7, 0x30, 0x74, 0xb2, 0x20, 0xc8, 0x8c, 0x00, 0x39, 0xb0, 0xc0, 0x95, 0x38, - 0xed, 0x9c, 0xa0, 0xfd, 0x34, 0xa3, 0xdd, 0x7a, 0x1b, 0x5a, 0x6e, 0xd1, 0xd0, 0x49, 0x99, 0x53, - 0x19, 0x01, 0xda, 0x80, 0xa5, 0xd4, 0xec, 0x30, 0xf1, 0x13, 0xaa, 0xcc, 0xd7, 0xa4, 0xc6, 0x05, - 0x02, 0x22, 0xe4, 0xf0, 0x08, 0xfa, 0x0e, 0x2a, 0x03, 0x3f, 0xa6, 0x2c, 0xf1, 0xc6, 0xe2, 0xc5, - 0x7f, 0x2d, 0xbe, 0x9c, 0x32, 0x3a, 0xa9, 0x05, 0x04, 0x45, 0xe6, 0xf7, 0xa9, 0x52, 0x12, 0xda, - 0xe2, 0x8c, 0xbe, 0x84, 0xe2, 0x93, 0x90, 0x05, 0x4a, 0xb9, 0x26, 0x35, 0x2a, 0x5b, 0xb7, 0xcf, - 0x9f, 0x82, 0xf8, 0xb1, 0x13, 0xb2, 0x80, 0x88, 0x42, 0xd4, 0x82, 0xb5, 0x61, 0xe2, 0xc7, 0x89, - 0x97, 0x84, 0x7d, 0xea, 0x8d, 0x58, 0xf8, 0xd4, 0x63, 0x3e, 0x8b, 0x94, 0x85, 0x9a, 0xd4, 0x28, - 0x93, 0x8b, 0x22, 0xe7, 0x86, 0x7d, 0xda, 0x65, 0xe1, 0x53, 0xcb, 0x67, 0x11, 0xba, 0x0d, 0x88, - 0xb2, 0xe0, 0x2c, 0x7c, 0x51, 0xc0, 0x57, 0x29, 0x0b, 0x26, 0xc0, 0xbb, 0x00, 0x7e, 0x92, 0xc4, - 0xe1, 0xe3, 0x51, 0x42, 0x87, 0xca, 0x05, 0xb1, 0x2a, 0x37, 0xce, 0x59, 0xc4, 0x1d, 0xfa, 0x6c, - 0xcf, 0xef, 0x8d, 0xc6, 0x37, 0xf0, 0x14, 0x01, 0xba, 0x0f, 0x4a, 0x10, 0x47, 0x83, 0x01, 0x0d, - 0xbc, 0x93, 0xa8, 0xb7, 0x1f, 0x8d, 0x58, 0xa2, 0x40, 0x4d, 0x6a, 0xac, 0x90, 0xcb, 0x59, 0x5e, - 0x3d, 0x4e, 0x6b, 0x3c, 0x8b, 0xbe, 0x82, 0x32, 0x3d, 0xa4, 0x2c, 0x19, 0x2a, 0x4b, 0xc2, 0x44, - 0xe3, 0x0d, 0x3a, 0x85, 0x79, 0x01, 0xc9, 0xea, 0xd0, 0x47, 0xb0, 0x36, 0xd6, 0x4e, 0x23, 0x99, - 0xee, 0xb2, 0xd0, 0x45, 0x59, 0x4e, 0xd4, 0x64, 0x9a, 0x5f, 0x40, 0xa9, 0x17, 0xb2, 0x27, 0x43, - 0x65, 0x65, 0xc6, 0x7b, 0x4f, 0x4a, 0x9a, 0x21, 0x7b, 0x42, 0xd2, 0x2a, 0xd4, 0x84, 0xff, 0x8d, - 0x05, 0x45, 0x20, 0xd3, 0xab, 0x08, 0xbd, 0x8b, 0x59, 0x8a, 0x17, 0x64, 0x72, 0x9f, 0x43, 0x99, - 0xef, 0xe6, 0x68, 0xa8, 0xac, 0x8a, 0x0b, 0xbf, 0x79, 0x8e, 0x9e, 0xc0, 0x92, 0xac, 0x66, 0xfd, - 0x57, 0x09, 0x4a, 0xc2, 0x3c, 0xda, 0x84, 0xca, 0x99, 0xe1, 0x4a, 0x62, 0xb8, 0xcb, 0xc9, 0xe9, - 0xc9, 0x8e, 0x97, 0x71, 0xee, 0xd4, 0x32, 0x4e, 0x4e, 0x7b, 0xfe, 0x5d, 0x4e, 0xbb, 0x38, 0x6b, - 0xda, 0xeb, 0x7f, 0xce, 0x41, 0x91, 0x77, 0xe6, 0x3f, 0xf6, 0x89, 0x99, 0xec, 0x6f, 0xf1, 0x5d, - 0xf6, 0xb7, 0x34, 0xab, 0xbf, 0xf5, 0x9f, 0x25, 0x58, 0x1c, 0x7f, 0x47, 0xd0, 0x15, 0xb8, 0xe4, - 0x74, 0x54, 0xcb, 0xdb, 0x31, 0x2c, 0xdd, 0xeb, 0x5a, 0x4e, 0x07, 0x6b, 0xc6, 0xb6, 0x81, 0x75, - 0xb9, 0x80, 0x2e, 0x03, 0x3a, 0x49, 0x19, 0x96, 0x8b, 0x89, 0xa5, 0x9a, 0xb2, 0x84, 0xd6, 0x40, - 0x3e, 0x89, 0x3b, 0x98, 0xec, 0x61, 0x22, 0xcf, 0x4d, 0x46, 0x35, 0xd3, 0xc0, 0x96, 0x2b, 0xcf, - 0x4f, 0x72, 0x74, 0x88, 0xad, 0x77, 0x35, 0x4c, 0xe4, 0xe2, 0x64, 0x5c, 0xb3, 0x2d, 0xa7, 0xbb, - 0x8b, 0x89, 0x5c, 0xaa, 0xff, 0xbd, 0x00, 0xe5, 0x74, 0xb7, 0xd1, 0xf7, 0xb0, 0x1a, 0xd0, 0x41, - 0x4c, 0xf7, 0xfd, 0x84, 0x06, 0xde, 0x7e, 0x14, 0xa4, 0x7f, 0x06, 0x54, 0xce, 0xfb, 0x25, 0x9d, - 0x96, 0x37, 0xf5, 0xe3, 0xda, 0x34, 0xa0, 0x45, 0x01, 0x6d, 0xcf, 0x29, 0x12, 0xa9, 0x9c, 0xb0, - 0xf2, 0x18, 0x52, 0x60, 0xa1, 0x4f, 0x87, 0x43, 0xff, 0x60, 0x7c, 0x1d, 0xc6, 0x8f, 0x48, 0x83, - 0xa2, 0x90, 0x9d, 0x17, 0xb2, 0xad, 0x37, 0x92, 0x3d, 0x11, 0x23, 0xa2, 0xb8, 0xfe, 0xb2, 0x04, - 0x6b, 0xd3, 0xbc, 0xa0, 0x6b, 0x70, 0x45, 0xc7, 0x1d, 0x82, 0x35, 0xd5, 0xc5, 0xba, 0xe7, 0xb8, - 0xaa, 0xdb, 0x75, 0x3c, 0xcd, 0xd6, 0xb1, 0x67, 0xef, 0xc8, 0x05, 0xb4, 0x09, 0xb5, 0x9c, 0xb4, - 0xa6, 0x5a, 0x1a, 0x36, 0x4d, 0xac, 0xcb, 0x12, 0x6a, 0xc0, 0x66, 0x0e, 0xaa, 0x6b, 0xed, 0x58, - 0xf6, 0xd7, 0x96, 0x87, 0x09, 0xb1, 0xf9, 0x7c, 0x6e, 0xc3, 0x8d, 0x1c, 0xa4, 0x61, 0xed, 0xa9, - 0xa6, 0xa1, 0x7b, 0x2a, 0x79, 0xd0, 0xdd, 0x4d, 0xc7, 0xf6, 0x21, 0x34, 0x72, 0xc0, 0x3a, 0x56, - 0x75, 0xd3, 0xb0, 0xb0, 0x87, 0x1f, 0x69, 0x18, 0xeb, 0x58, 0x97, 0x8b, 0x33, 0xac, 0x5a, 0xb6, - 0xeb, 0x6d, 0xdb, 0x5d, 0x4b, 0x97, 0x4b, 0xe8, 0x26, 0x7c, 0x90, 0x83, 0x52, 0x4d, 0x82, 0x55, - 0xfd, 0x1b, 0x0f, 0x3f, 0x32, 0x1c, 0xd7, 0x91, 0xcb, 0x33, 0xe4, 0x3b, 0x98, 0xec, 0x1a, 0x8e, - 0x63, 0xd8, 0x96, 0xa7, 0x63, 0x8b, 0xef, 0xe9, 0x02, 0xba, 0x03, 0x37, 0x73, 0xd0, 0x04, 0x3b, - 0x76, 0x97, 0x68, 0xdc, 0xec, 0x43, 0xb5, 0xeb, 0xb8, 0x58, 0x97, 0x17, 0x51, 0x13, 0x6e, 0xe5, - 0xc0, 0xb7, 0x55, 0xc3, 0xc4, 0x7c, 0x4d, 0xb1, 0x66, 0x5b, 0xba, 0xe1, 0x1a, 0xb6, 0x25, 0x5f, - 0x40, 0x75, 0xa8, 0xe6, 0xf9, 0x6e, 0xdb, 0x84, 0x73, 0x02, 0xba, 0x01, 0xef, 0xe7, 0xcd, 0xb2, - 0xeb, 0x7a, 0xf6, 0xb6, 0x47, 0x54, 0xeb, 0x01, 0x96, 0x97, 0x66, 0xce, 0xcb, 0xd8, 0xed, 0x98, - 0x98, 0x0f, 0x00, 0xeb, 0xf2, 0xf2, 0x8c, 0x76, 0x8d, 0xaf, 0x62, 0x36, 0xda, 0x15, 0x74, 0x1d, - 0xea, 0xb9, 0xa4, 0xea, 0x9e, 0x6a, 0x98, 0x6a, 0xdb, 0xc4, 0x72, 0x65, 0xc6, 0x9c, 0x74, 0xd5, - 0x55, 0x3d, 0xd3, 0x76, 0x1c, 0x79, 0x15, 0xdd, 0x82, 0xeb, 0xf9, 0x6c, 0x5d, 0xf7, 0x21, 0xb6, - 0x5c, 0x43, 0xe4, 0x64, 0xb9, 0x6e, 0x01, 0x9c, 0xda, 0xe8, 0x4b, 0x70, 0x71, 0x12, 0xee, 0x60, - 0x57, 0x2e, 0x20, 0x04, 0x95, 0x33, 0xdb, 0x2d, 0x9d, 0x85, 0x66, 0x4b, 0xda, 0xfe, 0x49, 0x7a, - 0xfe, 0xba, 0x2a, 0xbd, 0x78, 0x5d, 0x95, 0xfe, 0x7a, 0x5d, 0x95, 0x7e, 0x3c, 0xaa, 0x16, 0x5e, - 0x1c, 0x55, 0x0b, 0xbf, 0x1d, 0x55, 0x0b, 0xb0, 0x11, 0x46, 0x33, 0x2f, 0x60, 0x1b, 0xc4, 0x77, - 0xbe, 0xc3, 0x83, 0x1d, 0xe9, 0x5b, 0xf3, 0x2d, 0x3e, 0xe5, 0xad, 0x09, 0xe0, 0x1d, 0xc1, 0x7b, - 0xe7, 0x80, 0xb2, 0xe3, 0xff, 0x9c, 0x1e, 0x97, 0x45, 0xec, 0xde, 0x3f, 0x01, 0x00, 0x00, 0xff, - 0xff, 0x01, 0x46, 0xc4, 0x7a, 0x60, 0x0d, 0x00, 0x00, + 0x14, 0x96, 0x94, 0x9b, 0xf6, 0xc2, 0x32, 0xe6, 0xd6, 0x20, 0x22, 0x91, 0x02, 0xb5, 0x32, 0x92, + 0x43, 0xbf, 0x43, 0x2f, 0x3d, 0xf4, 0x1b, 0x05, 0x05, 0x0a, 0xe4, 0x58, 0xa4, 0x6d, 0x50, 0xc4, + 0x5f, 0xa3, 0x87, 0x62, 0x97, 0x94, 0x6d, 0x19, 0xa2, 0x9c, 0xa0, 0xc8, 0xa5, 0x17, 0x63, 0x39, + 0xf3, 0xe6, 0xbd, 0xc7, 0x99, 0x59, 0xda, 0x86, 0x46, 0x3c, 0xa0, 0x11, 0xa3, 0x3d, 0xda, 0xa7, + 0x2c, 0x79, 0xd6, 0x1a, 0x24, 0x31, 0x8b, 0x5b, 0x2c, 0xf1, 0xf7, 0x69, 0xeb, 0xf0, 0x6e, 0x7a, + 0x68, 0x8a, 0x20, 0x7a, 0x6f, 0x02, 0x99, 0x06, 0x9b, 0x29, 0xe0, 0xf0, 0xee, 0xfa, 0xda, 0x41, + 0x7c, 0x10, 0xa7, 0xd5, 0xfc, 0x94, 0xa6, 0xd7, 0x6f, 0x4d, 0x63, 0xdf, 0x8f, 0xfb, 0xfd, 0x38, + 0xe2, 0xf4, 0xe9, 0x29, 0xc3, 0x36, 0xa7, 0x61, 0x13, 0x3a, 0x8c, 0x47, 0x49, 0x6a, 0x66, 0x7c, + 0x4e, 0xf1, 0xf5, 0xdf, 0x25, 0x58, 0x21, 0x59, 0xc8, 0x19, 0xf8, 0xd1, 0x10, 0xed, 0xc0, 0xe2, + 0x18, 0xa3, 0x48, 0x35, 0xa9, 0xb1, 0xb4, 0x75, 0xb3, 0x39, 0xcd, 0xf4, 0x31, 0xd1, 0xe1, 0xdd, + 0xe6, 0x98, 0xa1, 0x5d, 0x7c, 0xfe, 0x6a, 0xa3, 0x40, 0x8e, 0x09, 0xd0, 0x0f, 0x70, 0x2d, 0x8c, + 0x86, 0x2c, 0x19, 0xf5, 0x69, 0xc4, 0x7c, 0x16, 0xc6, 0x91, 0xd7, 0x0b, 0x1f, 0x27, 0x7e, 0xf2, + 0xcc, 0x1b, 0x72, 0x35, 0x65, 0xae, 0x36, 0xdf, 0x58, 0xda, 0xfa, 0xa4, 0x39, 0xab, 0x2d, 0x4d, + 0x63, 0x92, 0xc2, 0x4c, 0x19, 0x84, 0x5d, 0x72, 0x35, 0xcc, 0x4f, 0xd6, 0x7f, 0x95, 0xe0, 0xea, + 0x8c, 0x62, 0xc4, 0xe0, 0xff, 0x39, 0xf6, 0xb2, 0x57, 0xff, 0x78, 0xaa, 0xb1, 0xac, 0xe3, 0xb9, + 0xce, 0xb2, 0x36, 0x5c, 0x9e, 0x6e, 0x0d, 0xdd, 0x87, 0xd2, 0xe9, 0x97, 0xaf, 0xcf, 0x7e, 0x79, + 0xee, 0x94, 0xa4, 0x05, 0xf5, 0x3f, 0x96, 0xa1, 0xc8, 0x9f, 0xd1, 0x1e, 0x2c, 0x0a, 0x80, 0x17, + 0x06, 0xc2, 0xe9, 0x72, 0xfb, 0x33, 0x2e, 0xf9, 0xf2, 0xd5, 0xc6, 0xbd, 0x83, 0xf8, 0x0c, 0x5f, + 0xc8, 0x97, 0xa5, 0xd7, 0xa3, 0xfb, 0x2c, 0x4e, 0x5a, 0x61, 0xc4, 0x68, 0x12, 0xf9, 0xbd, 0x56, + 0xe0, 0x33, 0xbf, 0xe9, 0x72, 0x0e, 0x43, 0x27, 0x0b, 0x82, 0xcc, 0x08, 0x90, 0x03, 0x0b, 0x5c, + 0x89, 0xd3, 0xce, 0x09, 0xda, 0x4f, 0x33, 0xda, 0xad, 0xb7, 0xa1, 0xe5, 0x16, 0x0d, 0x9d, 0x94, + 0x39, 0x95, 0x11, 0xa0, 0x0d, 0x58, 0x4a, 0xcd, 0x0e, 0x99, 0xcf, 0xa8, 0x32, 0x5f, 0x93, 0x1a, + 0x17, 0x08, 0x88, 0x90, 0xc3, 0x23, 0xe8, 0x3b, 0xa8, 0x0c, 0xfc, 0x84, 0x46, 0xcc, 0x1b, 0x8b, + 0x17, 0xff, 0xb5, 0xf8, 0x72, 0xca, 0xe8, 0xa4, 0x16, 0x10, 0x14, 0x23, 0xbf, 0x4f, 0x95, 0x92, + 0xd0, 0x16, 0x67, 0xf4, 0x25, 0x14, 0x9f, 0x84, 0x51, 0xa0, 0x94, 0x6b, 0x52, 0xa3, 0xb2, 0x75, + 0xfb, 0xfc, 0x29, 0x88, 0x1f, 0x3b, 0x61, 0x14, 0x10, 0x51, 0x88, 0x5a, 0xb0, 0x36, 0x64, 0x7e, + 0xc2, 0x3c, 0x16, 0xf6, 0xa9, 0x37, 0x8a, 0xc2, 0xa7, 0x5e, 0xe4, 0x47, 0xb1, 0xb2, 0x50, 0x93, + 0x1a, 0x65, 0x72, 0x51, 0xe4, 0xdc, 0xb0, 0x4f, 0xbb, 0x51, 0xf8, 0xd4, 0xf2, 0xa3, 0x18, 0xdd, + 0x06, 0x44, 0xa3, 0xe0, 0x2c, 0x7c, 0x51, 0xc0, 0x57, 0x69, 0x14, 0x4c, 0x80, 0x77, 0x01, 0x7c, + 0xc6, 0x92, 0xf0, 0xf1, 0x88, 0xd1, 0xa1, 0x72, 0x41, 0xac, 0xca, 0x8d, 0x73, 0xd6, 0x71, 0x87, + 0x3e, 0xdb, 0xf3, 0x7b, 0xa3, 0xf1, 0x3d, 0x3c, 0x45, 0x80, 0xee, 0x83, 0x12, 0x24, 0xf1, 0x60, + 0x40, 0x03, 0xef, 0x24, 0xea, 0xed, 0xc7, 0xa3, 0x88, 0x29, 0x50, 0x93, 0x1a, 0x2b, 0xe4, 0x72, + 0x96, 0x57, 0x8f, 0xd3, 0x1a, 0xcf, 0xa2, 0xaf, 0xa0, 0x4c, 0x0f, 0x69, 0xc4, 0x86, 0xca, 0x92, + 0x30, 0xd1, 0x78, 0x83, 0x4e, 0x61, 0x5e, 0x40, 0xb2, 0x3a, 0xf4, 0x11, 0xac, 0x8d, 0xb5, 0xd3, + 0x48, 0xa6, 0xbb, 0x2c, 0x74, 0x51, 0x96, 0x13, 0x35, 0x99, 0xe6, 0x17, 0x50, 0xea, 0x85, 0xd1, + 0x93, 0xa1, 0xb2, 0x32, 0xe3, 0xbd, 0x27, 0x25, 0xcd, 0x30, 0x7a, 0x42, 0xd2, 0x2a, 0xd4, 0x84, + 0xff, 0x8d, 0x05, 0x45, 0x20, 0xd3, 0xab, 0x08, 0xbd, 0x8b, 0x59, 0x8a, 0x17, 0x64, 0x72, 0x9f, + 0x43, 0x99, 0xef, 0xe6, 0x68, 0xa8, 0xac, 0x8a, 0x6b, 0xbf, 0x79, 0x8e, 0x9e, 0xc0, 0x92, 0xac, + 0x66, 0xfd, 0x17, 0x09, 0x4a, 0xc2, 0x3c, 0xda, 0x84, 0xca, 0x99, 0xe1, 0x4a, 0x62, 0xb8, 0xcb, + 0xec, 0xf4, 0x64, 0xc7, 0xcb, 0x38, 0x77, 0x6a, 0x19, 0x27, 0xa7, 0x3d, 0xff, 0x2e, 0xa7, 0x5d, + 0x9c, 0x35, 0xed, 0xf5, 0x3f, 0xe7, 0xa0, 0xc8, 0x3b, 0xf3, 0x1f, 0xfb, 0xc4, 0x4c, 0xf6, 0xb7, + 0xf8, 0x2e, 0xfb, 0x5b, 0x9a, 0xd5, 0xdf, 0xfa, 0xcf, 0x12, 0x2c, 0x8e, 0xbf, 0x23, 0xe8, 0x0a, + 0x5c, 0x72, 0x3a, 0xaa, 0xe5, 0xed, 0x18, 0x96, 0xee, 0x75, 0x2d, 0xa7, 0x83, 0x35, 0x63, 0xdb, + 0xc0, 0xba, 0x5c, 0x40, 0x97, 0x01, 0x9d, 0xa4, 0x0c, 0xcb, 0xc5, 0xc4, 0x52, 0x4d, 0x59, 0x42, + 0x6b, 0x20, 0x9f, 0xc4, 0x1d, 0x4c, 0xf6, 0x30, 0x91, 0xe7, 0x26, 0xa3, 0x9a, 0x69, 0x60, 0xcb, + 0x95, 0xe7, 0x27, 0x39, 0x3a, 0xc4, 0xd6, 0xbb, 0x1a, 0x26, 0x72, 0x71, 0x32, 0xae, 0xd9, 0x96, + 0xd3, 0xdd, 0xc5, 0x44, 0x2e, 0xd5, 0xff, 0x5e, 0x80, 0x72, 0xba, 0xdb, 0xe8, 0x7b, 0x58, 0x0d, + 0xe8, 0x20, 0xa1, 0xfb, 0x3e, 0xa3, 0x81, 0xb7, 0x1f, 0x07, 0xe9, 0x1f, 0x03, 0x95, 0xf3, 0x7e, + 0x55, 0xa7, 0xe5, 0x4d, 0xfd, 0xb8, 0x36, 0x0d, 0x68, 0x71, 0x40, 0xdb, 0x73, 0x8a, 0x44, 0x2a, + 0x27, 0xac, 0x3c, 0x86, 0x14, 0x58, 0xe8, 0xd3, 0xe1, 0xd0, 0x3f, 0x18, 0x5f, 0x87, 0xf1, 0x23, + 0xd2, 0xa0, 0x28, 0x64, 0xe7, 0x85, 0x6c, 0xeb, 0x8d, 0x64, 0x4f, 0xc4, 0x88, 0x28, 0xae, 0xbf, + 0x2c, 0xc1, 0xda, 0x34, 0x2f, 0xe8, 0x1a, 0x5c, 0xd1, 0x71, 0x87, 0x60, 0x4d, 0x75, 0xb1, 0xee, + 0x39, 0xae, 0xea, 0x76, 0x1d, 0x4f, 0xb3, 0x75, 0xec, 0xd9, 0x3b, 0x72, 0x01, 0x6d, 0x42, 0x2d, + 0x27, 0xad, 0xa9, 0x96, 0x86, 0x4d, 0x13, 0xeb, 0xb2, 0x84, 0x1a, 0xb0, 0x99, 0x83, 0xea, 0x5a, + 0x3b, 0x96, 0xfd, 0xb5, 0xe5, 0x61, 0x42, 0x6c, 0x3e, 0x9f, 0xdb, 0x70, 0x23, 0x07, 0x69, 0x58, + 0x7b, 0xaa, 0x69, 0xe8, 0x9e, 0x4a, 0x1e, 0x74, 0x77, 0xd3, 0xb1, 0x7d, 0x08, 0x8d, 0x1c, 0xb0, + 0x8e, 0x55, 0xdd, 0x34, 0x2c, 0xec, 0xe1, 0x47, 0x1a, 0xc6, 0x3a, 0xd6, 0xe5, 0xe2, 0x0c, 0xab, + 0x96, 0xed, 0x7a, 0xdb, 0x76, 0xd7, 0xd2, 0xe5, 0x12, 0xba, 0x09, 0x1f, 0xe4, 0xa0, 0x54, 0x93, + 0x60, 0x55, 0xff, 0xc6, 0xc3, 0x8f, 0x0c, 0xc7, 0x75, 0xe4, 0xf2, 0x0c, 0xf9, 0x0e, 0x26, 0xbb, + 0x86, 0xe3, 0x18, 0xb6, 0xe5, 0xe9, 0xd8, 0xe2, 0x7b, 0xba, 0x80, 0xee, 0xc0, 0xcd, 0x1c, 0x34, + 0xc1, 0x8e, 0xdd, 0x25, 0x1a, 0x37, 0xfb, 0x50, 0xed, 0x3a, 0x2e, 0xd6, 0xe5, 0x45, 0xd4, 0x84, + 0x5b, 0x39, 0xf0, 0x6d, 0xd5, 0x30, 0x31, 0x5f, 0x53, 0xac, 0xd9, 0x96, 0x6e, 0xb8, 0x86, 0x6d, + 0xc9, 0x17, 0x50, 0x1d, 0xaa, 0x79, 0xbe, 0xdb, 0x36, 0xe1, 0x9c, 0x80, 0x6e, 0xc0, 0xfb, 0x79, + 0xb3, 0xec, 0xba, 0x9e, 0xbd, 0xed, 0x11, 0xd5, 0x7a, 0x80, 0xe5, 0xa5, 0x99, 0xf3, 0x32, 0x76, + 0x3b, 0x26, 0xe6, 0x03, 0xc0, 0xba, 0xbc, 0x3c, 0xa3, 0x5d, 0xe3, 0xab, 0x98, 0x8d, 0x76, 0x05, + 0x5d, 0x87, 0x7a, 0x2e, 0xa9, 0xba, 0xa7, 0x1a, 0xa6, 0xda, 0x36, 0xb1, 0x5c, 0x99, 0x31, 0x27, + 0x5d, 0x75, 0x55, 0xcf, 0xb4, 0x1d, 0x47, 0x5e, 0x45, 0xb7, 0xe0, 0x7a, 0x3e, 0x5b, 0xd7, 0x7d, + 0x88, 0x2d, 0xd7, 0x10, 0x39, 0x59, 0xae, 0x5b, 0x00, 0xa7, 0x36, 0xfa, 0x12, 0x5c, 0x9c, 0x84, + 0x3b, 0xd8, 0x95, 0x0b, 0x08, 0x41, 0xe5, 0xcc, 0x76, 0x4b, 0x67, 0xa1, 0xd9, 0x92, 0xb6, 0x7f, + 0x92, 0x9e, 0xbf, 0xae, 0x4a, 0x2f, 0x5e, 0x57, 0xa5, 0xbf, 0x5e, 0x57, 0xa5, 0x1f, 0x8f, 0xaa, + 0x85, 0x17, 0x47, 0xd5, 0xc2, 0x6f, 0x47, 0xd5, 0x02, 0x6c, 0x84, 0xf1, 0xcc, 0x0b, 0xd8, 0x06, + 0xf1, 0x9d, 0xef, 0xf0, 0x60, 0x47, 0xfa, 0xd6, 0x7c, 0x8b, 0x4f, 0x79, 0x6b, 0x02, 0x78, 0x47, + 0xf0, 0xde, 0x39, 0xa0, 0xd1, 0xf1, 0xff, 0x4f, 0x8f, 0xcb, 0x22, 0x76, 0xef, 0x9f, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x9f, 0x4d, 0x03, 0x35, 0x66, 0x0d, 0x00, 0x00, } func (m *ResourceSpans) Marshal() (dAtA []byte, err error) { @@ -909,18 +909,16 @@ func (m *InstrumentationLibrarySpans) MarshalToSizedBuffer(dAtA []byte) (int, er dAtA[i] = 0x12 } } - if m.InstrumentationLibrary != nil { - { - size, err := m.InstrumentationLibrary.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTrace(dAtA, i, uint64(size)) + { + size, err := m.InstrumentationLibrary.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i-- - dAtA[i] = 0xa + i -= size + i = encodeVarintTrace(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1275,10 +1273,8 @@ func (m *InstrumentationLibrarySpans) Size() (n int) { } var l int _ = l - if m.InstrumentationLibrary != nil { - l = m.InstrumentationLibrary.Size() - n += 1 + l + sovTrace(uint64(l)) - } + l = m.InstrumentationLibrary.Size() + n += 1 + l + sovTrace(uint64(l)) if len(m.Spans) > 0 { for _, e := range m.Spans { l = e.Size() @@ -1605,9 +1601,6 @@ func (m *InstrumentationLibrarySpans) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.InstrumentationLibrary == nil { - m.InstrumentationLibrary = &v11.InstrumentationLibrary{} - } if err := m.InstrumentationLibrary.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/internal/goldendataset/traces_generator.go b/internal/goldendataset/traces_generator.go index 25704d2f5a7..623a127dffb 100644 --- a/internal/goldendataset/traces_generator.go +++ b/internal/goldendataset/traces_generator.go @@ -121,10 +121,9 @@ func countTotalSpanCases(spanPairsFile string) (int, error) { return count, err } -func generateInstrumentationLibrary(tracingInputs *PICTTracingInputs, - index int) *otlpcommon.InstrumentationLibrary { +func generateInstrumentationLibrary(tracingInputs *PICTTracingInputs, index int) otlpcommon.InstrumentationLibrary { if LibraryNone == tracingInputs.InstrumentationLibrary { - return nil + return otlpcommon.InstrumentationLibrary{} } nameStr := fmt.Sprintf("%s-%s-%s-%d", tracingInputs.Resource, tracingInputs.InstrumentationLibrary, tracingInputs.Spans, index) @@ -132,7 +131,7 @@ func generateInstrumentationLibrary(tracingInputs *PICTTracingInputs, if index > 0 { verStr = "" } - return &otlpcommon.InstrumentationLibrary{ + return otlpcommon.InstrumentationLibrary{ Name: nameStr, Version: verStr, } diff --git a/internal/processor/filtermatcher/filtermatcher_test.go b/internal/processor/filtermatcher/filtermatcher_test.go index d538c86c898..31102381d71 100644 --- a/internal/processor/filtermatcher/filtermatcher_test.go +++ b/internal/processor/filtermatcher/filtermatcher_test.go @@ -210,7 +210,6 @@ func Test_Matching_False(t *testing.T) { }) library := pdata.NewInstrumentationLibrary() - library.InitEmpty() library.SetName("lib") library.SetVersion("ver") @@ -374,7 +373,6 @@ func Test_Matching_True(t *testing.T) { }) library := pdata.NewInstrumentationLibrary() - library.InitEmpty() library.SetName("lib") library.SetVersion("ver") diff --git a/processor/filterprocessor/metric_index.go b/processor/filterprocessor/metric_index.go index c490ea7d9ac..ca55b83a2ca 100644 --- a/processor/filterprocessor/metric_index.go +++ b/processor/filterprocessor/metric_index.go @@ -72,7 +72,6 @@ func (idx metricIndex) extract(pdm pdata.Metrics) pdata.Metrics { ilmOut.InitEmpty() ilmSliceOut.Append(ilmOut) ilOut := ilmOut.InstrumentationLibrary() - ilOut.InitEmpty() ilmIn.InstrumentationLibrary().CopyTo(ilOut) mSliceOut := ilmOut.Metrics() for _, metricIdx := range sortMetrics(ilmIndexes[ilmIdx]) { diff --git a/proto_patch.sed b/proto_patch.sed index 93f887e72b2..53a1a67e519 100644 --- a/proto_patch.sed +++ b/proto_patch.sed @@ -19,21 +19,16 @@ s+bytes \(.*span_id\) = \(.*\);+bytes \1 = \2\ ];+g s+repeated opentelemetry.proto.common.v1.KeyValue \(.*\);+repeated opentelemetry.proto.common.v1.KeyValue \1\ - [\ - (gogoproto.nullable) = false\ - ];+g + [ (gogoproto.nullable) = false ];+g s+repeated KeyValue \(.*\);+repeated KeyValue \1\ - [\ - (gogoproto.nullable) = false\ - ];+g + [ (gogoproto.nullable) = false ];+g s+repeated opentelemetry.proto.common.v1.StringKeyValue \(.*\);+repeated opentelemetry.proto.common.v1.StringKeyValue \1\ - [\ - (gogoproto.nullable) = false\ - ];+g + [ (gogoproto.nullable) = false ];+g s+opentelemetry.proto.resource.v1.Resource resource = \(.*\);+opentelemetry.proto.resource.v1.Resource resource = \1\ - [\ - (gogoproto.nullable) = false\ - ];+g + [ (gogoproto.nullable) = false ];+g + +s+opentelemetry.proto.common.v1.InstrumentationLibrary instrumentation_library = \(.*\);+opentelemetry.proto.common.v1.InstrumentationLibrary instrumentation_library = \1\ + [ (gogoproto.nullable) = false ];+g \ No newline at end of file diff --git a/receiver/otlpreceiver/marshal_jsonpb_test.go b/receiver/otlpreceiver/marshal_jsonpb_test.go index 9ecad8848b9..0ff7bceb48b 100644 --- a/receiver/otlpreceiver/marshal_jsonpb_test.go +++ b/receiver/otlpreceiver/marshal_jsonpb_test.go @@ -37,6 +37,7 @@ const expectedJSON = `{ }, "instrumentationLibrarySpans": [ { + "instrumentationLibrary": {}, "spans": [ { "traceId": "", @@ -86,7 +87,7 @@ func TestJSONPbMarshal(t *testing.T) { otlp := pdata.TracesToOtlp(td) bytes, err := jpb.Marshal(otlp[0]) assert.NoError(t, err) - assert.EqualValues(t, expectedJSON, string(bytes)) + assert.JSONEq(t, expectedJSON, string(bytes)) } func TestJSONPbUnmarshal(t *testing.T) { diff --git a/translator/trace/jaeger/jaegerproto_to_traces.go b/translator/trace/jaeger/jaegerproto_to_traces.go index 1e21be4b83d..1cf2d8068d2 100644 --- a/translator/trace/jaeger/jaegerproto_to_traces.go +++ b/translator/trace/jaeger/jaegerproto_to_traces.go @@ -150,7 +150,6 @@ func jSpansToInternal(spans []*model.Span) map[instrumentationLibrary]pdata.Inst spansByLibrary[library] = ils if library.name != "" { - ils.InstrumentationLibrary().InitEmpty() ils.InstrumentationLibrary().SetName(library.name) ils.InstrumentationLibrary().SetVersion(library.version) } diff --git a/translator/trace/jaeger/jaegerproto_to_traces_test.go b/translator/trace/jaeger/jaegerproto_to_traces_test.go index c5d52a2bed2..9453d0a3af4 100644 --- a/translator/trace/jaeger/jaegerproto_to_traces_test.go +++ b/translator/trace/jaeger/jaegerproto_to_traces_test.go @@ -553,8 +553,6 @@ func generateTraceDataWithLibraryInfo() pdata.Traces { td := generateTraceDataOneSpanNoResource() rs0 := td.ResourceSpans().At(0) rs0ils0 := rs0.InstrumentationLibrarySpans().At(0) - - rs0ils0.InstrumentationLibrary().InitEmpty() rs0ils0.InstrumentationLibrary().SetName("io.opentelemetry.test") rs0ils0.InstrumentationLibrary().SetVersion("0.42.0") return td @@ -848,7 +846,6 @@ func generateTraceDataTwoSpansFromTwoLibraries() pdata.Traces { rs0.InstrumentationLibrarySpans().Resize(2) rs0ils0 := rs0.InstrumentationLibrarySpans().At(0) - rs0ils0.InstrumentationLibrary().InitEmpty() rs0ils0.InstrumentationLibrary().SetName("library1") rs0ils0.InstrumentationLibrary().SetVersion("0.42.0") rs0ils0.Spans().Resize(1) @@ -860,7 +857,6 @@ func generateTraceDataTwoSpansFromTwoLibraries() pdata.Traces { span1.SetEndTime(testSpanEndTimestamp) rs0ils1 := rs0.InstrumentationLibrarySpans().At(1) - rs0ils1.InstrumentationLibrary().InitEmpty() rs0ils1.InstrumentationLibrary().SetName("library2") rs0ils1.InstrumentationLibrary().SetVersion("0.42.0") rs0ils1.Spans().Resize(1) diff --git a/translator/trace/jaeger/traces_to_jaegerproto.go b/translator/trace/jaeger/traces_to_jaegerproto.go index 3a289e20841..ceec15729fb 100644 --- a/translator/trace/jaeger/traces_to_jaegerproto.go +++ b/translator/trace/jaeger/traces_to_jaegerproto.go @@ -451,9 +451,6 @@ func getTagsFromTraceState(traceState pdata.TraceState) ([]model.KeyValue, bool) func getTagsFromInstrumentationLibrary(il pdata.InstrumentationLibrary) ([]model.KeyValue, bool) { keyValues := make([]model.KeyValue, 0) - if il.IsNil() { - return keyValues, false - } if ilName := il.Name(); ilName != "" { kv := model.KeyValue{ Key: tracetranslator.TagInstrumentationName, diff --git a/translator/trace/zipkin/traces_to_zipkinv2.go b/translator/trace/zipkin/traces_to_zipkinv2.go index 922e10cf391..a8378c2cd22 100644 --- a/translator/trace/zipkin/traces_to_zipkinv2.go +++ b/translator/trace/zipkin/traces_to_zipkinv2.go @@ -95,9 +95,6 @@ func resourceSpansToZipkinSpans(rs pdata.ResourceSpans, estSpanCount int) ([]*zi } func extractInstrumentationLibraryTags(il pdata.InstrumentationLibrary, zTags map[string]string) { - if il.IsNil() { - return - } if ilName := il.Name(); ilName != "" { zTags[tracetranslator.TagInstrumentationName] = ilName } diff --git a/translator/trace/zipkin/zipkinv2_to_traces.go b/translator/trace/zipkin/zipkinv2_to_traces.go index 2524ed4a4b5..d2e4d8b4f57 100644 --- a/translator/trace/zipkin/zipkinv2_to_traces.go +++ b/translator/trace/zipkin/zipkinv2_to_traces.go @@ -400,7 +400,6 @@ func populateILFromZipkinSpan(tags map[string]string, instrLibName string, libra if instrLibName == "" { return } - library.InitEmpty() if value, ok := tags[tracetranslator.TagInstrumentationName]; ok { library.SetName(value) delete(tags, tracetranslator.TagInstrumentationName)