Remove semver: prefix from instrumentation version

CHANGELOG.md

@@ -11,6 +11,13 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Added
 
 - 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)
+
+### Deprecated
+
+- `SemVersion` functions in instrumentation packages are deprecated, use `Version` instead. (#3681)
 
 ## [1.16.1/0.41.1/0.10.1] - 2023-05-02
 

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/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/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/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/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/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/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/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/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/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/gorilla/mux/otelmux/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/labstack/echo/otelecho/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/labstack/echo/otelecho/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/go.mongodb.org/mongo-driver/mongo/otelmongo/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/go.mongodb.org/mongo-driver/mongo/otelmongo/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/google.golang.org/grpc/otelgrpc/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/google.golang.org/grpc/otelgrpc/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/gopkg.in/macaron.v1/otelmacaron/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/gopkg.in/macaron.v1/otelmacaron/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/host/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/net/http/httptrace/otelhttptrace/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/net/http/httptrace/otelhttptrace/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/net/http/otelhttp/test/handler_test.go

@@ -44,7 +44,7 @@ import (
 func assertScopeMetrics(t *testing.T, sm metricdata.ScopeMetrics, attrs attribute.Set) {
 	assert.Equal(t, instrumentation.Scope{
 		Name:    "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",
-		Version: otelhttp.SemVersion(),
+		Version: otelhttp.Version(),
 	}, sm.Scope)
 
 	require.Len(t, sm.Metrics, 3)