Change InstrumentationLibrary to be non-nullable

Signed-off-by: Bogdan Drutu <[email protected]>
open-telemetry · Nov 23, 2020 · 23cba0d · 23cba0d
1 parent 7874cd5
commit 23cba0d
Show file tree

Hide file tree

Showing 26 changed files with 271 additions and 367 deletions.
diff --git 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
diff --git a/consumer/pdata/generated_common_test.go b/consumer/pdata/generated_common_test.go
diff --git a/consumer/pdata/generated_log.go b/consumer/pdata/generated_log.go
diff --git a/consumer/pdata/generated_log_test.go b/consumer/pdata/generated_log_test.go
diff --git a/consumer/pdata/generated_metrics.go b/consumer/pdata/generated_metrics.go
diff --git a/consumer/pdata/generated_metrics_test.go b/consumer/pdata/generated_metrics_test.go
diff --git a/consumer/pdata/generated_trace.go b/consumer/pdata/generated_trace.go
diff --git a/consumer/pdata/generated_trace_test.go b/consumer/pdata/generated_trace_test.go
diff --git 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
@@ -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
@@ -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
@@ -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++ {