feat(concurrency): Refactor test suites

DataDog · Jun 11, 2024 · 91385b2 · 91385b2
1 parent 05629d9
commit 91385b2
Show file tree

Hide file tree

Showing 24 changed files with 68 additions and 9 deletions.
diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/CrossedContextTest.groovy b/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/CrossedContextTest.groovy
@@ -6,6 +6,7 @@ import io.netty.channel.nio.NioEventLoopGroup
 import io.netty.channel.oio.OioEventLoopGroup
 import io.netty.util.concurrent.DefaultEventExecutor
 import org.apache.tomcat.util.threads.TaskQueue
+import runnable.Descendant
 import spock.lang.Shared
 
 import java.util.concurrent.ExecutorService

diff --git a/...groovy/ExecutorInstrumentationTest.groovy → ...ecutor/ExecutorInstrumentationTest.groovy b/...groovy/ExecutorInstrumentationTest.groovy → ...ecutor/ExecutorInstrumentationTest.groovy
@@ -1,10 +1,15 @@
+package executor
+
 import com.google.common.util.concurrent.MoreExecutors
 import datadog.trace.agent.test.AgentTestRunner
 import datadog.trace.api.Trace
 import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.bootstrap.instrumentation.java.concurrent.RunnableWrapper
 import datadog.trace.core.DDSpan
+import forkjoin.PeriodicTask
 import org.apache.tomcat.util.threads.TaskQueue
+import runnable.ComparableAsyncChild
+import runnable.JavaAsyncChild
 import spock.lang.Shared
 
 import java.lang.reflect.InvocationTargetException
@@ -63,8 +68,8 @@ abstract class ExecutorInstrumentationTest extends AgentTestRunner {
   void configurePreAgent() {
     super.configurePreAgent()
 
-    injectSysConfig("dd.trace.executors", "CustomThreadPoolExecutor")
-    injectSysConfig("trace.thread-pool-executors.exclude", "ExecutorInstrumentationTest\$ToBeIgnoredExecutor")
+    injectSysConfig("dd.trace.executors", CustomThreadPoolExecutor.name)
+    injectSysConfig("trace.thread-pool-executors.exclude", ToBeIgnoredExecutor.name)
   }
 
   def "#poolName '#name' propagates"() {
@@ -482,12 +487,6 @@ abstract class ExecutorInstrumentationTest extends AgentTestRunner {
 
     poolName = poolImpl.class.simpleName
   }
-
-  static class ToBeIgnoredExecutor extends ThreadPoolExecutor {
-    ToBeIgnoredExecutor() {
-      super(1, 1, 0, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10))
-    }
-  }
 }
 
 class ExecutorInstrumentationForkedTest extends ExecutorInstrumentationTest {

diff --git a/...y/NettyExecutorInstrumentationTest.groovy → ...r/NettyExecutorInstrumentationTest.groovy b/...y/NettyExecutorInstrumentationTest.groovy → ...r/NettyExecutorInstrumentationTest.groovy
@@ -1,3 +1,5 @@
+package executor
+
 import datadog.trace.agent.test.AgentTestRunner
 import datadog.trace.api.Trace
 import datadog.trace.core.DDSpan
@@ -6,6 +8,7 @@ import io.netty.channel.epoll.EpollEventLoopGroup
 import io.netty.channel.local.LocalEventLoopGroup
 import io.netty.channel.nio.NioEventLoopGroup
 import io.netty.util.concurrent.DefaultEventExecutorGroup
+import runnable.JavaAsyncChild
 import spock.lang.Shared
 
 import java.lang.reflect.InvocationTargetException

diff --git a/...RecursiveThreadPoolPropagationTest.groovy → ...RecursiveThreadPoolPropagationTest.groovy b/...RecursiveThreadPoolPropagationTest.groovy → ...RecursiveThreadPoolPropagationTest.groovy
@@ -1,5 +1,10 @@
+package executor
+
 import datadog.trace.agent.test.AgentTestRunner
 import datadog.trace.core.DDSpan
+import executor.recursive.RecursiveThreadPoolExecution
+import executor.recursive.RecursiveThreadPoolMixedSubmissionAndExecution
+import executor.recursive.RecursiveThreadPoolSubmission
 import io.netty.channel.DefaultEventLoopGroup
 import spock.lang.Shared
 

diff --git a/.../test/groovy/RejectedExecutionTest.groovy → ...ovy/executor/RejectedExecutionTest.groovy b/.../test/groovy/RejectedExecutionTest.groovy → ...ovy/executor/RejectedExecutionTest.groovy
@@ -1,8 +1,13 @@
+package executor
+
 import datadog.trace.agent.test.AgentTestRunner
 import datadog.trace.api.DDSpanId
 import datadog.trace.core.DDSpan
+import executor.rejectedexecutionhandler.ExecutingRejectedExecutionHandler
+import executor.rejectedexecutionhandler.SwallowingRejectedExecutionHandler
 import io.netty.util.concurrent.DefaultEventExecutor
 import io.netty.util.concurrent.DefaultThreadFactory
+import runnable.JavaAsyncChild
 
 import java.util.concurrent.ArrayBlockingQueue
 import java.util.concurrent.CountDownLatch

diff --git a/...a-agent/instrumentation/java-concurrent/src/test/groovy/executor/ToBeIgnoredExecutor.java b/...a-agent/instrumentation/java-concurrent/src/test/groovy/executor/ToBeIgnoredExecutor.java
@@ -0,0 +1,11 @@
+package executor;
+
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+public class ToBeIgnoredExecutor extends ThreadPoolExecutor {
+  public ToBeIgnoredExecutor() {
+    super(1, 1, 0, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<>(10));
+  }
+}
diff --git a/...groovy/ForkJoinPoolPropagationTest.groovy → ...rkjoin/ForkJoinPoolPropagationTest.groovy b/...groovy/ForkJoinPoolPropagationTest.groovy → ...rkjoin/ForkJoinPoolPropagationTest.groovy
@@ -1,3 +1,5 @@
+package forkjoin
+
 import datadog.trace.agent.test.AgentTestRunner
 import datadog.trace.core.DDSpan
 

diff --git a/.../groovy/FutureTaskContinuationTest.groovy → ...unnable/FutureTaskContinuationTest.groovy b/.../groovy/FutureTaskContinuationTest.groovy → ...unnable/FutureTaskContinuationTest.groovy
@@ -1,7 +1,8 @@
+package runnable
+
 import datadog.trace.agent.test.AgentTestRunner
 
 import java.util.concurrent.ExecutionException
-import java.util.concurrent.FutureTask
 
 import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
 import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace

diff --git a/...rc/test/groovy/ModuleInjectionTest.groovy → ...roovy/runnable/ModuleInjectionTest.groovy b/...rc/test/groovy/ModuleInjectionTest.groovy → ...roovy/runnable/ModuleInjectionTest.groovy
@@ -1,3 +1,5 @@
+package runnable
+
 import datadog.trace.agent.test.AgentTestRunner
 
 import javax.swing.*

diff --git a/...t/groovy/TimerTaskContinuationTest.groovy → ...vy/timer/TimerTaskContinuationTest.groovy b/...t/groovy/TimerTaskContinuationTest.groovy → ...vy/timer/TimerTaskContinuationTest.groovy
@@ -1,3 +1,5 @@
+package timer
+
 import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
 import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan

diff --git a/...c/test/java/CustomThreadPoolExecutor.java → ...va/executor/CustomThreadPoolExecutor.java b/...c/test/java/CustomThreadPoolExecutor.java → ...va/executor/CustomThreadPoolExecutor.java
@@ -1,3 +1,5 @@
+package executor;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.AbstractExecutorService;

diff --git a/...est/java/TypeAwareThreadPoolExecutor.java → ...executor/TypeAwareThreadPoolExecutor.java b/...est/java/TypeAwareThreadPoolExecutor.java → ...executor/TypeAwareThreadPoolExecutor.java
@@ -1,3 +1,5 @@
+package executor;
+
 import datadog.trace.bootstrap.instrumentation.java.concurrent.Wrapper;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;

diff --git a/...st/java/RecursiveThreadPoolExecution.java → ...cursive/RecursiveThreadPoolExecution.java b/...st/java/RecursiveThreadPoolExecution.java → ...cursive/RecursiveThreadPoolExecution.java
@@ -1,3 +1,5 @@
+package executor.recursive;
+
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
 

diff --git a/...hreadPoolMixedSubmissionAndExecution.java → ...hreadPoolMixedSubmissionAndExecution.java b/...hreadPoolMixedSubmissionAndExecution.java → ...hreadPoolMixedSubmissionAndExecution.java
@@ -1,3 +1,5 @@
+package executor.recursive;
+
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
 

diff --git a/...t/java/RecursiveThreadPoolSubmission.java → ...ursive/RecursiveThreadPoolSubmission.java b/...t/java/RecursiveThreadPoolSubmission.java → ...ursive/RecursiveThreadPoolSubmission.java
@@ -1,3 +1,5 @@
+package executor.recursive;
+
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
 

diff --git a/...va/ExecutingRejectedExecutionHandler.java → ...er/ExecutingRejectedExecutionHandler.java b/...va/ExecutingRejectedExecutionHandler.java → ...er/ExecutingRejectedExecutionHandler.java
@@ -1,3 +1,5 @@
+package executor.rejectedexecutionhandler;
+
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ThreadPoolExecutor;
 

diff --git a/...a/SwallowingRejectedExecutionHandler.java → ...r/SwallowingRejectedExecutionHandler.java b/...a/SwallowingRejectedExecutionHandler.java → ...r/SwallowingRejectedExecutionHandler.java
@@ -1,3 +1,5 @@
+package executor.rejectedexecutionhandler;
+
 import io.netty.util.concurrent.SingleThreadEventExecutor;
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ThreadPoolExecutor;

diff --git a/...-concurrent/src/test/java/LinearTask.java → ...nt/src/test/java/forkjoin/LinearTask.java b/...-concurrent/src/test/java/LinearTask.java → ...nt/src/test/java/forkjoin/LinearTask.java
@@ -1,3 +1,5 @@
+package forkjoin;
+
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
 

diff --git a/...oncurrent/src/test/java/PeriodicTask.java → .../src/test/java/forkjoin/PeriodicTask.java b/...oncurrent/src/test/java/PeriodicTask.java → .../src/test/java/forkjoin/PeriodicTask.java
@@ -1,3 +1,5 @@
+package forkjoin;
+
 import datadog.trace.api.Trace;
 
 public class PeriodicTask implements Runnable {

diff --git a/...current/src/test/java/CheckpointTask.java → ...rc/test/java/runnable/CheckpointTask.java b/...current/src/test/java/CheckpointTask.java → ...rc/test/java/runnable/CheckpointTask.java
@@ -1,3 +1,5 @@
+package runnable;
+
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeScope;
 
 import datadog.trace.api.Trace;

diff --git a/...t/src/test/java/ComparableAsyncChild.java → ...t/java/runnable/ComparableAsyncChild.java b/...t/src/test/java/ComparableAsyncChild.java → ...t/java/runnable/ComparableAsyncChild.java
@@ -1,3 +1,5 @@
+package runnable;
+
 public class ComparableAsyncChild implements Runnable, Comparable<ComparableAsyncChild> {
 
   private final int priority;

diff --git a/...-concurrent/src/test/java/Descendant.java → ...nt/src/test/java/runnable/Descendant.java b/...-concurrent/src/test/java/Descendant.java → ...nt/src/test/java/runnable/Descendant.java
@@ -1,3 +1,5 @@
+package runnable;
+
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
 

diff --git a/...current/src/test/java/JavaAsyncChild.java → ...rc/test/java/runnable/JavaAsyncChild.java b/...current/src/test/java/JavaAsyncChild.java → ...rc/test/java/runnable/JavaAsyncChild.java
@@ -1,3 +1,5 @@
+package runnable;
+
 import datadog.trace.api.Trace;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ForkJoinTask;

diff --git a/...current/src/test/java/SettableFuture.java → ...rc/test/java/runnable/SettableFuture.java b/...current/src/test/java/SettableFuture.java → ...rc/test/java/runnable/SettableFuture.java
@@ -1,3 +1,5 @@
+package runnable;
+
 import java.util.concurrent.Callable;
 import java.util.concurrent.FutureTask;