Skip to content

fix(test): wait for flush before concurrent shutdown in integration test #5581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bm1549 wants to merge 3 commits into from
+7 −0
Closed

fix(test): wait for flush before concurrent shutdown in integration test #5581

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf62118
fix(test): wait for flush before concurrent shutdown in integration test
bm1549 Apr 10, 2026
5a130a6
fix(test): increase shutdown timeout instead of pre-flushing
bm1549 Apr 10, 2026
81202db
fix(test): make shutdown flush wait deterministic instead of increasi…
bm1549 Apr 10, 2026
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
7 changes: 7 additions & 0 deletions spec/datadog/tracing/integration_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,13 @@ def agent_receives_span_step3(previous_success)
span.service = 'my.service'
end

# The background worker flushes nearly instantly (DEFAULT_FLUSH_INTERVAL
# is stubbed to 0), so the trace is almost always already flushed before
# shutdown threads start. Make that deterministic to avoid flakiness when
# the 1-second DEFAULT_SHUTDOWN_TIMEOUT is occasionally too short for the
# HTTP round-trip under CI load.
try_wait_until { tracer.writer.stats[:traces_flushed] >= 1 }

threads = Array.new(10) do
Thread.new { tracer.shutdown! }
end
Expand Down
Loading