Skip to content

Conversation

@jboolean
Copy link
Contributor

@jboolean jboolean commented Nov 13, 2025

What does this PR do?

Fixes main​ by fixing duplicate and disordered keys in env var files.

Motivation

This was causing failures on my other branch not attributable to my changes #4100 and causing confusion

Reviewer's Checklist

  • Changed code has unit tests for its functionality at or near 100% coverage.
  • System-Tests covering this feature have been added and enabled with the va.b.c-dev version tag.
  • There is a benchmark for any new code, or changes to existing code.
  • If this interacts with the agent in a new way, a system test has been added.
  • New code is free of linting errors. You can check this by running ./scripts/lint.sh locally.
  • Add an appropriate team label so this PR gets put in the right place for the release notes.
  • Non-trivial go.mod changes, e.g. adding new modules, are reviewed by @DataDog/dd-trace-go-guild.

Unsure? Have a question? Request a review!

Copy link
Contributor Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

@jboolean jboolean changed the title Fix duplicate key in supported_configurations fix: Fix duplicate key in supported_configurations Nov 13, 2025
@pr-commenter
Copy link

pr-commenter bot commented Nov 13, 2025

Benchmarks

Benchmark execution time: 2025-11-13 16:42:58

Comparing candidate commit b333831 in PR branch jb/fix-duplicate-key-in-supported_configurations with baseline commit bce309f in branch main.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 23 metrics, 1 unstable metrics.

@datadog-official
Copy link
Contributor

datadog-official bot commented Nov 13, 2025

✅ Tests

🎉 All green!

❄️ No new flaky tests detected
🧪 All tests passed

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: b333831 | Docs | Datadog PR Page | Was this helpful? Give us feedback!

@jboolean jboolean changed the title fix: Fix duplicate key in supported_configurations fix: Fix duplicate and out-of-order key in supported_configurations Nov 13, 2025
"DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED": {},
"DD_TRACE_ABANDONED_SPAN_TIMEOUT": {},
"DD_TRACE_AGENT_PORT": {},
"DD_TRACE_V1_PAYLOAD_FORMAT_ENABLED": {},
Copy link
Contributor Author

@jboolean jboolean Nov 13, 2025

Choose a reason for hiding this comment

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

The generation script moves this key to be in lexicographical order.

This change was made by running go run ./scripts/configinverter/main.go generate

"DD_TRACE_VAULT_ANALYTICS_ENABLED": [
"A"
],
"DD_TRACE_V1_PAYLOAD_FORMAT_ENABLED": [
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This duplicate key, which also appears on 615, is removed by running make test.

@jboolean jboolean requested a review from genesor November 13, 2025 16:29
@jboolean jboolean marked this pull request as ready for review November 13, 2025 16:30
@jboolean jboolean requested a review from a team as a code owner November 13, 2025 16:30
@jboolean
Copy link
Contributor Author

/merge

@dd-devflow-routing-codex
Copy link

dd-devflow-routing-codex bot commented Nov 13, 2025

View all feedbacks in Devflow UI.

2025-11-13 17:07:24 UTC ℹ️ Start processing command /merge


2025-11-13 17:07:35 UTC ℹ️ MergeQueue: waiting for PR to be ready

This pull request is not mergeable according to GitHub. Common reasons include pending required checks, missing approvals, or merge conflicts — but it could also be blocked by other repository rules or settings.
It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.


2025-11-13 17:52:36 UTC ℹ️ MergeQueue: merge request added to the queue

The expected merge time in main is approximately 18m (p90).


2025-11-13 18:07:28 UTCMergeQueue: The checks failed on this merge request

Tests failed on this commit fbebbbc:

What to do next?

  • Investigate the failures and when ready, re-add your pull request to the queue!
  • If your PR checks are green, try to rebase/merge. It might be because the CI run is a bit old.
  • Any question, go check the FAQ.

@jboolean
Copy link
Contributor Author

test_core is failing 3/4 times. Unrelated

/merge

@jboolean
Copy link
Contributor Author

/merge

@dd-devflow-routing-codex
Copy link

dd-devflow-routing-codex bot commented Nov 13, 2025

View all feedbacks in Devflow UI.

2025-11-13 18:09:39 UTC ℹ️ Start processing command /merge


2025-11-13 18:09:44 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in main is approximately 18m (p90).


2025-11-13 18:22:38 UTC ℹ️ MergeQueue: This merge request was merged

Copy link
Contributor Author

Merge activity

  • Nov 13, 6:14 PM UTC: Graphite couldn't merge this PR because it failed for an unknown reason (GitHub is reporting that this PR is not mergeable, despite passing required status checks defined by your branch protection rules. Please check your rulesets for additional blocking criteria. Graphite Merge Queue does not currently support rulesets. Please contact Graphite support for further assistance.).

@dd-mergequeue dd-mergequeue bot merged commit 2b60c19 into main Nov 13, 2025
297 of 306 checks passed
@dd-mergequeue dd-mergequeue bot deleted the jb/fix-duplicate-key-in-supported_configurations branch November 13, 2025 18:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants