Remove semver: prefix from instrumentation version

CHANGELOG.md

@@ -12,6 +12,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 - Add the new `go.opentelemetry.io/contrib/instrgen` package to provide auto-generated source code instrumentation. (#3068, #3108)
 
+### Changed
+
+- Remove `semver:` prefix from instrumentation version. (#3681, #3798)
+
+### Deprecated
+
+- `SemVersion` functions in instrumentation packages are deprecated, use `Version` instead. (#3681, #3798)
+
 ## [1.16.1/0.41.1/0.10.1] - 2023-05-02
 
 ### Added

detectors/aws/ec2/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

detectors/aws/ecs/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

detectors/aws/eks/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

detectors/gcp/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

instrumentation/github.com/Shopify/sarama/otelsarama/option.go

@@ -41,7 +41,7 @@ func newConfig(opts ...Option) config {
 
 	cfg.Tracer = cfg.TracerProvider.Tracer(
 		defaultTracerName,
-		trace.WithInstrumentationVersion(SemVersion()),
+		trace.WithInstrumentationVersion(Version()),
 	)
 
 	return cfg

instrumentation/github.com/Shopify/sarama/otelsarama/option_test.go

@@ -59,7 +59,7 @@ func TestNewConfig(t *testing.T) {
 			},
 			expected: config{
 				TracerProvider: tp,
-				Tracer:         tp.Tracer(defaultTracerName, trace.WithInstrumentationVersion(SemVersion())),
+				Tracer:         tp.Tracer(defaultTracerName, trace.WithInstrumentationVersion(Version())),
 				Propagators:    otel.GetTextMapPropagator(),
 			},
 		},
@@ -70,7 +70,7 @@ func TestNewConfig(t *testing.T) {
 			},
 			expected: config{
 				TracerProvider: otel.GetTracerProvider(),
-				Tracer:         otel.GetTracerProvider().Tracer(defaultTracerName, trace.WithInstrumentationVersion(SemVersion())),
+				Tracer:         otel.GetTracerProvider().Tracer(defaultTracerName, trace.WithInstrumentationVersion(Version())),
 				Propagators:    otel.GetTextMapPropagator(),
 			},
 		},
@@ -81,7 +81,7 @@ func TestNewConfig(t *testing.T) {
 			},
 			expected: config{
 				TracerProvider: otel.GetTracerProvider(),
-				Tracer:         otel.GetTracerProvider().Tracer(defaultTracerName, trace.WithInstrumentationVersion(SemVersion())),
+				Tracer:         otel.GetTracerProvider().Tracer(defaultTracerName, trace.WithInstrumentationVersion(Version())),
 				Propagators:    prop,
 			},
 		},
@@ -92,7 +92,7 @@ func TestNewConfig(t *testing.T) {
 			},
 			expected: config{
 				TracerProvider: otel.GetTracerProvider(),
-				Tracer:         otel.GetTracerProvider().Tracer(defaultTracerName, trace.WithInstrumentationVersion(SemVersion())),
+				Tracer:         otel.GetTracerProvider().Tracer(defaultTracerName, trace.WithInstrumentationVersion(Version())),
 				Propagators:    otel.GetTextMapPropagator(),
 			},
 		},

instrumentation/github.com/Shopify/sarama/otelsarama/test/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

instrumentation/github.com/Shopify/sarama/otelsarama/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

instrumentation/github.com/astaxie/beego/otelbeego/test/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

instrumentation/github.com/astaxie/beego/otelbeego/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

instrumentation/github.com/aws/aws-lambda-go/otellambda/lambda.go

@@ -52,7 +52,7 @@ func newInstrumentor(opts ...Option) instrumentor {
 	}
 
 	return instrumentor{configuration: cfg,
-		tracer:   cfg.TracerProvider.Tracer(tracerName, trace.WithInstrumentationVersion(SemVersion())),
+		tracer:   cfg.TracerProvider.Tracer(tracerName, trace.WithInstrumentationVersion(Version())),
 		resAttrs: []attribute.KeyValue{}}
 }
 

instrumentation/github.com/aws/aws-lambda-go/otellambda/test/lambda_test.go

@@ -153,7 +153,7 @@ var (
 			attribute.String("faas.version", "$LATEST"),
 			attribute.String("faas.instance", "2023/01/01/[$LATEST]5d1edb9e525d486696cf01a3503487bc"),
 			attribute.Int("faas.max_memory", 128)),
-		InstrumentationLibrary: instrumentation.Library{Name: "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda", Version: otellambda.SemVersion()},
+		InstrumentationLibrary: instrumentation.Library{Name: "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda", Version: otellambda.Version()},
 	}
 )
 
@@ -343,7 +343,7 @@ var (
 			attribute.String("faas.version", "$LATEST"),
 			attribute.String("faas.instance", "2023/01/01/[$LATEST]5d1edb9e525d486696cf01a3503487bc"),
 			attribute.Int("faas.max_memory", 128)),
-		InstrumentationLibrary: instrumentation.Library{Name: "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda", Version: otellambda.SemVersion()},
+		InstrumentationLibrary: instrumentation.Library{Name: "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda", Version: otellambda.Version()},
 	}
 )
 

instrumentation/github.com/aws/aws-lambda-go/otellambda/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/xrayconfig_test.go

@@ -92,7 +92,7 @@ var (
 		})
 
 	expectedSpans = v1trace.ScopeSpans{
-		Scope: &v1common.InstrumentationScope{Name: "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda", Version: otellambda.SemVersion()},
+		Scope: &v1common.InstrumentationScope{Name: "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda", Version: otellambda.Version()},
 		Spans: []*v1trace.Span{{
 			TraceId:           []byte{0x57, 0x59, 0xe9, 0x88, 0xbd, 0x86, 0x2e, 0x3f, 0xe1, 0xbe, 0x46, 0xa9, 0x94, 0x27, 0x27, 0x93},
 			SpanId:            nil,

instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/aws.go

@@ -156,7 +156,7 @@ func AppendMiddlewares(apiOptions *[]func(*middleware.Stack) error, opts ...Opti
 	}
 
 	m := otelMiddlewares{tracer: cfg.TracerProvider.Tracer(tracerName,
-		trace.WithInstrumentationVersion(SemVersion())),
+		trace.WithInstrumentationVersion(Version())),
 		propagator:      cfg.TextMapPropagator,
 		attributeSetter: cfg.AttributeSetter}
 	*apiOptions = append(*apiOptions, m.initializeMiddlewareBefore, m.initializeMiddlewareAfter, m.finalizeMiddleware, m.deserializeMiddleware)

instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/gomemcache.go

@@ -60,7 +60,7 @@ func NewClientWithTracing(client *memcache.Client, opts ...Option) *Client {
 		client,
 		cfg.tracerProvider.Tracer(
 			tracerName,
-			oteltrace.WithInstrumentationVersion(SemVersion()),
+			oteltrace.WithInstrumentationVersion(Version()),
 		),
 		context.Background(),
 	}

instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

instrumentation/github.com/emicklei/go-restful/otelrestful/restful.go

@@ -41,7 +41,7 @@ func OTelFilter(service string, opts ...Option) restful.FilterFunction {
 	}
 	tracer := cfg.TracerProvider.Tracer(
 		tracerName,
-		oteltrace.WithInstrumentationVersion(SemVersion()),
+		oteltrace.WithInstrumentationVersion(Version()),
 	)
 	if cfg.Propagators == nil {
 		cfg.Propagators = otel.GetTextMapPropagator()

instrumentation/github.com/emicklei/go-restful/otelrestful/test/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

instrumentation/github.com/emicklei/go-restful/otelrestful/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

instrumentation/github.com/gin-gonic/gin/otelgin/gintrace.go

@@ -49,7 +49,7 @@ func Middleware(service string, opts ...Option) gin.HandlerFunc {
 	}
 	tracer := cfg.TracerProvider.Tracer(
 		tracerName,
-		oteltrace.WithInstrumentationVersion(SemVersion()),
+		oteltrace.WithInstrumentationVersion(Version()),
 	)
 	if cfg.Propagators == nil {
 		cfg.Propagators = otel.GetTextMapPropagator()
@@ -118,7 +118,7 @@ func HTML(c *gin.Context, code int, name string, obj interface{}) {
 	if !ok {
 		tracer = otel.GetTracerProvider().Tracer(
 			tracerName,
-			oteltrace.WithInstrumentationVersion(SemVersion()),
+			oteltrace.WithInstrumentationVersion(Version()),
 		)
 	}
 	savedContext := c.Request.Context()

instrumentation/github.com/gin-gonic/gin/otelgin/test/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

instrumentation/github.com/gin-gonic/gin/otelgin/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

instrumentation/github.com/go-kit/kit/otelkit/endpoint.go

@@ -52,7 +52,7 @@ func EndpointMiddleware(options ...Option) endpoint.Middleware {
 
 	tracer := cfg.TracerProvider.Tracer(
 		tracerName,
-		trace.WithInstrumentationVersion(SemVersion()),
+		trace.WithInstrumentationVersion(Version()),
 	)
 
 	return func(next endpoint.Endpoint) endpoint.Endpoint {

instrumentation/github.com/go-kit/kit/otelkit/test/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

instrumentation/github.com/go-kit/kit/otelkit/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

instrumentation/github.com/gocql/gocql/otelgocql/gocql.go

@@ -31,7 +31,7 @@ func NewSessionWithTracing(ctx context.Context, cluster *gocql.ClusterConfig, op
 	instruments := newInstruments(cfg.meterProvider)
 	tracer := cfg.tracerProvider.Tracer(
 		internal.InstrumentationName,
-		trace.WithInstrumentationVersion(SemVersion()),
+		trace.WithInstrumentationVersion(Version()),
 	)
 	cluster.QueryObserver = &OTelQueryObserver{
 		enabled:  cfg.instrumentQuery,

instrumentation/github.com/gocql/gocql/otelgocql/instrument.go

@@ -44,7 +44,7 @@ type instruments struct {
 func newInstruments(p metric.MeterProvider) *instruments {
 	meter := p.Meter(
 		internal.InstrumentationName,
-		metric.WithInstrumentationVersion(SemVersion()),
+		metric.WithInstrumentationVersion(Version()),
 	)
 	instruments := &instruments{}
 	var err error

instrumentation/github.com/gocql/gocql/otelgocql/test/gocql_test.go

@@ -255,7 +255,7 @@ func getCluster() *gocql.ClusterConfig {
 func assertScope(t *testing.T, sm metricdata.ScopeMetrics) {
 	assert.Equal(t, instrumentation.Scope{
 		Name:    "go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql",
-		Version: otelgocql.SemVersion(),
+		Version: otelgocql.Version(),
 	}, sm.Scope)
 }
 

instrumentation/github.com/gocql/gocql/otelgocql/test/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

instrumentation/github.com/gocql/gocql/otelgocql/version.go

@@ -21,6 +21,8 @@ func Version() string {
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.
+//
+// Deprecated: Use [Version] instead.
 func SemVersion() string {
-	return "semver:" + Version()
+	return Version()
 }

instrumentation/github.com/gorilla/mux/otelmux/mux.go

@@ -47,7 +47,7 @@ func Middleware(service string, opts ...Option) mux.MiddlewareFunc {
 	}
 	tracer := cfg.TracerProvider.Tracer(
 		tracerName,
-		trace.WithInstrumentationVersion(SemVersion()),
+		trace.WithInstrumentationVersion(Version()),
 	)
 	if cfg.Propagators == nil {
 		cfg.Propagators = otel.GetTextMapPropagator()