pin old v1.29.0 of otel

go.mod

@@ -4,6 +4,12 @@ go 1.22.2
 
 replace modernc.org/sqlite => gitlab.com/NyaaaWhatsUpDoc/sqlite v1.33.1-concurrency-workaround
 
+replace go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.29.0
+
+replace go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.29.0
+
+replace go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.29.0
+
 require (
 	codeberg.org/gruf/go-bytes v1.0.2
 	codeberg.org/gruf/go-bytesize v1.0.3

go.sum

@@ -632,8 +632,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY=
+go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw=
-go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE=
+go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 h1:dIIDULZJpgdiHz5tXrTgKIMLkus6jEFa7x5SOKcyR7E=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0/go.mod h1:jlRVBe7+Z1wyxFSUs48L6OBQZ5JwH2Hg/Vbl+t9rAgI=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.29.0 h1:nSiV3s7wiCam610XcLbYOmMfJxB9gO4uK3Xgv5gmTgg=
@@ -642,14 +642,14 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0 h1:JAv0J
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0/go.mod h1:QNKLmUEAq2QUbPQUfvw4fmv0bgbK7UlOSFCnXyfvSNc=
 go.opentelemetry.io/otel/exporters/prometheus v0.51.0 h1:G7uexXb/K3T+T9fNLCCKncweEtNEBMTO+46hKX5EdKw=
 go.opentelemetry.io/otel/exporters/prometheus v0.51.0/go.mod h1:v0mFe5Kk7woIh938mrZBJBmENYquyA0IICrlYm4Y0t4=
-go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE=
+go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc=
-go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY=
+go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8=
 go.opentelemetry.io/otel/sdk v1.29.0 h1:vkqKjk7gwhS8VaWb0POZKmIEDimRCMsopNYnriHyryo=
 go.opentelemetry.io/otel/sdk v1.29.0/go.mod h1:pM8Dx5WKnvxLCb+8lG1PRNIDxu9g9b9g59Qr7hfAAok=
 go.opentelemetry.io/otel/sdk/metric v1.29.0 h1:K2CfmJohnRgvZ9UAj2/FhIf/okdWcNdBwe1m8xFXiSY=
 go.opentelemetry.io/otel/sdk/metric v1.29.0/go.mod h1:6zZLdCl2fkauYoZIOn/soQIDSWFmNSRcICarHfuhNJQ=
-go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys=
+go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4=
-go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A=
+go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ=
 go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0=
 go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8=
 go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=

vendor/go.opentelemetry.io/otel/.golangci.yml

@@ -25,7 +25,6 @@ linters:
     - revive
     - staticcheck
     - tenv
-    - testifylint
     - typecheck
     - unconvert
     - unused
@@ -65,12 +64,12 @@ issues:
     - path: _test\.go
       linters:
         - gosec
-    # Ignoring gosec G404: Use of weak random number generator (math/rand instead of crypto/rand)
+    # Igonoring gosec G404: Use of weak random number generator (math/rand instead of crypto/rand)
     # as we commonly use it in tests and examples.
     - text: "G404:"
       linters:
         - gosec
-    # Ignoring gosec G402: TLS MinVersion too low
+    # Igonoring gosec G402: TLS MinVersion too low
     # as the https://pkg.go.dev/crypto/tls#Config handles MinVersion default well.
     - text: "G402: TLS MinVersion too low."
       linters:
@@ -303,9 +302,3 @@ linters-settings:
       # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#waitgroup-by-value
       - name: waitgroup-by-value
         disabled: false
-  testifylint:
-    enable-all: true
-    disable:
-      - float-compare
-      - go-require
-      - require-error

vendor/go.opentelemetry.io/otel/CHANGELOG.md

@@ -11,54 +11,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 <!-- Released section -->
 <!-- Don't change this section unless doing release -->
 
-## [1.31.0/0.53.0/0.7.0/0.0.10] 2024-10-11
-
-### Added
-
-- Add `go.opentelemetry.io/otel/sdk/metric/exemplar` package which includes `Exemplar`, `Filter`, `TraceBasedFilter`, `AlwaysOnFilter`, `HistogramReservoir`, `FixedSizeReservoir`, `Reservoir`, `Value` and `ValueType` types. These will be used for configuring the exemplar reservoir for the metrics sdk. (#5747, #5862)
-- Add `WithExportBufferSize` option to log batch processor.(#5877)
-
-### Changed
-
-- Enable exemplars by default in `go.opentelemetry.io/otel/sdk/metric`. Exemplars can be disabled by setting `OTEL_METRICS_EXEMPLAR_FILTER=always_off` (#5778)
-- `Logger.Enabled` in `go.opentelemetry.io/otel/log` now accepts a newly introduced `EnabledParameters` type instead of `Record`. (#5791)
-- `FilterProcessor.Enabled` in `go.opentelemetry.io/otel/sdk/log/internal/x` now accepts `EnabledParameters` instead of `Record`. (#5791)
-- The `Record` type in `go.opentelemetry.io/otel/log` is no longer comparable. (#5847)
-- Performance improvements for the trace SDK `SetAttributes` method in `Span`. (#5864)
-- Reduce memory allocations for the `Event` and `Link` lists in `Span`. (#5858)
-- Performance improvements for the trace SDK `AddEvent`, `AddLink`, `RecordError` and `End` methods in `Span`. (#5874)
-
-### Deprecated
-
-- Deprecate all examples under `go.opentelemetry.io/otel/example` as they are moved to [Contrib repository](https://github.com/open-telemetry/opentelemetry-go-contrib/tree/main/examples). (#5854)
-
-### Fixed
-
-- The race condition for multiple `FixedSize` exemplar reservoirs identified in #5814 is resolved. (#5819)
-- Fix log records duplication in case of heterogeneous resource attributes by correctly mapping each log record to it's resource and scope. (#5803)
-- Fix timer channel drain to avoid hanging on Go 1.23. (#5868)
-- Fix delegation for global meter providers, and panic when calling otel.SetMeterProvider. (#5827)
-- Change the `reflect.TypeOf` to use a nil pointer to not allocate on the heap unless necessary. (#5827)
-
-## [1.30.0/0.52.0/0.6.0/0.0.9] 2024-09-09
-
-### Added
-
-- Support `OTEL_EXPORTER_OTLP_LOGS_INSECURE` and `OTEL_EXPORTER_OTLP_INSECURE` environments in `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc`. (#5739)
-- The `WithResource` option for `NewMeterProvider` now merges the provided resources with the ones from environment variables. (#5773)
-- The `WithResource` option for `NewLoggerProvider` now merges the provided resources with the ones from environment variables. (#5773)
-- Add UTF-8 support to `go.opentelemetry.io/otel/exporters/prometheus`. (#5755)
-
-### Fixed
-
-- Fix memory leak in the global `MeterProvider` when identical instruments are repeatedly created. (#5754)
-- Fix panic on instruments creation when setting meter provider. (#5758)
-- Fix an issue where `SetMeterProvider` in `go.opentelemetry.io/otel` might miss the delegation for instruments and registries. (#5780)
-
-### Removed
-
-- Drop support for [Go 1.21]. (#5736, #5740, #5800)
-
 ## [1.29.0/0.51.0/0.5.0] 2024-08-23
 
 This release is the last to support [Go 1.21].
@@ -1943,7 +1895,7 @@ with major version 0.
 - Setting error status while recording error with Span from oteltest package. (#1729)
 - The concept of a remote and local Span stored in a context is unified to just the current Span.
   Because of this `"go.opentelemetry.io/otel/trace".RemoteSpanContextFromContext` is removed as it is no longer needed.
-  Instead, `"go.opentelemetry.io/otel/trace".SpanContextFromContext` can be used to return the current Span.
+  Instead, `"go.opentelemetry.io/otel/trace".SpanContextFromContex` can be used to return the current Span.
   If needed, that Span's `SpanContext.IsRemote()` can then be used to determine if it is remote or not. (#1731)
 - The `HasRemoteParent` field of the `"go.opentelemetry.io/otel/sdk/trace".SamplingParameters` is removed.
   This field is redundant to the information returned from the `Remote` method of the `SpanContext` held in the `ParentContext` field. (#1749)
@@ -2517,7 +2469,7 @@ This release migrates the default OpenTelemetry SDK into its own Go module, deco
 - Prometheus exporter will not apply stale updates or forget inactive metrics. (#903)
 - Add test for api.standard `HTTPClientAttributesFromHTTPRequest`. (#905)
 - Bump github.com/golangci/golangci-lint from 1.27.0 to 1.28.1 in /tools. (#901, #913)
-- Update otel-collector example to use the v0.5.0 collector. (#915)
+- Update otel-colector example to use the v0.5.0 collector. (#915)
 - The `grpctrace` instrumentation uses a span name conforming to the OpenTelemetry semantic conventions (does not contain a leading slash (`/`)). (#922)
 - The `grpctrace` instrumentation includes an `rpc.method` attribute now set to the gRPC method name. (#900, #922)
 - The `grpctrace` instrumentation `rpc.service` attribute now contains the package name if one exists.
@@ -3110,9 +3062,7 @@ It contains api and sdk for trace and meter.
 - CircleCI build CI manifest files.
 - CODEOWNERS file to track owners of this project.
 
-[Unreleased]: https://github.com/open-telemetry/opentelemetry-go/compare/v1.31.0...HEAD
+[Unreleased]: https://github.com/open-telemetry/opentelemetry-go/compare/v1.29.0...HEAD
-[1.31.0/0.53.0/0.7.0/0.0.10]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.31.0
-[1.30.0/0.52.0/0.6.0/0.0.9]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.30.0
 [1.29.0/0.51.0/0.5.0]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.29.0
 [1.28.0/0.50.0/0.4.0]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.28.0
 [1.27.0/0.49.0/0.3.0]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.27.0

vendor/go.opentelemetry.io/otel/CODEOWNERS

@@ -12,6 +12,6 @@
 #  https://help.github.com/en/articles/about-code-owners
 #
 
-* @MrAlias @XSAM @dashpole @pellared @dmathieu
+* @MrAlias @XSAM @dashpole @MadVikingGod @pellared @hanyuancheung @dmathieu
 
-CODEOWNERS @MrAlias @pellared @dashpole @XSAM @dmathieu
+CODEOWNERS @MrAlias @MadVikingGod @pellared @dashpole @XSAM @dmathieu

vendor/go.opentelemetry.io/otel/CONTRIBUTING.md

@@ -578,10 +578,7 @@ See also:
 The tests should never leak goroutines.
 
 Use the term `ConcurrentSafe` in the test name when it aims to verify the
-absence of race conditions. The top-level tests with this term will be run
+absence of race conditions.
-many times in the `test-concurrent-safe` CI job to increase the chance of
-catching concurrency issues. This does not apply to subtests when this term
-is not in their root name.
 
 ### Internal packages
 
@@ -631,8 +628,11 @@ should be canceled.
 
 ### Approvers
 
+- [Chester Cheung](https://github.com/hanyuancheung), Tencent
+
 ### Maintainers
 
+- [Aaron Clawson](https://github.com/MadVikingGod), LightStep
 - [Damien Mathieu](https://github.com/dmathieu), Elastic
 - [David Ashpole](https://github.com/dashpole), Google
 - [Robert Pająk](https://github.com/pellared), Splunk
@@ -641,13 +641,11 @@ should be canceled.
 
 ### Emeritus
 
-- [Aaron Clawson](https://github.com/MadVikingGod), LightStep
+- [Liz Fong-Jones](https://github.com/lizthegrey), Honeycomb
-- [Anthony Mirabella](https://github.com/Aneurysm9), AWS
-- [Chester Cheung](https://github.com/hanyuancheung), Tencent
-- [Evan Torrie](https://github.com/evantorrie), Yahoo
 - [Gustavo Silva Paiva](https://github.com/paivagustavo), LightStep
 - [Josh MacDonald](https://github.com/jmacd), LightStep
-- [Liz Fong-Jones](https://github.com/lizthegrey), Honeycomb
+- [Anthony Mirabella](https://github.com/Aneurysm9), AWS
+- [Evan Torrie](https://github.com/evantorrie), Yahoo
 
 ### Become an Approver or a Maintainer
 

vendor/go.opentelemetry.io/otel/Makefile

@@ -54,6 +54,9 @@ $(TOOLS)/stringer: PACKAGE=golang.org/x/tools/cmd/stringer
 PORTO = $(TOOLS)/porto
 $(TOOLS)/porto: PACKAGE=github.com/jcchavezs/porto/cmd/porto
 
+GOJQ = $(TOOLS)/gojq
+$(TOOLS)/gojq: PACKAGE=github.com/itchyny/gojq/cmd/gojq
+
 GOTMPL = $(TOOLS)/gotmpl
 $(GOTMPL): PACKAGE=go.opentelemetry.io/build-tools/gotmpl
 
@@ -64,7 +67,7 @@ GOVULNCHECK = $(TOOLS)/govulncheck
 $(TOOLS)/govulncheck: PACKAGE=golang.org/x/vuln/cmd/govulncheck
 
 .PHONY: tools
-tools: $(CROSSLINK) $(GOLANGCI_LINT) $(MISSPELL) $(GOCOVMERGE) $(STRINGER) $(PORTO) $(SEMCONVGEN) $(MULTIMOD) $(SEMCONVKIT) $(GOTMPL) $(GORELEASE)
+tools: $(CROSSLINK) $(GOLANGCI_LINT) $(MISSPELL) $(GOCOVMERGE) $(STRINGER) $(PORTO) $(GOJQ) $(SEMCONVGEN) $(MULTIMOD) $(SEMCONVKIT) $(GOTMPL) $(GORELEASE)
 
 # Virtualized python tools via docker
 
@@ -142,14 +145,12 @@ build-tests/%:
 
 # Tests
 
-TEST_TARGETS := test-default test-bench test-short test-verbose test-race test-concurrent-safe
+TEST_TARGETS := test-default test-bench test-short test-verbose test-race
 .PHONY: $(TEST_TARGETS) test
 test-default test-race: ARGS=-race
 test-bench:   ARGS=-run=xxxxxMatchNothingxxxxx -test.benchtime=1ms -bench=.
 test-short:   ARGS=-short
 test-verbose: ARGS=-v -race
-test-concurrent-safe: ARGS=-run=ConcurrentSafe -count=100 -race
-test-concurrent-safe: TIMEOUT=120
 $(TEST_TARGETS): test
 test: $(OTEL_GO_MOD_DIRS:%=test/%)
 test/%: DIR=$*

vendor/go.opentelemetry.io/otel/README.md

@@ -51,18 +51,25 @@ Currently, this project supports the following environments.
 |----------|------------|--------------|
 | Ubuntu   | 1.23       | amd64        |
 | Ubuntu   | 1.22       | amd64        |
+| Ubuntu   | 1.21       | amd64        |
 | Ubuntu   | 1.23       | 386          |
 | Ubuntu   | 1.22       | 386          |
+| Ubuntu   | 1.21       | 386          |
 | Linux    | 1.23       | arm64        |
 | Linux    | 1.22       | arm64        |
+| Linux    | 1.21       | arm64        |
 | macOS 13 | 1.23       | amd64        |
 | macOS 13 | 1.22       | amd64        |
+| macOS 13 | 1.21       | amd64        |
 | macOS    | 1.23       | arm64        |
 | macOS    | 1.22       | arm64        |
+| macOS    | 1.21       | arm64        |
 | Windows  | 1.23       | amd64        |
 | Windows  | 1.22       | amd64        |
+| Windows  | 1.21       | amd64        |
 | Windows  | 1.23       | 386          |
 | Windows  | 1.22       | 386          |
+| Windows  | 1.21       | 386          |
 
 While this project should work for other systems, no compatibility guarantees
 are made for those systems currently.
@@ -89,8 +96,8 @@ If you need to extend the telemetry an instrumentation library provides or want
 to build your own instrumentation for your application directly you will need
 to use the
 [Go otel](https://pkg.go.dev/go.opentelemetry.io/otel)
-package. The [examples](https://github.com/open-telemetry/opentelemetry-go-contrib/tree/main/examples)
+package. The included [examples](./example/) are a good way to see some
-are a good way to see some practical uses of this process.
+practical uses of this process.
 
 ### Export
 

vendor/go.opentelemetry.io/otel/RELEASING.md

@@ -111,6 +111,17 @@ It is critical you make sure the version you push upstream is correct.
 Finally create a Release for the new `<new tag>` on GitHub.
 The release body should include all the release notes from the Changelog for this release.
 
+## Verify Examples
+
+After releasing verify that examples build outside of the repository.
+
+```
+./verify_examples.sh
+```
+
+The script copies examples into a different directory removes any `replace` declarations in `go.mod` and builds them.
+This ensures they build with the published release, not the local copy.
+
 ## Post-Release
 
 ### Contrib Repository

vendor/go.opentelemetry.io/otel/attribute/set.go

@@ -347,25 +347,45 @@ func computeDistinct(kvs []KeyValue) Distinct {
 func computeDistinctFixed(kvs []KeyValue) interface{} {
 	switch len(kvs) {
 	case 1:
-		return [1]KeyValue(kvs)
+		ptr := new([1]KeyValue)
+		copy((*ptr)[:], kvs)
+		return *ptr
 	case 2:
-		return [2]KeyValue(kvs)
+		ptr := new([2]KeyValue)
+		copy((*ptr)[:], kvs)
+		return *ptr
 	case 3:
-		return [3]KeyValue(kvs)
+		ptr := new([3]KeyValue)
+		copy((*ptr)[:], kvs)
+		return *ptr
 	case 4:
-		return [4]KeyValue(kvs)
+		ptr := new([4]KeyValue)
+		copy((*ptr)[:], kvs)
+		return *ptr
 	case 5:
-		return [5]KeyValue(kvs)
+		ptr := new([5]KeyValue)
+		copy((*ptr)[:], kvs)
+		return *ptr
 	case 6:
-		return [6]KeyValue(kvs)
+		ptr := new([6]KeyValue)
+		copy((*ptr)[:], kvs)
+		return *ptr
 	case 7:
-		return [7]KeyValue(kvs)
+		ptr := new([7]KeyValue)
+		copy((*ptr)[:], kvs)
+		return *ptr
 	case 8:
-		return [8]KeyValue(kvs)
+		ptr := new([8]KeyValue)
+		copy((*ptr)[:], kvs)
+		return *ptr
 	case 9:
-		return [9]KeyValue(kvs)
+		ptr := new([9]KeyValue)
+		copy((*ptr)[:], kvs)
+		return *ptr
 	case 10:
-		return [10]KeyValue(kvs)
+		ptr := new([10]KeyValue)
+		copy((*ptr)[:], kvs)
+		return *ptr
 	default:
 		return nil
 	}

vendor/go.opentelemetry.io/otel/baggage/baggage.go

@@ -50,7 +50,7 @@ type Property struct {
 // component boundaries may impose their own restrictions on Property key.
 // For example, the W3C Baggage specification restricts the Property keys to strings that
 // satisfy the token definition from RFC7230, Section 3.2.6.
-// For maximum compatibility, alphanumeric value are strongly recommended to be used as Property key.
+// For maximum compatibility, alpha-numeric value are strongly recommended to be used as Property key.
 func NewKeyProperty(key string) (Property, error) {
 	if !validateBaggageName(key) {
 		return newInvalidProperty(), fmt.Errorf("%w: %q", errInvalidKey, key)
@@ -90,7 +90,7 @@ func NewKeyValueProperty(key, value string) (Property, error) {
 // component boundaries may impose their own restrictions on Property key.
 // For example, the W3C Baggage specification restricts the Property keys to strings that
 // satisfy the token definition from RFC7230, Section 3.2.6.
-// For maximum compatibility, alphanumeric value are strongly recommended to be used as Property key.
+// For maximum compatibility, alpha-numeric value are strongly recommended to be used as Property key.
 func NewKeyValuePropertyRaw(key, value string) (Property, error) {
 	if !validateBaggageName(key) {
 		return newInvalidProperty(), fmt.Errorf("%w: %q", errInvalidKey, key)
@@ -287,7 +287,7 @@ func NewMember(key, value string, props ...Property) (Member, error) {
 // component boundaries may impose their own restrictions on baggage key.
 // For example, the W3C Baggage specification restricts the baggage keys to strings that
 // satisfy the token definition from RFC7230, Section 3.2.6.
-// For maximum compatibility, alphanumeric value are strongly recommended to be used as baggage key.
+// For maximum compatibility, alpha-numeric value are strongly recommended to be used as baggage key.
 func NewMemberRaw(key, value string, props ...Property) (Member, error) {
 	m := Member{
 		key:        key,

vendor/go.opentelemetry.io/otel/internal/global/meter.go

@@ -5,8 +5,8 @@ package global // import "go.opentelemetry.io/otel/internal/global"
 
 import (
 	"container/list"
-	"reflect"
 	"sync"
+	"sync/atomic"
 
 	"go.opentelemetry.io/otel/metric"
 	"go.opentelemetry.io/otel/metric/embedded"
@@ -76,7 +76,7 @@ func (p *meterProvider) Meter(name string, opts ...metric.MeterOption) metric.Me
 		return val
 	}
 
-	t := &meter{name: name, opts: opts, instruments: make(map[instID]delegatedInstrument)}
+	t := &meter{name: name, opts: opts}
 	p.meters[key] = t
 	return t
 }
@@ -92,29 +92,17 @@ type meter struct {
 	opts []metric.MeterOption
 
 	mtx         sync.Mutex
-	instruments map[instID]delegatedInstrument
+	instruments []delegatedInstrument
 
 	registry list.List
 
-	delegate metric.Meter
+	delegate atomic.Value // metric.Meter
 }
 
 type delegatedInstrument interface {
 	setDelegate(metric.Meter)
 }
 
-// instID are the identifying properties of a instrument.
-type instID struct {
-	// name is the name of the stream.
-	name string
-	// description is the description of the stream.
-	description string
-	// kind defines the functional group of the instrument.
-	kind reflect.Type
-	// unit is the unit of the stream.
-	unit string
-}
-
 // setDelegate configures m to delegate all Meter functionality to Meters
 // created by provider.
 //
@@ -122,12 +110,12 @@ type instID struct {
 //
 // It is guaranteed by the caller that this happens only once.
 func (m *meter) setDelegate(provider metric.MeterProvider) {
+	meter := provider.Meter(m.name, m.opts...)
+	m.delegate.Store(meter)
+
 	m.mtx.Lock()
 	defer m.mtx.Unlock()
 
-	meter := provider.Meter(m.name, m.opts...)
-	m.delegate = meter
-
 	for _, inst := range m.instruments {
 		inst.setDelegate(meter)
 	}
@@ -145,337 +133,169 @@ func (m *meter) setDelegate(provider metric.MeterProvider) {
 }
 
 func (m *meter) Int64Counter(name string, options ...metric.Int64CounterOption) (metric.Int64Counter, error) {
+	if del, ok := m.delegate.Load().(metric.Meter); ok {
+		return del.Int64Counter(name, options...)
+	}
 	m.mtx.Lock()
 	defer m.mtx.Unlock()
-
-	if m.delegate != nil {
-		return m.delegate.Int64Counter(name, options...)
-	}
-
-	cfg := metric.NewInt64CounterConfig(options...)
-	id := instID{
-		name:        name,
-		kind:        reflect.TypeOf((*siCounter)(nil)),
-		description: cfg.Description(),
-		unit:        cfg.Unit(),
-	}
-	if f, ok := m.instruments[id]; ok {
-		return f.(metric.Int64Counter), nil
-	}
 	i := &siCounter{name: name, opts: options}
-	m.instruments[id] = i
+	m.instruments = append(m.instruments, i)
 	return i, nil
 }
 
 func (m *meter) Int64UpDownCounter(name string, options ...metric.Int64UpDownCounterOption) (metric.Int64UpDownCounter, error) {
+	if del, ok := m.delegate.Load().(metric.Meter); ok {
+		return del.Int64UpDownCounter(name, options...)
+	}
 	m.mtx.Lock()
 	defer m.mtx.Unlock()
-
-	if m.delegate != nil {
-		return m.delegate.Int64UpDownCounter(name, options...)
-	}
-
-	cfg := metric.NewInt64UpDownCounterConfig(options...)
-	id := instID{
-		name:        name,
-		kind:        reflect.TypeOf((*siUpDownCounter)(nil)),
-		description: cfg.Description(),
-		unit:        cfg.Unit(),
-	}
-	if f, ok := m.instruments[id]; ok {
-		return f.(metric.Int64UpDownCounter), nil
-	}
 	i := &siUpDownCounter{name: name, opts: options}
-	m.instruments[id] = i
+	m.instruments = append(m.instruments, i)
 	return i, nil
 }
 
 func (m *meter) Int64Histogram(name string, options ...metric.Int64HistogramOption) (metric.Int64Histogram, error) {
+	if del, ok := m.delegate.Load().(metric.Meter); ok {
+		return del.Int64Histogram(name, options...)
+	}
 	m.mtx.Lock()
 	defer m.mtx.Unlock()
-
-	if m.delegate != nil {
-		return m.delegate.Int64Histogram(name, options...)
-	}
-
-	cfg := metric.NewInt64HistogramConfig(options...)
-	id := instID{
-		name:        name,
-		kind:        reflect.TypeOf((*siHistogram)(nil)),
-		description: cfg.Description(),
-		unit:        cfg.Unit(),
-	}
-	if f, ok := m.instruments[id]; ok {
-		return f.(metric.Int64Histogram), nil
-	}
 	i := &siHistogram{name: name, opts: options}
-	m.instruments[id] = i
+	m.instruments = append(m.instruments, i)
 	return i, nil
 }
 
 func (m *meter) Int64Gauge(name string, options ...metric.Int64GaugeOption) (metric.Int64Gauge, error) {
+	if del, ok := m.delegate.Load().(metric.Meter); ok {
+		return del.Int64Gauge(name, options...)
+	}
 	m.mtx.Lock()
 	defer m.mtx.Unlock()
-
-	if m.delegate != nil {
-		return m.delegate.Int64Gauge(name, options...)
-	}
-
-	cfg := metric.NewInt64GaugeConfig(options...)
-	id := instID{
-		name:        name,
-		kind:        reflect.TypeOf((*siGauge)(nil)),
-		description: cfg.Description(),
-		unit:        cfg.Unit(),
-	}
-	if f, ok := m.instruments[id]; ok {
-		return f.(metric.Int64Gauge), nil
-	}
 	i := &siGauge{name: name, opts: options}
-	m.instruments[id] = i
+	m.instruments = append(m.instruments, i)
 	return i, nil
 }
 
 func (m *meter) Int64ObservableCounter(name string, options ...metric.Int64ObservableCounterOption) (metric.Int64ObservableCounter, error) {
+	if del, ok := m.delegate.Load().(metric.Meter); ok {
+		return del.Int64ObservableCounter(name, options...)
+	}
 	m.mtx.Lock()
 	defer m.mtx.Unlock()
-
-	if m.delegate != nil {
-		return m.delegate.Int64ObservableCounter(name, options...)
-	}
-
-	cfg := metric.NewInt64ObservableCounterConfig(options...)
-	id := instID{
-		name:        name,
-		kind:        reflect.TypeOf((*aiCounter)(nil)),
-		description: cfg.Description(),
-		unit:        cfg.Unit(),
-	}
-	if f, ok := m.instruments[id]; ok {
-		return f.(metric.Int64ObservableCounter), nil
-	}
 	i := &aiCounter{name: name, opts: options}
-	m.instruments[id] = i
+	m.instruments = append(m.instruments, i)
 	return i, nil
 }
 
 func (m *meter) Int64ObservableUpDownCounter(name string, options ...metric.Int64ObservableUpDownCounterOption) (metric.Int64ObservableUpDownCounter, error) {
+	if del, ok := m.delegate.Load().(metric.Meter); ok {
+		return del.Int64ObservableUpDownCounter(name, options...)
+	}
 	m.mtx.Lock()
 	defer m.mtx.Unlock()
-
-	if m.delegate != nil {
-		return m.delegate.Int64ObservableUpDownCounter(name, options...)
-	}
-
-	cfg := metric.NewInt64ObservableUpDownCounterConfig(options...)
-	id := instID{
-		name:        name,
-		kind:        reflect.TypeOf((*aiUpDownCounter)(nil)),
-		description: cfg.Description(),
-		unit:        cfg.Unit(),
-	}
-	if f, ok := m.instruments[id]; ok {
-		return f.(metric.Int64ObservableUpDownCounter), nil
-	}
 	i := &aiUpDownCounter{name: name, opts: options}
-	m.instruments[id] = i
+	m.instruments = append(m.instruments, i)
 	return i, nil
 }
 
 func (m *meter) Int64ObservableGauge(name string, options ...metric.Int64ObservableGaugeOption) (metric.Int64ObservableGauge, error) {
+	if del, ok := m.delegate.Load().(metric.Meter); ok {
+		return del.Int64ObservableGauge(name, options...)
+	}
 	m.mtx.Lock()
 	defer m.mtx.Unlock()
-
-	if m.delegate != nil {
-		return m.delegate.Int64ObservableGauge(name, options...)
-	}
-
-	cfg := metric.NewInt64ObservableGaugeConfig(options...)
-	id := instID{
-		name:        name,
-		kind:        reflect.TypeOf((*aiGauge)(nil)),
-		description: cfg.Description(),
-		unit:        cfg.Unit(),
-	}
-	if f, ok := m.instruments[id]; ok {
-		return f.(metric.Int64ObservableGauge), nil
-	}
 	i := &aiGauge{name: name, opts: options}
-	m.instruments[id] = i
+	m.instruments = append(m.instruments, i)
 	return i, nil
 }
 
 func (m *meter) Float64Counter(name string, options ...metric.Float64CounterOption) (metric.Float64Counter, error) {
+	if del, ok := m.delegate.Load().(metric.Meter); ok {
+		return del.Float64Counter(name, options...)
+	}
 	m.mtx.Lock()
 	defer m.mtx.Unlock()
-
-	if m.delegate != nil {
-		return m.delegate.Float64Counter(name, options...)
-	}
-
-	cfg := metric.NewFloat64CounterConfig(options...)
-	id := instID{
-		name:        name,
-		kind:        reflect.TypeOf((*sfCounter)(nil)),
-		description: cfg.Description(),
-		unit:        cfg.Unit(),
-	}
-	if f, ok := m.instruments[id]; ok {
-		return f.(metric.Float64Counter), nil
-	}
 	i := &sfCounter{name: name, opts: options}
-	m.instruments[id] = i
+	m.instruments = append(m.instruments, i)
 	return i, nil
 }
 
 func (m *meter) Float64UpDownCounter(name string, options ...metric.Float64UpDownCounterOption) (metric.Float64UpDownCounter, error) {
+	if del, ok := m.delegate.Load().(metric.Meter); ok {
+		return del.Float64UpDownCounter(name, options...)
+	}
 	m.mtx.Lock()
 	defer m.mtx.Unlock()
-
-	if m.delegate != nil {
-		return m.delegate.Float64UpDownCounter(name, options...)
-	}
-
-	cfg := metric.NewFloat64UpDownCounterConfig(options...)
-	id := instID{
-		name:        name,
-		kind:        reflect.TypeOf((*sfUpDownCounter)(nil)),
-		description: cfg.Description(),
-		unit:        cfg.Unit(),
-	}
-	if f, ok := m.instruments[id]; ok {
-		return f.(metric.Float64UpDownCounter), nil
-	}
 	i := &sfUpDownCounter{name: name, opts: options}
-	m.instruments[id] = i
+	m.instruments = append(m.instruments, i)
 	return i, nil
 }
 
 func (m *meter) Float64Histogram(name string, options ...metric.Float64HistogramOption) (metric.Float64Histogram, error) {
+	if del, ok := m.delegate.Load().(metric.Meter); ok {
+		return del.Float64Histogram(name, options...)
+	}
 	m.mtx.Lock()
 	defer m.mtx.Unlock()
-
-	if m.delegate != nil {
-		return m.delegate.Float64Histogram(name, options...)
-	}
-
-	cfg := metric.NewFloat64HistogramConfig(options...)
-	id := instID{
-		name:        name,
-		kind:        reflect.TypeOf((*sfHistogram)(nil)),
-		description: cfg.Description(),
-		unit:        cfg.Unit(),
-	}
-	if f, ok := m.instruments[id]; ok {
-		return f.(metric.Float64Histogram), nil
-	}
 	i := &sfHistogram{name: name, opts: options}
-	m.instruments[id] = i
+	m.instruments = append(m.instruments, i)
 	return i, nil
 }
 
 func (m *meter) Float64Gauge(name string, options ...metric.Float64GaugeOption) (metric.Float64Gauge, error) {
+	if del, ok := m.delegate.Load().(metric.Meter); ok {
+		return del.Float64Gauge(name, options...)
+	}
 	m.mtx.Lock()
 	defer m.mtx.Unlock()
-
-	if m.delegate != nil {
-		return m.delegate.Float64Gauge(name, options...)
-	}
-
-	cfg := metric.NewFloat64GaugeConfig(options...)
-	id := instID{
-		name:        name,
-		kind:        reflect.TypeOf((*sfGauge)(nil)),
-		description: cfg.Description(),
-		unit:        cfg.Unit(),
-	}
-	if f, ok := m.instruments[id]; ok {
-		return f.(metric.Float64Gauge), nil
-	}
 	i := &sfGauge{name: name, opts: options}
-	m.instruments[id] = i
+	m.instruments = append(m.instruments, i)
 	return i, nil
 }
 
 func (m *meter) Float64ObservableCounter(name string, options ...metric.Float64ObservableCounterOption) (metric.Float64ObservableCounter, error) {
+	if del, ok := m.delegate.Load().(metric.Meter); ok {
+		return del.Float64ObservableCounter(name, options...)
+	}
 	m.mtx.Lock()
 	defer m.mtx.Unlock()
-
-	if m.delegate != nil {
-		return m.delegate.Float64ObservableCounter(name, options...)
-	}
-
-	cfg := metric.NewFloat64ObservableCounterConfig(options...)
-	id := instID{
-		name:        name,
-		kind:        reflect.TypeOf((*afCounter)(nil)),
-		description: cfg.Description(),
-		unit:        cfg.Unit(),
-	}
-	if f, ok := m.instruments[id]; ok {
-		return f.(metric.Float64ObservableCounter), nil
-	}
 	i := &afCounter{name: name, opts: options}
-	m.instruments[id] = i
+	m.instruments = append(m.instruments, i)
 	return i, nil
 }
 
 func (m *meter) Float64ObservableUpDownCounter(name string, options ...metric.Float64ObservableUpDownCounterOption) (metric.Float64ObservableUpDownCounter, error) {
+	if del, ok := m.delegate.Load().(metric.Meter); ok {
+		return del.Float64ObservableUpDownCounter(name, options...)
+	}
 	m.mtx.Lock()
 	defer m.mtx.Unlock()
-
-	if m.delegate != nil {
-		return m.delegate.Float64ObservableUpDownCounter(name, options...)
-	}
-
-	cfg := metric.NewFloat64ObservableUpDownCounterConfig(options...)
-	id := instID{
-		name:        name,
-		kind:        reflect.TypeOf((*afUpDownCounter)(nil)),
-		description: cfg.Description(),
-		unit:        cfg.Unit(),
-	}
-	if f, ok := m.instruments[id]; ok {
-		return f.(metric.Float64ObservableUpDownCounter), nil
-	}
 	i := &afUpDownCounter{name: name, opts: options}
-	m.instruments[id] = i
+	m.instruments = append(m.instruments, i)
 	return i, nil
 }
 
 func (m *meter) Float64ObservableGauge(name string, options ...metric.Float64ObservableGaugeOption) (metric.Float64ObservableGauge, error) {
+	if del, ok := m.delegate.Load().(metric.Meter); ok {
+		return del.Float64ObservableGauge(name, options...)
+	}
 	m.mtx.Lock()
 	defer m.mtx.Unlock()
-
-	if m.delegate != nil {
-		return m.delegate.Float64ObservableGauge(name, options...)
-	}
-
-	cfg := metric.NewFloat64ObservableGaugeConfig(options...)
-	id := instID{
-		name:        name,
-		kind:        reflect.TypeOf((*afGauge)(nil)),
-		description: cfg.Description(),
-		unit:        cfg.Unit(),
-	}
-	if f, ok := m.instruments[id]; ok {
-		return f.(metric.Float64ObservableGauge), nil
-	}
 	i := &afGauge{name: name, opts: options}
-	m.instruments[id] = i
+	m.instruments = append(m.instruments, i)
 	return i, nil
 }
 
 // RegisterCallback captures the function that will be called during Collect.
 func (m *meter) RegisterCallback(f metric.Callback, insts ...metric.Observable) (metric.Registration, error) {
+	if del, ok := m.delegate.Load().(metric.Meter); ok {
+		insts = unwrapInstruments(insts)
+		return del.RegisterCallback(f, insts...)
+	}
+
 	m.mtx.Lock()
 	defer m.mtx.Unlock()
 
-	if m.delegate != nil {
-		insts = unwrapInstruments(insts)
-		return m.delegate.RegisterCallback(f, insts...)
-	}
-
 	reg := &registration{instruments: insts, function: f}
 	e := m.registry.PushBack(reg)
 	reg.unreg = func() error {
@@ -529,7 +349,6 @@ func (c *registration) setDelegate(m metric.Meter) {
 	reg, err := m.RegisterCallback(c.function, insts...)
 	if err != nil {
 		GetErrorHandler().Handle(err)
-		return
 	}
 
 	c.unreg = reg.Unregister

vendor/go.opentelemetry.io/otel/internal/rawhelpers.go

@@ -20,8 +20,7 @@ func RawToBool(r uint64) bool {
 }
 
 func Int64ToRaw(i int64) uint64 {
-	// Assumes original was a valid int64 (overflow not checked).
+	return uint64(i)
-	return uint64(i) // nolint: gosec
 }
 
 func RawToInt64(r uint64) int64 {

vendor/go.opentelemetry.io/otel/metric/asyncfloat64.go

@@ -213,7 +213,7 @@ type Float64Observer interface {
 }
 
 // Float64Callback is a function registered with a Meter that makes
-// observations for a Float64Observable instrument it is registered with.
+// observations for a Float64Observerable instrument it is registered with.
 // Calls to the Float64Observer record measurement values for the
 // Float64Observable.
 //

vendor/go.opentelemetry.io/otel/metric/asyncint64.go

@@ -212,7 +212,7 @@ type Int64Observer interface {
 }
 
 // Int64Callback is a function registered with a Meter that makes observations
-// for an Int64Observable instrument it is registered with. Calls to the
+// for an Int64Observerable instrument it is registered with. Calls to the
 // Int64Observer record measurement values for the Int64Observable.
 //
 // The function needs to complete in a finite amount of time and the deadline

vendor/go.opentelemetry.io/otel/metric/instrument.go

@@ -351,7 +351,7 @@ func WithAttributeSet(attributes attribute.Set) MeasurementOption {
 //
 //	cp := make([]attribute.KeyValue, len(attributes))
 //	copy(cp, attributes)
-//	WithAttributeSet(attribute.NewSet(cp...))
+//	WithAttributes(attribute.NewSet(cp...))
 //
 // [attribute.NewSet] may modify the passed attributes so this will make a copy
 // of attributes before creating a set in order to ensure this function is

vendor/go.opentelemetry.io/otel/renovate.json

@@ -19,14 +19,6 @@
       "matchManagers": ["gomod"],
       "matchDepTypes": ["indirect"],
       "enabled": false
-    },
-    {
-      "matchPackageNames": ["google.golang.org/genproto/googleapis/**"],
-      "groupName": "googleapis"
-    },
-    {
-      "matchPackageNames": ["golang.org/x/**"],
-      "groupName": "golang.org/x"
     }
   ]
 }

vendor/go.opentelemetry.io/otel/trace/context.go

@@ -22,7 +22,7 @@ func ContextWithSpanContext(parent context.Context, sc SpanContext) context.Cont
 	return ContextWithSpan(parent, nonRecordingSpan{sc: sc})
 }
 
-// ContextWithRemoteSpanContext returns a copy of parent with rsc set explicitly
+// ContextWithRemoteSpanContext returns a copy of parent with rsc set explicly
 // as a remote SpanContext and as the current Span. The Span implementation
 // that wraps rsc is non-recording and performs no operations other than to
 // return rsc as the SpanContext from the SpanContext method.

vendor/go.opentelemetry.io/otel/trace/doc.go

@@ -96,7 +96,7 @@ can embed the API interface directly.
 
 This option is not recommended. It will lead to publishing packages that
 contain runtime panics when users update to newer versions of
-[go.opentelemetry.io/otel/trace], which may be done with a transitive
+[go.opentelemetry.io/otel/trace], which may be done with a trasitive
 dependency.
 
 Finally, an author can embed another implementation in theirs. The embedded

vendor/go.opentelemetry.io/otel/verify_examples.sh

@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+set -euo pipefail
+
+cd $(dirname $0)
+TOOLS_DIR=$(pwd)/.tools
+
+if [ -z "${GOPATH}" ] ; then
+	printf "GOPATH is not defined.\n"
+	exit -1
+fi
+
+if [ ! -d "${GOPATH}" ] ; then
+	printf "GOPATH ${GOPATH} is invalid \n"
+	exit -1
+fi
+
+# Pre-requisites
+if ! git diff --quiet; then \
+	git status
+	printf "\n\nError: working tree is not clean\n"
+	exit -1
+fi
+
+if [ "$(git tag --contains $(git log -1 --pretty=format:"%H"))" = "" ] ; then
+	printf "$(git log -1)"
+	printf "\n\nError: HEAD is not pointing to a tagged version"
+fi
+
+make ${TOOLS_DIR}/gojq
+
+DIR_TMP="${GOPATH}/src/oteltmp/"
+rm -rf $DIR_TMP
+mkdir -p $DIR_TMP
+
+printf "Copy examples to ${DIR_TMP}\n"
+cp -a ./example ${DIR_TMP}
+
+# Update go.mod files
+printf "Update go.mod: rename module and remove replace\n"
+
+PACKAGE_DIRS=$(find . -mindepth 2 -type f -name 'go.mod' -exec dirname {} \; | egrep 'example' | sed 's/^\.\///' | sort)
+
+for dir in $PACKAGE_DIRS; do
+	printf "  Update go.mod for $dir\n"
+	(cd "${DIR_TMP}/${dir}" && \
+	 # replaces is ("mod1" "mod2" …)
+	 replaces=($(go mod edit -json | ${TOOLS_DIR}/gojq '.Replace[].Old.Path')) && \
+	 # strip double quotes
+	 replaces=("${replaces[@]%\"}") && \
+	 replaces=("${replaces[@]#\"}") && \
+	 # make an array (-dropreplace=mod1 -dropreplace=mod2 …)
+	 dropreplaces=("${replaces[@]/#/-dropreplace=}") && \
+	 go mod edit -module "oteltmp/${dir}" "${dropreplaces[@]}" && \
+	 go mod tidy)
+done
+printf "Update done:\n\n"
+
+# Build directories that contain main package. These directories are different than
+# directories that contain go.mod files.
+printf "Build examples:\n"
+EXAMPLES=$(./get_main_pkgs.sh ./example)
+for ex in $EXAMPLES; do
+	printf "  Build $ex in ${DIR_TMP}/${ex}\n"
+	(cd "${DIR_TMP}/${ex}" && \
+	 go build .)
+done
+
+# Cleanup
+printf "Remove copied files.\n"
+rm -rf $DIR_TMP

vendor/go.opentelemetry.io/otel/version.go

@@ -5,5 +5,5 @@ package otel // import "go.opentelemetry.io/otel"
 
 // Version is the current release version of OpenTelemetry in use.
 func Version() string {
-	return "1.31.0"
+	return "1.29.0"
 }

vendor/go.opentelemetry.io/otel/versions.yaml

@@ -3,7 +3,7 @@
 
 module-sets:
   stable-v1:
-    version: v1.31.0
+    version: v1.29.0
     modules:
       - go.opentelemetry.io/otel
       - go.opentelemetry.io/otel/bridge/opencensus
@@ -29,12 +29,12 @@ module-sets:
       - go.opentelemetry.io/otel/sdk/metric
       - go.opentelemetry.io/otel/trace
   experimental-metrics:
-    version: v0.53.0
+    version: v0.51.0
     modules:
       - go.opentelemetry.io/otel/example/prometheus
       - go.opentelemetry.io/otel/exporters/prometheus
   experimental-logs:
-    version: v0.7.0
+    version: v0.5.0
     modules:
       - go.opentelemetry.io/otel/log
       - go.opentelemetry.io/otel/sdk/log
@@ -42,7 +42,7 @@ module-sets:
       - go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp
       - go.opentelemetry.io/otel/exporters/stdout/stdoutlog
   experimental-schema:
-    version: v0.0.10
+    version: v0.0.8
     modules:
       - go.opentelemetry.io/otel/schema
 excluded-modules:

vendor/modules.txt

@@ -974,8 +974,8 @@ go.mongodb.org/mongo-driver/bson/bsonrw
 go.mongodb.org/mongo-driver/bson/bsontype
 go.mongodb.org/mongo-driver/bson/primitive
 go.mongodb.org/mongo-driver/x/bsonx/bsoncore
-# go.opentelemetry.io/otel v1.31.0
+# go.opentelemetry.io/otel v1.31.0 => go.opentelemetry.io/otel v1.29.0
-## explicit; go 1.22
+## explicit; go 1.21
 go.opentelemetry.io/otel
 go.opentelemetry.io/otel/attribute
 go.opentelemetry.io/otel/baggage
@@ -1015,8 +1015,8 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp/internal/retry
 # go.opentelemetry.io/otel/exporters/prometheus v0.51.0
 ## explicit; go 1.21
 go.opentelemetry.io/otel/exporters/prometheus
-# go.opentelemetry.io/otel/metric v1.31.0
+# go.opentelemetry.io/otel/metric v1.31.0 => go.opentelemetry.io/otel/metric v1.29.0
-## explicit; go 1.22
+## explicit; go 1.21
 go.opentelemetry.io/otel/metric
 go.opentelemetry.io/otel/metric/embedded
 go.opentelemetry.io/otel/metric/noop
@@ -1036,8 +1036,8 @@ go.opentelemetry.io/otel/sdk/metric/internal/aggregate
 go.opentelemetry.io/otel/sdk/metric/internal/exemplar
 go.opentelemetry.io/otel/sdk/metric/internal/x
 go.opentelemetry.io/otel/sdk/metric/metricdata
-# go.opentelemetry.io/otel/trace v1.31.0
+# go.opentelemetry.io/otel/trace v1.31.0 => go.opentelemetry.io/otel/trace v1.29.0
-## explicit; go 1.22
+## explicit; go 1.21
 go.opentelemetry.io/otel/trace
 go.opentelemetry.io/otel/trace/embedded
 go.opentelemetry.io/otel/trace/noop
@@ -1346,3 +1346,6 @@ modernc.org/token
 ## explicit; go 1.19
 mvdan.cc/xurls/v2
 # modernc.org/sqlite => gitlab.com/NyaaaWhatsUpDoc/sqlite v1.33.1-concurrency-workaround
+# go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.29.0
+# go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.29.0
+# go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.29.0