GoogleCloudPlatform · Feb 10, 2025 · Feb 10, 2025 · Feb 21, 2025 · Feb 24, 2025 · Feb 26, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ on:
   pull_request:
 env:
   # Default minimum version of Go to support.
-  DEFAULT_GO_VERSION: "1.23.1"
+  DEFAULT_GO_VERSION: "1.23.6"
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -107,7 +107,7 @@ jobs:
   compatibility-test:
     strategy:
       matrix:
-        go-version: ["1.23.1", "1.22.5"]
+        go-version: ["1.23.6", "1.24.0"]
         os: [ubuntu-latest, macos-latest, windows-latest]
         arch: ["386", amd64]
         exclude:

diff --git a/Makefile b/Makefile
@@ -48,7 +48,7 @@ GOCOVMERGE = $(TOOLS)/gocovmerge
 $(TOOLS)/gocovmerge: PACKAGE=github.com/wadey/gocovmerge
 
 .PHONY: tools
-tools: $(GOLANGCI_LINT) $(MISSPELL) $(GOCOVMERGE) $(STRINGER) $(GOJQ) $(FIELDALIGNMENT) $(PROTOC_GEN_GO)
+tools: $(GOLANGCI_LINT) $(MISSPELL) $(GOCOVMERGE) $(STRINGER) $(GOJQ) $(FIELDALIGNMENT) $(PROTOC_GEN_GO) $(GOVULNCHECK)
 
 PROTOBUF_VERSION = 3.19.0
 PROTOBUF_OS = linux
@@ -157,9 +157,9 @@ lint: $(GOLANGCI_LINT) $(MISSPELL) govulncheck
 	done
 	$(MISSPELL) -w $(ALL_DOCS)
 	set -e; for dir in $(ALL_GO_MOD_DIRS) $(TOOLS_MOD_DIR); do \
-	  echo "go mod tidy -compat=1.22 in $${dir}"; \
+	  echo "go mod tidy -compat=1.23 in $${dir}"; \
 	  (cd "$${dir}" && \
-	    go mod tidy -compat=1.22); \
+	    go mod tidy -compat=1.23); \
 	done
 
 generate: $(STRINGER) $(PROTOC)
@@ -198,45 +198,12 @@ govulncheck/%: | $(GOVULNCHECK)
 
 .PHONY: gotidy
 gotidy:
-	$(MAKE) for-all-mod CMD="go mod tidy -compat=1.22"
+	$(MAKE) for-all-mod CMD="go mod tidy -compat=1.23"
 
 .PHONY: update-dep
 update-dep:
 	$(MAKE) for-all-mod CMD="$(PWD)/internal/buildscripts/update-dep"
 
-STABLE_OTEL_VERSION=v1.30.0
-UNSTABLE_OTEL_VERSION=v0.52.0
-STABLE_CONTRIB_OTEL_VERSION=v1.30.0
-UNSTABLE_CONTRIB_OTEL_VERSION=v0.55.0
-STABLE_COLLECTOR_VERSION=v1.15.0
-UNSTABLE_COLLECTOR_VERSION=v0.109.0
-UNSTABLE_COLLECTOR_CONTRIB_VERSION=v0.109.0
-
-.PHONY: update-otel
-update-otel:
-	$(MAKE) update-dep MODULE=go.opentelemetry.io/otel VERSION=$(STABLE_OTEL_VERSION)
-	$(MAKE) update-dep MODULE=go.opentelemetry.io/otel/metric VERSION=$(STABLE_OTEL_VERSION)
-	$(MAKE) update-dep MODULE=go.opentelemetry.io/otel/sdk VERSION=$(STABLE_OTEL_VERSION)
-	$(MAKE) update-dep MODULE=go.opentelemetry.io/otel/sdk/metric VERSION=$(STABLE_OTEL_VERSION)
-	$(MAKE) update-dep MODULE=go.opentelemetry.io/otel/trace VERSION=$(STABLE_OTEL_VERSION)
-	$(MAKE) update-dep MODULE=go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp VERSION=$(STABLE_OTEL_VERSION)
-	$(MAKE) update-dep MODULE=go.opentelemetry.io/otel/exporters/prometheus VERSION=$(UNSTABLE_OTEL_VERSION)
-	$(MAKE) update-dep MODULE=go.opentelemetry.io/contrib/detectors/gcp VERSION=$(STABLE_CONTRIB_OTEL_VERSION)
-	$(MAKE) update-dep MODULE=go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp VERSION=$(UNSTABLE_CONTRIB_OTEL_VERSION)
-	$(MAKE) update-dep MODULE=go.opentelemetry.io/collector VERSION=$(UNSTABLE_COLLECTOR_VERSION)
-	$(MAKE) update-dep MODULE=go.opentelemetry.io/collector/confmap VERSION=$(STABLE_COLLECTOR_VERSION)
-	$(MAKE) update-dep MODULE=go.opentelemetry.io/collector/component VERSION=$(UNSTABLE_COLLECTOR_VERSION)
-	$(MAKE) update-dep MODULE=go.opentelemetry.io/collector/semconv VERSION=$(UNSTABLE_COLLECTOR_VERSION)
-	$(MAKE) update-dep MODULE=go.opentelemetry.io/collector/otelcol VERSION=$(UNSTABLE_COLLECTOR_VERSION)
-	$(MAKE) update-dep MODULE=go.opentelemetry.io/collector/extension VERSION=$(UNSTABLE_COLLECTOR_VERSION)
-	$(MAKE) update-dep MODULE=go.opentelemetry.io/collector/extension/auth VERSION=$(UNSTABLE_COLLECTOR_VERSION)
-	$(MAKE) update-dep MODULE=go.opentelemetry.io/collector/featuregate VERSION=$(STABLE_COLLECTOR_VERSION)
-	$(MAKE) update-dep MODULE=go.opentelemetry.io/collector/pdata VERSION=$(STABLE_COLLECTOR_VERSION)
-	$(MAKE) update-dep MODULE=github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus VERSION=$(UNSTABLE_COLLECTOR_CONTRIB_VERSION)
-	$(MAKE) gotidy
-	$(MAKE) build
-	$(MAKE) fixtures
-
 .PHONY: prepare-release
 prepare-release:
 	echo "make sure tools/release.go is updated to your desired stable and unstable versions"

diff --git a/cloudbuild-e2e-cloud-functions-gen2.yaml b/cloudbuild-e2e-cloud-functions-gen2.yaml
@@ -14,7 +14,7 @@
 
 steps:
   # Vendor dependencies, and zip the code.
-  - name: golang:1.23.1
+  - name: golang:1.23.6
     id: zip-code
     entrypoint: /bin/bash
     args:
@@ -33,7 +33,7 @@ steps:
     env: ["PROJECT_ID=$PROJECT_ID"]
     args:
       - cloud-functions-gen2
-      - --runtime=go122
+      - --runtime=go123
       - --functionsource=/workspace/e2e-test-server/cloud_functions/function-source.zip
       - --entrypoint=HandleCloudFunction
 

diff --git a/cloudbuild-e2e-gae-standard.yaml b/cloudbuild-e2e-gae-standard.yaml
@@ -33,7 +33,7 @@ steps:
     env: ["PROJECT_ID=$PROJECT_ID"]
     args:
       - gae-standard
-      - --runtime=go122
+      - --runtime=go123
       - --appsource=/workspace/e2e-test-server/appsource.zip
 logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
 substitutions:

diff --git a/cloudbuild-e2e-gae.yaml b/cloudbuild-e2e-gae.yaml
@@ -30,7 +30,7 @@ steps:
     args:
       - gae
       - --image=$_TEST_SERVER_IMAGE
-      - --runtime=go122
+      - --runtime=go123
 
 logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
 substitutions:

diff --git a/cloudbuild-integration-tests.yaml b/cloudbuild-integration-tests.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 steps:
-  - name: golang:1.23.1
+  - name: golang:1.23.6
     env: ["SECOND_PROJECT_ID=opentelemetry-ops-e2e-2"]
     args: ["make", "integrationtest"]
 logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
diff --git a/detectors/gcp/go.mod b/detectors/gcp/go.mod
@@ -2,7 +2,7 @@ module github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp
 
 go 1.22
 
-toolchain go1.23.4
+toolchain go1.23.6
 
 require (
 	cloud.google.com/go/compute/metadata v0.6.0

diff --git a/e2e-test-server/Dockerfile b/e2e-test-server/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.23.5 as builder
+FROM golang:1.23.6 as builder
 
 WORKDIR /workspace/e2e-test-server/
 

diff --git a/e2e-test-server/cloud_functions/go.mod b/e2e-test-server/cloud_functions/go.mod
@@ -7,7 +7,7 @@ toolchain go1.22.0
 require (
 	cloud.google.com/go/pubsub v1.45.3
 	github.com/GoogleCloudPlatform/functions-framework-go v1.9.1
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/e2e-test-server v0.50.0
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/e2e-test-server v0.51.0
 	github.com/cloudevents/sdk-go/v2 v2.15.2
 )
 
@@ -19,9 +19,9 @@ require (
 	cloud.google.com/go/functions v1.19.3 // indirect
 	cloud.google.com/go/iam v1.3.1 // indirect
 	cloud.google.com/go/trace v1.11.3 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.26.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.27.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect

diff --git a/e2e-test-server/go.mod b/e2e-test-server/go.mod
@@ -6,7 +6,7 @@ toolchain go1.22.0
 
 require (
 	cloud.google.com/go/pubsub v1.45.3
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.26.0
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.27.0
 	go.opentelemetry.io/contrib/detectors/gcp v1.31.0
 	go.opentelemetry.io/otel v1.31.0
 	go.opentelemetry.io/otel/sdk v1.31.0
@@ -21,8 +21,8 @@ require (
 	cloud.google.com/go/compute/metadata v0.6.0 // indirect
 	cloud.google.com/go/iam v1.3.1 // indirect
 	cloud.google.com/go/trace v1.11.3 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect

diff --git a/example/metric/exponential_histogram/go.mod b/example/metric/exponential_histogram/go.mod
@@ -5,7 +5,7 @@ go 1.22.0
 toolchain go1.23.4
 
 require (
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0
 	go.opentelemetry.io/contrib/detectors/gcp v1.31.0
 	go.opentelemetry.io/otel v1.31.0
 	go.opentelemetry.io/otel/metric v1.31.0
@@ -19,8 +19,8 @@ require (
 	cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
 	cloud.google.com/go/compute/metadata v0.6.0 // indirect
 	cloud.google.com/go/monitoring v1.22.1 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/google/s2a-go v0.1.9 // indirect

diff --git a/example/metric/otlpgrpc/go.mod b/example/metric/otlpgrpc/go.mod
@@ -16,7 +16,7 @@ require (
 
 require (
 	cloud.google.com/go/compute/metadata v0.6.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect

diff --git a/example/metric/sdk/go.mod b/example/metric/sdk/go.mod
@@ -5,7 +5,7 @@ go 1.22
 toolchain go1.22.0
 
 require (
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0
 	go.opentelemetry.io/contrib/detectors/gcp v1.31.0
 	go.opentelemetry.io/otel v1.31.0
 	go.opentelemetry.io/otel/metric v1.31.0
@@ -18,8 +18,8 @@ require (
 	cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
 	cloud.google.com/go/compute/metadata v0.6.0 // indirect
 	cloud.google.com/go/monitoring v1.22.1 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/google/s2a-go v0.1.9 // indirect

diff --git a/example/trace/http/go.mod b/example/trace/http/go.mod
@@ -5,8 +5,8 @@ go 1.22
 toolchain go1.22.0
 
 require (
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.26.0
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/propagator v0.50.0
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.27.0
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/propagator v0.51.0
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0
 	go.opentelemetry.io/otel v1.31.0
 	go.opentelemetry.io/otel/sdk v1.31.0
@@ -18,7 +18,7 @@ require (
 	cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
 	cloud.google.com/go/compute/metadata v0.6.0 // indirect
 	cloud.google.com/go/trace v1.11.3 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect

diff --git a/example/trace/otlpgrpc/example.go b/example/trace/otlpgrpc/example.go
@@ -52,7 +52,7 @@ func initTracer() (func(), error) {
 
 	tp := sdktrace.NewTracerProvider(
 		// For this example code we use sdktrace.AlwaysSample sampler to sample all traces.
-		// In a production application, use sdktrace.ProbabilitySampler with a desired probability.
+		// In a production application, use sdktrace.TraceIDRatioBased with a desired probability.
 		sdktrace.WithSampler(sdktrace.AlwaysSample()),
 		sdktrace.WithBatcher(exporter))
 

diff --git a/exporter/collector/config.go b/exporter/collector/config.go
@@ -19,9 +19,11 @@ import (
 	"errors"
 	"fmt"
 	"regexp"
+	"runtime"
 	"strings"
 	"time"
 
+	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/pmetric"
 	"go.opentelemetry.io/otel/metric"
@@ -197,7 +199,6 @@ var domains = []string{"googleapis.com", "kubernetes.io", "istio.io", "knative.d
 // DefaultConfig creates the default configuration for exporter.
 func DefaultConfig() Config {
 	return Config{
-		UserAgent: "opentelemetry-collector-contrib {{version}}",
 		LogConfig: LogConfig{
 			ServiceResourceLabels: true,
 			MapMonitoredResource:  defaultResourceToLoggingMonitoredResource,
@@ -252,8 +253,21 @@ func ValidateConfig(cfg Config) error {
 	return nil
 }
 
-func setVersionInUserAgent(cfg *Config, version string) {
-	cfg.UserAgent = strings.ReplaceAll(cfg.UserAgent, "{{version}}", version)
+func SetUserAgent(cfg *Config, buildInfo component.BuildInfo) {
+	if cfg.UserAgent == "" {
+		cfg.UserAgent = fmt.Sprintf(
+			"%s/%s (%s/%s)",
+			buildInfo.Description,
+			buildInfo.Version,
+			runtime.GOOS,
+			runtime.GOARCH,
+		)
+		return
+	}
+
+	if strings.Contains(cfg.UserAgent, "{{version}}") {
+		cfg.UserAgent = strings.ReplaceAll(cfg.UserAgent, "{{version}}", buildInfo.Version)
+	}
 }
 
 func generateClientOptions(ctx context.Context, clientCfg *ClientConfig, cfg *Config, scopes []string, meterProvider metric.MeterProvider) ([]option.ClientOption, error) {

diff --git a/exporter/collector/config_test.go b/exporter/collector/config_test.go
@@ -15,8 +15,11 @@
 package collector
 
 import (
+	"fmt"
+	"runtime"
 	"testing"
 
+	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/confmap"
 	"gopkg.in/yaml.v3"
 )
@@ -104,3 +107,24 @@ func TestMarshal(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
+// These tests are not super useful for functionality, but they
+// exist as an assertion of how we expect the user agent
+// to be constructed from build info to alert if somebody
+// changes it unknowingly.
+func TestBuildInfoUserAgentFallback(t *testing.T) {
+	config := DefaultConfig()
+	SetUserAgent(&config, component.BuildInfo{
+		Description: "GoogleCloudExporter Tests",
+		Version:     Version(),
+	})
+	expectedUserAgent := fmt.Sprintf(
+		"GoogleCloudExporter Tests/%s (%s/%s)",
+		Version(),
+		runtime.GOOS,
+		runtime.GOARCH,
+	)
+	if config.UserAgent != expectedUserAgent {
+		t.Fatalf("expected user agent to be %s, was %s", expectedUserAgent, config.UserAgent)
+	}
+}