Adjust tests again.

sarahchen6 · sarahchen6 · commit 6a0fae5eef14 · 2025-03-11T13:50:00.000-04:00
diff --git a/dd-smoke-tests/concurrent/src/main/java/datadog/smoketest/concurrent/DemoExecutorService.java b/dd-smoke-tests/concurrent/src/main/java/datadog/smoketest/concurrent/DemoExecutorService.java
@@ -1,6 +1,6 @@
 package datadog.smoketest.concurrent;
 
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.util.concurrent.Callable;
@@ -43,7 +43,7 @@ public Long call() throws ExecutionException, InterruptedException {
   public void close() {
     executorService.shutdown();
     try {
-      if (!executorService.awaitTermination(800, MILLISECONDS)) {
+      if (!executorService.awaitTermination(10, SECONDS)) {
         executorService.shutdownNow();
       }
     } catch (InterruptedException e) {
diff --git a/dd-smoke-tests/concurrent/src/main/java/datadog/smoketest/concurrent/DemoForkJoin.java b/dd-smoke-tests/concurrent/src/main/java/datadog/smoketest/concurrent/DemoForkJoin.java
@@ -11,7 +11,6 @@ public DemoForkJoin() {
     forkJoinPool = new ForkJoinPool();
   }
 
-  @WithSpan("compute")
   @Override
   public long computeFibonacci(int n) {
     return forkJoinPool.invoke(new FibonacciTask(n));
@@ -24,6 +23,7 @@ public FibonacciTask(int n) {
       this.n = n;
     }
 
+    @WithSpan("compute")
     @Override
     protected Long compute() {
       if (n <= 1) {
diff --git a/dd-smoke-tests/concurrent/src/test/groovy/datadog/smoketest/AbstractDemoTest.groovy b/dd-smoke-tests/concurrent/src/test/groovy/datadog/smoketest/AbstractDemoTest.groovy
@@ -1,7 +1,7 @@
 package datadog.smoketest
 
+import static java.util.concurrent.TimeUnit.SECONDS
 import datadog.trace.test.agent.decoder.DecodedTrace
-
 import java.util.function.Function
 
 abstract class AbstractDemoTest extends AbstractSmokeTest {
@@ -30,32 +30,37 @@ abstract class AbstractDemoTest extends AbstractSmokeTest {
   protected static Function<DecodedTrace, Boolean> checkTrace() {
     return {
       trace ->
-      // Get root span
-      def rootSpan = trace.spans.find { it.name == 'main' }
-      if (!rootSpan) {
+      // Check for 'main' span
+      def mainSpan = trace.spans.find { it.name == 'main' }
+      if (!mainSpan) {
         return false
       }
       // Check that there are only 'main' and 'compute' spans
       def otherSpans = trace.spans.findAll { it.name != 'main' && it.name != 'compute' }
       if (!otherSpans.isEmpty()) {
         return false
       }
-      // Check every 'compute' span is either a child of the root span or another 'compute' span
+      // Check that every 'compute' span is in the same trace and is either a child of the 'main' span or another 'compute' span
       def computeSpans = trace.spans.findAll { it.name == 'compute' }
       if (computeSpans.isEmpty()) {
         return false
       }
       return computeSpans.every {
-        // Check same trace
-        if (it.traceId != rootSpan.traceId) {
+        if (it.traceId != mainSpan.traceId) {
           return false
         }
-        // Check parent
-        if (it.parentId != rootSpan.spanId && trace.spans.find(s -> s.spanId == it.parentId).name != 'compute') {
+        if (it.parentId != mainSpan.spanId && trace.spans.find(s -> s.spanId == it.parentId).name != 'compute') {
           return false
         }
         return true
       }
     }
   }
+
+  protected void receivedCorrectTrace() {
+    waitForTrace(defaultPoll, checkTrace())
+    assert traceCount.get() == 1
+    assert testedProcess.waitFor(TIMEOUT_SECS, SECONDS)
+    assert testedProcess.exitValue() == 0
+  }
 }
diff --git a/dd-smoke-tests/concurrent/src/test/groovy/datadog/smoketest/DemoExecutorServiceTest.groovy b/dd-smoke-tests/concurrent/src/test/groovy/datadog/smoketest/DemoExecutorServiceTest.groovy
@@ -1,22 +1,12 @@
 package datadog.smoketest
 
-import static java.util.concurrent.TimeUnit.SECONDS
-
 class DemoExecutorServiceTest extends AbstractDemoTest {
-  @Override
   protected List<String> getTestArguments() {
     return ["executorService"]
   }
 
-  def 'receive one expected trace for ExecutorService'() {
-    when:
-    waitForTrace(defaultPoll, checkTrace())
-
-    then:
-    traceCount.get() == 1
-
-    and:
-    assert testedProcess.waitFor(TIMEOUT_SECS, SECONDS)
-    assert testedProcess.exitValue() == 0
+  def 'receive one correct trace when using ExecutorService'() {
+    expect:
+    receivedCorrectTrace()
   }
 }
diff --git a/dd-smoke-tests/concurrent/src/test/groovy/datadog/smoketest/DemoForkJoinTest.groovy b/dd-smoke-tests/concurrent/src/test/groovy/datadog/smoketest/DemoForkJoinTest.groovy
@@ -1,22 +1,12 @@
 package datadog.smoketest
 
-import static java.util.concurrent.TimeUnit.SECONDS
-
 class DemoForkJoinTest extends AbstractDemoTest {
-  @Override
   protected List<String> getTestArguments() {
     return ["forkJoin"]
   }
 
-  def 'receive one expected trace for ExecutorService'() {
-    when:
-    waitForTrace(defaultPoll, checkTrace())
-
-    then:
-    traceCount.get() == 1
-
-    and:
-    assert testedProcess.waitFor(TIMEOUT_SECS, SECONDS)
-    assert testedProcess.exitValue() == 0
+  def 'receive one correct trace when using ForkJoin'() {
+    expect:
+    receivedCorrectTrace()
   }
 }
diff --git a/dd-smoke-tests/concurrent/src/test/groovy/datadog/smoketest/DemoMixedConcurrencyTest.groovy b/dd-smoke-tests/concurrent/src/test/groovy/datadog/smoketest/DemoMixedConcurrencyTest.groovy
diff --git a/dd-smoke-tests/concurrent/src/test/groovy/datadog/smoketest/DemoMultipleConcurrenciesTest.groovy b/dd-smoke-tests/concurrent/src/test/groovy/datadog/smoketest/DemoMultipleConcurrenciesTest.groovy
@@ -0,0 +1,12 @@
+package datadog.smoketest
+
+class DemoMultipleConcurrenciesTest extends AbstractDemoTest {
+  protected List<String> getTestArguments() {
+    return ["executorService", "forkJoin"]
+  }
+
+  def 'receive one correct trace when using multiple concurrency strategies (ExecutorService and ForkJoin)'() {
+    expect:
+    receivedCorrectTrace()
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ public DemoForkJoin() {`
`11`	`11`	`forkJoinPool = new ForkJoinPool();`
`12`	`12`	`}`
`13`	`13`
`14`		`- @WithSpan("compute")`
`15`	`14`	`@Override`
`16`	`15`	`public long computeFibonacci(int n) {`
`17`	`16`	`return forkJoinPool.invoke(new FibonacciTask(n));`
`@@ -24,6 +23,7 @@ public FibonacciTask(int n) {`
`24`	`23`	`this.n = n;`
`25`	`24`	`}`
`26`	`25`
	`26`	`+ @WithSpan("compute")`
`27`	`27`	`@Override`
`28`	`28`	`protected Long compute() {`
`29`	`29`	`if (n <= 1) {`