Skip to content
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
2 changes: 0 additions & 2 deletions test/correctness/cases/otlp-metrics/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,4 @@ comparison:
- DD_DATA_PLANE_ENABLED=true
- DD_DATA_PLANE_STANDALONE_MODE=true
- DD_DATA_PLANE_OTLP_ENABLED=true
Comment on lines 17 to 18

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Keep DogStatsD disabled while in standalone mode

With these OTLP comparison runs still setting DD_DATA_PLANE_STANDALONE_MODE=true, ADP does not bootstrap the remote-agent config stream that would let Agent 7.80 supply its resolved data_plane.dogstatsd.enabled decision; in this path DataPlaneDogStatsDConfiguration falls back to its default of true. Removing the explicit DD_DATA_PLANE_DOGSTATSD_ENABLED=false therefore re-enables ADP's DogStatsD pipeline in all six OTLP-only cases, so any DogStatsD/internal traffic can again perturb the baseline-vs-comparison results despite the tests intending to validate only OTLP behavior.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is correct that ADP will own the dogstatsd socket now, but this is actually fine. The Core Agent will read DD_DATA_PLANE_ENABLED, see that is enabled, and that DD_DATA_PLANE_DOGSTATSD_ENABLED isn't set to false so it'll not start dogstatsd (and thus the ports won't conflict).

There could be an argument here to keep dogstatsd disabled in ADP for these specific OTLP tests, but given that the default is that it is enabled, I think it is better to run the OTLP tests with in enabled.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good to me.

# TODO: remove when we have Agent v7.80 https://github.com/DataDog/saluki/issues/1577
- DD_DATA_PLANE_DOGSTATSD_ENABLED=false
- DD_AGGREGATE_CONTEXT_LIMIT=500000
2 changes: 0 additions & 2 deletions test/correctness/cases/otlp-traces-ets/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,4 @@ comparison:
- DD_DATA_PLANE_ENABLED=true
- DD_DATA_PLANE_STANDALONE_MODE=true
- DD_DATA_PLANE_OTLP_ENABLED=true
# TODO: remove when we have Agent v7.80 https://github.com/DataDog/saluki/issues/1577
- DD_DATA_PLANE_DOGSTATSD_ENABLED=false
- DD_APM_ERROR_TRACKING_STANDALONE_ENABLED=true
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,3 @@ comparison:
- DD_DATA_PLANE_ENABLED=true
- DD_DATA_PLANE_STANDALONE_MODE=true
- DD_DATA_PLANE_OTLP_ENABLED=true
# TODO: remove when we have Agent v7.80 https://github.com/DataDog/saluki/issues/1577
- DD_DATA_PLANE_DOGSTATSD_ENABLED=false
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,3 @@ comparison:
- DD_DATA_PLANE_ENABLED=true
- DD_DATA_PLANE_STANDALONE_MODE=true
- DD_DATA_PLANE_OTLP_ENABLED=true
# TODO: remove when we have Agent v7.80 https://github.com/DataDog/saluki/issues/1577
- DD_DATA_PLANE_DOGSTATSD_ENABLED=false
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,4 @@ comparison:
- DD_DATA_PLANE_ENABLED=true
- DD_DATA_PLANE_STANDALONE_MODE=true
- DD_DATA_PLANE_OTLP_ENABLED=true
# TODO: remove when we have Agent v7.80 https://github.com/DataDog/saluki/issues/1577
- DD_DATA_PLANE_DOGSTATSD_ENABLED=false
- DD_APM_PROBABILISTIC_SAMPLER_ENABLED=true
2 changes: 0 additions & 2 deletions test/correctness/cases/otlp-traces/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,3 @@ comparison:
- DD_DATA_PLANE_ENABLED=true
- DD_DATA_PLANE_STANDALONE_MODE=true
- DD_DATA_PLANE_OTLP_ENABLED=true
# TODO: remove when we have Agent v7.80 https://github.com/DataDog/saluki/issues/1577
- DD_DATA_PLANE_DOGSTATSD_ENABLED=false
Loading