Skip to content

[OTAGENT-399] upgrade otel versions to v0.126.0 #36940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .copyright-overrides.yml
Original file line number Diff line number Diff line change
Expand Up @@ -402,3 +402,4 @@ github.com/bhmj/xpression: Copyright 2021-2022 Michael Gurov (github.com/bhmj)

github.com/bboreham/go-loser: bboreham <[email protected]>
cel.dev/expr: TristonianJones <[email protected]>
github.com/google/go-tpm: Copyright (c) 2014, Google LLC All rights reserved.
27 changes: 21 additions & 6 deletions LICENSE-3rdparty.csv
Original file line number Diff line number Diff line change
Expand Up @@ -979,6 +979,8 @@ core,github.com/facette/natsort,BSD-3-Clause,"Copyright (c) 2015, Vincent Batouf
core,github.com/fatih/color,MIT,Copyright (c) 2013 Fatih Arslan
core,github.com/fatih/structtag,BSD-3-Clause,"Copyright (c) 2012 The Go Authors. All rights reserved | Copyright (c) 2017, Fatih Arslan"
core,github.com/felixge/httpsnoop,MIT,Copyright (c) 2016 Felix Geisendörfer ([email protected])
core,github.com/foxboron/go-tpm-keyfiles,MIT,Copyright (c) 2024 Morten Linderud
core,github.com/foxboron/go-tpm-keyfiles/template,MIT,Copyright (c) 2024 Morten Linderud
core,github.com/freddierice/go-losetup,MIT,Copyright (c) 2017 Freddie Rice
core,github.com/fsnotify/fsnotify,BSD-3-Clause,Copyright (c) 2012 The Go Authors. All rights reserved. | Copyright (c) 2012-2019 fsnotify Authors. All rights reserved.
core,github.com/fsnotify/fsnotify/internal,BSD-3-Clause,Copyright (c) 2012 The Go Authors. All rights reserved. | Copyright (c) 2012-2019 fsnotify Authors. All rights reserved.
Expand Down Expand Up @@ -1147,6 +1149,11 @@ core,github.com/google/go-containerregistry/pkg/v1/stream,Apache-2.0,Copyright 2
core,github.com/google/go-containerregistry/pkg/v1/tarball,Apache-2.0,Copyright 2018 Google LLC All Rights Reserved. | Copyright 2019 Google LLC All Rights Reserved. | Copyright 2020 Google LLC All Rights Reserved. | Copyright 2021 Google LLC All Rights Reserved. | Copyright 2022 Google LLC All Rights Reserved.
core,github.com/google/go-containerregistry/pkg/v1/types,Apache-2.0,Copyright 2018 Google LLC All Rights Reserved. | Copyright 2019 Google LLC All Rights Reserved. | Copyright 2020 Google LLC All Rights Reserved. | Copyright 2021 Google LLC All Rights Reserved. | Copyright 2022 Google LLC All Rights Reserved.
core,github.com/google/go-querystring/query,BSD-3-Clause,Copyright (c) 2013 Google. All rights reserved
core,github.com/google/go-tpm/legacy/tpm2,Apache-2.0,"Copyright (c) 2014, Google LLC All rights reserved."
core,github.com/google/go-tpm/tpm2,Apache-2.0,"Copyright (c) 2014, Google LLC All rights reserved."
core,github.com/google/go-tpm/tpm2/transport,Apache-2.0,"Copyright (c) 2014, Google LLC All rights reserved."
core,github.com/google/go-tpm/tpmutil,Apache-2.0,"Copyright (c) 2014, Google LLC All rights reserved."
core,github.com/google/go-tpm/tpmutil/tbs,Apache-2.0,"Copyright (c) 2014, Google LLC All rights reserved."
core,github.com/google/gofuzz,Apache-2.0,Copyright 2014 Google Inc. All rights reserved.
core,github.com/google/gofuzz/bytesource,Apache-2.0,Copyright 2014 Google Inc. All rights reserved.
core,github.com/google/gopacket,BSD-3-Clause,"Copyright (c) 2009-2011 Andreas Krennmair. All rights reserved. | Copyright (c) 2012 Google, Inc. All rights reserved."
Expand Down Expand Up @@ -1645,6 +1652,7 @@ core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/errors
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/attrs,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/emit,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/archive,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/checkpoint,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/fileset,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/fingerprint,Apache-2.0,Copyright The OpenTelemetry Authors
Expand Down Expand Up @@ -1698,6 +1706,8 @@ core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zi
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin/zipkinthriftconverter,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin/zipkinv1,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin/zipkinv2,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters/internal/third_party/telegraf/win_perf_counters,MIT,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor,Apache-2.0,Copyright The OpenTelemetry Authors
Expand Down Expand Up @@ -1768,12 +1778,11 @@ core,github.com/open-telemetry/opentelemetry-collector-contrib/processor/transfo
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver/internal,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/perfcounters,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/perfcounters/third_party/perflib,MIT,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/cpuscraper,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/ucal,Apache-2.0,Copyright The OpenTelemetry Authors
Expand Down Expand Up @@ -2246,6 +2255,7 @@ core,go.opentelemetry.io/collector/config/configtls,Apache-2.0,Copyright The Ope
core,go.opentelemetry.io/collector/confmap,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/confmap/internal/envvar,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/confmap/internal/mapstructure,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/confmap/internal/third_party/composehook,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/confmap/provider/envprovider,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/confmap/provider/fileprovider,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/confmap/provider/httpprovider,Apache-2.0,Copyright The OpenTelemetry Authors
Expand Down Expand Up @@ -2366,17 +2376,13 @@ core,go.opentelemetry.io/collector/scraper,Apache-2.0,Copyright The OpenTelemetr
core,go.opentelemetry.io/collector/scraper/scrapererror,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/scraper/scraperhelper,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/scraper/scraperhelper/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/semconv/v1.16.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/semconv/v1.17.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/semconv/v1.18.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/semconv/v1.21.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/semconv/v1.22.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/semconv/v1.25.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/semconv/v1.26.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/semconv/v1.27.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/semconv/v1.6.1,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/semconv/v1.8.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/semconv/v1.9.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/extensions,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/hostcapabilities,Apache-2.0,Copyright The OpenTelemetry Authors
Expand All @@ -2386,6 +2392,7 @@ core,go.opentelemetry.io/collector/service/internal/capabilityconsumer,Apache-2.
core,go.opentelemetry.io/collector/service/internal/graph,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/internal/moduleinfo,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/internal/obsconsumer,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/internal/proctelemetry,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/internal/resource,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/internal/status,Apache-2.0,Copyright The OpenTelemetry Authors
Expand Down Expand Up @@ -2474,10 +2481,18 @@ core,go.opentelemetry.io/otel/sdk/trace,Apache-2.0,Copyright The OpenTelemetry A
core,go.opentelemetry.io/otel/sdk/trace/tracetest,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/semconv/internal,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/semconv/v1.12.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/semconv/v1.15.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/semconv/v1.16.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/semconv/v1.17.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/semconv/v1.18.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/semconv/v1.20.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/semconv/v1.21.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/semconv/v1.25.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/semconv/v1.26.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/semconv/v1.27.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/semconv/v1.6.1,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/semconv/v1.8.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/semconv/v1.9.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/trace,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/trace/embedded,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/trace/internal/telemetry,Apache-2.0,Copyright The OpenTelemetry Authors
Expand Down
12 changes: 6 additions & 6 deletions cmd/otel-agent/config/agent_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func (suite *ConfigTestSuite) TestAgentConfig() {
assert.Equal(t, false, c.Get("apm_config.receiver_enabled"))
assert.Equal(t, 10, c.Get("apm_config.trace_buffer"))
assert.Equal(t, false, c.Get("otlp_config.traces.span_name_as_resource_name"))
assert.Equal(t, []string{"disable_operation_and_resource_name_logic_v2"}, c.Get("apm_config.features"))
assert.Equal(t, []string{}, c.Get("apm_config.features"))
}

func (suite *ConfigTestSuite) TestAgentConfigDefaults() {
Expand All @@ -82,12 +82,12 @@ func (suite *ConfigTestSuite) TestAgentConfigDefaults() {
assert.Equal(t, "https://trace.agent.datadoghq.com", c.Get("apm_config.apm_dd_url"))
assert.Equal(t, false, c.Get("apm_config.receiver_enabled"))
assert.Equal(t, false, c.Get("otlp_config.traces.span_name_as_resource_name"))
assert.Equal(t, []string{"disable_operation_and_resource_name_logic_v2", "enable_otlp_compute_top_level_by_span_kind"},
assert.Equal(t, []string{"enable_otlp_compute_top_level_by_span_kind"},
c.Get("apm_config.features"))
}

func (suite *ConfigTestSuite) TestOperationAndResourceNameV2FeatureGate() {
featuregate.GlobalRegistry().Set("datadog.EnableOperationAndResourceNameV2", true)
func (suite *ConfigTestSuite) TestDisableOperationAndResourceNameV2FeatureGate() {
featuregate.GlobalRegistry().Set("datadog.EnableOperationAndResourceNameV2", false)
t := suite.T()
fileName := "testdata/config_default.yaml"
c, err := NewConfigComponent(context.Background(), "", []string{fileName})
Expand All @@ -106,7 +106,7 @@ func (suite *ConfigTestSuite) TestOperationAndResourceNameV2FeatureGate() {
assert.Equal(t, "https://trace.agent.datadoghq.com", c.Get("apm_config.apm_dd_url"))
assert.Equal(t, false, c.Get("apm_config.receiver_enabled"))
assert.Equal(t, false, c.Get("otlp_config.traces.span_name_as_resource_name"))
assert.Equal(t, []string{"enable_otlp_compute_top_level_by_span_kind"},
assert.Equal(t, []string{"disable_operation_and_resource_name_logic_v2", "enable_otlp_compute_top_level_by_span_kind"},
c.Get("apm_config.features"))
}

Expand Down Expand Up @@ -165,7 +165,7 @@ func (suite *ConfigTestSuite) TestAgentConfigWithDatadogYamlDefaults() {
assert.Equal(t, "https://trace.agent.datadoghq.com", c.Get("apm_config.apm_dd_url"))
assert.Equal(t, false, c.Get("apm_config.receiver_enabled"))
assert.Equal(t, false, c.Get("otlp_config.traces.span_name_as_resource_name"))
assert.Equal(t, []string{"disable_operation_and_resource_name_logic_v2", "enable_otlp_compute_top_level_by_span_kind"}, c.Get("apm_config.features"))
assert.Equal(t, []string{"enable_otlp_compute_top_level_by_span_kind"}, c.Get("apm_config.features"))

// log_level from datadog.yaml takes precedence -> more verbose
assert.Equal(t, "debug", c.Get("log_level"))
Expand Down
2 changes: 1 addition & 1 deletion comp/api/api/def/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
go.uber.org/dig v1.18.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/sys v0.32.0 // indirect
golang.org/x/sys v0.33.0 // indirect
)

// This section was automatically added by 'dda inv modules.add-all-replace' command, do not edit manually
Expand Down
4 changes: 2 additions & 2 deletions comp/api/api/def/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions comp/core/config/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ require (
github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
github.com/magiconair/properties v1.8.9 // indirect
github.com/magiconair/properties v1.8.10 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
Expand All @@ -73,9 +73,9 @@ require (
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.62.0 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/shirou/gopsutil/v4 v4.25.3 // indirect
github.com/shirou/gopsutil/v4 v4.25.4 // indirect
github.com/spf13/afero v1.14.0 // indirect
github.com/spf13/cast v1.7.1 // indirect
github.com/spf13/cast v1.8.0 // indirect
github.com/spf13/cobra v1.9.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.6 // indirect
Expand All @@ -87,8 +87,8 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
golang.org/x/sys v0.32.0 // indirect
golang.org/x/text v0.24.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/text v0.25.0 // indirect
golang.org/x/time v0.11.0 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading
Loading