From 0fc7e36f0c05bbed23dc51beb9a037b99eb96a6c Mon Sep 17 00:00:00 2001 From: Donal O'Sullivan Date: Wed, 7 Jan 2026 11:56:28 +0000 Subject: [PATCH 1/2] Switch version from function to string in otelrestful --- .../github.com/emicklei/go-restful/otelrestful/restful.go | 2 +- .../github.com/emicklei/go-restful/otelrestful/version.go | 5 +---- .../emicklei/go-restful/otelrestful/version_test.go | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/restful.go b/instrumentation/github.com/emicklei/go-restful/otelrestful/restful.go index 5c0559922ef..a38e99455dd 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/restful.go +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/restful.go @@ -30,7 +30,7 @@ func OTelFilter(service string, opts ...Option) restful.FilterFunction { } tracer := cfg.TracerProvider.Tracer( ScopeName, - oteltrace.WithInstrumentationVersion(Version()), + oteltrace.WithInstrumentationVersion(Version), ) if cfg.Propagators == nil { cfg.Propagators = otel.GetTextMapPropagator() diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/version.go b/instrumentation/github.com/emicklei/go-restful/otelrestful/version.go index bc1719f9558..6b3e63cc28d 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/version.go +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/version.go @@ -4,7 +4,4 @@ package otelrestful // import "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful" // Version is the current release version of the go-restful 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/emicklei/go-restful/otelrestful/version_test.go b/instrumentation/github.com/emicklei/go-restful/otelrestful/version_test.go index c3838bee471..ee704bf723e 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/version_test.go +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/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 := otelrestful.Version() + v := otelrestful.Version assert.NotNil(t, versionRegex.FindStringSubmatch(v), "version is not semver: %s", v) } From 546d34554733faff7235624eda66042221b5e7d0 Mon Sep 17 00:00:00 2001 From: Donal O'Sullivan Date: Wed, 7 Jan 2026 12:01:33 +0000 Subject: [PATCH 2/2] Add changelog for https://github.com/open-telemetry/opentelemetry-go-contrib/pull/8360 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a25b53353a..b8e1865fd33 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/emicklei/go-restful/otelrestful` has been replaced by `const Version`. (#8360)