Skip to content

Fix JMS1 CLIENT_ACKNOWLEDGE flaky test with high scope iteration keep-alive #10798

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

Merged
gh-worker-dd-mergequeue-cf854d merged 9 commits into from
Mar 12, 2026
Merged

Fix JMS1 CLIENT_ACKNOWLEDGE flaky test with high scope iteration keep-alive #10798

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3f32873
Mark receiving messages with manual acknowledgement as @Flaky for JMS…
bm1549 Mar 10, 2026
86ed7ca
Fix JMS1 CLIENT_ACKNOWLEDGE flaky test by tolerating early scope cleanup
bm1549 Mar 10, 2026
ddc2f0a
Fix JMS1 CLIENT_ACKNOWLEDGE flaky test with low scope iteration keep-…
bm1549 Mar 11, 2026
e3673fd
Retry CI after infrastructure failures
bm1549 Mar 11, 2026
ce2009f
Retry CI - ghcr.io connectivity issue
bm1549 Mar 11, 2026
3d43b74
ci: retrigger pipeline (infrastructure failures)
bm1549 Mar 11, 2026
d879341
fix: restore acknowledge() before assertTraces to fix timeout
bm1549 Mar 12, 2026
d210ea6
fix: restore two-phase assertion with high keep-alive to prevent flak…
bm1549 Mar 12, 2026
5ad44de
ci: retrigger pipeline to resolve SSI infrastructure failures
bm1549 Mar 12, 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
6 changes: 4 additions & 2 deletions dd-java-agent/instrumentation/jms/javax-jms-1.1/src/test/groovy/JMS1Test.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,10 @@ abstract class JMS1Test extends VersionedNamingTestBase {
receivedMessage1.text == messageText1
receivedMessage2.text == messageText2
receivedMessage3.text == messageText3
// only two consume traces will be finished at this point
assertTraces(5) {
// At least two consume traces will be finished at this point (3 producer + 2 consumer = 5).
// The 3rd consumer trace may also be finished early due to the scope iteration keep-alive
// cleanup firing before acknowledge() is called, so we tolerate 5 or 6 traces here.
assertTraces(5, true) {
producerTraceWithNaming(it, destination)
producerTraceWithNaming(it, destination)
producerTraceWithNaming(it, destination)
Expand Down
6 changes: 5 additions & 1 deletion ...va-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/ListWriterAssert.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@ class ListWriterAssert {
try {
writer.waitForTraces(expectedSize)
def array = writer.toArray()
assert array.length == expectedSize
if (ignoreAdditionalTraces) {
assert array.length >= expectedSize
} else {
assert array.length == expectedSize
}
def traces = (Arrays.asList(array) as List<List<DDSpan>>)
Collections.sort(traces, traceSorter)
def asserter = new ListWriterAssert(traces)
Expand Down
Loading