diff --git a/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/Common.java b/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/Common.java index 42cd6cc1ff7..d51fcf5a5d0 100644 --- a/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/Common.java +++ b/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/Common.java @@ -4,5 +4,5 @@ public class Common { // for the sake of this example it avoids boilerplate ton inject an ejb into a spring context - public static final AtomicBoolean ENABLED = new AtomicBoolean(false); + public static final AtomicBoolean TRACE_REQUEST_PENDING = new AtomicBoolean(false); } diff --git a/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/ejb/ScheduledEjb.java b/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/ejb/ScheduledEjb.java index 0550a4e3b1e..323e6adde40 100644 --- a/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/ejb/ScheduledEjb.java +++ b/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/ejb/ScheduledEjb.java @@ -1,6 +1,6 @@ package com.example.ejb; -import static com.example.Common.ENABLED; +import static com.example.Common.TRACE_REQUEST_PENDING; import datadog.trace.api.Trace; import javax.ejb.Schedule; @@ -11,7 +11,7 @@ public class ScheduledEjb { @Schedule(second = "*/1", minute = "*", hour = "*") public void runIt() { - if (ENABLED.getAndSet(false)) { + if (TRACE_REQUEST_PENDING.getAndSet(false)) { generateSomeTrace(); } } diff --git a/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/hello/HelloController.java b/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/hello/HelloController.java index 2592edc3ec8..e10f9a39982 100644 --- a/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/hello/HelloController.java +++ b/dd-smoke-tests/wildfly/spring-ear/war/src/main/java/com/example/hello/HelloController.java @@ -1,6 +1,6 @@ package com.example.hello; -import static com.example.Common.ENABLED; +import static com.example.Common.TRACE_REQUEST_PENDING; import java.util.concurrent.CompletableFuture; import org.springframework.http.ResponseEntity; @@ -17,10 +17,11 @@ public String hello() { @RequestMapping("/enableScheduling") public CompletableFuture> enableScheduling() { - ENABLED.set(true); + TRACE_REQUEST_PENDING.set(true); return CompletableFuture.supplyAsync( () -> { - while (!ENABLED.get()) { + // Wait until the scheduled task picks up the request. + while (TRACE_REQUEST_PENDING.get()) { try { Thread.sleep(200); } catch (InterruptedException e) {