From f75487948f05858837e8ee53f1ef131076282850 Mon Sep 17 00:00:00 2001 From: Jongwoo Han Date: Thu, 8 Jan 2026 10:15:20 +0900 Subject: [PATCH 1/2] Switch version from function to string in otelecho Signed-off-by: Jongwoo Han --- CHANGELOG.md | 1 + instrumentation/github.com/labstack/echo/otelecho/echo.go | 4 ++-- .../github.com/labstack/echo/otelecho/echo_test.go | 2 +- instrumentation/github.com/labstack/echo/otelecho/version.go | 5 +---- .../github.com/labstack/echo/otelecho/version_test.go | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0635d4bd5bb..0a2e8ee6381 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Changed - 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/github.com/labstack/echo/otelecho` has been replaced by `const Version`. (#8365) 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) } From 0ecc00d5f4535bc07fb3d219c8967dc1022211f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Paj=C4=85k?= Date: Thu, 8 Jan 2026 17:34:33 +0100 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8beebef2f16..c1db6d43993 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,7 +28,7 @@ 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)