chore: Lazy configurations access

bric3 · bric3 · commit e1a1de355f8b · 2025-10-13T13:26:34.000+02:00
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/build.gradle b/dd-java-agent/agent-otel/otel-bootstrap/build.gradle
@@ -11,12 +11,14 @@ apply from: "$rootDir/gradle/java.gradle"
 apply plugin: 'instrument'
 
 configurations {
-  embeddedClasspath {
+  def ec = register('embeddedClasspath') {
     visible = false
     canBeConsumed = false
     canBeResolved = true
   }
-  compileClasspath.extendsFrom(embeddedClasspath)
+  named('compileClasspath') {
+    compileClasspath.extendsFrom(ec.get())
+  }
   instrumentPluginClasspath {
     visible = false
     canBeConsumed = false
@@ -55,13 +57,12 @@ dependencies {
 
 // unpack embeddedClasspath to same path as compiled classes so it can get instrumented
 tasks.register('unpackJars', Copy) {
-  dependsOn configurations.embeddedClasspath
+  dependsOn configurations.named('embeddedClasspath')
   exclude 'META-INF/'
   exclude '**/module-info.class'
   exclude '**/package-info.class'
-  from {
-    configurations.embeddedClasspath.collect { zipTree(it) }
-  }
+
+  from(configurations.named('embeddedClasspath').map { it.collect { zipTree(it) } })
   into compileJava.destinationDirectory
 }
 
diff --git a/dd-java-agent/appsec/appsec-test-fixtures/build.gradle b/dd-java-agent/appsec/appsec-test-fixtures/build.gradle
@@ -6,6 +6,6 @@ dependencies {
   api project(':dd-java-agent:instrumentation-testing')
 }
 
-configurations.api {
+configurations.named('api') {
   exclude group: 'org.eclipse.jetty', module: 'jetty-server'
 }
diff --git a/dd-java-agent/instrumentation/cxf-2.1/build.gradle b/dd-java-agent/instrumentation/cxf-2.1/build.gradle
@@ -76,9 +76,16 @@ dependencies {
   latestDepTestImplementation group: 'org.apache.cxf', name: 'cxf-rt-frontend-jaxrs', version: '+'
   latestDepTestImplementation group: 'org.apache.cxf', name:'cxf-rt-transports-http-jetty', version: '+'
 
-  configurations.findAll {it.name in ['latestDepTestRuntimeClasspath', 'cxf3LatestDepTestRuntimeClasspath'] }.each {
-    it.resolutionStrategy {
-      force libs.slf4j
-    }
+}
+
+configurations.named('latestDepTestRuntimeClasspath') {
+  resolutionStrategy {
+    force libs.slf4j
+  }
+}
+
+configurations.named('cxf3LatestDepTestRuntimeClasspath') {
+  resolutionStrategy {
+    force libs.slf4j
   }
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/rest-5/build.gradle b/dd-java-agent/instrumentation/elasticsearch/rest-5/build.gradle
@@ -46,6 +46,6 @@ dependencies {
   latestDepTestImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.3.+'
 }
 
-configurations.latestDepTestImplementation {
+configurations.named('latestDepTestImplementation') {
   exclude group: "org.elasticsearch.client", module: "rest"
 }
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/build.gradle b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/build.gradle
@@ -26,7 +26,7 @@ dependencies {
   latestDepTestImplementation group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '2.+'
 }
 
-configurations.testRuntimeOnly {
+configurations.named('testRuntimeOnly') {
   // jersey-container-grizzly2-http transitively imports its own set repackaged asm classes
   exclude group: 'org.ow2.asm'
 }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/build.gradle b/dd-java-agent/instrumentation/netty/netty-3.8/build.gradle
@@ -33,7 +33,7 @@ dependencies {
 }
 
 // We need to force the dependency to the earliest supported version because other libraries declare newer versions.
-configurations.testImplementation {
+configurations.named('testImplementation') {
   resolutionStrategy {
     eachDependency { DependencyResolveDetails details ->
       //specifying a fixed version for all libraries with io.netty' group
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/build.gradle b/dd-java-agent/instrumentation/netty/netty-4.0/build.gradle
@@ -47,7 +47,7 @@ dependencies {
 }
 
 // We need to force the dependency to the earliest supported version because other libraries declare newer versions.
-configurations.testImplementation {
+configurations.named('testImplementation') {
   resolutionStrategy {
     eachDependency { DependencyResolveDetails details ->
       //specifying a fixed version for all libraries with io.netty' group
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/build.gradle b/dd-java-agent/instrumentation/netty/netty-4.1/build.gradle
@@ -58,7 +58,7 @@ dependencies {
 }
 
 // We need to force the dependency to the earliest supported version because other libraries declare newer versions.
-configurations.testImplementation {
+configurations.named('testImplementation') {
   resolutionStrategy {
     eachDependency { DependencyResolveDetails details ->
       //specifying a fixed version for all libraries with io.netty' group
diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/build.gradle b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/build.gradle
@@ -30,7 +30,7 @@ dependencies {
   latestReactorTestImplementation group: 'io.projectreactor.rabbitmq', name: 'reactor-rabbitmq', version: '+'
 }
 
-configurations.testRuntimeOnly {
+configurations.named('testRuntimeOnly') {
   resolutionStrategy {
     force group: 'com.rabbitmq', name: 'amqp-client', version: '2.7.0'
   }
@@ -41,5 +41,5 @@ tasks.withType(Test).configureEach {
 }
 
 tasks.named("latestDepTest", Test) {
-  finalizedBy latestReactorTest
+  finalizedBy 'latestReactorTest'
 }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle
@@ -156,14 +156,15 @@ tasks.withType(Test).configureEach {
 }
 
 // Exclude all the dependencies from test for latestDepTest since the names are completely different.
-configurations.findAll { it.name in ["latestDepTestImplementation", "tomcat9TestImplementation", "latest10TestImplementation"] }
-.each {
-  it.exclude group: 'tomcat', module: 'catalina'
-  it.exclude group: 'tomcat', module: 'tomcat-coyote'
-  it.exclude group: 'tomcat', module: 'tomcat-util'
-  it.exclude group: 'tomcat', module: 'tomcat-http'
-  it.exclude group: 'tomcat', module: 'naming-resources'
-  it.exclude group: 'tomcat', module: 'naming-factory'
-  it.exclude group: 'commons-modeler', module: 'commons-modeler'
-  it.exclude group: 'javax.servlet', module: 'servlet-api'
+["latestDepTestImplementation", "tomcat9TestImplementation", "latest10TestImplementation"].each {
+  configurations.named(it) {
+    it.exclude group: 'tomcat', module: 'catalina'
+    it.exclude group: 'tomcat', module: 'tomcat-coyote'
+    it.exclude group: 'tomcat', module: 'tomcat-util'
+    it.exclude group: 'tomcat', module: 'tomcat-http'
+    it.exclude group: 'tomcat', module: 'naming-resources'
+    it.exclude group: 'tomcat', module: 'naming-factory'
+    it.exclude group: 'commons-modeler', module: 'commons-modeler'
+    it.exclude group: 'javax.servlet', module: 'servlet-api'
+  }
 }
diff --git a/dd-java-agent/instrumentation/wildfly-9.0/build.gradle b/dd-java-agent/instrumentation/wildfly-9.0/build.gradle
@@ -81,20 +81,20 @@ def extractWildfly(NamedDomainObjectProvider<Configuration> config, String zipFi
 }
 
 def extractWildflyTask = tasks.register("extractWildfly", Copy) {
-  dependsOn configurations.wildflyTest
-  mustRunAfter tasks.compileTestGroovy
+  dependsOn configurations.named('wildflyTest')
+  mustRunAfter 'compileTestGroovy'
   extractWildfly(configurations.named("wildflyTest"), "wildfly-dist", it)
 
   // When tests are disabled this would still be run, so disable this manually
   onlyIf { !project.rootProject.hasProperty("skipTests") }
 }
 
 def extractLatestWildfly = tasks.register("extractLatestWildfly", Copy) {
-  mustRunAfter tasks.compileLatestDepTestGroovy
-  mustRunAfter tasks.compileLatestDepForkedTestGroovy
-  mustRunAfter tasks.compileLatestDepTestJava
-  mustRunAfter tasks.compileLatestDepForkedTestJava
-  mustRunAfter tasks.compileJava
+  mustRunAfter 'compileLatestDepTestGroovy'
+  mustRunAfter 'compileLatestDepForkedTestGroovy'
+  mustRunAfter 'compileLatestDepTestJava'
+  mustRunAfter 'compileLatestDepForkedTestJava'
+  mustRunAfter 'compileJava'
   extractWildfly(configurations.named("wildflyLatestDepTest"), "wildfly", it)
 
   // When tests are disabled this would still be run, so disable this manually
diff --git a/dd-java-agent/testing/build.gradle b/dd-java-agent/testing/build.gradle
@@ -27,7 +27,7 @@ excludedClassesCoverage += [
   'datadog.trace.agent.test.TestProfilingContextIntegration.TestQueueTiming'
 ]
 
-configurations.api {
+configurations.named('api') {
   exclude group: 'org.snakeyaml', module: 'snakeyaml-engine' // we vendor this in the agent jar
 }
 
diff --git a/dd-smoke-tests/osgi/build.gradle b/dd-smoke-tests/osgi/build.gradle
@@ -18,7 +18,7 @@ configurations {
   bundles
 }
 
-configurations.bundles {
+configurations.named('bundles') {
   transitive = false
 }
 
diff --git a/dd-smoke-tests/play-2.8-split-routes/build.gradle b/dd-smoke-tests/play-2.8-split-routes/build.gradle
@@ -66,7 +66,7 @@ dependencies {
   testImplementation project(':dd-smoke-tests')
 }
 
-configurations.testImplementation {
+configurations.named('testImplementation') {
   exclude group: 'com.typesafe.play', module: "play-test_$scalaVer"
 }
 
diff --git a/dd-smoke-tests/rum/wildfly-15/build.gradle b/dd-smoke-tests/rum/wildfly-15/build.gradle
@@ -26,7 +26,7 @@ apply from: "$rootDir/gradle/java.gradle"
 description = 'Wildfly Smoke Tests.'
 
 configurations {
-  serverFile {
+  register('serverFile') {
     extendsFrom implementation
     canBeResolved = true
   }
@@ -59,18 +59,16 @@ tasks.register('earBuild', Exec) {
     include '**/*'
     exclude '.gradle/**'
   })
-  .withPropertyName("application")
-  .withPathSensitivity(PathSensitivity.RELATIVE)
-}
+    .withPropertyName("application")
+    .withPathSensitivity(PathSensitivity.RELATIVE)
 
-tasks.named("earBuild", Exec) {
   dependsOn project(':dd-trace-api').tasks.named("jar")
 }
 
 tasks.named("compileTestGroovy", GroovyCompile) {
-  dependsOn tasks.earBuild
+  dependsOn 'earBuild'
   outputs.upToDateWhen {
-    !earBuild.didWork
+    !tasks.named('earBuild').get().didWork
   }
 }
 
@@ -84,41 +82,43 @@ spotless {
   }
 }
 
-def wildflyDir="${buildDir}/${serverName}-${serverVersion}"
-
 tasks.register("unzip", Copy) {
-  dependsOn tasks.earBuild
-  mustRunAfter tasks.compileTestGroovy
+  dependsOn 'earBuild'
+  mustRunAfter 'compileTestGroovy'
   def zipFileNamePrefix = "wildfly"
-  def zipPath = project.configurations.serverFile.find {
-    it.name.startsWith(zipFileNamePrefix)
-  }
-  if (zipPath != null) {
-    def zipFile = file(zipPath)
-    def outputDir = file("${buildDir}")
-
-    from zipTree(zipFile)
-    into outputDir
-  } else {
-    throw new GradleException("Can't find server zip file that starts with: " + zipFileNamePrefix)
+
+  def serverZipTree = providers.provider {
+    // eager access
+    def zipPath = project.configurations.serverFile.find {
+      it.name.startsWith(zipFileNamePrefix)
+    }
+    if (zipPath == null) {
+      throw new GradleException("Can't find server zip file that starts with: " + zipFileNamePrefix)
+    }
+    zipTree(zipPath)
   }
 
+  from serverZipTree
+  into layout.buildDirectory
+
   // When tests are disabled this would still be run, so disable this manually
   onlyIf { !project.rootProject.hasProperty("skipTests") }
 }
 
 tasks.withType(Jar).configureEach {
-  dependsOn tasks.unzip
+  dependsOn 'unzip'
 }
 
+def wildflyDir = "${buildDir}/${serverName}-${serverVersion}"
+
 tasks.register("deploy", Copy) {
-  dependsOn tasks.unzip
+  dependsOn 'unzip'
   from "${appBuildDir}/libs/wildfly-rum-ear-smoketest.ear"
   into "${wildflyDir}/standalone/deployments"
 }
 
 tasks.withType(Test).configureEach {
-  dependsOn tasks.deploy
+  dependsOn 'deploy'
   jvmArgs "-Ddatadog.smoketest.wildflyDir=${wildflyDir}"
 }
 
diff --git a/dd-smoke-tests/wildfly/build.gradle b/dd-smoke-tests/wildfly/build.gradle
@@ -26,7 +26,7 @@ apply from: "$rootDir/gradle/java.gradle"
 description = 'Wildfly Smoke Tests.'
 
 configurations {
-  serverFile {
+  register('serverFile') {
     extendsFrom implementation
     canBeResolved = true
   }
@@ -60,16 +60,14 @@ tasks.register('earBuild', Exec) {
     include '**/*'
     exclude '.gradle/**'
   })
-  .withPropertyName("application")
-  .withPathSensitivity(PathSensitivity.RELATIVE)
-}
+    .withPropertyName("application")
+    .withPathSensitivity(PathSensitivity.RELATIVE)
 
-tasks.named("earBuild", Exec) {
   dependsOn project(':dd-trace-api').tasks.named("jar")
 }
 
 tasks.named("compileTestGroovy", GroovyCompile) {
-  dependsOn tasks.earBuild
+  dependsOn 'earBuild'
   outputs.upToDateWhen {
     !earBuild.didWork
   }
@@ -85,41 +83,43 @@ spotless {
   }
 }
 
-def wildflyDir="${buildDir}/${serverName}-${serverVersion}"
-
 tasks.register("unzip", Copy) {
-  dependsOn tasks.earBuild
-  mustRunAfter tasks.compileTestGroovy
+  dependsOn 'earBuild'
+  mustRunAfter 'compileTestGroovy'
   def zipFileNamePrefix = "wildfly"
-  def zipPath = project.configurations.serverFile.find {
-    it.name.startsWith(zipFileNamePrefix)
-  }
-  if (zipPath != null) {
-    def zipFile = file(zipPath)
-    def outputDir = file("${buildDir}")
-
-    from zipTree(zipFile)
-    into outputDir
-  } else {
-    throw new GradleException("Can't find server zip file that starts with: " + zipFileNamePrefix)
+
+  def serverZipTree = providers.provider {
+    // eager access
+    def zipPath = project.configurations.serverFile.find {
+      it.name.startsWith(zipFileNamePrefix)
+    }
+    if (zipPath == null) {
+      throw new GradleException("Can't find server zip file that starts with: " + zipFileNamePrefix)
+    }
+    zipTree(zipPath)
   }
 
+  from serverZipTree
+  into layout.buildDirectory
+
   // When tests are disabled this would still be run, so disable this manually
   onlyIf { !project.rootProject.hasProperty("skipTests") }
 }
 
 tasks.withType(Jar).configureEach {
-  dependsOn tasks.unzip
+  dependsOn 'unzip'
 }
 
+def wildflyDir = "${buildDir}/${serverName}-${serverVersion}"
+
 tasks.register("deploy", Copy) {
-  dependsOn tasks.unzip
+  dependsOn 'unzip'
   from "${appBuildDir}/libs/wildfly-spring-ear-smoketest.ear"
   into "${wildflyDir}/standalone/deployments"
 }
 
 tasks.withType(Test).configureEach {
-  dependsOn tasks.deploy
+  dependsOn 'deploy'
   jvmArgs "-Ddatadog.smoketest.wildflyDir=${wildflyDir}"
 }
 
diff --git a/gradle/util.gradle b/gradle/util.gradle
@@ -2,7 +2,8 @@ tasks.register("artifacts") {
   group = "Help"
   description = "Displays the artifacts associated with each configuration of " + project
   doFirst {
-    configurations.findAll().each { config ->
+    // This eager access is ok as it is during the task execution phase
+    configurations.each { config ->
       println "${config}:"
       config.allArtifacts.getFiles().each { file ->
         println " " + file

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ dependencies {`
`6`	`6`	`api project(':dd-java-agent:instrumentation-testing')`
`7`	`7`	`}`
`8`	`8`
`9`		`-configurations.api {`
	`9`	`+configurations.named('api') {`
`10`	`10`	`exclude group: 'org.eclipse.jetty', module: 'jetty-server'`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,6 @@ dependencies {`
`46`	`46`	`latestDepTestImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.3.+'`
`47`	`47`	`}`
`48`	`48`
`49`		`-configurations.latestDepTestImplementation {`
	`49`	`+configurations.named('latestDepTestImplementation') {`
`50`	`50`	`exclude group: "org.elasticsearch.client", module: "rest"`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ dependencies {`
`26`	`26`	`latestDepTestImplementation group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '2.+'`
`27`	`27`	`}`
`28`	`28`
`29`		`-configurations.testRuntimeOnly {`
	`29`	`+configurations.named('testRuntimeOnly') {`
`30`	`30`	`// jersey-container-grizzly2-http transitively imports its own set repackaged asm classes`
`31`	`31`	`exclude group: 'org.ow2.asm'`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ dependencies {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`// We need to force the dependency to the earliest supported version because other libraries declare newer versions.`
`36`		`-configurations.testImplementation {`
	`36`	`+configurations.named('testImplementation') {`
`37`	`37`	`resolutionStrategy {`
`38`	`38`	`eachDependency { DependencyResolveDetails details ->`
`39`	`39`	`//specifying a fixed version for all libraries with io.netty' group`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ dependencies {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`// We need to force the dependency to the earliest supported version because other libraries declare newer versions.`
`50`		`-configurations.testImplementation {`
	`50`	`+configurations.named('testImplementation') {`
`51`	`51`	`resolutionStrategy {`
`52`	`52`	`eachDependency { DependencyResolveDetails details ->`
`53`	`53`	`//specifying a fixed version for all libraries with io.netty' group`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ dependencies {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`// We need to force the dependency to the earliest supported version because other libraries declare newer versions.`
`61`		`-configurations.testImplementation {`
	`61`	`+configurations.named('testImplementation') {`
`62`	`62`	`resolutionStrategy {`
`63`	`63`	`eachDependency { DependencyResolveDetails details ->`
`64`	`64`	`//specifying a fixed version for all libraries with io.netty' group`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ dependencies {`
`30`	`30`	`latestReactorTestImplementation group: 'io.projectreactor.rabbitmq', name: 'reactor-rabbitmq', version: '+'`
`31`	`31`	`}`
`32`	`32`
`33`		`-configurations.testRuntimeOnly {`
	`33`	`+configurations.named('testRuntimeOnly') {`
`34`	`34`	`resolutionStrategy {`
`35`	`35`	`force group: 'com.rabbitmq', name: 'amqp-client', version: '2.7.0'`
`36`	`36`	`}`
`@@ -41,5 +41,5 @@ tasks.withType(Test).configureEach {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`tasks.named("latestDepTest", Test) {`
`44`		`- finalizedBy latestReactorTest`
	`44`	`+ finalizedBy 'latestReactorTest'`
`45`	`45`	`}`