Skip to content

Commit

Permalink
Bump datadog-agent dependencies (open-telemetry#32823)
Browse files Browse the repository at this point in the history
Updates pkg/trace to the following commit version:
DataDog/datadog-agent@32187be.

Includes the following notable changes:
- DataDog/datadog-agent#25099
- DataDog/datadog-agent#23284
  - This config option is not being removed in the Collector yet

Verified locally that when only `peer_service_aggregation` is set,
`peer_tags_aggregation` gets updated automatically with the same value
and a warning log is emitted.
  • Loading branch information
liustanley committed May 2, 2024
1 parent bea4bb1 commit de971f3
Show file tree
Hide file tree
Showing 16 changed files with 253 additions and 217 deletions.
27 changes: 27 additions & 0 deletions .chloggen/stanley.liu_update-pkg-trace.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: exporter/datadog

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Support stable semantic conventions for HTTP spans

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [32823]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
18 changes: 9 additions & 9 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -218,18 +218,18 @@ require (
github.com/ClickHouse/clickhouse-go/v2 v2.23.0 // indirect
github.com/Code-Hex/go-generics-cache v1.3.1 // indirect
github.com/DataDog/agent-payload/v5 v5.0.114 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/proto v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.54.0-rc.1.0.20240502131837-32187be66dbd // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-api-client-go/v2 v2.25.0 // indirect
github.com/DataDog/datadog-go/v5 v5.5.0 // indirect
github.com/DataDog/go-sqllexer v0.0.9 // indirect
github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.15.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.15.0 // indirect
Expand Down
36 changes: 18 additions & 18 deletions cmd/configschema/go.sum

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

18 changes: 9 additions & 9 deletions cmd/otelcontribcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -281,18 +281,18 @@ require (
github.com/ClickHouse/clickhouse-go/v2 v2.23.0 // indirect
github.com/Code-Hex/go-generics-cache v1.3.1 // indirect
github.com/DataDog/agent-payload/v5 v5.0.114 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/proto v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.54.0-rc.1.0.20240502131837-32187be66dbd // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-api-client-go/v2 v2.25.0 // indirect
github.com/DataDog/datadog-go/v5 v5.5.0 // indirect
github.com/DataDog/go-sqllexer v0.0.9 // indirect
github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.15.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.15.0 // indirect
Expand Down
36 changes: 18 additions & 18 deletions cmd/otelcontribcol/go.sum

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

20 changes: 10 additions & 10 deletions connector/datadogconnector/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/connector/datad
go 1.21.0

require (
github.com/DataDog/datadog-agent/pkg/proto v0.52.1-0.20240321095122-a3c5dbb936ae
github.com/DataDog/datadog-agent/pkg/trace v0.52.1-0.20240321095122-a3c5dbb936ae
github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.1
github.com/DataDog/datadog-agent/pkg/trace v0.54.0-rc.1.0.20240502131837-32187be66dbd
github.com/DataDog/datadog-go/v5 v5.5.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.15.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.15.0
Expand Down Expand Up @@ -35,15 +35,15 @@ require (
require (
cloud.google.com/go/compute/metadata v0.3.0 // indirect
github.com/DataDog/agent-payload/v5 v5.0.114 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.52.1-0.20240321095122-a3c5dbb936ae // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect
github.com/DataDog/datadog-api-client-go/v2 v2.25.0 // indirect
github.com/DataDog/go-sqllexer v0.0.9 // indirect
github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.15.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.15.0 // indirect
Expand Down Expand Up @@ -183,7 +183,7 @@ require (
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
golang.org/x/mod v0.16.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/oauth2 v0.19.0 // indirect
golang.org/x/sys v0.19.0 // indirect
Expand Down
Loading

0 comments on commit de971f3

Please sign in to comment.