Skip to content

Commit

Permalink
Bump Datadog agent versions and change datadog.EnableReceiveResourceS… (
Browse files Browse the repository at this point in the history
open-telemetry#37576)

…pansV2 result

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description

In latest `datadog-agent` version, `enable_receive_resource_spans_v2` is
replaced by `disable_receive_resource_spans_v2` (opt-out instead of
opt-in). Import the latest `datadog-agent` version, which has these
changes, and change which flag is set by
`datadog.EnableReceiveResourceSpansV2` (no change for end user)

<!--Describe what testing was performed and which tests were added.-->
#### Testing

Unit tests on ReceiveResourceSpansV2 continue to pass, and ran collector
locally with `datadog.EnableReceiveResourceSpansV2` on and off.
  • Loading branch information
IbraheemA authored Jan 29, 2025
1 parent 80b2e50 commit 7a69dac
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions connector/datadogconnector/connector.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ func getTraceAgentCfg(logger *zap.Logger, cfg TracesConfig, attributesTranslator
logger.Info("traces::compute_top_level_by_span_kind needs to be enabled in both the Datadog connector and Datadog exporter configs if both components are being used")
acfg.Features["enable_otlp_compute_top_level_by_span_kind"] = struct{}{}
}
if datadog.ReceiveResourceSpansV2FeatureGate.IsEnabled() {
acfg.Features["enable_receive_resource_spans_v2"] = struct{}{}
if !datadog.ReceiveResourceSpansV2FeatureGate.IsEnabled() {
acfg.Features["disable_receive_resource_spans_v2"] = struct{}{}
}
if datadog.OperationAndResourceNameV2FeatureGate.IsEnabled() {
acfg.Features["enable_operation_and_resource_name_logic_v2"] = struct{}{}
Expand Down
4 changes: 2 additions & 2 deletions connector/datadogconnector/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.61.0
github.com/DataDog/datadog-agent/pkg/obfuscate v0.63.0-devel.0.20250123185937-1feb84b482c8
github.com/DataDog/datadog-agent/pkg/proto v0.63.0-devel.0.20250123185937-1feb84b482c8
github.com/DataDog/datadog-agent/pkg/trace v0.63.0-devel.0.20250123185937-1feb84b482c8
github.com/DataDog/datadog-agent/pkg/trace v0.64.0-devel.0.20250129182827-bab631c10d61
github.com/DataDog/datadog-go/v5 v5.6.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.24.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.24.0
Expand Down Expand Up @@ -137,7 +137,7 @@ require (
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
github.com/containerd/cgroups/v3 v3.0.4 // indirect
github.com/containerd/cgroups/v3 v3.0.5 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/docker/go-units v0.5.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions connector/datadogconnector/go.sum

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

4 changes: 2 additions & 2 deletions exporter/datadogexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ require (
github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/proto v0.63.0-devel.0.20250123185937-1feb84b482c8
github.com/DataDog/datadog-agent/pkg/status/health v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.63.0-devel.0.20250123185937-1feb84b482c8
github.com/DataDog/datadog-agent/pkg/trace v0.64.0-devel.0.20250129182827-bab631c10d61
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.61.0
github.com/DataDog/datadog-agent/pkg/util/startstop v0.61.0 // indirect
github.com/DataDog/datadog-api-client-go/v2 v2.34.0
Expand Down Expand Up @@ -180,7 +180,7 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
github.com/containerd/cgroups/v3 v3.0.4 // indirect
github.com/containerd/cgroups/v3 v3.0.5 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dennwc/varint v1.0.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions exporter/datadogexporter/go.sum

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

4 changes: 2 additions & 2 deletions exporter/datadogexporter/integrationtest/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ require (
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/status/health v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/telemetry v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.63.0-devel.0.20250123185937-1feb84b482c8 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.64.0-devel.0.20250129182827-bab631c10d61 // indirect
github.com/DataDog/datadog-agent/pkg/util/backoff v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/executable v0.61.0 // indirect
Expand Down Expand Up @@ -151,7 +151,7 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
github.com/containerd/cgroups/v3 v3.0.4 // indirect
github.com/containerd/cgroups/v3 v3.0.5 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dennwc/varint v1.0.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions exporter/datadogexporter/integrationtest/go.sum

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

4 changes: 2 additions & 2 deletions exporter/datadogexporter/traces_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,8 @@ func newTraceAgentConfig(ctx context.Context, params exporter.Settings, cfg *Con
if cfg.Traces.ComputeTopLevelBySpanKind {
acfg.Features["enable_otlp_compute_top_level_by_span_kind"] = struct{}{}
}
if datadog.ReceiveResourceSpansV2FeatureGate.IsEnabled() {
acfg.Features["enable_receive_resource_spans_v2"] = struct{}{}
if !datadog.ReceiveResourceSpansV2FeatureGate.IsEnabled() {
acfg.Features["disable_receive_resource_spans_v2"] = struct{}{}
}
tracelog.SetLogger(&zaplogger{params.Logger}) // TODO: This shouldn't be a singleton
return acfg, nil
Expand Down

0 comments on commit 7a69dac

Please sign in to comment.