ENGTAI-40849: Add service.instance.id attribute in SpanFromContext function

tim-mwangi · tim-mwangi · commit f8486a1d5bc5 · 2025-05-01T09:11:35.000-07:00
This is used by the otel http and grpc instrumentation. StartSpan already adds service.instance.id attribute. So adding it in SpanFromContext as well
diff --git a/instrumentation/opentelemetry/span.go b/instrumentation/opentelemetry/span.go
@@ -117,7 +117,9 @@ func (s *Span) GetSpanId() string {
 }
 
 func SpanFromContext(ctx context.Context) sdk.Span {
-	return &Span{trace.SpanFromContext(ctx)}
+	span := &Span{trace.SpanFromContext(ctx)}
+	span.SetAttributes(identifier.ServiceInstanceKeyValue)
+	return span
 }
 
 type getTracerProvider func() trace.TracerProvider

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,9 @@ func (s *Span) GetSpanId() string {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`func SpanFromContext(ctx context.Context) sdk.Span {`
`120`		`- return &Span{trace.SpanFromContext(ctx)}`
	`120`	`+ span := &Span{trace.SpanFromContext(ctx)}`
	`121`	`+ span.SetAttributes(identifier.ServiceInstanceKeyValue)`
	`122`	`+ return span`
`121`	`123`	`}`
`122`	`124`
`123`	`125`	`type getTracerProvider func() trace.TracerProvider`