DataDog · AlexeyKuznetsov-DD · Oct 13, 2025 · Oct 13, 2025 · Oct 13, 2025 · Oct 13, 2025
@@ -2,21 +2,23 @@ import com.diffplug.gradle.spotless.SpotlessExtension
 import datadog.gradle.plugin.ci.testAggregate
 
 plugins {
-  id("datadog.gradle-debug")
+  kotlin("jvm") version libs.versions.kotlin.plugin apply false
+
+  id("datadog.ci-jobs")
+  id("datadog.config-inversion-linter")
   id("datadog.dependency-locking")
-  id("datadog.tracer-version")
   id("datadog.dump-hanged-test")
-  id("config-inversion-linter")
-  id("datadog.ci-jobs")
+  id("datadog.gradle-debug")
+  id("datadog.groovy-spock")
+  id("datadog.tracer-version")
 
   id("com.diffplug.spotless") version "6.13.0"
   id("com.github.spotbugs") version "5.0.14"
+  id("com.gradleup.shadow") version "8.3.6" apply false
   id("de.thetaphi.forbiddenapis") version "3.8"
   id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
-  id("com.gradleup.shadow") version "8.3.6" apply false
   id("me.champeau.jmh") version "0.7.3" apply false
   id("org.gradle.playframework") version "0.13" apply false
-  kotlin("jvm") version libs.versions.kotlin.plugin apply false
 }
 
 description = "dd-trace-java"

@@ -13,35 +13,47 @@ java {
 }
 
 gradlePlugin {
+  // Sorted list of plugins:
   plugins {
-    create("instrument-plugin") {
-      id = "instrument"
-      implementationClass = "InstrumentPlugin"
-    }
-    create("muzzle-plugin") {
-      id = "muzzle"
-      implementationClass = "datadog.gradle.plugin.muzzle.MuzzlePlugin"
-    }
     create("call-site-instrumentation-plugin") {
       id = "call-site-instrumentation"
       implementationClass = "datadog.gradle.plugin.csi.CallSiteInstrumentationPlugin"
     }
-    create("tracer-version-plugin") {
-      id = "datadog.tracer-version"
-      implementationClass = "datadog.gradle.plugin.version.TracerVersionPlugin"
-    }
+
     create("dump-hanged-test-plugin") {
       id = "datadog.dump-hanged-test"
       implementationClass = "datadog.gradle.plugin.dump.DumpHangedTestPlugin"
     }
+
+    create("groovy-spock-plugin") {
+      id = "datadog.groovy-spock"
+      implementationClass = "datadog.gradle.plugin.config.groovy.GroovySpockConventionPlugin"
+    }
+
+    create("instrument-plugin") {
+      id = "instrument"
+      implementationClass = "InstrumentPlugin"
+    }
+
+    create("muzzle-plugin") {
+      id = "muzzle"
+      implementationClass = "datadog.gradle.plugin.muzzle.MuzzlePlugin"
+    }
+
     create("supported-config-generation") {
-      id = "supported-config-generator"
+      id = "datadog.supported-config-generator"
       implementationClass = "datadog.gradle.plugin.config.SupportedConfigPlugin"
     }
+
     create("supported-config-linter") {
-      id = "config-inversion-linter"
+      id = "datadog.config-inversion-linter"
       implementationClass = "datadog.gradle.plugin.config.ConfigInversionLinter"
     }
+
+    create("tracer-version-plugin") {
+      id = "datadog.tracer-version"
+      implementationClass = "datadog.gradle.plugin.version.TracerVersionPlugin"
+    }
   }
 }
 
@@ -76,6 +88,10 @@ dependencies {
   implementation("com.fasterxml.jackson.core:jackson-core")
 
   compileOnly(libs.develocity)
+
+  // We have to use Spock with Groovy3 as Gradle 8.x bundled with Groovy3.
+  // TODO: We can refactor `buildSrc` folder to not use Groovy at all.
+  testImplementation(libs.spock.core.groovy3)
 }
 
 tasks.compileKotlin {
@@ -86,10 +102,6 @@ testing {
   @Suppress("UnstableApiUsage")
   suites {
     val test by getting(JvmTestSuite::class) {
-      dependencies {
-        implementation(libs.groovy)
-        implementation(libs.spock.core)
-      }
       targets.configureEach {
         testTask.configure {
           enabled = project.hasProperty("runBuildSrcTests")

@@ -32,11 +32,12 @@ dependencies {
   implementation("org.freemarker", "freemarker", "2.3.30")
   implementation(libs.asm)
   implementation(libs.asm.tree)
-  implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4")
+  implementation(libs.javaparser.solver)
 
   testImplementation(libs.bytebuddy)
-  testImplementation(libs.groovy)
-  testImplementation(libs.bundles.spock)
+  testImplementation(libs.groovy4)
+  testImplementation(libs.spock.core.groovy4)
+  testImplementation(libs.objenesis)
   testImplementation("javax.servlet", "javax.servlet-api", "3.0.1")
   testImplementation("com.github.spotbugs", "spotbugs-annotations", "4.2.0")
 }

@@ -0,0 +1,70 @@
+package datadog.gradle.plugin.config.groovy
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.api.plugins.JavaLibraryPlugin
+import org.gradle.api.plugins.JavaPlugin
+
+@Suppress("unused")
+class GroovySpockConventionPlugin : Plugin<Project> {
+  override fun apply(project: Project) {
+    if (project == project.rootProject) {
+      project.subprojects {
+        this.pluginManager.apply(GroovySpockConventionPlugin::class.java)
+      }
+      return
+    }
+
+    val extension = project.extensions.create("groovySpock", GroovySpockExtension::class.java)
+
+    project.plugins.withType(JavaPlugin::class.java) {
+      configure(project, extension)
+    }
+
+    project.plugins.withType(JavaLibraryPlugin::class.java) {
+      configure(project, extension)
+    }
+  }
+
+  private fun configure(
+    project: Project,
+    extension: GroovySpockExtension
+  ) {
+    // TODO: check `afterEvaluate` is really needed.
+    project.afterEvaluate {
+      val groovyAlias = when (val groovyVersion = extension.groovyVersion.get()) {
+        3 -> "groovy3"
+        4 -> "groovy4"
+        else -> error("Unsupported groovyVersion=$groovyVersion (only 3 or 4 supported)")
+      }
+
+      val catalogs = project.extensions.getByType(VersionCatalogsExtension::class.java).named("libs")
+
+      fun findLibrary(alias: String) = catalogs.findLibrary(alias)
+        .orElseThrow { IllegalArgumentException("Library not found in catalog for alias: $alias") }
+
+      val defaultLibs = listOf(
+        findLibrary(groovyAlias),
+        findLibrary("$groovyAlias-json"),
+        findLibrary("spock-core-$groovyAlias"),
+        findLibrary("objenesis")
+      )
+
+      fun configureDependencies(cfg: String, deps: List<Any>) =
+        deps.forEach { project.dependencies.add(cfg, it) }
+
+      val configurations = extension.configurations
+
+      if (configurations.isEmpty()) {
+        // If nothing configured, setup default configuration, suitable in most cases.
+        configureDependencies("testImplementation", defaultLibs)
+      } else {
+        configurations.forEach { (cfg, deps) ->
+          configureDependencies(cfg, defaultLibs)
+          deps.forEach { project.dependencies.add(cfg, it) }
+        }
+      }
+    }
+  }
+}
@@ -0,0 +1,28 @@
+package datadog.gradle.plugin.config.groovy
+
+import org.gradle.api.model.ObjectFactory
+import org.gradle.api.provider.Property
+import java.util.concurrent.ConcurrentHashMap
+import javax.inject.Inject
+
+/**
+ * Configuration for Groovy and Spock.
+ */
+abstract class GroovySpockExtension @Inject constructor(
+  objects: ObjectFactory
+) {
+  internal val configurations: MutableMap<String, MutableList<Any>> = ConcurrentHashMap()
+
+  internal val groovyVersion: Property<Int> =
+    objects.property(Int::class.java)
+      .convention(4)
+
+  fun groovyVersion(version: Int) {
+    groovyVersion.set(version)
+  }
+
+  fun configureDependencies(taskName: String, vararg dependencies: Any) {
+    configurations.computeIfAbsent(taskName) { mutableListOf() }.addAll(dependencies)
+  }
+}
+
@@ -1,6 +1,10 @@
 apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/version.gradle"
 
+groovySpock {
+  configureDependencies("compileOnly")
+}
+
 dependencies {
   api project(':dd-java-agent:instrumentation-testing')
   api project(':dd-java-agent:agent-ci-visibility:civisibility-test-fixtures')

@@ -1,6 +1,10 @@
 apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/version.gradle"
 
+groovySpock {
+  configureDependencies("compileOnly")
+}
+
 dependencies {
   api project(':dd-java-agent:agent-ci-visibility')
   api project(':dd-java-agent:testing')
@@ -11,5 +15,7 @@ dependencies {
   api libs.jackson.databind
   api group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.9.6'
   api group: 'org.xmlunit', name: 'xmlunit-core', version: '2.10.3'
+
+  compileOnly libs.junit.jupiter
 }
 
@@ -11,6 +11,7 @@ import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.civisibility.config.LibraryCapability
 import datadog.trace.api.civisibility.config.TestFQN
 import datadog.trace.core.DDSpan
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
 import freemarker.core.Environment
 import freemarker.core.InvalidReferenceException
 import freemarker.template.Template
@@ -367,6 +368,7 @@ abstract class CiVisibilityTestUtils {
     return compiledPaths
   }
 
+  @SuppressFBWarnings("UPM_UNCALLED_PRIVATE_METHOD")
   private static DynamicPath path(String rawPath, boolean unique = true) {
     return new DynamicPath(rawPath, JsonPath.compile(rawPath), unique)
   }

@@ -34,6 +34,10 @@ protobuf {
   }
 }
 
+groovySpock {
+  configureDependencies("testImplementation", libs.groovy4.yaml)
+}
+
 dependencies {
   api libs.slf4j
 
@@ -50,7 +54,6 @@ dependencies {
   testImplementation project(':dd-java-agent:agent-bootstrap')
   testImplementation libs.bytebuddy
   testImplementation('org.skyscreamer:jsonassert:1.5.1')
-  testImplementation libs.groovy.yaml
   testImplementation libs.guava
 
   testImplementation group: 'io.grpc', name: 'grpc-core', version: grpcVersion

@@ -1,6 +1,10 @@
 apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/version.gradle"
 
+groovySpock {
+  configureDependencies("compileOnly")
+}
+
 dependencies {
   api project(':dd-java-agent:agent-iast')
   api project(':dd-java-agent:instrumentation-testing')

@@ -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()))

@@ -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++) {

@@ -1,9 +1,15 @@
 apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/version.gradle"
 
+groovySpock {
+  configureDependencies("compileOnly")
+}
+
 dependencies {
   api project(':dd-java-agent:appsec')
   api project(':dd-java-agent:instrumentation-testing')
+
+  compileOnly(libs.junit.jupiter)
 }
 
 configurations.named('api') {

@@ -785,8 +785,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'
 
   }
 

@@ -1,17 +1,22 @@
 apply from: "$rootDir/gradle/java.gradle"
 
+groovySpock {
+  configureDependencies("compileOnly")
+  configureDependencies("testImplementation")
+}
+
 dependencies {
   api libs.bytebuddy
   api libs.bytebuddyagent
   api libs.slf4j
-  api libs.bundles.spock
   api libs.bundles.test.logging
   api libs.guava
 
   api project(':dd-java-agent:testing')
 
   implementation project(':dd-java-agent:agent-debugger')
 
+  implementation(libs.junit.jupiter)
   implementation "org.junit.platform:junit-platform-runner:${libs.versions.junit.platform.get()}"
 
   testImplementation project(':dd-java-agent:instrumentation:trace-annotation')