From 34b5156cc08705a534a7e4e429584faa780bcc6a Mon Sep 17 00:00:00 2001 From: Bamdad Date: Fri, 13 Feb 2026 03:13:18 +0100 Subject: [PATCH 1/2] add version file to autodetect module # Conflicts: # CHANGELOG.md --- CHANGELOG.md | 1 + detectors/autodetect/go.mod | 3 +++ detectors/autodetect/version.go | 7 +++++++ detectors/autodetect/version_test.go | 23 +++++++++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 detectors/autodetect/version.go create mode 100644 detectors/autodetect/version_test.go diff --git a/CHANGELOG.md b/CHANGELOG.md index aeb97652f89..e0f7b2b6a0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ The next release will require at least [Go 1.25]. - `WithSpanKind` option in `go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc` to override the default span kind. (#8506) - Add `const Version` in `go.opentelemetry.io/contrib/bridges/otelzap`. (#8544) - Support testing of [Go 1.26]. (#8549) +- Add `const Version` in `go.opentelemetry.io/contrib/detectors/autodetect`. (#8555) ### Fixed diff --git a/detectors/autodetect/go.mod b/detectors/autodetect/go.mod index 3d2ccdeb37d..f974a1d5700 100644 --- a/detectors/autodetect/go.mod +++ b/detectors/autodetect/go.mod @@ -3,6 +3,7 @@ module go.opentelemetry.io/contrib/detectors/autodetect go 1.24.0 require ( + github.com/stretchr/testify v1.11.1 go.opentelemetry.io/contrib/detectors/aws/ec2/v2 v2.2.0 go.opentelemetry.io/contrib/detectors/aws/ecs v1.40.0 go.opentelemetry.io/contrib/detectors/aws/eks v1.40.0 @@ -58,6 +59,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/x448/float16 v0.8.4 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect go.opentelemetry.io/otel/metric v1.40.0 // indirect @@ -73,6 +75,7 @@ require ( google.golang.org/protobuf v1.36.11 // indirect gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/api v0.34.3 // indirect k8s.io/apimachinery v0.34.3 // indirect k8s.io/client-go v0.34.3 // indirect diff --git a/detectors/autodetect/version.go b/detectors/autodetect/version.go new file mode 100644 index 00000000000..f059223b054 --- /dev/null +++ b/detectors/autodetect/version.go @@ -0,0 +1,7 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package autodetect // import "go.opentelemetry.io/contrib/detectors/autodetect" + +// Version is the current release version of the autodetect detector. +const Version = "0.12.0" diff --git a/detectors/autodetect/version_test.go b/detectors/autodetect/version_test.go new file mode 100644 index 00000000000..4ba93c436da --- /dev/null +++ b/detectors/autodetect/version_test.go @@ -0,0 +1,23 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package autodetect_test + +import ( + "regexp" + "testing" + + "github.com/stretchr/testify/assert" + "go.opentelemetry.io/contrib/detectors/autodetect" +) + +// regex taken from https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string +var versionRegex = regexp.MustCompile(`^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)` + + `(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)` + + `(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?` + + `(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$`) + +func TestVersionSemver(t *testing.T) { + v := autodetect.Version + assert.NotNil(t, versionRegex.FindStringSubmatch(v), "version is not semver: %s", v) +} From 0b5c4b8b7b1e6736743f7c5a832908dd24a7b144 Mon Sep 17 00:00:00 2001 From: Bamdad Date: Fri, 13 Feb 2026 12:55:12 +0100 Subject: [PATCH 2/2] fix lint issues --- detectors/autodetect/version_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/detectors/autodetect/version_test.go b/detectors/autodetect/version_test.go index 4ba93c436da..ab2963c35f5 100644 --- a/detectors/autodetect/version_test.go +++ b/detectors/autodetect/version_test.go @@ -8,6 +8,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/contrib/detectors/autodetect" )