diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c5308fcf7a..39fba7fdb09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,13 +28,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Changed -- Change `Version()` function in `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` to a `const Version` string. (#8142) +- The `Version()` function in `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` has been replaced by `const Version`. (#8142) - The `Version()` function in `go.opentelemetry.io/contrib/zpages` has been replaced by `const Version`. (#8325) - The `Version()` function in `go.opentelemetry.io/contrib/instrumentation/host` has been replaced by `const Version`. (#8358) - The `Version()` function in `go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda` has been replaced by `const Version`. (#8357) - The `Version()` function in `go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws` has been replaced by `const Version`. (#8356) - The `Version()` function in `go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful` has been replaced by `const Version`. (#8360) - The `Version()` function in `go.opentelemetry.io/contrib/propagators/opencensus` has been replaced by `const Version`. (#8361) +- The `Version()` function in `go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho` has been replaced by `const Version`. (#8365) - The `Version()` function in `go.opentelemetry.io/contrib/samplers/probability/consistent` has been replaced by `const Version`. (#8366) diff --git a/instrumentation/github.com/labstack/echo/otelecho/echo.go b/instrumentation/github.com/labstack/echo/otelecho/echo.go index 59286051d1d..7bf2be0ca80 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/echo.go +++ b/instrumentation/github.com/labstack/echo/otelecho/echo.go @@ -37,7 +37,7 @@ func Middleware(serverName string, opts ...Option) echo.MiddlewareFunc { } tracer := cfg.TracerProvider.Tracer( ScopeName, - oteltrace.WithInstrumentationVersion(Version()), + oteltrace.WithInstrumentationVersion(Version), ) if cfg.Propagators == nil { cfg.Propagators = otel.GetTextMapPropagator() @@ -54,7 +54,7 @@ func Middleware(serverName string, opts ...Option) echo.MiddlewareFunc { meter := cfg.MeterProvider.Meter( ScopeName, - metric.WithInstrumentationVersion(Version()), + metric.WithInstrumentationVersion(Version), ) semconvSrv := semconv.NewHTTPServer(meter) diff --git a/instrumentation/github.com/labstack/echo/otelecho/echo_test.go b/instrumentation/github.com/labstack/echo/otelecho/echo_test.go index aa5e822f321..1ee680c0aea 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/echo_test.go +++ b/instrumentation/github.com/labstack/echo/otelecho/echo_test.go @@ -197,7 +197,7 @@ func TestMetrics(t *testing.T) { require.Len(t, rm.ScopeMetrics, 1) sm := rm.ScopeMetrics[0] assert.Equal(t, ScopeName, sm.Scope.Name) - assert.Equal(t, Version(), sm.Scope.Version) + assert.Equal(t, Version, sm.Scope.Version) attrs := []attribute.KeyValue{ attribute.String("http.request.method", "GET"), diff --git a/instrumentation/github.com/labstack/echo/otelecho/version.go b/instrumentation/github.com/labstack/echo/otelecho/version.go index 89d822d708a..71193ae9000 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/version.go +++ b/instrumentation/github.com/labstack/echo/otelecho/version.go @@ -4,7 +4,4 @@ package otelecho // import "go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho" // Version is the current release version of the echo instrumentation. -func Version() string { - return "0.64.0" - // This string is updated by the pre_release.sh script during release -} +const Version = "0.64.0" diff --git a/instrumentation/github.com/labstack/echo/otelecho/version_test.go b/instrumentation/github.com/labstack/echo/otelecho/version_test.go index 022dab55630..27e7362f7c8 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/version_test.go +++ b/instrumentation/github.com/labstack/echo/otelecho/version_test.go @@ -19,6 +19,6 @@ var versionRegex = regexp.MustCompile(`^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*) `(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$`) func TestVersionSemver(t *testing.T) { - v := otelecho.Version() + v := otelecho.Version assert.NotNil(t, versionRegex.FindStringSubmatch(v), "version is not semver: %s", v) }