use futures instead of doneLatch

jandro996 · jandro996 · commit 270a64c93db1 · 2025-11-11T11:06:38.000+01:00
diff --git a/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/gateway/AppSecRequestContextSpecification.groovy b/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/gateway/AppSecRequestContextSpecification.groovy
@@ -615,41 +615,36 @@ class AppSecRequestContextSpecification extends DDSpecification {
     def context = new AppSecRequestContext()
     def numThreads = 3
     def startLatch = new java.util.concurrent.CountDownLatch(1)
-    def doneLatch = new java.util.concurrent.CountDownLatch(numThreads)
 
     when:
     // Simulate concurrent updates from multiple threads
     def executorService = java.util.concurrent.Executors.newFixedThreadPool(numThreads)
-    def tasks = []
+    def futures = []
 
-    tasks << executorService.submit({
+    futures << executorService.submit({
       startLatch.await() // Wait for all threads to be ready
       context.reportDerivatives(['attr1': ['value': 'value1']])
       context.reportDerivatives(['attr2': ['value': 'value2']])
-      doneLatch.countDown()
     })
 
-    tasks << executorService.submit({
+    futures << executorService.submit({
       startLatch.await() // Wait for all threads to be ready
       context.reportDerivatives(['attr3': ['value': 'value3']])
       context.reportDerivatives(['attr4': ['value': 'value4']])
-      doneLatch.countDown()
     })
 
-    tasks << executorService.submit({
+    futures << executorService.submit({
       startLatch.await() // Wait for all threads to be ready
       context.reportDerivatives(['attr5': ['value': 'value5']])
       context.reportDerivatives(['attr6': ['value': 'value6']])
-      doneLatch.countDown()
     })
 
     // Release all threads at once to maximize concurrent execution
     startLatch.countDown()
 
-    // Wait for all tasks to complete
-    doneLatch.await(5, java.util.concurrent.TimeUnit.SECONDS)
+    // Wait for all tasks to complete using the futures
+    futures.each { it.get() }
     executorService.shutdown()
-    executorService.awaitTermination(5, java.util.concurrent.TimeUnit.SECONDS)
 
     then:
     // Verify all attributes were added despite concurrent access
