Allow relying on InstrumentationScope in SpanStub and fix remaining deprecation issues

CHANGELOG.md

@@ -11,6 +11,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Added
 
 - Add macOS ARM64 platform to the compatibility testing suite. (#5577)
+- The `InstrumentationScope` attribute to `SpanStub` in `go.opentelemetry.io/otel/sdk/trace/tracetest`, as a replacement for the deprecated `InstrumentationLibrary`. (#5627)
 
 ### Fixed
 

exporters/otlp/otlptrace/otlptracegrpc/internal/otlptracetest/data.go

@@ -46,7 +46,7 @@ func SingleReadOnlySpan() []tracesdk.ReadOnlySpan {
 			DroppedLinks:      0,
 			ChildSpanCount:    0,
 			Resource:          resource.NewSchemaless(attribute.String("a", "b")),
-			InstrumentationLibrary: instrumentation.Library{
+			InstrumentationScope: instrumentation.Scope{
 				Name:    "bar",
 				Version: "0.0.0",
 			},

exporters/otlp/otlptrace/otlptracehttp/internal/otlptracetest/data.go

@@ -46,7 +46,7 @@ func SingleReadOnlySpan() []tracesdk.ReadOnlySpan {
 			DroppedLinks:      0,
 			ChildSpanCount:    0,
 			Resource:          resource.NewSchemaless(attribute.String("a", "b")),
-			InstrumentationLibrary: instrumentation.Library{
+			InstrumentationScope: instrumentation.Scope{
 				Name:    "bar",
 				Version: "0.0.0",
 			},

exporters/stdout/stdouttrace/trace_test.go

@@ -186,6 +186,11 @@ func expectedJSON(now time.Time) string {
 			}
 		}
 	],
+	"InstrumentationScope": {
+		"Name": "",
+		"Version": "",
+		"SchemaURL": ""
+	},
 	"InstrumentationLibrary": {
 		"Name": "",
 		"Version": "",

exporters/zipkin/model_test.go

@@ -1015,15 +1015,15 @@ func TestTagsTransformation(t *testing.T) {
 		{
 			name: "instrLib-empty",
 			data: tracetest.SpanStub{
-				InstrumentationLibrary: instrumentation.Library{},
+				InstrumentationScope: instrumentation.Scope{},
 			},
 			want: nil,
 		},
 		{
 			name: "instrLib-noversion",
 			data: tracetest.SpanStub{
 				Attributes: []attribute.KeyValue{},
-				InstrumentationLibrary: instrumentation.Library{
+				InstrumentationScope: instrumentation.Scope{
 					Name: instrLibName,
 				},
 			},
@@ -1035,7 +1035,7 @@ func TestTagsTransformation(t *testing.T) {
 			name: "instrLib-with-version",
 			data: tracetest.SpanStub{
 				Attributes: []attribute.KeyValue{},
-				InstrumentationLibrary: instrumentation.Library{
+				InstrumentationScope: instrumentation.Scope{
 					Name:    instrLibName,
 					Version: instrLibVersion,
 				},

internal/shared/otlp/otlptrace/otlptracetest/data.go.tmpl

@@ -46,7 +46,7 @@ func SingleReadOnlySpan() []tracesdk.ReadOnlySpan {
 			DroppedLinks:      0,
 			ChildSpanCount:    0,
 			Resource:          resource.NewSchemaless(attribute.String("a", "b")),
-			InstrumentationLibrary: instrumentation.Library{
+			InstrumentationScope: instrumentation.Scope{
 				Name:    "bar",
 				Version: "0.0.0",
 			},

sdk/trace/tracetest/span.go

@@ -60,6 +60,7 @@ type SpanStub struct {
 	DroppedLinks           int
 	ChildSpanCount         int
 	Resource               *resource.Resource
+	InstrumentationScope   instrumentation.Scope
 	InstrumentationLibrary instrumentation.Library
 }
 
@@ -85,12 +86,18 @@ func SpanStubFromReadOnlySpan(ro tracesdk.ReadOnlySpan) SpanStub {
 		DroppedLinks:           ro.DroppedLinks(),
 		ChildSpanCount:         ro.ChildSpanCount(),
 		Resource:               ro.Resource(),
+		InstrumentationScope:   ro.InstrumentationScope(),
 		InstrumentationLibrary: ro.InstrumentationScope(),
 	}
 }
 
 // Snapshot returns a read-only copy of the SpanStub.
 func (s SpanStub) Snapshot() tracesdk.ReadOnlySpan {
+	scopeOrLibrary := s.InstrumentationScope
+	if scopeOrLibrary.Name == "" && scopeOrLibrary.Version == "" && scopeOrLibrary.SchemaURL == "" {
+		scopeOrLibrary = s.InstrumentationLibrary
+	}
+
 	return spanSnapshot{
 		name:                 s.Name,
 		spanContext:          s.SpanContext,
@@ -107,7 +114,7 @@ func (s SpanStub) Snapshot() tracesdk.ReadOnlySpan {
 		droppedLinks:         s.DroppedLinks,
 		childSpanCount:       s.ChildSpanCount,
 		resource:             s.Resource,
-		instrumentationScope: s.InstrumentationLibrary,
+		instrumentationScope: scopeOrLibrary,
 	}
 }