Skip to content

fix(ddtrace/tracer): deflake TestMultipleSpanIntegrationTags#4021

Merged
dd-mergequeue[bot] merged 1 commit into
mainfrom
dd/deflake-test-multiple-span-integration-tags
Oct 3, 2025
Merged

fix(ddtrace/tracer): deflake TestMultipleSpanIntegrationTags#4021
dd-mergequeue[bot] merged 1 commit into
mainfrom
dd/deflake-test-multiple-span-integration-tags

Conversation

@genesor

@genesor genesor commented Oct 3, 2025

Copy link
Copy Markdown
Member

PR by Bits for Dev Agent Session.

You can ask for changes by mentioning @DataDog in a comment.

Feedback (especially what can be better) welcome in #code-gen-feedback!


What does this PR do?

  • Deflakes TestMultipleSpanIntegrationTags by replacing a timing-sensitive tg.Wait call with assert.Eventually that waits for both spans_started and spans_finished to reach 10 within 1s (polling every 10ms).
  • Keeps the final equality assertions unchanged once the expected counts are observed.

Motivation

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!

@genesor
genesor requested a review from a team as a code owner October 3, 2025 12:05
@datadog-official

Copy link
Copy Markdown
Contributor

Bits AI Dev Agent Status: ✅ Done

You can ask for changes by mentioning @DataDog in a comment.

@pr-commenter

pr-commenter Bot commented Oct 3, 2025

Copy link
Copy Markdown

Benchmarks

Benchmark execution time: 2025-10-03 12:19:21

Comparing candidate commit 2172648 in PR branch dd/deflake-test-multiple-span-integration-tags with baseline commit e3f00fd in branch main.

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

@genesor genesor changed the title Fix flaky TestMultipleSpanIntegrationTags in dd-trace-go fix(ddtrace/tracer): deflake TestMultipleSpanIntegrationTags Oct 3, 2025
@genesor

genesor commented Oct 3, 2025

Copy link
Copy Markdown
Member Author

/merge

@dd-devflow-routing-codex

dd-devflow-routing-codex Bot commented Oct 3, 2025

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2025-10-03 12:53:14 UTC ℹ️ Start processing command /merge


2025-10-03 12:53:20 UTC ℹ️ MergeQueue: pull request added to the queue

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


2025-10-03 13:05:04 UTC ℹ️ MergeQueue: This merge request was merged

@dd-mergequeue
dd-mergequeue Bot merged commit 7d19197 into main Oct 3, 2025
239 of 240 checks passed
@dd-mergequeue
dd-mergequeue Bot deleted the dd/deflake-test-multiple-span-integration-tags branch October 3, 2025 13:05
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.

2 participants