Skip to content

Commit 701bbb9

Browse files
authored
[OTAGENT-399] upgrade otel versions to v0.126.0 (#36940)
1 parent e133641 commit 701bbb9

238 files changed

Lines changed: 4414 additions & 4214 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.copyright-overrides.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,3 +402,4 @@ github.com/bhmj/xpression: Copyright 2021-2022 Michael Gurov (github.com/bhmj)
402402

403403
github.com/bboreham/go-loser: bboreham <bjboreham@gmail.com>
404404
cel.dev/expr: TristonianJones <tswadell@google.com>
405+
github.com/google/go-tpm: Copyright (c) 2014, Google LLC All rights reserved.

LICENSE-3rdparty.csv

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -979,6 +979,8 @@ core,github.com/facette/natsort,BSD-3-Clause,"Copyright (c) 2015, Vincent Batouf
979979
core,github.com/fatih/color,MIT,Copyright (c) 2013 Fatih Arslan
980980
core,github.com/fatih/structtag,BSD-3-Clause,"Copyright (c) 2012 The Go Authors. All rights reserved | Copyright (c) 2017, Fatih Arslan"
981981
core,github.com/felixge/httpsnoop,MIT,Copyright (c) 2016 Felix Geisendörfer (felix@debuggable.com)
982+
core,github.com/foxboron/go-tpm-keyfiles,MIT,Copyright (c) 2024 Morten Linderud
983+
core,github.com/foxboron/go-tpm-keyfiles/template,MIT,Copyright (c) 2024 Morten Linderud
982984
core,github.com/freddierice/go-losetup,MIT,Copyright (c) 2017 Freddie Rice
983985
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.
984986
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.
@@ -1147,6 +1149,11 @@ core,github.com/google/go-containerregistry/pkg/v1/stream,Apache-2.0,Copyright 2
11471149
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.
11481150
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.
11491151
core,github.com/google/go-querystring/query,BSD-3-Clause,Copyright (c) 2013 Google. All rights reserved
1152+
core,github.com/google/go-tpm/legacy/tpm2,Apache-2.0,"Copyright (c) 2014, Google LLC All rights reserved."
1153+
core,github.com/google/go-tpm/tpm2,Apache-2.0,"Copyright (c) 2014, Google LLC All rights reserved."
1154+
core,github.com/google/go-tpm/tpm2/transport,Apache-2.0,"Copyright (c) 2014, Google LLC All rights reserved."
1155+
core,github.com/google/go-tpm/tpmutil,Apache-2.0,"Copyright (c) 2014, Google LLC All rights reserved."
1156+
core,github.com/google/go-tpm/tpmutil/tbs,Apache-2.0,"Copyright (c) 2014, Google LLC All rights reserved."
11501157
core,github.com/google/gofuzz,Apache-2.0,Copyright 2014 Google Inc. All rights reserved.
11511158
core,github.com/google/gofuzz/bytesource,Apache-2.0,Copyright 2014 Google Inc. All rights reserved.
11521159
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."
@@ -1645,6 +1652,7 @@ core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/errors
16451652
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer,Apache-2.0,Copyright The OpenTelemetry Authors
16461653
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/attrs,Apache-2.0,Copyright The OpenTelemetry Authors
16471654
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/emit,Apache-2.0,Copyright The OpenTelemetry Authors
1655+
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/archive,Apache-2.0,Copyright The OpenTelemetry Authors
16481656
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/checkpoint,Apache-2.0,Copyright The OpenTelemetry Authors
16491657
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/fileset,Apache-2.0,Copyright The OpenTelemetry Authors
16501658
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/fingerprint,Apache-2.0,Copyright The OpenTelemetry Authors
@@ -1698,6 +1706,8 @@ core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zi
16981706
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin/zipkinthriftconverter,Apache-2.0,Copyright The OpenTelemetry Authors
16991707
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin/zipkinv1,Apache-2.0,Copyright The OpenTelemetry Authors
17001708
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin/zipkinv2,Apache-2.0,Copyright The OpenTelemetry Authors
1709+
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters,Apache-2.0,Copyright The OpenTelemetry Authors
1710+
core,github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters/internal/third_party/telegraf/win_perf_counters,MIT,Copyright The OpenTelemetry Authors
17011711
core,github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor,Apache-2.0,Copyright The OpenTelemetry Authors
17021712
core,github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
17031713
core,github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor,Apache-2.0,Copyright The OpenTelemetry Authors
@@ -1768,12 +1778,11 @@ core,github.com/open-telemetry/opentelemetry-collector-contrib/processor/transfo
17681778
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver,Apache-2.0,Copyright The OpenTelemetry Authors
17691779
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
17701780
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver,Apache-2.0,Copyright The OpenTelemetry Authors
1781+
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver/internal,Apache-2.0,Copyright The OpenTelemetry Authors
17711782
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
17721783
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver,Apache-2.0,Copyright The OpenTelemetry Authors
17731784
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal,Apache-2.0,Copyright The OpenTelemetry Authors
17741785
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
1775-
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/perfcounters,Apache-2.0,Copyright The OpenTelemetry Authors
1776-
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/perfcounters/third_party/perflib,MIT,Copyright The OpenTelemetry Authors
17771786
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/cpuscraper,Apache-2.0,Copyright The OpenTelemetry Authors
17781787
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
17791788
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/ucal,Apache-2.0,Copyright The OpenTelemetry Authors
@@ -2246,6 +2255,7 @@ core,go.opentelemetry.io/collector/config/configtls,Apache-2.0,Copyright The Ope
22462255
core,go.opentelemetry.io/collector/confmap,Apache-2.0,Copyright The OpenTelemetry Authors
22472256
core,go.opentelemetry.io/collector/confmap/internal/envvar,Apache-2.0,Copyright The OpenTelemetry Authors
22482257
core,go.opentelemetry.io/collector/confmap/internal/mapstructure,Apache-2.0,Copyright The OpenTelemetry Authors
2258+
core,go.opentelemetry.io/collector/confmap/internal/third_party/composehook,Apache-2.0,Copyright The OpenTelemetry Authors
22492259
core,go.opentelemetry.io/collector/confmap/provider/envprovider,Apache-2.0,Copyright The OpenTelemetry Authors
22502260
core,go.opentelemetry.io/collector/confmap/provider/fileprovider,Apache-2.0,Copyright The OpenTelemetry Authors
22512261
core,go.opentelemetry.io/collector/confmap/provider/httpprovider,Apache-2.0,Copyright The OpenTelemetry Authors
@@ -2366,17 +2376,13 @@ core,go.opentelemetry.io/collector/scraper,Apache-2.0,Copyright The OpenTelemetr
23662376
core,go.opentelemetry.io/collector/scraper/scrapererror,Apache-2.0,Copyright The OpenTelemetry Authors
23672377
core,go.opentelemetry.io/collector/scraper/scraperhelper,Apache-2.0,Copyright The OpenTelemetry Authors
23682378
core,go.opentelemetry.io/collector/scraper/scraperhelper/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
2369-
core,go.opentelemetry.io/collector/semconv/v1.16.0,Apache-2.0,Copyright The OpenTelemetry Authors
23702379
core,go.opentelemetry.io/collector/semconv/v1.17.0,Apache-2.0,Copyright The OpenTelemetry Authors
23712380
core,go.opentelemetry.io/collector/semconv/v1.18.0,Apache-2.0,Copyright The OpenTelemetry Authors
23722381
core,go.opentelemetry.io/collector/semconv/v1.21.0,Apache-2.0,Copyright The OpenTelemetry Authors
23732382
core,go.opentelemetry.io/collector/semconv/v1.22.0,Apache-2.0,Copyright The OpenTelemetry Authors
2374-
core,go.opentelemetry.io/collector/semconv/v1.25.0,Apache-2.0,Copyright The OpenTelemetry Authors
23752383
core,go.opentelemetry.io/collector/semconv/v1.26.0,Apache-2.0,Copyright The OpenTelemetry Authors
23762384
core,go.opentelemetry.io/collector/semconv/v1.27.0,Apache-2.0,Copyright The OpenTelemetry Authors
23772385
core,go.opentelemetry.io/collector/semconv/v1.6.1,Apache-2.0,Copyright The OpenTelemetry Authors
2378-
core,go.opentelemetry.io/collector/semconv/v1.8.0,Apache-2.0,Copyright The OpenTelemetry Authors
2379-
core,go.opentelemetry.io/collector/semconv/v1.9.0,Apache-2.0,Copyright The OpenTelemetry Authors
23802386
core,go.opentelemetry.io/collector/service,Apache-2.0,Copyright The OpenTelemetry Authors
23812387
core,go.opentelemetry.io/collector/service/extensions,Apache-2.0,Copyright The OpenTelemetry Authors
23822388
core,go.opentelemetry.io/collector/service/hostcapabilities,Apache-2.0,Copyright The OpenTelemetry Authors
@@ -2386,6 +2392,7 @@ core,go.opentelemetry.io/collector/service/internal/capabilityconsumer,Apache-2.
23862392
core,go.opentelemetry.io/collector/service/internal/graph,Apache-2.0,Copyright The OpenTelemetry Authors
23872393
core,go.opentelemetry.io/collector/service/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
23882394
core,go.opentelemetry.io/collector/service/internal/moduleinfo,Apache-2.0,Copyright The OpenTelemetry Authors
2395+
core,go.opentelemetry.io/collector/service/internal/obsconsumer,Apache-2.0,Copyright The OpenTelemetry Authors
23892396
core,go.opentelemetry.io/collector/service/internal/proctelemetry,Apache-2.0,Copyright The OpenTelemetry Authors
23902397
core,go.opentelemetry.io/collector/service/internal/resource,Apache-2.0,Copyright The OpenTelemetry Authors
23912398
core,go.opentelemetry.io/collector/service/internal/status,Apache-2.0,Copyright The OpenTelemetry Authors
@@ -2474,10 +2481,18 @@ core,go.opentelemetry.io/otel/sdk/trace,Apache-2.0,Copyright The OpenTelemetry A
24742481
core,go.opentelemetry.io/otel/sdk/trace/tracetest,Apache-2.0,Copyright The OpenTelemetry Authors
24752482
core,go.opentelemetry.io/otel/semconv/internal,Apache-2.0,Copyright The OpenTelemetry Authors
24762483
core,go.opentelemetry.io/otel/semconv/v1.12.0,Apache-2.0,Copyright The OpenTelemetry Authors
2484+
core,go.opentelemetry.io/otel/semconv/v1.15.0,Apache-2.0,Copyright The OpenTelemetry Authors
2485+
core,go.opentelemetry.io/otel/semconv/v1.16.0,Apache-2.0,Copyright The OpenTelemetry Authors
24772486
core,go.opentelemetry.io/otel/semconv/v1.17.0,Apache-2.0,Copyright The OpenTelemetry Authors
2487+
core,go.opentelemetry.io/otel/semconv/v1.18.0,Apache-2.0,Copyright The OpenTelemetry Authors
24782488
core,go.opentelemetry.io/otel/semconv/v1.20.0,Apache-2.0,Copyright The OpenTelemetry Authors
24792489
core,go.opentelemetry.io/otel/semconv/v1.21.0,Apache-2.0,Copyright The OpenTelemetry Authors
2490+
core,go.opentelemetry.io/otel/semconv/v1.25.0,Apache-2.0,Copyright The OpenTelemetry Authors
24802491
core,go.opentelemetry.io/otel/semconv/v1.26.0,Apache-2.0,Copyright The OpenTelemetry Authors
2492+
core,go.opentelemetry.io/otel/semconv/v1.27.0,Apache-2.0,Copyright The OpenTelemetry Authors
2493+
core,go.opentelemetry.io/otel/semconv/v1.6.1,Apache-2.0,Copyright The OpenTelemetry Authors
2494+
core,go.opentelemetry.io/otel/semconv/v1.8.0,Apache-2.0,Copyright The OpenTelemetry Authors
2495+
core,go.opentelemetry.io/otel/semconv/v1.9.0,Apache-2.0,Copyright The OpenTelemetry Authors
24812496
core,go.opentelemetry.io/otel/trace,Apache-2.0,Copyright The OpenTelemetry Authors
24822497
core,go.opentelemetry.io/otel/trace/embedded,Apache-2.0,Copyright The OpenTelemetry Authors
24832498
core,go.opentelemetry.io/otel/trace/internal/telemetry,Apache-2.0,Copyright The OpenTelemetry Authors

cmd/otel-agent/config/agent_config_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func (suite *ConfigTestSuite) TestAgentConfig() {
6060
assert.Equal(t, false, c.Get("apm_config.receiver_enabled"))
6161
assert.Equal(t, 10, c.Get("apm_config.trace_buffer"))
6262
assert.Equal(t, false, c.Get("otlp_config.traces.span_name_as_resource_name"))
63-
assert.Equal(t, []string{"disable_operation_and_resource_name_logic_v2"}, c.Get("apm_config.features"))
63+
assert.Equal(t, []string{}, c.Get("apm_config.features"))
6464
}
6565

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

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

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

170170
// log_level from datadog.yaml takes precedence -> more verbose
171171
assert.Equal(t, "debug", c.Get("log_level"))

comp/api/api/def/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
go.uber.org/dig v1.18.1 // indirect
1212
go.uber.org/multierr v1.11.0 // indirect
1313
go.uber.org/zap v1.27.0 // indirect
14-
golang.org/x/sys v0.32.0 // indirect
14+
golang.org/x/sys v0.33.0 // indirect
1515
)
1616

1717
// This section was automatically added by 'dda inv modules.add-all-replace' command, do not edit manually

comp/api/api/def/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

comp/core/config/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ require (
6060
github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb // indirect
6161
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6262
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
63-
github.com/magiconair/properties v1.8.9 // indirect
63+
github.com/magiconair/properties v1.8.10 // indirect
6464
github.com/mattn/go-colorable v0.1.14 // indirect
6565
github.com/mattn/go-isatty v0.0.20 // indirect
6666
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
@@ -73,9 +73,9 @@ require (
7373
github.com/prometheus/client_model v0.6.1 // indirect
7474
github.com/prometheus/common v0.62.0 // indirect
7575
github.com/prometheus/procfs v0.16.1 // indirect
76-
github.com/shirou/gopsutil/v4 v4.25.3 // indirect
76+
github.com/shirou/gopsutil/v4 v4.25.4 // indirect
7777
github.com/spf13/afero v1.14.0 // indirect
78-
github.com/spf13/cast v1.7.1 // indirect
78+
github.com/spf13/cast v1.8.0 // indirect
7979
github.com/spf13/cobra v1.9.1 // indirect
8080
github.com/spf13/jwalterweatherman v1.1.0 // indirect
8181
github.com/spf13/pflag v1.0.6 // indirect
@@ -87,8 +87,8 @@ require (
8787
go.uber.org/multierr v1.11.0 // indirect
8888
go.uber.org/zap v1.27.0 // indirect
8989
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
90-
golang.org/x/sys v0.32.0 // indirect
91-
golang.org/x/text v0.24.0 // indirect
90+
golang.org/x/sys v0.33.0 // indirect
91+
golang.org/x/text v0.25.0 // indirect
9292
golang.org/x/time v0.11.0 // indirect
9393
google.golang.org/protobuf v1.36.6 // indirect
9494
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)