Code cleanup.

buildSrc/build.gradle.kts

@@ -86,8 +86,8 @@ testing {
   suites {
     val test by getting(JvmTestSuite::class) {
       dependencies {
-        implementation(libs.spock.core)
         implementation(libs.groovy)
+        implementation(libs.spock.core)
       }
       targets.configureEach {
         testTask.configure {

buildSrc/call-site-instrumentation-plugin/build.gradle.kts

@@ -35,9 +35,8 @@ dependencies {
   implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4")
 
   testImplementation(libs.bytebuddy)
-  testImplementation(libs.spock.core)
-  testImplementation("org.objenesis", "objenesis", "3.0.1")
   testImplementation(libs.groovy)
+  testImplementation(libs.bundles.spock)
   testImplementation("javax.servlet", "javax.servlet-api", "3.0.1")
   testImplementation("com.github.spotbugs", "spotbugs-annotations", "4.2.0")
 }

communication/src/test/groovy/datadog/communication/http/RejectingExecutorServiceTest.groovy

@@ -1,19 +1,19 @@
 package datadog.communication.http
 
+import static org.junit.jupiter.api.Assertions.assertThrows
+
 import org.junit.jupiter.api.Test
 
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.RejectedExecutionException
 import java.util.concurrent.TimeUnit
 
-import static groovy.test.GroovyAssert.shouldFail
-
 class RejectingExecutorServiceTest {
   ExecutorService executorService = new RejectingExecutorService()
 
   @Test
   void 'execute throws exception'() {
-    shouldFail(RejectedExecutionException) {
+    assertThrows(RejectedExecutionException) {
       executorService.execute({})
     }
   }

dd-java-agent/agent-iast/iast-test-fixtures/src/main/groovy/com/datadog/iast/test/NoopOverheadController.groovy

@@ -3,9 +3,9 @@ package com.datadog.iast.test
 import com.datadog.iast.model.VulnerabilityType
 import com.datadog.iast.overhead.Operation
 import com.datadog.iast.overhead.OverheadController
-import com.github.javaparser.quality.Nullable
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
 import groovy.transform.CompileStatic
+import javax.annotation.Nullable
 
 @CompileStatic
 class NoopOverheadController implements OverheadController {

dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy

@@ -515,7 +515,7 @@ abstract class InstrumentationSpecification extends DDSpecification implements A
       def sw = new StringWriter()
       PrintWriter pw = new PrintWriter(sw)
       entry.value.eachWithIndex { Exception e, int i ->
-        pw.write('\n' as char)
+        pw.write((char)'\n')
         pw.write "Location $i:\n"
         def st = e.stackTrace
         int loc = st.findIndexOf {

dd-java-agent/instrumentation-testing/src/test/groovy/server/HttpServerTest.groovy

@@ -435,7 +435,7 @@ class HttpServerTest extends InstrumentationSpecification {
 
     then:
     clientResponse.code() == 500
-    IOUtils.readFully (clientResponse.body().byteStream()).contains("assert body != null")
+    IOUtils.readFully(clientResponse.body().byteStream()).contains("assert body != null")
 
     cleanup:
     server.stop()

dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/timer/TimerTaskContinuationTest.groovy

@@ -64,7 +64,7 @@ class TimerTaskContinuationTest extends InstrumentationSpecification {
   def "test continuation activated when TimerTask runs (date)"() {
     when:
     runUnderTrace("parent", {
-      timer.schedule(timerTask, Instant.now().plusMillis(100).toDate())
+      timer.schedule(timerTask, Date.from(Instant.now().plusMillis(100)))
     })
     runLatch.await()
 

dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/previewTest/groovy/StructuredConcurrencyTest.groovy

@@ -1,13 +1,13 @@
+import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
+import static datadog.trace.agent.test.utils.TraceUtils.runnableUnderTrace
+import static java.time.Instant.now
+import static java.time.temporal.ChronoUnit.SECONDS
+
 import datadog.trace.agent.test.InstrumentationSpecification
 import datadog.trace.api.Trace
-
 import java.util.concurrent.Callable
 import java.util.concurrent.StructuredTaskScope
 
-import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
-import static datadog.trace.agent.test.utils.TraceUtils.runnableUnderTrace
-import static java.time.Instant.now
-
 class StructuredConcurrencyTest extends InstrumentationSpecification {
   /**
    * Tests the structured task scope with a single task.
@@ -26,7 +26,7 @@ class StructuredConcurrencyTest extends InstrumentationSpecification {
             return true
           }
         })
-      taskScope.joinUntil(now() + 10) // Wait for 10 seconds at maximum
+      taskScope.joinUntil(now().plus(10, SECONDS))
       result = task.get()
     }
     taskScope.close()
@@ -73,7 +73,7 @@ class StructuredConcurrencyTest extends InstrumentationSpecification {
       taskScope.fork {
         runnableUnderTrace("child3") {}
       }
-      taskScope.joinUntil(now() + 10) // Wait for 10 seconds at maximum
+      taskScope.joinUntil(now().plus(10, SECONDS))
     }
     taskScope.close()
 
@@ -132,7 +132,7 @@ class StructuredConcurrencyTest extends InstrumentationSpecification {
       taskScope.fork {
         runnableUnderTrace("child2") {}
       }
-      taskScope.joinUntil(now() + 10) // Wait for 10 seconds at maximum
+      taskScope.joinUntil(now().plus(10, SECONDS))
     }
     taskScope.close()
 

dd-java-agent/instrumentation/jax-rs-annotations-1/build.gradle

@@ -16,7 +16,7 @@ apply from: "$rootDir/gradle/java.gradle"
 dependencies {
   compileOnly group: 'javax.ws.rs', name: 'jsr311-api', version: '1.1.1'
 
-  testImplementation libs.spock.junit4 // This legacy module still needs JUnit4.
+  testImplementation libs.spock.junit4 // This module still needs Spock with JUnit4.
   testImplementation group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.7.1'
   testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
 }

dd-java-agent/instrumentation/junit/junit-5.3/build.gradle

@@ -38,6 +38,8 @@ dependencies {
 
   testImplementation project(':dd-java-agent:agent-ci-visibility:civisibility-instrumentation-test-fixtures')
 
+  testImplementation libs.junit4 // This module still needs JUnit4.
+
   // versions used below are not the minimum ones that we support,
   // but the tests need to use them in order to be compliant with Spock 2.x
   testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: libs.versions.junit.platform.get()

dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestAssumptionLegacy.java

@@ -7,6 +7,7 @@ public class TestAssumptionLegacy {
 
   @Test
   public void test_fail_assumption_legacy() {
+    // Throw exception from legacy JUnit4 library.
     throw new AssumptionViolatedException("assumption is not fulfilled");
   }
 }

dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle

@@ -24,7 +24,7 @@ dependencies {
   compileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
   implementation project(':dd-java-agent:instrumentation:kafka:kafka-common')
 
-  testImplementation libs.spock.junit4 // This legacy module still needs JUnit4.
+  testImplementation libs.spock.junit4 // This module still needs Spock with JUnit4.
   testImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
   testImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '1.3.3.RELEASE'
   testImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '1.3.3.RELEASE'

dd-java-agent/instrumentation/kafka/kafka-streams-0.11/build.gradle

@@ -26,6 +26,7 @@ dependencies {
 
   // Include latest version of kafka itself along with latest version of client libs.
   // This seems to help with jar compatibility hell.
+  latestDepTestImplementation libs.spock.junit4 // This module still needs Spock with JUnit4.
   latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka_2.13', version: '2.+'
   latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '2.+'
   latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-streams', version: '2.+'

dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle

@@ -86,7 +86,7 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1')
   testImplementation project(':dd-java-agent:instrumentation:reactive-streams')
   testImplementation project(':dd-java-agent:instrumentation:reactor-netty-1')
-  testImplementation group: 'org.spockframework', name: 'spock-spring', version: '1.1-groovy-2.4'
+  testImplementation libs.spock.spring
 
   testImplementation group: 'org.springframework', name: 'spring-webflux', version: '5.0.0.RELEASE'
   testImplementation group: 'io.projectreactor.ipc', name: 'reactor-netty', version: '0.7.0.RELEASE'

dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/bootTest/groovy/SingleThreadedSpringWebfluxTest.groovy

@@ -1,6 +1,4 @@
 import dd.trace.instrumentation.springwebflux.server.SpringWebFluxTestApplication
-import org.junit.AfterClass
-import org.junit.BeforeClass
 import org.springframework.boot.test.context.SpringBootTest
 
 /**
@@ -11,13 +9,11 @@ import org.springframework.boot.test.context.SpringBootTest
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = [SpringWebFluxTestApplication, ForceNettyAutoConfiguration])
 class SingleThreadedSpringWebfluxTest extends SpringWebfluxTest {
 
-  @BeforeClass
-  static void init() {
+  def setup() {
     System.setProperty("reactor.netty.ioWorkerCount", "1")
   }
 
-  @AfterClass
-  static void teardown() {
+  def cleanup() {
     System.clearProperty("reactor.netty.ioWorkerCount")
   }
 }

dd-smoke-tests/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractIastSpringBootTest.groovy

@@ -1247,7 +1247,7 @@ abstract class AbstractIastSpringBootTest extends AbstractIastServerSmokeTest {
   void 'untrusted deserialization for snakeyaml with a string'() {
     setup:
     final String yaml = "test"
-    final url = "http://localhost:${httpPort}/untrusted_deserialization/snakeyaml?yaml=${yaml}"
+    final url = "http://localhost:${httpPort}/untrusted_deserialization/snakeyaml?yaml=${yaml}".toString()
     final request = new Request.Builder().url(url).get().build()
 
     when:

gradle/codenarc.gradle

@@ -9,7 +9,3 @@ dependencies {
 codenarc {
   configFile = rootProject.file('gradle/enforcement/codenarc.groovy')
 }
-
-//codenarcTest {
-//    configFile rootProject.file('gradle/enforcement/codenarcTest.groovy')
-//}

gradle/libs.versions.toml

@@ -8,6 +8,7 @@ okio = "1.17.6" # Datadog fork
 
 spock = "2.4-M6-groovy-3.0"
 groovy = "3.0.24"
+junit4 = "4.13.2"
 junit5 = "5.12.2"
 junit-platform = "1.12.2"
 logback = "1.2.13"
@@ -75,6 +76,8 @@ objenesis = { module = "org.objenesis:objenesis", version = "3.3" } # Used by Sp
 
 groovy = { module = "org.codehaus.groovy:groovy-all", version.ref = "groovy" }
 groovy-yaml = { module = "org.codehaus.groovy:groovy-yaml", version.ref = "groovy" }
+
+junit4 = { module = "junit:junit", version.ref = "junit4" }
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit5" }
 junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit5" }
 junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" }

telemetry/src/test/groovy/datadog/telemetry/dependency/DependencyResolverSpecification.groovy

@@ -1,6 +1,5 @@
 package datadog.telemetry.dependency
 
-import org.apache.tools.ant.taskdefs.Classloader
 import spock.lang.TempDir
 
 import java.nio.charset.Charset
@@ -136,8 +135,8 @@ class DependencyResolverSpecification extends DepSpecification {
 
   void 'spring boot dependency'() throws IOException {
     when:
-    String zipPath = Classloader.classLoader.getResource('datadog/telemetry/dependencies/spring-boot-app.jar').path
-    URI uri = new URI("jar:file:$zipPath!/BOOT-INF/lib/opentracing-util-0.33.0.jar!/")
+    URI zipPath = zipPath('datadog/telemetry/dependencies/spring-boot-app.jar')
+    URI uri = new URI("jar:$zipPath!/BOOT-INF/lib/opentracing-util-0.33.0.jar!/")
 
     Dependency dep = DependencyResolver.resolve(uri).get(0)
 
@@ -151,8 +150,8 @@ class DependencyResolverSpecification extends DepSpecification {
 
   void 'spring boot dependency without trailing slash'() throws IOException {
     when:
-    String zipPath = Classloader.classLoader.getResource('datadog/telemetry/dependencies/spring-boot-app.jar').path
-    URI uri = new URI("jar:file:$zipPath!/BOOT-INF/lib/opentracing-util-0.33.0.jar!")
+    URI zipPath = zipPath('datadog/telemetry/dependencies/spring-boot-app.jar')
+    URI uri = new URI("jar:$zipPath!/BOOT-INF/lib/opentracing-util-0.33.0.jar!")
 
     Dependency dep = DependencyResolver.resolve(uri).get(0)
 
@@ -166,8 +165,8 @@ class DependencyResolverSpecification extends DepSpecification {
 
   void 'spring boot dependency new style'() throws IOException {
     when:
-    String zipPath = Classloader.classLoader.getResource('datadog/telemetry/dependencies/spring-boot-app.jar').path
-    URI uri = new URI("jar:nested:$zipPath/!BOOT-INF/lib/opentracing-util-0.33.0.jar!/")
+    String zipPath = zipPath('datadog/telemetry/dependencies/spring-boot-app.jar').toString().replace("file:", "nested:")
+    URI uri = new URI("jar:$zipPath/!BOOT-INF/lib/opentracing-util-0.33.0.jar!/")
 
     Dependency dep = DependencyResolver.resolve(uri).get(0)
 
@@ -235,7 +234,7 @@ class DependencyResolverSpecification extends DepSpecification {
 
   void 'fat jar with multiple pom.properties'() throws IOException {
     when:
-    URI uri = Classloader.classLoader.getResource('datadog/telemetry/dependencies/budgetapp.jar').toURI()
+    URI uri = zipPath('datadog/telemetry/dependencies/budgetapp.jar')
 
     List<Dependency> deps = DependencyResolver.resolve(uri)
 
@@ -246,7 +245,7 @@ class DependencyResolverSpecification extends DepSpecification {
 
   void 'fat jar with two pom.properties'() throws IOException {
     when:
-    URI uri = Classloader.classLoader.getResource('datadog/telemetry/dependencies/budgetappreduced.jar').toURI()
+    URI uri = zipPath('datadog/telemetry/dependencies/budgetappreduced.jar')
 
     List<Dependency> deps = DependencyResolver.resolve(uri)
     Dependency dep1 = deps.get(0)
@@ -260,7 +259,7 @@ class DependencyResolverSpecification extends DepSpecification {
 
   void 'fat jar with two pom.properties one of them bad'() throws IOException {
     when:
-    URI uri = Classloader.classLoader.getResource('datadog/telemetry/dependencies/budgetappreducedbadproperties.jar').toURI()
+    URI uri = zipPath('datadog/telemetry/dependencies/budgetappreducedbadproperties.jar')
 
     List<Dependency> deps = DependencyResolver.resolve(uri)
     Dependency dep1 = deps.get(0)
@@ -352,4 +351,14 @@ class DependencyResolverSpecification extends DepSpecification {
     then:
     deps.size() == 1
   }
+
+  private static URI zipPath(String outerJar) {
+    URL outerJarUrl = Thread.currentThread()
+      .contextClassLoader
+      .getResource(outerJar)
+
+    assert outerJarUrl != null : "Resource not found: ${outerJar}"
+
+    outerJarUrl.toURI()
+  }
 }

utils/test-utils/src/main/groovy/datadog/trace/test/util/MultipartRequestParser.groovy

@@ -35,7 +35,7 @@ class MultipartRequestParser {
     String getCharacterEncoding() {
       ParameterParser parser = new ParameterParser()
       parser.setLowerCaseNames(true)
-      String charset = parser.parse(contentType, ';' as char).get("charset")
+      String charset = parser.parse(contentType, (char)';').get("charset")
       return charset != null ? charset : "UTF-8"
     }