Fix JMS1 CLIENT_ACKNOWLEDGE flaky test by tolerating early scope cleanup

The "receiving messages from TEMPORARY_TOPIC with manual acknowledgement"
test in JMS1V1ForkedTest was flaky because the scope iteration keep-alive
cleanup (set to 1 second in tests) could finish the 3rd consumer span
before acknowledge() was called, producing 6 traces instead of expected 5.

Root cause: In the legacy context manager path, activateNext() schedules a
root iteration scope cleanup. If this fires before the test's intermediate
assertTraces(5) check, the 3rd consumer trace is already complete.

Fix: Use assertTraces(5, true) for the intermediate assertion to tolerate
additional traces. Also fix ListWriterAssert.ignoreAdditionalTraces to
properly use >= instead of == for the size check, matching the behavior
of the Java TraceAssertions class.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: bm1549

dd-java-agent/instrumentation/jms/javax-jms-1.1/src/test/groovy/JMS1Test.groovy

@@ -11,7 +11,6 @@ import datadog.trace.api.config.TraceInstrumentationConfig
 import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags
 import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.core.DDSpan
-import datadog.trace.test.util.Flaky
 import org.apache.activemq.ActiveMQConnectionFactory
 import org.apache.activemq.command.ActiveMQTextMessage
 import org.apache.activemq.junit.EmbeddedActiveMQBroker
@@ -256,7 +255,6 @@ abstract class JMS1Test extends VersionedNamingTestBase {
     DestinationType.TEMPORARY_TOPIC | _
   }
 
-  @Flaky(value = "Race condition: TEMPORARY_TOPIC consumer trace for message3 may complete before acknowledge() is called", suites = ["JMS1V1ForkedTest"])
   def "receiving messages from #destinationType with manual acknowledgement"() {
     setup:
     def destination = destinationType.create(session)
@@ -278,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)

dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/ListWriterAssert.groovy

@@ -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)