Clean up test utils classes (#9853)

PerfectSlayer · web-flow · commit 5370add8f663 · 2025-10-24T14:07:46.000Z
diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/FieldBackedContextStoresTest.groovy b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/FieldBackedContextStoresTest.groovy
@@ -1,6 +1,6 @@
 package datadog.trace.bootstrap
 
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 import datadog.trace.test.util.DDSpecification
 
 import java.util.concurrent.atomic.AtomicInteger
diff --git a/dd-java-agent/instrumentation-testing/src/test/groovy/utils/ThreadUtilsTest.groovy b/dd-java-agent/instrumentation-testing/src/test/groovy/utils/ThreadUtilsTest.groovy
@@ -1,7 +1,7 @@
 package utils
 
 import datadog.trace.agent.test.InstrumentationSpecification
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 import org.spockframework.runtime.ConditionNotSatisfiedError
 import spock.lang.FailsWith
 import spock.lang.Shared
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle
@@ -109,6 +109,7 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
   testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
 
+  baseTestImplementation project(':utils:test-utils')
   baseTestImplementation libs.scala211
   // First 10.0.x version with a convenient way to test http2 support
   baseTestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.0.10'
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/groovy/AkkaHttpServerInstrumentationTest.groovy b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/groovy/AkkaHttpServerInstrumentationTest.groovy
@@ -1,7 +1,7 @@
 import datadog.trace.agent.test.base.HttpServer
 import datadog.trace.agent.test.base.HttpServerTest
 import datadog.trace.agent.test.naming.TestingGenericHttpNamingConventions
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 import datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator
 import okhttp3.HttpUrl
 import okhttp3.MultipartBody
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy
@@ -1,8 +1,8 @@
 import datadog.trace.agent.test.base.HttpServer
 import datadog.trace.agent.test.base.HttpServerTest
 import datadog.trace.agent.test.naming.TestingGenericHttpNamingConventions
-import datadog.trace.agent.test.utils.ThreadUtils
 import datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator
+import datadog.trace.test.util.ThreadUtils
 import okhttp3.HttpUrl
 import okhttp3.MediaType
 import okhttp3.MultipartBody
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/baseTest/groovy/PekkoHttpServerInstrumentationTest.groovy b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/baseTest/groovy/PekkoHttpServerInstrumentationTest.groovy
@@ -1,7 +1,7 @@
 import datadog.trace.agent.test.base.HttpServer
 import datadog.trace.agent.test.base.HttpServerTest
 import datadog.trace.agent.test.naming.TestingGenericHttpNamingConventions
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 import datadog.trace.instrumentation.pekkohttp.PekkoHttpServerDecorator
 import okhttp3.Request
 import spock.lang.Shared
diff --git a/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/utils/ThreadUtils.java b/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/utils/ThreadUtils.java
diff --git a/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/utils/UnsafeUtils.java b/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/utils/UnsafeUtils.java
diff --git a/dd-smoke-tests/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/SpringBootSmokeTest.groovy b/dd-smoke-tests/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/SpringBootSmokeTest.groovy
@@ -2,7 +2,7 @@ package datadog.smoketest.appsec
 
 import datadog.appsec.api.blocking.BlockingException
 import datadog.trace.agent.test.utils.OkHttpUtils
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 import groovy.json.JsonSlurper
 import okhttp3.FormBody
 import okhttp3.MediaType
diff --git a/dd-smoke-tests/armeria-grpc/src/test/groovy/datadog/smoketest/ArmeriaSmokeTest.groovy b/dd-smoke-tests/armeria-grpc/src/test/groovy/datadog/smoketest/ArmeriaSmokeTest.groovy
@@ -2,7 +2,7 @@ package datadog.smoketest
 
 
 import datadog.armeria.grpc.Hello
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 import spock.lang.Shared
 
 import java.util.concurrent.ThreadLocalRandom
diff --git a/dd-smoke-tests/build.gradle b/dd-smoke-tests/build.gradle
@@ -27,7 +27,6 @@ allprojects {
   }
 }
 
-Project parent_project = project
 subprojects { Project subProj ->
   // Don't need javadoc task run for internal projects.
   subProj.tasks.withType(Javadoc).configureEach { enabled = false }
diff --git a/dd-smoke-tests/play-2.4/src/test/groovy/datadog/smoketest/PlayNettySmokeTest.groovy b/dd-smoke-tests/play-2.4/src/test/groovy/datadog/smoketest/PlayNettySmokeTest.groovy
@@ -1,7 +1,7 @@
 package datadog.smoketest
 
 import datadog.trace.agent.test.server.http.TestHttpServer
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 import datadog.trace.test.util.Flaky
 import okhttp3.Request
 import spock.lang.AutoCleanup
diff --git a/dd-smoke-tests/play-2.5/src/test/groovy/datadog/smoketest/PlayNettySmokeTest.groovy b/dd-smoke-tests/play-2.5/src/test/groovy/datadog/smoketest/PlayNettySmokeTest.groovy
@@ -1,7 +1,7 @@
 package datadog.smoketest
 
 import datadog.trace.agent.test.server.http.TestHttpServer
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 import okhttp3.Request
 import spock.lang.AutoCleanup
 import spock.lang.Shared
diff --git a/dd-smoke-tests/play-2.6/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy b/dd-smoke-tests/play-2.6/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy
@@ -2,7 +2,7 @@ package datadog.smoketest
 
 import java.nio.file.Files
 import datadog.trace.agent.test.server.http.TestHttpServer
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 
 import java.util.concurrent.ThreadLocalRandom
 import java.util.concurrent.atomic.AtomicInteger
diff --git a/dd-smoke-tests/play-2.7/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy b/dd-smoke-tests/play-2.7/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy
@@ -1,7 +1,7 @@
 package datadog.smoketest
 
 import datadog.trace.agent.test.server.http.TestHttpServer
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 
 import java.nio.file.Files
 import java.util.concurrent.ThreadLocalRandom
diff --git a/dd-smoke-tests/play-2.8-otel/src/test/groovy/datadog/smoketest/Play28OTelSmokeTest.groovy b/dd-smoke-tests/play-2.8-otel/src/test/groovy/datadog/smoketest/Play28OTelSmokeTest.groovy
@@ -1,7 +1,7 @@
 package datadog.smoketest
 
 import datadog.trace.agent.test.server.http.TestHttpServer
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 
 import java.nio.file.Files
 import java.util.concurrent.ThreadLocalRandom
diff --git a/dd-smoke-tests/play-2.8/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy b/dd-smoke-tests/play-2.8/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy
@@ -1,7 +1,7 @@
 package datadog.smoketest
 
 import datadog.trace.agent.test.server.http.TestHttpServer
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 
 import java.nio.file.Files
 import java.util.concurrent.ThreadLocalRandom
diff --git a/dd-smoke-tests/quarkus-native/src/test/groovy/datadog/smoketest/QuarkusNativeSmokeTest.groovy b/dd-smoke-tests/quarkus-native/src/test/groovy/datadog/smoketest/QuarkusNativeSmokeTest.groovy
@@ -1,6 +1,6 @@
 package datadog.smoketest
 
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 import okhttp3.Request
 import spock.lang.Shared
 
diff --git a/dd-smoke-tests/quarkus/src/test/groovy/datadog/smoketest/QuarkusSmokeTest.groovy b/dd-smoke-tests/quarkus/src/test/groovy/datadog/smoketest/QuarkusSmokeTest.groovy
@@ -1,6 +1,6 @@
 package datadog.smoketest
 
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 import okhttp3.Request
 import spock.lang.Shared
 
diff --git a/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy b/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy
@@ -1,7 +1,7 @@
 package datadog.smoketest
 
 import datadog.environment.JavaVirtualMachine
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 import okhttp3.FormBody
 import okhttp3.Request
 import spock.lang.Requires
diff --git a/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy b/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy
@@ -1,7 +1,7 @@
 package datadog.smoketest
 
 import datadog.environment.JavaVirtualMachine
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 import okhttp3.FormBody
 import okhttp3.Request
 import spock.lang.Requires
diff --git a/dd-smoke-tests/vertx-3.4/src/test/groovy/datadog/smoketest/VertxSmokeTest.groovy b/dd-smoke-tests/vertx-3.4/src/test/groovy/datadog/smoketest/VertxSmokeTest.groovy
@@ -1,6 +1,6 @@
 package datadog.smoketest
 
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 import okhttp3.Request
 import spock.lang.IgnoreIf
 import spock.lang.Shared
diff --git a/dd-smoke-tests/vertx-3.9-resteasy/src/test/groovy/datadog/smoketest/VertxSmokeTest.groovy b/dd-smoke-tests/vertx-3.9-resteasy/src/test/groovy/datadog/smoketest/VertxSmokeTest.groovy
@@ -1,6 +1,6 @@
 package datadog.smoketest
 
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 import okhttp3.Request
 import spock.lang.Shared
 
diff --git a/dd-smoke-tests/vertx-3.9/src/test/groovy/datadog/smoketest/VertxSmokeTest.groovy b/dd-smoke-tests/vertx-3.9/src/test/groovy/datadog/smoketest/VertxSmokeTest.groovy
@@ -1,6 +1,6 @@
 package datadog.smoketest
 
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 import okhttp3.Request
 import spock.lang.Shared
 
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/scopemanager/ScopeManagerTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/scopemanager/ScopeManagerTest.groovy
@@ -2,7 +2,7 @@ package datadog.trace.core.scopemanager
 
 import datadog.context.Context
 import datadog.context.ContextKey
-import datadog.trace.agent.test.utils.ThreadUtils
+import datadog.trace.test.util.ThreadUtils
 import datadog.trace.api.DDTraceId
 import datadog.trace.api.Stateful
 import datadog.trace.api.interceptor.MutableSpan
diff --git a/internal-api/src/test/groovy/datadog/trace/api/cache/RadixTreeCacheTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/cache/RadixTreeCacheTest.groovy
@@ -4,7 +4,7 @@ import datadog.trace.test.util.DDSpecification
 
 import java.util.concurrent.ThreadLocalRandom
 
-import static datadog.trace.ThreadUtils.runConcurrently
+import static datadog.trace.test.util.ThreadUtils.runConcurrently
 
 class RadixTreeCacheTest extends DDSpecification {
 
diff --git a/utils/test-utils/src/main/java/datadog/trace/test/util/ThreadUtils.java b/utils/test-utils/src/main/java/datadog/trace/test/util/ThreadUtils.java
@@ -1,4 +1,4 @@
-package datadog.trace;
+package datadog.trace.test.util;
 
 import groovy.lang.Closure;
 import java.util.concurrent.CountDownLatch;
