Bump Groovy: 3.0.25 -> 4.0.29

dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy

@@ -16,6 +16,7 @@ import freemarker.core.InvalidReferenceException
 import freemarker.template.Template
 import freemarker.template.TemplateException
 import freemarker.template.TemplateExceptionHandler
+import groovy.transform.CompileStatic
 import org.opentest4j.AssertionFailedError
 import org.skyscreamer.jsonassert.JSONAssert
 import org.skyscreamer.jsonassert.JSONCompareMode
@@ -367,6 +368,7 @@ abstract class CiVisibilityTestUtils {
     return compiledPaths
   }
 
+  @CompileStatic // Workaround for Groovy 4 to not produce false-positive FindBugs warning `UPM_UNCALLED_PRIVATE_METHOD`.
   private static DynamicPath path(String rawPath, boolean unique = true) {
     return new DynamicPath(rawPath, JsonPath.compile(rawPath), unique)
   }

dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/HashCodeTest.groovy

@@ -1,6 +1,7 @@
 package com.datadog.iast.taint
 
 import datadog.trace.test.util.DDSpecification
+import groovy.transform.CompileStatic
 import spock.lang.IgnoreIf
 import spock.lang.Shared
 
@@ -51,6 +52,7 @@ class HashCodeTest extends DDSpecification {
     }
   }
 
+  @CompileStatic // Workaround to avoid NPE in Groovy 4 `org.codehaus.groovy.vmplugin.v8.IndyInterface.fromCache()` method.
   private static List<Integer> genHashCodes(final int n) {
     (1..n).collect {
       System.identityHashCode(Double.toString(Math.random()))

dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/ObjectGen.groovy

@@ -2,9 +2,12 @@ package com.datadog.iast.taint
 
 import static TaintedMap.POSITIVE_MASK
 
+import groovy.transform.CompileStatic
+
 /**
  * Generate objects to test {@link TaintedMap}.
  */
+@CompileStatic // Workaround to avoid java.lang.AbstractMethodError with Groovy 4.
 class ObjectGen {
 
   final int capacity
@@ -36,7 +39,8 @@ class ObjectGen {
     }
   }
 
-  def genBucket(int nObjects, Closure<Boolean> isValid) {
+  // Have to return specific type to avoid java.lang.AbstractMethodError with Groovy 4.
+  List<Object> genBucket(int nObjects, Closure<Boolean> isValid) {
     assert nObjects > 0
     while (true) {
       for (int i = 0; i < capacity; i++) {

dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/ddwaf/WAFModuleSpecification.groovy

@@ -787,8 +787,8 @@ class WAFModuleSpecification extends DDSpecification {
     stackTrace.language == 'java'
     stackTrace.message == 'Exploit detected'
     stackTrace.frames.size() >= 1
-    stackTrace.frames[0].class_name == 'org.codehaus.groovy.runtime.callsite.CallSiteArray'
-    stackTrace.frames[0].function == 'defaultCall'
+    stackTrace.frames[0].class_name == 'org.codehaus.groovy.vmplugin.v8.IndyInterface' // With Groovy 3 it was 'org.codehaus.groovy.runtime.callsite.CallSiteArray'
+    stackTrace.frames[0].function == 'fromCache' // With Groovy 3 it was 'defaultCall'
   }
 
   void 'redaction with default settings'() {

dd-java-agent/instrumentation/aerospike-4.0/build.gradle

@@ -39,3 +39,5 @@ dependencies {
 tasks.withType(Test).configureEach {
   usesService(testcontainersLimit)
 }
+
+configureGroovyCompiler(21, "compileLatestDepTestGroovy", "compileLatestDepForkedTestGroovy")

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

@@ -127,7 +127,7 @@ class CompletableFutureTest extends InstrumentationSpecification {
       // The parent and the child spans can finish out of order since they run
       // on different threads concurrently
       trace(2) {
-        def pIndex = span(0).isRootSpan() ? 0 : 1
+        def pIndex = span(0).checkRootSpan() ? 0 : 1
         def cIndex = 1 - pIndex
         basicSpan(it, pIndex, "parent")
         basicSpan(it, cIndex, "child", span(pIndex))

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

@@ -60,7 +60,7 @@ class CrossedContextTest extends InstrumentationSpecification {
     then:
     for (List<DDSpan> trace : TEST_WRITER) {
       assert trace.size() == 2
-      DDSpan parent = trace.find({ it.isRootSpan() })
+      DDSpan parent = trace.find({ it.checkRootSpan() })
       assert null != parent
       DDSpan child = trace.find({ it.getParentId() == parent.getSpanId() })
       assert null != child
@@ -121,7 +121,7 @@ class CrossedContextTest extends InstrumentationSpecification {
     then:
     for (List<DDSpan> trace : TEST_WRITER) {
       assert trace.size() == 2
-      DDSpan parent = trace.find({ it.isRootSpan() })
+      DDSpan parent = trace.find({ it.checkRootSpan() })
       assert null != parent
       DDSpan child = trace.find({ it.getParentId() == parent.getSpanId() })
       assert null != child

dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/RecursiveThreadPoolPropagationTest.groovy

@@ -346,7 +346,7 @@ class RecursiveThreadPoolPropagationTest extends InstrumentationSpecification {
     List<DDSpan> trace = TEST_WRITER.get(0)
     assert trace.size() == depth
     for (DDSpan span : sortByDepth(trace)) {
-      orphanCount += span.isRootSpan() ? 1 : 0
+      orphanCount += span.checkRootSpan() ? 1 : 0
       assert String.valueOf(i++) == span.getOperationName()
     }
     assert orphanCount == 1

dd-java-agent/instrumentation/java/java-nio-1.8/src/test/groovy/DirectAllocationTrackingTest.groovy

@@ -53,12 +53,12 @@ class DirectAllocationTrackingTest extends InstrumentationSpecification {
     def sample = directAllocations.find({ it.getEventType().name.equals("datadog.DirectAllocationSample")})
     sample.getLong("allocated") == 20
     sample.getString("source") == "MMAP"
-    sample.getString("allocatingClass") == "org.codehaus.groovy.runtime.callsite.PlainObjectMetaMethodSite"
+    sample.getString("allocatingClass") == "org.codehaus.groovy.vmplugin.v8.IndyInterface" // With Groovy 3 it was "org.codehaus.groovy.runtime.callsite.PlainObjectMetaMethodSite"
     sample.getLong("spanId") == expectedSpanId.get()
     def total = directAllocations.find({ it.getEventType().name.equals("datadog.DirectAllocationTotal")})
     total.getLong("allocated") == 20
     total.getString("source") == "MMAP"
-    total.getString("allocatingClass") == "org.codehaus.groovy.runtime.callsite.PlainObjectMetaMethodSite"
+    total.getString("allocatingClass") == "org.codehaus.groovy.vmplugin.v8.IndyInterface" // With Groovy 3 it was "org.codehaus.groovy.runtime.callsite.PlainObjectMetaMethodSite"
 
     cleanup:
     recording.close()
@@ -80,12 +80,12 @@ class DirectAllocationTrackingTest extends InstrumentationSpecification {
     def sample = directAllocations.find({ it.getEventType().name.equals("datadog.DirectAllocationSample")})
     sample.getLong("allocated") == 10
     sample.getString("source") == "ALLOCATE_DIRECT"
-    sample.getString("allocatingClass") == "java_nio_ByteBuffer\$allocateDirect"
+    sample.getString("allocatingClass") == "org.codehaus.groovy.vmplugin.v8.IndyInterface" // With Groovy 3 it was "java_nio_ByteBuffer\$allocateDirect"
     sample.getLong("spanId") == expectedSpanId.get()
     def total = directAllocations.find({ it.getEventType().name.equals("datadog.DirectAllocationTotal")})
     total.getLong("allocated") == 10
     total.getString("source") == "ALLOCATE_DIRECT"
-    total.getString("allocatingClass") == "java_nio_ByteBuffer\$allocateDirect"
+    total.getString("allocatingClass") == "org.codehaus.groovy.vmplugin.v8.IndyInterface"// With Groovy 3 it was "java_nio_ByteBuffer\$allocateDirect"
 
     cleanup:
     recording.close()

dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/build.gradle

@@ -32,6 +32,13 @@ tasks.named("compileMain_java11Java", JavaCompile) {
   configureCompiler(it, 11, JavaVersion.VERSION_1_8)
 }
 
+configureGroovyCompiler(11,
+  "compileTestGroovy",
+  "compileJetty11TestGroovy",
+  "compileLatestDepTestGroovy",
+  "compileJetty10LatestDepTestGroovy"
+  )
+
 dependencies {
   main_java11CompileOnly group: 'org.eclipse.jetty', name: 'jetty-client', version: '10.0.0'
   main_java11Implementation(project(':dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-common')) {

dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/build.gradle

@@ -20,6 +20,8 @@ tasks.named("compileMain_java17Java", JavaCompile) {
   configureCompiler(it, 17, JavaVersion.VERSION_17)
 }
 
+configureGroovyCompiler(17, "compileTestGroovy", "compileLatestDepTestGroovy")
+
 configurations.matching { it.name.startsWith('test') || it.name.startsWith('latestDepTest') }.configureEach {
   it.resolutionStrategy {
     force group: 'org.slf4j', name: 'slf4j-api', version: libs.versions.slf4j.get()

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

@@ -85,3 +85,5 @@ tasks.named("latestDepTest", Test) {
     minJavaVersion = JavaVersion.VERSION_17
   }
 }
+
+configureGroovyCompiler(17, "compileLatestDepTestGroovy")

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

@@ -77,3 +77,5 @@ tasks.named("latestDepTest", Test) {
     minJavaVersion = JavaVersion.VERSION_17
   }
 }
+
+configureGroovyCompiler(17, "compileLatestDepTestGroovy")

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

@@ -32,6 +32,12 @@ dependencies {
   latestDepTestImplementation group: 'org.spockframework', name: 'spock-core', version: '2.+'
 }
 
+configurations {
+  testImplementation {
+    exclude group: 'org.apache.groovy'
+  }
+}
+
 configurations.matching({ it.name.startsWith('test') }).configureEach({
   it.resolutionStrategy {
     force group: 'org.junit.platform', name: 'junit-platform-launcher', version: libs.versions.junit.platform.get()

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 module still needs Spock with 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/kotlin-coroutines-1.3/src/latestDepTest/kotlin/KotlinCoroutineTests.kt

@@ -2,33 +2,43 @@ import datadog.trace.api.Trace
 import datadog.trace.instrumentation.kotlin.coroutines.CoreKotlinCoroutineTests
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.single
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withTimeout
 
+// Workaround for Groovy 4 breaking Kotlin SAM conversion for FlowCollector
+private suspend inline fun <T> Flow<T>.forEach(crossinline action: suspend (T) -> Unit) = collect(object : FlowCollector<T> {
+  override suspend fun emit(value: T) = action(value)
+})
+
 class KotlinCoroutineTests(dispatcher: CoroutineDispatcher) : CoreKotlinCoroutineTests(dispatcher) {
 
   @Trace
   fun tracedAcrossFlows(withModifiedContext: Boolean): Int = runTest {
-    val producer = flow {
-      repeat(3) {
-        tracedChild("produce_$it")
-        if (withModifiedContext) {
-          withTimeout(100) {
-            emit(it)
-          }
-        } else {
+    // Use channelFlow when emitting from modified context (withTimeout) as regular flow doesn't allow it
+    val producer: Flow<Int> = if (withModifiedContext) {
+      channelFlow {
+        repeat(3) {
+          tracedChild("produce_$it")
+          withTimeout(100) { send(it) }
+        }
+      }
+    } else {
+      flow {
+        repeat(3) {
+          tracedChild("produce_$it")
           emit(it)
         }
       }
     }.flowOn(jobName("producer"))
 
     launch(jobName("consumer")) {
-      producer.collect {
-        tracedChild("consume_$it")
-      }
+      producer.forEach { tracedChild("consume_$it") }
     }
 
     7

dd-java-agent/instrumentation/liberty/liberty-23.0/build.gradle

@@ -65,7 +65,6 @@ dependencies {
 
 configurations.named("testRuntimeOnly") {
   exclude group: 'ch.qos.logback', module: 'logback-classic'
-  exclude group: 'org.codehaus.groovy', module: 'groovy-servlet'
 }
 configurations.named("webappRuntimeClasspath") {
   exclude group: 'ch.qos.logback', module: 'logback-classic'

dd-java-agent/instrumentation/ratpack-1.5/build.gradle

@@ -17,8 +17,12 @@ dependencies {
   compileOnly group: 'io.ratpack', name: 'ratpack-core', version: '1.5.0'
 
   testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
-  testImplementation group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.5.0'
+  testImplementation(group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.5.0') {
+    exclude group: 'org.codehaus.groovy'
+  }
   testImplementation 'com.sun.activation:jakarta.activation:1.2.2'
   testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures')
-  latestDepTestImplementation group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.+'
+  latestDepTestImplementation(group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.+') {
+    exclude group: 'org.codehaus.groovy'
+  }
 }

dd-java-agent/instrumentation/spring/spring-boot-1.3/build.gradle

@@ -25,7 +25,7 @@ addTestSuiteExtendingForDir("boot2LatestDepForkedTest", "boot2LatestDepTest", "t
 addTestSuiteExtendingForDir("boot3ForkedTest", "boot3Test", "test")
 addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "test")
 
-configureGroovyCompiler(17, "compileLatestDepTestGroovy", "compileBoot3TestGroovy")
+configureGroovyCompiler(17, "compileLatestDepTestGroovy", "compileBoot3TestGroovy", "compileBoot3ForkedTestGroovy", "compileLatestDepForkedTestGroovy")
 
 dependencies {
   implementation project(':dd-java-agent:instrumentation:span-origin')

dd-java-agent/instrumentation/undertow/undertow-2.2/build.gradle

@@ -58,3 +58,4 @@ tasks.named("latestDepForkedTest", Test) {
   }
 }
 
+configureGroovyCompiler(11, "compileLatestDepTestGroovy", "compileLatestDepForkedTestGroovy")

dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/server/http/TestHttpServer.groovy

@@ -6,6 +6,7 @@ import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext
 import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.core.DDSpan
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
+import groovy.transform.CompileStatic
 import org.eclipse.jetty.http.HttpMethod
 import org.eclipse.jetty.http.HttpVersion
 import org.eclipse.jetty.server.Handler
@@ -319,6 +320,7 @@ class TestHttpServer implements AutoCloseable {
       this.prefix = prefix.startsWith("/") ? prefix : "/" + prefix
     }
 
+    @CompileStatic // Groovy 4: workaround to avoid `groovy.lang.MissingMethodException`.
     @Override
     void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
       if (target.startsWith(prefix)) {
@@ -491,7 +493,7 @@ class TestHttpServer implements AutoCloseable {
       }
 
       void send(byte[] body) {
-        sendWithType(DEFAULT_TYPE, body)
+        sendWithType(DEFAULT_TYPE, (byte[]) body) // Groovy 4 has stricter coercions rules.
       }
 
       void sendWithType(String contentType, byte[] body) {

dd-smoke-tests/gradle/build.gradle

@@ -8,11 +8,23 @@ plugins {
 apply from: "$rootDir/gradle/java.gradle"
 description = 'Gradle Daemon Instrumentation Smoke Tests.'
 
+// Gradle 8.14.3 bundles Groovy 3 via `gradleTestKit()`, so we need Spock for Groovy 3 instead of Groovy 4.
+// Gradle 9.x bundles Groovy 4, so eventually we can drop this workaround.
+configurations.configureEach {
+  // Exclude Groovy 4. Starting from v4 it has group: `org.apache.groovy`.
+  exclude group: 'org.apache.groovy'
+
+  resolutionStrategy {
+    // Force Spock for Groovy 3.
+    force "org.spockframework:spock-core:2.4-groovy-3.0"
+  }
+}
+
 dependencies {
   testImplementation gradleTestKit()
   testImplementation project(':dd-smoke-tests:backend-mock')
   testImplementation project(':internal-api')
-  testImplementation project(':dd-java-agent:agent-ci-visibility:civisibility-test-fixtures')
+  testImplementation(project(':dd-java-agent:agent-ci-visibility:civisibility-test-fixtures'))
 }
 
 tasks.named("test", Test) {

dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java

@@ -1610,7 +1610,7 @@ protected static final DDSpan buildSpanImpl(
         List<AgentSpanLink> links,
         DDSpanContext spanContext) {
       DDSpan span = DDSpan.create(instrumentationName, timestampMicro, spanContext, links);
-      if (span.isLocalRootSpan()) {
+      if (span.checkLocalRootSpan()) {
         EndpointTracker tracker = tracer.onRootSpanStarted(span);
         if (tracker != null) {
           span.setEndpointTracker(tracker);

dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java

@@ -310,7 +310,7 @@ public boolean isForceKeep() {
    *
    * @return true if root, false otherwise
    */
-  public final boolean isRootSpan() {
+  public final boolean checkRootSpan() {
     return context.getParentId() == DDSpanId.ZERO;
   }
 
@@ -330,7 +330,7 @@ public DDSpan getLocalRootSpan() {
    *
    * @return {@literal true} if this span is the same as {@linkplain #getLocalRootSpan()}
    */
-  public boolean isLocalRootSpan() {
+  public boolean checkLocalRootSpan() {
     return getLocalRootSpan().equals(this);
   }
 
@@ -382,7 +382,7 @@ private boolean isExceptionReplayEnabled() {
     boolean captureOnlyRootSpan =
         (Config.get().isDebuggerExceptionOnlyLocalRoot()
             || !Config.get().isDebuggerExceptionCaptureIntermediateSpansEnabled());
-    if (captureOnlyRootSpan && !isLocalRootSpan()) {
+    if (captureOnlyRootSpan && !checkLocalRootSpan()) {
       return false;
     }
     return true;

dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanTest.groovy

@@ -279,14 +279,14 @@ class DDSpanTest extends DDCoreSpecification {
     new ExtractedContext(DDTraceId.ONE, 2, PrioritySampling.SAMPLER_DROP, "some-origin", propagationTagsFactory.empty(), DATADOG) | _
   }
 
-  def "isRootSpan() in and not in the context of distributed tracing"() {
+  def "checkRootSpan() in and not in the context of distributed tracing"() {
     setup:
     def root = tracer.buildSpan("root").asChildOf((AgentSpanContext) extractedContext).start()
     def child = tracer.buildSpan("child").asChildOf(root).start()
 
     expect:
-    root.isRootSpan() == isTraceRootSpan
-    !child.isRootSpan()
+    root.checkRootSpan() == isTraceRootSpan
+    !child.checkRootSpan()
 
     cleanup:
     child.finish()

gradle/codenarc.gradle

@@ -1,7 +1,7 @@
 apply plugin: "codenarc"
 
 dependencies {
-  codenarc('org.codenarc:CodeNarc:3.7.0')
+  codenarc('org.codenarc:CodeNarc:3.7.0-groovy-4.0')
 }
 
 codenarc {