Merge branch 'main' into bugfix/5084

open-telemetry · May 21, 2024 · 97fe881 · 97fe881
2 parents 4258921 + a91e60b
commit 97fe881
Show file tree

Hide file tree

Showing 130 changed files with 931 additions and 925 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,6 +21,8 @@ jobs:
     steps:
     - name: Checkout Repo
       uses: actions/checkout@v4
+      with:
+        fetch-depth: 0 ## Needed for "Set tools/go.mod timestamp" step.
     - name: Install Go
       uses: actions/setup-go@v5
       with:
@@ -34,6 +36,14 @@ jobs:
       with:
         path: .tools
         key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('./tools/**') }}
+      # The step below is needed to not rebuild all the build tools.
+    - name: Set tools/go.mod timestamp
+      run: |
+        filename="tools/go.mod"
+        unixtime=$(git log -1 --format="%at" -- "${filename}")
+        touchtime=$(date -d @$unixtime +'%Y%m%d%H%M.%S')
+        touch -t ${touchtime} "${filename}"
+        ls -la --time-style=full-iso "${filename}"
     - name: Generate
       run: make generate
     - name: Run linters
@@ -76,7 +86,7 @@ jobs:
         cp coverage.txt $TEST_RESULTS
         cp coverage.html $TEST_RESULTS
     - name: Upload coverage report
-      uses: codecov/[email protected].0
+      uses: codecov/[email protected].1
       with:
         file: ./coverage.txt
         fail_ci_if_error: true
@@ -149,7 +159,7 @@ jobs:
         find . -name 'coverage.html' > "${TEST_RESULTS}/coverage.lst"
         tar -n -cf - -T "${TEST_RESULTS}/coverage.lst" | tar -C "${TEST_RESULTS}" -xvf -
     - name: Upload coverage report
-      uses: codecov/[email protected].0
+      uses: codecov/[email protected].1
       if: hashFiles('coverage.out') != ''
       with:
         file: ./coverage.out

diff --git a/Makefile b/Makefile
@@ -29,7 +29,7 @@ TOOLS = $(CURDIR)/.tools
 
 $(TOOLS):
 	@mkdir -p $@
-$(TOOLS)/%: | $(TOOLS)
+$(TOOLS)/%: $(TOOLS_MOD_DIR)/go.mod | $(TOOLS)
 	cd $(TOOLS_MOD_DIR) && \
 	$(GO) build -o $@ $(PACKAGE)
 
@@ -76,18 +76,18 @@ generate: go-generate vanity-import-fix
 .PHONY: go-generate
 go-generate: $(OTEL_GO_MOD_DIRS:%=go-generate/%)
 go-generate/%: DIR=$*
-go-generate/%: | $(STRINGER) $(GOTMPL)
+go-generate/%: $(STRINGER) $(GOTMPL)
 	@echo "$(GO) generate $(DIR)/..." \
 		&& cd $(DIR) \
 		&& PATH="$(TOOLS):$${PATH}" $(GO) generate ./...
 
 .PHONY: vanity-import-fix
-vanity-import-fix: | $(PORTO)
+vanity-import-fix: $(PORTO)
 	@$(PORTO) --include-internal -w .
 
 # Generate go.work file for local development.
 .PHONY: go-work
-go-work: | $(CROSSLINK)
+go-work: $(CROSSLINK)
 	$(CROSSLINK) work --root=$(shell pwd)
 
 # Build
@@ -116,13 +116,13 @@ golangci-lint-fix: ARGS=--fix
 golangci-lint-fix: golangci-lint
 golangci-lint: $(OTEL_GO_MOD_DIRS:%=golangci-lint/%)
 golangci-lint/%: DIR=$*
-golangci-lint/%: | $(GOLANGCI_LINT)
+golangci-lint/%: $(GOLANGCI_LINT)
 	@echo 'golangci-lint $(if $(ARGS),$(ARGS) ,)$(DIR)' \
 		&& cd $(DIR) \
 		&& $(GOLANGCI_LINT) run --allow-serial-runners $(ARGS)
 
 .PHONY: crosslink
-crosslink: | $(CROSSLINK)
+crosslink: $(CROSSLINK)
 	@echo "Updating intra-repository dependencies in all go modules" \
 		&& $(CROSSLINK) --root=$(shell pwd) --prune
 
@@ -135,13 +135,13 @@ go-mod-tidy/%:
 		&& $(GO) mod tidy -compat=1.21
 
 .PHONY: misspell
-misspell: | $(MISSPELL)
+misspell: $(MISSPELL)
 	@$(MISSPELL) -w $(ALL_DOCS)
 
 .PHONY: govulncheck
 govulncheck: $(ALL_GO_MOD_DIRS:%=govulncheck/%)
 govulncheck/%: DIR=$*
-govulncheck/%: | $(GOVULNCHECK)
+govulncheck/%: $(GOVULNCHECK)
 	@echo "govulncheck in $(DIR)" \
 		&& cd $(DIR) \
 		&& $(GOVULNCHECK) ./...
@@ -252,26 +252,26 @@ test-mongo-driver:
 .PHONY: gorelease
 gorelease: $(OTEL_GO_MOD_DIRS:%=gorelease/%)
 gorelease/%: DIR=$*
-gorelease/%:| $(GORELEASE)
+gorelease/%: $(GORELEASE)
 	@echo "gorelease in $(DIR):" \
 		&& cd $(DIR) \
 		&& $(GORELEASE) \
 		|| echo ""
 
 COREPATH ?= "../opentelemetry-go"
 .PHONY: sync-core
-sync-core: | $(MULTIMOD)
+sync-core: $(MULTIMOD)
 	@[ ! -d $COREPATH ] || ( echo ">> Path to core repository must be set in COREPATH and must exist"; exit 1 )
 	$(MULTIMOD) verify && $(MULTIMOD) sync -a -o ${COREPATH}
 
 .PHONY: prerelease
-prerelease: | $(MULTIMOD)
+prerelease: $(MULTIMOD)
 	@[ "${MODSET}" ] || ( echo ">> env var MODSET is not set"; exit 1 )
 	$(MULTIMOD) verify && $(MULTIMOD) prerelease -m ${MODSET}
 
 COMMIT ?= "HEAD"
 .PHONY: add-tags
-add-tags: | $(MULTIMOD)
+add-tags: $(MULTIMOD)
 	@[ "${MODSET}" ] || ( echo ">> env var MODSET is not set"; exit 1 )
 	$(MULTIMOD) verify && $(MULTIMOD) tag -m ${MODSET} -c ${COMMIT}
 

diff --git a/bridges/otellogrus/go.mod b/bridges/otellogrus/go.mod
@@ -5,17 +5,17 @@ go 1.21
 require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.9.0
-	go.opentelemetry.io/otel/log v0.2.0-alpha.0.20240517142840-ebd0adee357f
+	go.opentelemetry.io/otel/log v0.2.0-alpha.0.20240520052501-49c866fbcd20
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	go.opentelemetry.io/otel v1.26.0 // indirect
-	go.opentelemetry.io/otel/metric v1.26.0 // indirect
-	go.opentelemetry.io/otel/trace v1.26.0 // indirect
+	go.opentelemetry.io/otel v1.26.1-0.20240520052501-49c866fbcd20 // indirect
+	go.opentelemetry.io/otel/metric v1.26.1-0.20240520052501-49c866fbcd20 // indirect
+	go.opentelemetry.io/otel/trace v1.26.1-0.20240520052501-49c866fbcd20 // indirect
 	golang.org/x/sys v0.20.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/bridges/otellogrus/go.sum b/bridges/otellogrus/go.sum
@@ -16,14 +16,14 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-go.opentelemetry.io/otel v1.26.0 h1:LQwgL5s/1W7YiiRwxf03QGnWLb2HW4pLiAhaA5cZXBs=
-go.opentelemetry.io/otel v1.26.0/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4=
-go.opentelemetry.io/otel/log v0.2.0-alpha.0.20240517142840-ebd0adee357f h1:JmJ7snaC8Dqrt0WlZHpHNqglp84kbrHBHV3/n0HeoI8=
-go.opentelemetry.io/otel/log v0.2.0-alpha.0.20240517142840-ebd0adee357f/go.mod h1:vbFZc65yq4c4ssvXY43y/nIqkNJLxORrqw0L85P59LA=
-go.opentelemetry.io/otel/metric v1.26.0 h1:7S39CLuY5Jgg9CrnA9HHiEjGMF/X2VHvoXGgSllRz30=
-go.opentelemetry.io/otel/metric v1.26.0/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4=
-go.opentelemetry.io/otel/trace v1.26.0 h1:1ieeAUb4y0TE26jUFrCIXKpTuVK7uJGN9/Z/2LP5sQA=
-go.opentelemetry.io/otel/trace v1.26.0/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0=
+go.opentelemetry.io/otel v1.26.1-0.20240520052501-49c866fbcd20 h1:8PBsZmviiO2hsqFdY+BPeUB6tUIrgwW1O9cRm8EO2Js=
+go.opentelemetry.io/otel v1.26.1-0.20240520052501-49c866fbcd20/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4=
+go.opentelemetry.io/otel/log v0.2.0-alpha.0.20240520052501-49c866fbcd20 h1:UIk9SaCROnqN8Xl6x6MN+lbvYHdPiLMnfn8vSHNsRSY=
+go.opentelemetry.io/otel/log v0.2.0-alpha.0.20240520052501-49c866fbcd20/go.mod h1:vbFZc65yq4c4ssvXY43y/nIqkNJLxORrqw0L85P59LA=
+go.opentelemetry.io/otel/metric v1.26.1-0.20240520052501-49c866fbcd20 h1:X36M641DzoaeEOUT6sBlFbJvgbNvSmC3fvgie0JfjPg=
+go.opentelemetry.io/otel/metric v1.26.1-0.20240520052501-49c866fbcd20/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4=
+go.opentelemetry.io/otel/trace v1.26.1-0.20240520052501-49c866fbcd20 h1:Kqo6TuxL7DwoDHTZQhW6B/LkHotw8NyCm779IT/QH+Y=
+go.opentelemetry.io/otel/trace v1.26.1-0.20240520052501-49c866fbcd20/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

diff --git a/bridges/otelslog/go.mod b/bridges/otelslog/go.mod
@@ -4,16 +4,16 @@ go 1.21
 
 require (
 	github.com/stretchr/testify v1.9.0
-	go.opentelemetry.io/otel/log v0.2.0-alpha
+	go.opentelemetry.io/otel/log v0.2.0-alpha.0.20240520052501-49c866fbcd20
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	go.opentelemetry.io/otel v1.26.0 // indirect
-	go.opentelemetry.io/otel/metric v1.26.0 // indirect
-	go.opentelemetry.io/otel/trace v1.26.0 // indirect
+	go.opentelemetry.io/otel v1.26.1-0.20240520052501-49c866fbcd20 // indirect
+	go.opentelemetry.io/otel/metric v1.26.1-0.20240520052501-49c866fbcd20 // indirect
+	go.opentelemetry.io/otel/trace v1.26.1-0.20240520052501-49c866fbcd20 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/bridges/otelslog/go.sum b/bridges/otelslog/go.sum
@@ -11,14 +11,14 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-go.opentelemetry.io/otel v1.26.0 h1:LQwgL5s/1W7YiiRwxf03QGnWLb2HW4pLiAhaA5cZXBs=
-go.opentelemetry.io/otel v1.26.0/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4=
-go.opentelemetry.io/otel/log v0.2.0-alpha h1:ixOPvMzserpqA07SENHvRzkZOsnG0XbPr74hv1AQ+n0=
-go.opentelemetry.io/otel/log v0.2.0-alpha/go.mod h1:vbFZc65yq4c4ssvXY43y/nIqkNJLxORrqw0L85P59LA=
-go.opentelemetry.io/otel/metric v1.26.0 h1:7S39CLuY5Jgg9CrnA9HHiEjGMF/X2VHvoXGgSllRz30=
-go.opentelemetry.io/otel/metric v1.26.0/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4=
-go.opentelemetry.io/otel/trace v1.26.0 h1:1ieeAUb4y0TE26jUFrCIXKpTuVK7uJGN9/Z/2LP5sQA=
-go.opentelemetry.io/otel/trace v1.26.0/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0=
+go.opentelemetry.io/otel v1.26.1-0.20240520052501-49c866fbcd20 h1:8PBsZmviiO2hsqFdY+BPeUB6tUIrgwW1O9cRm8EO2Js=
+go.opentelemetry.io/otel v1.26.1-0.20240520052501-49c866fbcd20/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4=
+go.opentelemetry.io/otel/log v0.2.0-alpha.0.20240520052501-49c866fbcd20 h1:UIk9SaCROnqN8Xl6x6MN+lbvYHdPiLMnfn8vSHNsRSY=
+go.opentelemetry.io/otel/log v0.2.0-alpha.0.20240520052501-49c866fbcd20/go.mod h1:vbFZc65yq4c4ssvXY43y/nIqkNJLxORrqw0L85P59LA=
+go.opentelemetry.io/otel/metric v1.26.1-0.20240520052501-49c866fbcd20 h1:X36M641DzoaeEOUT6sBlFbJvgbNvSmC3fvgie0JfjPg=
+go.opentelemetry.io/otel/metric v1.26.1-0.20240520052501-49c866fbcd20/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4=
+go.opentelemetry.io/otel/trace v1.26.1-0.20240520052501-49c866fbcd20 h1:Kqo6TuxL7DwoDHTZQhW6B/LkHotw8NyCm779IT/QH+Y=
+go.opentelemetry.io/otel/trace v1.26.1-0.20240520052501-49c866fbcd20/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

diff --git a/bridges/otelzap/core_test.go b/bridges/otelzap/core_test.go
@@ -30,7 +30,7 @@ func TestCore(t *testing.T) {
 	logger.Info(testMessage)
 
 	// TODO (#5580): Not sure why index 1 is populated with results and not 0.
-	got := rec.Result()[1].Records[0]
+	got := rec.Result()[0].Records[0]
 	assert.Equal(t, testMessage, got.Body().AsString())
 	assert.Equal(t, log.SeverityInfo, got.Severity())
 }
@@ -44,18 +44,18 @@ func TestCoreEnabled(t *testing.T) {
 	logger := zap.New(NewCore(loggerName, WithLoggerProvider(r)))
 
 	logger.Debug(testMessage)
-	assert.Empty(t, r.Result()[1].Records)
+	assert.Empty(t, r.Result()[0].Records)
 
 	if ce := logger.Check(zap.DebugLevel, testMessage); ce != nil {
 		ce.Write()
 	}
-	assert.Empty(t, r.Result()[1].Records)
+	assert.Empty(t, r.Result()[0].Records)
 
 	if ce := logger.Check(zap.InfoLevel, testMessage); ce != nil {
 		ce.Write()
 	}
-	require.Len(t, r.Result()[1].Records, 1)
-	got := r.Result()[1].Records[0]
+	require.Len(t, r.Result()[0].Records, 1)
+	got := r.Result()[0].Records[0]
 	assert.Equal(t, testMessage, got.Body().AsString())
 	assert.Equal(t, log.SeverityInfo, got.Severity())
 }
@@ -70,12 +70,10 @@ func TestNewCoreConfiguration(t *testing.T) {
 		var h *Core
 		require.NotPanics(t, func() { h = NewCore(loggerName) })
 		require.NotNil(t, h.logger)
-		require.IsType(t, &logtest.Recorder{}, h.logger)
-		l := h.logger.(*logtest.Recorder)
-		require.Len(t, l.Result(), 1)
+		require.Len(t, r.Result(), 1)
 
 		want := &logtest.ScopeRecords{Name: loggerName}
-		got := l.Result()[0]
+		got := r.Result()[0]
 		assert.Equal(t, want, got)
 	})
 
@@ -91,12 +89,10 @@ func TestNewCoreConfiguration(t *testing.T) {
 			)
 		})
 		require.NotNil(t, h.logger)
-		require.IsType(t, &logtest.Recorder{}, h.logger)
-		l := h.logger.(*logtest.Recorder)
-		require.Len(t, l.Result(), 1)
+		require.Len(t, r.Result(), 1)
 
 		want := &logtest.ScopeRecords{Name: loggerName, Version: "1.0.0", SchemaURL: "url"}
-		got := l.Result()[0]
+		got := r.Result()[0]
 		assert.Equal(t, want, got)
 	})
 }

diff --git a/bridges/otelzap/go.mod b/bridges/otelzap/go.mod
@@ -4,7 +4,7 @@ go 1.21
 
 require (
 	github.com/stretchr/testify v1.9.0
-	go.opentelemetry.io/otel/log v0.2.0-alpha
+	go.opentelemetry.io/otel/log v0.2.0-alpha.0.20240520052501-49c866fbcd20
 	go.uber.org/zap v1.27.0
 )
 
@@ -13,9 +13,9 @@ require (
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	go.opentelemetry.io/otel v1.26.0 // indirect
-	go.opentelemetry.io/otel/metric v1.26.0 // indirect
-	go.opentelemetry.io/otel/trace v1.26.0 // indirect
+	go.opentelemetry.io/otel v1.26.1-0.20240520052501-49c866fbcd20 // indirect
+	go.opentelemetry.io/otel/metric v1.26.1-0.20240520052501-49c866fbcd20 // indirect
+	go.opentelemetry.io/otel/trace v1.26.1-0.20240520052501-49c866fbcd20 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/bridges/otelzap/go.sum b/bridges/otelzap/go.sum
@@ -11,14 +11,14 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-go.opentelemetry.io/otel v1.26.0 h1:LQwgL5s/1W7YiiRwxf03QGnWLb2HW4pLiAhaA5cZXBs=
-go.opentelemetry.io/otel v1.26.0/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4=
-go.opentelemetry.io/otel/log v0.2.0-alpha h1:ixOPvMzserpqA07SENHvRzkZOsnG0XbPr74hv1AQ+n0=
-go.opentelemetry.io/otel/log v0.2.0-alpha/go.mod h1:vbFZc65yq4c4ssvXY43y/nIqkNJLxORrqw0L85P59LA=
-go.opentelemetry.io/otel/metric v1.26.0 h1:7S39CLuY5Jgg9CrnA9HHiEjGMF/X2VHvoXGgSllRz30=
-go.opentelemetry.io/otel/metric v1.26.0/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4=
-go.opentelemetry.io/otel/trace v1.26.0 h1:1ieeAUb4y0TE26jUFrCIXKpTuVK7uJGN9/Z/2LP5sQA=
-go.opentelemetry.io/otel/trace v1.26.0/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0=
+go.opentelemetry.io/otel v1.26.1-0.20240520052501-49c866fbcd20 h1:8PBsZmviiO2hsqFdY+BPeUB6tUIrgwW1O9cRm8EO2Js=
+go.opentelemetry.io/otel v1.26.1-0.20240520052501-49c866fbcd20/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4=
+go.opentelemetry.io/otel/log v0.2.0-alpha.0.20240520052501-49c866fbcd20 h1:UIk9SaCROnqN8Xl6x6MN+lbvYHdPiLMnfn8vSHNsRSY=
+go.opentelemetry.io/otel/log v0.2.0-alpha.0.20240520052501-49c866fbcd20/go.mod h1:vbFZc65yq4c4ssvXY43y/nIqkNJLxORrqw0L85P59LA=
+go.opentelemetry.io/otel/metric v1.26.1-0.20240520052501-49c866fbcd20 h1:X36M641DzoaeEOUT6sBlFbJvgbNvSmC3fvgie0JfjPg=
+go.opentelemetry.io/otel/metric v1.26.1-0.20240520052501-49c866fbcd20/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4=
+go.opentelemetry.io/otel/trace v1.26.1-0.20240520052501-49c866fbcd20 h1:Kqo6TuxL7DwoDHTZQhW6B/LkHotw8NyCm779IT/QH+Y=
+go.opentelemetry.io/otel/trace v1.26.1-0.20240520052501-49c866fbcd20/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=

diff --git a/bridges/prometheus/go.mod b/bridges/prometheus/go.mod
@@ -6,9 +6,9 @@ require (
 	github.com/prometheus/client_golang v1.19.1
 	github.com/prometheus/client_model v0.6.1
 	github.com/stretchr/testify v1.9.0
-	go.opentelemetry.io/otel v1.26.0
-	go.opentelemetry.io/otel/sdk v1.26.0
-	go.opentelemetry.io/otel/sdk/metric v1.26.0
+	go.opentelemetry.io/otel v1.26.1-0.20240520052501-49c866fbcd20
+	go.opentelemetry.io/otel/sdk v1.26.1-0.20240520052501-49c866fbcd20
+	go.opentelemetry.io/otel/sdk/metric v1.26.1-0.20240520052501-49c866fbcd20
 )
 
 require (
@@ -22,8 +22,8 @@ require (
 	github.com/prometheus/common v0.53.0 // indirect
 	github.com/prometheus/procfs v0.15.0 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
-	go.opentelemetry.io/otel/metric v1.26.0 // indirect
-	go.opentelemetry.io/otel/trace v1.26.0 // indirect
+	go.opentelemetry.io/otel/metric v1.26.1-0.20240520052501-49c866fbcd20 // indirect
+	go.opentelemetry.io/otel/trace v1.26.1-0.20240520052501-49c866fbcd20 // indirect
 	golang.org/x/sys v0.20.0 // indirect
 	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

diff --git a/bridges/prometheus/go.sum b/bridges/prometheus/go.sum
@@ -30,16 +30,16 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-go.opentelemetry.io/otel v1.26.0 h1:LQwgL5s/1W7YiiRwxf03QGnWLb2HW4pLiAhaA5cZXBs=
-go.opentelemetry.io/otel v1.26.0/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4=
-go.opentelemetry.io/otel/metric v1.26.0 h1:7S39CLuY5Jgg9CrnA9HHiEjGMF/X2VHvoXGgSllRz30=
-go.opentelemetry.io/otel/metric v1.26.0/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4=
-go.opentelemetry.io/otel/sdk v1.26.0 h1:Y7bumHf5tAiDlRYFmGqetNcLaVUZmh4iYfmGxtmz7F8=
-go.opentelemetry.io/otel/sdk v1.26.0/go.mod h1:0p8MXpqLeJ0pzcszQQN4F0S5FVjBLgypeGSngLsmirs=
-go.opentelemetry.io/otel/sdk/metric v1.26.0 h1:cWSks5tfriHPdWFnl+qpX3P681aAYqlZHcAyHw5aU9Y=
-go.opentelemetry.io/otel/sdk/metric v1.26.0/go.mod h1:ClMFFknnThJCksebJwz7KIyEDHO+nTB6gK8obLy8RyE=
-go.opentelemetry.io/otel/trace v1.26.0 h1:1ieeAUb4y0TE26jUFrCIXKpTuVK7uJGN9/Z/2LP5sQA=
-go.opentelemetry.io/otel/trace v1.26.0/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0=
+go.opentelemetry.io/otel v1.26.1-0.20240520052501-49c866fbcd20 h1:8PBsZmviiO2hsqFdY+BPeUB6tUIrgwW1O9cRm8EO2Js=
+go.opentelemetry.io/otel v1.26.1-0.20240520052501-49c866fbcd20/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4=
+go.opentelemetry.io/otel/metric v1.26.1-0.20240520052501-49c866fbcd20 h1:X36M641DzoaeEOUT6sBlFbJvgbNvSmC3fvgie0JfjPg=
+go.opentelemetry.io/otel/metric v1.26.1-0.20240520052501-49c866fbcd20/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4=
+go.opentelemetry.io/otel/sdk v1.26.1-0.20240520052501-49c866fbcd20 h1:o7Aiu+qUY3kGTB9yzr8E31D50mRynR80mjtWxKMjHak=
+go.opentelemetry.io/otel/sdk v1.26.1-0.20240520052501-49c866fbcd20/go.mod h1:mctrrtYdnKd2A2/yPjPk55H4nF9NjMKIwhroTsd2d40=
+go.opentelemetry.io/otel/sdk/metric v1.26.1-0.20240520052501-49c866fbcd20 h1:B728FBKMO9ARxYATJAQRtUgxAEHC11AGV8zViCdVdLM=
+go.opentelemetry.io/otel/sdk/metric v1.26.1-0.20240520052501-49c866fbcd20/go.mod h1:+fEAJsIfcI30IdZmkORofEzcnYRIQaJYDtvQ23ws09k=
+go.opentelemetry.io/otel/trace v1.26.1-0.20240520052501-49c866fbcd20 h1:Kqo6TuxL7DwoDHTZQhW6B/LkHotw8NyCm779IT/QH+Y=
+go.opentelemetry.io/otel/trace v1.26.1-0.20240520052501-49c866fbcd20/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0=
 golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=