Upgrade gradle to v8.14.3 (#8950)

sarahchen6 · nikita-tkachenko-datadog · bric3 · web-flow · commit 951975251dd1 · 2025-07-10T08:55:36.000-04:00
* Upgrade gradle to v8.14

* Fix checksum

* Update groovy version

* Update type parameters

* Upgrade gradle to v8.14.2

* Address issue with SpecificInstallationToolchainSpec

* Update JUnit jupiter and platform versions

* Make PropertyFactory change more readable

* Fix GString to String[] assignment

* Changed too many things for junit-5.3

* Skip muzzle for gradle 8.3 instrumentation

* Upgrade to gradle v8.14.3

* Fix Gradle 8.3 instrumentation

* Update gradle wrapper

* Remove log-injection groovy specification

* Upgrade groovy to 3.0.25

* Change groovy version back to 3.0.24 due to incompatibility

* Upgrade junit to x.12.0

* Add comment

* Retrieve binary gradle file only

Co-authored-by: Brice Dutheil &lt;brice.dutheil@gmail.com&gt;

---------

Co-authored-by: Nikita Tkachenko &lt;nikita.tkachenko@datadoghq.com&gt;
Co-authored-by: Brice Dutheil &lt;brice.dutheil@gmail.com&gt;
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ variables:
   BUILD_JOB_NAME: "build"
   DEPENDENCY_CACHE_POLICY: pull
   BUILD_CACHE_POLICY: pull
-  GRADLE_VERSION: "8.5" # must match gradle-wrapper.properties
+  GRADLE_VERSION: "8.14.3" # must match gradle-wrapper.properties
   MAVEN_REPOSITORY_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/maven-central/"
   GRADLE_PLUGIN_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/gradle-plugin-portal-proxy/"
   BUILDER_IMAGE_VERSION_PREFIX: "v25.06-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerInjector_8_3.java b/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerInjector_8_3.java
@@ -1,14 +1,23 @@
 package datadog.trace.instrumentation.gradle;
 
+import datadog.trace.util.MethodHandles;
+import java.lang.invoke.MethodHandle;
 import java.util.Arrays;
+import org.gradle.api.Action;
 import org.gradle.initialization.ClassLoaderRegistry;
 import org.gradle.internal.service.DefaultServiceRegistry;
+import org.gradle.internal.service.ServiceRegistration;
 import org.gradle.internal.service.ServiceRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class CiVisibilityGradleListenerInjector_8_3 {
 
+  private static final MethodHandles METHOD_HANDLES =
+      new MethodHandles(DefaultServiceRegistry.class.getClassLoader());
+  private static final MethodHandle REGISTER_SERVICE =
+      METHOD_HANDLES.method(DefaultServiceRegistry.class, "register", Action.class);
+
   private static final Logger LOGGER =
       LoggerFactory.getLogger(CiVisibilityGradleListenerInjector_8_3.class);
 
@@ -21,8 +30,9 @@ public static void injectCiVisibilityGradleListener(
       Class<?> ciVisibilityGradleListener =
           CiVisibilityGradleListenerInjector_8_3.loadCiVisibilityGradleListener(
               classLoaderRegistry);
-      buildScopeServices.register(
-          serviceRegistration -> serviceRegistration.add(ciVisibilityGradleListener));
+      Action<ServiceRegistration> registrationAction =
+          serviceRegistration -> serviceRegistration.add(ciVisibilityGradleListener);
+      METHOD_HANDLES.invoke(REGISTER_SERVICE, buildScopeServices, registrationAction);
     } catch (Exception e) {
       LOGGER.warn("Could not inject CI Visibility Gradle listener", e);
     }
diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java b/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java
@@ -11,8 +11,8 @@
 import java.util.Set;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.matcher.ElementMatcher;
+import org.gradle.internal.service.DefaultServiceRegistry;
 import org.gradle.internal.service.ServiceRegistry;
-import org.gradle.internal.service.scopes.BuildScopeServices;
 
 @AutoService(InstrumenterModule.class)
 public class GradleBuildScopeServices_8_3_Instrumentation extends InstrumenterModule.CiVisibility
@@ -55,10 +55,15 @@ public void methodAdvice(MethodTransformer transformer) {
   public static class Construct {
     @Advice.OnMethodExit(suppress = Throwable.class)
     public static void afterConstructor(
-        @Advice.This final BuildScopeServices buildScopeServices,
+        @Advice.This final DefaultServiceRegistry buildScopeServices,
         @Advice.Argument(0) final ServiceRegistry parentServices) {
       CiVisibilityGradleListenerInjector_8_3.injectCiVisibilityGradleListener(
           buildScopeServices, parentServices);
     }
   }
+
+  @Override
+  public String muzzleDirective() {
+    return "skipMuzzle";
+  }
 }
diff --git a/dd-java-agent/instrumentation/junit-5.3/build.gradle b/dd-java-agent/instrumentation/junit-5.3/build.gradle
@@ -1,4 +1,3 @@
-
 apply from: "$rootDir/gradle/java.gradle"
 
 // JUnit5 5.3.0+ version is needed because of the fix in the TestInheritance test suite names.
@@ -33,9 +32,9 @@ dependencies {
 
   // 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: '1.9.2'
-  testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.2'
-  testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.9.2'
+  testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.12.0'
+  testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.12.0'
+  testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.12.0'
 
   latestDepTestImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '+'
   latestDepTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '+'
@@ -44,8 +43,8 @@ dependencies {
 
 configurations.matching({ it.name.startsWith('test') }).each({
   it.resolutionStrategy {
-    force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.9.2'
-    force group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.2'
-    force group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.9.2'
+    force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.12.0'
+    force group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.12.0'
+    force group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.12.0'
   }
 })
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/build.gradle b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/build.gradle
@@ -5,7 +5,7 @@ muzzle {
     group = 'io.cucumber'
     module = 'cucumber-junit-platform-engine'
     versions = '[5.4.0,)'
-    extraDependency "org.junit.platform:junit-platform-launcher:1.9.2"
+    extraDependency "org.junit.platform:junit-platform-launcher:1.12.0"
   }
 }
 
@@ -19,9 +19,9 @@ dependencies {
 
   testImplementation testFixtures(project(':dd-java-agent:agent-ci-visibility'))
 
-  testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.9.2'
-  testImplementation group: 'org.junit.platform', name: 'junit-platform-suite', version: '1.9.2'
-  testImplementation group: 'org.junit.platform', name: 'junit-platform-suite-engine', version: '1.9.2'
+  testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.12.0'
+  testImplementation group: 'org.junit.platform', name: 'junit-platform-suite', version: '1.12.0'
+  testImplementation group: 'org.junit.platform', name: 'junit-platform-suite-engine', version: '1.12.0'
 
   testImplementation group: 'io.cucumber', name: 'cucumber-junit-platform-engine', version: '5.4.0'
   testImplementation group: 'io.cucumber', name: 'cucumber-java', version: '5.4.0'
@@ -33,8 +33,7 @@ dependencies {
 
 configurations.matching({ it.name.startsWith('test') }).each({
   it.resolutionStrategy {
-    force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.9.2'
-    force group: 'org.junit.platform', name: 'junit-platform-suite', version: '1.9.2'
-    force group: 'org.junit.platform', name: 'junit-platform-suite', version: '1.9.2'
+    force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.12.0'
+    force group: 'org.junit.platform', name: 'junit-platform-suite', version: '1.12.0'
   }
 })
diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/build.gradle b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/build.gradle
@@ -36,9 +36,9 @@ dependencies {
 
   // 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: '1.9.2'
-  testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.2'
-  testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.9.2'
+  testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.12.0'
+  testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.12.0'
+  testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.12.0'
 
   latestDepTestImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '+'
   latestDepTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '+'
@@ -47,8 +47,8 @@ dependencies {
 
 configurations.matching({ it.name.startsWith('test') }).each({
   it.resolutionStrategy {
-    force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.9.2'
-    force group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.2'
-    force group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.9.2'
+    force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.12.0'
+    force group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.12.0'
+    force group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.12.0'
   }
 })
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/build.gradle b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/build.gradle
@@ -7,7 +7,7 @@ muzzle {
     group = 'org.spockframework'
     module = 'spock-core'
     versions = "[2.0-groovy-${spockGroovyVersion},)"
-    extraDependency "org.junit.platform:junit-platform-launcher:1.9.2"
+    extraDependency "org.junit.platform:junit-platform-launcher:1.12.0"
   }
 }
 
@@ -22,7 +22,7 @@ dependencies {
 
   testImplementation testFixtures(project(':dd-java-agent:agent-ci-visibility'))
 
-  testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.9.2'
+  testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.12.0'
   testImplementation group: 'org.spockframework', name: 'spock-core', version: "2.2-groovy-${spockGroovyVersion}"
 
   // Broken from 2.4: https://datadoghq.atlassian.net/browse/AIDM-163
@@ -31,7 +31,7 @@ dependencies {
 
 configurations.matching({ it.name.startsWith('test') }).each({
   it.resolutionStrategy {
-    force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.9.2'
+    force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.12.0'
     force group: 'org.spockframework', name: 'spock-core', version: "2.2-groovy-${spockGroovyVersion}"
   }
 })
diff --git a/dd-java-agent/instrumentation/netty-promise-4/src/test/groovy/NettyProgressivePromiseTest.groovy b/dd-java-agent/instrumentation/netty-promise-4/src/test/groovy/NettyProgressivePromiseTest.groovy
@@ -1,7 +1,7 @@
 import datadog.trace.agent.test.base.AbstractPromiseTest
 import io.netty.util.concurrent.DefaultEventExecutorGroup
-import io.netty.util.concurrent.Future
 import io.netty.util.concurrent.GenericProgressiveFutureListener
+import io.netty.util.concurrent.ProgressiveFuture
 import io.netty.util.concurrent.ProgressivePromise
 import spock.lang.Shared
 
@@ -61,15 +61,12 @@ class NettyProgressivePromiseTest extends AbstractPromiseTest<ProgressivePromise
     when:
     runUnderTrace("parent") {
       def listeners = iterations.collect { int i ->
-        return new GenericProgressiveFutureListener<Future<?>>() {
-
-            @Override
-            void operationComplete(Future<?> future) throws Exception {
+        return new GenericProgressiveFutureListener<ProgressiveFuture<?>>() {
+            void operationComplete(ProgressiveFuture<?> future) throws Exception {
               runUnderTrace("listen$i") {}
             }
 
-            @Override
-            void operationProgressed(Future<?> future, long progress, long total) throws Exception {
+            void operationProgressed(ProgressiveFuture<?> future, long progress, long total) throws Exception {
               runUnderTrace("progress$i") {}
             }
           }
diff --git a/dd-java-agent/instrumentation/scala/build.gradle b/dd-java-agent/instrumentation/scala/build.gradle
@@ -27,7 +27,7 @@ final testTasks = scalaVersions.collect { scalaLibrary ->
   def (major, minor) = version.split('_').collect(Integer.&valueOf)
   final javaConcatenation = major > 2 || minor > 11 // after 2.11 scala uses java.lang.StringBuilder to perform concatenation
 
-  final configuration = configurations.create("${version}Implementation") {
+  final implementationConfiguration = configurations.create("${version}Implementation") {
     canBeConsumed = false
     canBeResolved = false
     canBeDeclared = true
@@ -36,14 +36,14 @@ final testTasks = scalaVersions.collect { scalaLibrary ->
     canBeConsumed = false
     canBeResolved = true
     canBeDeclared = false
-    extendsFrom(configuration)
+    extendsFrom(implementationConfiguration)
   }
 
   dependencies { handler ->
-    handler.add(configuration.name, scalaLibrary)
-    handler.add(configuration.name, libs.slf4j)
+    handler.add(implementationConfiguration.name, scalaLibrary)
+    handler.add(implementationConfiguration.name, libs.slf4j)
     if (javaConcatenation) {
-      handler.add(configuration.name, project(':dd-java-agent:instrumentation:java-lang'))
+      handler.add(implementationConfiguration.name, project(':dd-java-agent:instrumentation:java-lang'))
     }
   }
 
@@ -59,7 +59,7 @@ final testTasks = scalaVersions.collect { scalaLibrary ->
       .filter { !it.toString().contains('scala-library') }   // exclude default scala-library
       .minus(files(sourceSets.test.scala.classesDirectory))  // exclude default /build/classes/scala/test folder
       .plus(customSourceSet.output.classesDirs)              // add /build/classes/scala/${version} folder
-      .plus(classPathConfiguration)                                   // add new scala-library configuration
+      .plus(classPathConfiguration)                          // add new scala-library configuration
     systemProperty('uses.java.concat', javaConcatenation)
     dependsOn(tasks.named("compile${version.capitalize()}Scala"))
     group = 'verification'
diff --git a/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleLauncherSmokeTest.groovy b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleLauncherSmokeTest.groovy
@@ -60,7 +60,7 @@ class GradleLauncherSmokeTest extends AbstractGradleTest {
     ])
     String[] command = ["./gradlew", "--no-daemon", "--info"]
     if (gradleDaemonCmdLineParams) {
-      command += "-Dorg.gradle.jvmargs=$gradleDaemonCmdLineParams"
+      command += "-Dorg.gradle.jvmargs=$gradleDaemonCmdLineParams".toString()
     }
     return shellCommandExecutor.executeCommand(IOUtils::readFully, command)
   }
diff --git a/dd-smoke-tests/log-injection/build.gradle b/dd-smoke-tests/log-injection/build.gradle
@@ -7,15 +7,6 @@ plugins {
 apply from: "$rootDir/gradle/java.gradle"
 description = 'Log injection Smoke Tests.'
 
-// 3.0.24 added support for JDK 24 via ASM 9.7.1
-// https://groovy-lang.org/changelogs/changelog-3.0.24.html
-// https://asm.ow2.io/versions.html#9.7.1
-configurations.all {
-  resolutionStrategy {
-    force 'org.codehaus.groovy:groovy-all:3.0.24'
-  }
-}
-
 configurations {
   jcl
   log4j1
diff --git a/gradle/java_no_deps.gradle b/gradle/java_no_deps.gradle
@@ -1,3 +1,4 @@
+import org.gradle.api.internal.provider.PropertyFactory
 import org.gradle.jvm.toolchain.internal.SpecificInstallationToolchainSpec
 
 apply plugin: 'java-library'
@@ -175,7 +176,7 @@ project.afterEvaluate {
     def testJvmHomePath = getJavaHomePath(testJvmHome)
     // Only change test JVM if it's not the one we are running the gradle build with
     if (currentJavaHomePath != testJvmHomePath) {
-      def jvmSpec = new SpecificInstallationToolchainSpec(project.getObjects(), file(testJvmHomePath))
+      def jvmSpec = new SpecificInstallationToolchainSpec(project.services.get(PropertyFactory), file(testJvmHomePath))
       // The provider always says that a value is present so we need to wrap it for proper error messages
       Provider<JavaLauncher> launcher = providers.provider {
         try {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ okhttp-legacy = "[3.0,3.12.12]" # 3.12.x is last version to support Java7
 okio = "1.17.6" # Datadog fork
 
 spock = "2.3-groovy-3.0"
-groovy = "3.0.17"
+groovy = "3.0.24"
 junit5 = "5.9.2"
 logback = "1.2.3"
 bytebuddy = "1.17.5"
diff --git a/gradle/test-suites.gradle b/gradle/test-suites.gradle
@@ -1,6 +1,6 @@
 import org.gradle.api.plugins.jvm.JvmTestSuite
 
-ext.addTestSuiteExtendingForDir = (String testSuiteName, String parentSuiteName, String dirName) -> {
+ext.addTestSuiteExtendingForDir = { testSuiteName, parentSuiteName, dirName ->
   testing {
     suites {
       create(testSuiteName, JvmTestSuite, {
@@ -27,16 +27,12 @@ ext.addTestSuiteExtendingForDir = (String testSuiteName, String parentSuiteName,
             }
           }
         }
-        dependencies {
-          implementation project(project.path)
-        }
       })
     }
   }
 
   configurations {
-    def extendConf = {
-      String suffix ->
+    def extendConf = { suffix ->
       def config = named("${testSuiteName}${suffix}")
       def parentConfig = named("${parentSuiteName}${suffix}")
       if (parentConfig.present) {
@@ -65,12 +61,19 @@ ext.addTestSuiteExtendingForDir = (String testSuiteName, String parentSuiteName,
     from(sourceSets.named(testSuiteName).get().output)
     archiveClassifier = testSuiteName
   }
+
+  // The project dependency definition cannot sit inside previous blocks. As of Gradle 8.8, configurations cannot be mutated after they have been used as part of the dependency graph.
+  // See: https://docs.gradle.org/current/userguide/upgrading_version_8.html#mutate_configuration_after_locking
+  // And related issue: https://github.com/gradle/gradle/issues/28867
+  project.dependencies {
+    "${testSuiteName}Implementation"(project(project.path))
+  }
 }
 
-ext.addTestSuiteForDir = (String testSuiteName, String dirName) -> {
+ext.addTestSuiteForDir = { testSuiteName, dirName ->
   ext.addTestSuiteExtendingForDir(testSuiteName, 'test', dirName)
 }
 
-ext.addTestSuite = (String testSuiteName) -> {
+ext.addTestSuite = { testSuiteName ->
   ext.addTestSuiteForDir(testSuiteName, testSuiteName)
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,8 +2,8 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 # Please note that the version specific cache directory in
 # .gitlab-ci.yml needs to match this version.
-distributionSha256Sum=c16d517b50dd28b3f5838f0e844b7520b8f1eb610f2f29de7e4e04a1b7c9c79b
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
+distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/telemetry/src/test/groovy/datadog/telemetry/metric/MetricPeriodicActionTest.groovy b/telemetry/src/test/groovy/datadog/telemetry/metric/MetricPeriodicActionTest.groovy

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class GradleLauncherSmokeTest extends AbstractGradleTest {`
`60`	`60`	`])`
`61`	`61`	`String[] command = ["./gradlew", "--no-daemon", "--info"]`
`62`	`62`	`if (gradleDaemonCmdLineParams) {`
`63`		`- command += "-Dorg.gradle.jvmargs=$gradleDaemonCmdLineParams"`
	`63`	`+ command += "-Dorg.gradle.jvmargs=$gradleDaemonCmdLineParams".toString()`
`64`	`64`	`}`
`65`	`65`	`return shellCommandExecutor.executeCommand(IOUtils::readFully, command)`
`66`	`66`	`}`