Additional gradle lazy api changes (#9726)

* chore: Additional lazy API changes

* chore: Removes unnecessary .configure calls

* chore: Lazy access to shadowJar

Author: bric3

dd-java-agent/agent-bootstrap/build.gradle

@@ -9,7 +9,7 @@ plugins {
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: "idea"
 
-tasks.named("compileJava", JavaCompile).configure {
+tasks.named("compileJava", JavaCompile) {
   configureCompiler(it, 8, JavaVersion.VERSION_1_8, "Need access to sun.* packages")
 }
 

dd-java-agent/build.gradle

@@ -116,7 +116,7 @@ def generalShadowJarConfig(ShadowJar shadowJarTask) {
 
 def includeShadowJar(TaskProvider<ShadowJar> includedShadowJarTask, String destinationDir) {
   def opentracingFound = new AtomicBoolean()
-  project.processResources {
+  project.tasks.named("processResources", ProcessResources) {
     doFirst {
       eachFile {
         // We seem unlikely to use this name somewhere else.
@@ -147,9 +147,7 @@ def includeShadowJar(TaskProvider<ShadowJar> includedShadowJarTask, String desti
         }
       }
     }
-  }
 
-  project.tasks.named("processResources") {
     dependsOn includedShadowJarTask
   }
 

dd-java-agent/ddprof-lib/build.gradle

@@ -9,7 +9,7 @@ apply from: "$rootDir/gradle/java.gradle"
 dependencies {
   // This module provides the ddprof library as an api dependency
   // so that other modules can easily depend on it.
-  implementation project.hasProperty('ddprof.jar') ? files(project.getProperty('ddprof.jar')) : libs.ddprof
+  implementation project.hasProperty('ddprof.jar') ? files(project.findProperty('ddprof.jar')) : libs.ddprof
   api project(':internal-api')
   api project(':dd-trace-api')
 }

dd-java-agent/instrumentation/build.gradle

@@ -97,13 +97,12 @@ dependencies {
 
 if (project.gradle.startParameter.taskNames.any { it.endsWith("generateMuzzleReport") }) {
   apply plugin: 'muzzle'
-  task("muzzleInstrumentationReport") {
-    dependsOn(project.getAllTasks(true).values().flatten().findAll { it.name.endsWith("generateMuzzleReport") })
+  tasks.register('muzzleInstrumentationReport') {
+    dependsOn(subprojects.collect { p -> p.tasks.matching { it.name == "generateMuzzleReport" } })
     finalizedBy(tasks.named('mergeMuzzleReports'))
   }
 }
 
-
 tasks.named('shadowJar', ShadowJar) {
   duplicatesStrategy = DuplicatesStrategy.FAIL
   dependencies {

dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/build.gradle

@@ -23,12 +23,15 @@ apply from: "$rootDir/gradle/java.gradle"
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteForDir('muleLatestDepTest', 'test')
 
+configurations.named("muleLatestDepTestRuntimeClasspath") {
+  exclude(group: 'org.glassfish.grizzly')
+}
+
 dependencies {
   compileOnly group: 'org.glassfish.grizzly', name: 'grizzly-http-client', version: '1.9'
   // for some reason, the tests don't *load* until 1.12, but muzzles works as far back as 1.9
   testImplementation group: 'org.glassfish.grizzly', name: 'grizzly-http-client', version: '1.12'
 
   latestDepTestImplementation group: 'org.glassfish.grizzly', name: 'grizzly-http-client', version: '+'
   muleLatestDepTestImplementation group: 'org.mule.glassfish.grizzly', name: 'grizzly-http-client', version: '+'
-  configurations.getByName("muleLatestDepTestRuntimeClasspath").exclude(group: 'org.glassfish.grizzly')
 }

dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/build.gradle

@@ -34,6 +34,6 @@ dependencies {
   latestDepTestImplementation group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '2.+'
 }
 
-tasks.withType(Test) {
+tasks.withType(Test).configureEach {
   jvmArgs += ['-Ddd.integration.grizzly-filterchain.enabled=true']
 }

dd-java-agent/instrumentation/jersey/build.gradle

@@ -23,7 +23,7 @@ tasks.named("compileJersey3JettyTestGroovy", GroovyCompile) {
   configureCompiler(it, 11)
 }
 
-compileTestJava.configure {
+tasks.named("compileTestJava") {
   configureCompiler(it, 11, JavaVersion.VERSION_11)
 }
 
@@ -77,12 +77,15 @@ dependencies {
   jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jakarta-rs-annotations-3')
 }
 
-configurations.getByName('jersey3JettyTestRuntimeClasspath').resolutionStrategy {
-  force libs.slf4j
+configurations.named('jersey3JettyTestRuntimeClasspath') {
+  resolutionStrategy {
+    force libs.slf4j
+  }
 }
-configurations.getByName('jersey2JettyTestRuntimeClasspath').resolutionStrategy {
-  // override version in testImplementation
-  force "org.glassfish.jersey.core:jersey-common:${jersey2Version}"
-  force "org.eclipse.jetty:jetty-server:9.1.1.v20140108"
-
+configurations.named('jersey2JettyTestRuntimeClasspath') {
+  resolutionStrategy {
+    // override version in testImplementation
+    force "org.glassfish.jersey.core:jersey-common:${jersey2Version}"
+    force "org.eclipse.jetty:jetty-server:9.1.1.v20140108"
+  }
 }

dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle

@@ -30,7 +30,7 @@ configurations {
   javaxClassesToRelocate
 }
 
-task relocatedJavaxJar(type: ShadowJar) {
+tasks.register('relocatedJavaxJar', ShadowJar) {
   relocate 'javax.servlet', 'jakarta.servlet'
   relocate 'datadog.trace.instrumentation.servlet3', 'datadog.trace.instrumentation.servlet5'
   relocate 'datadog.trace.instrumentation.servlet', 'datadog.trace.instrumentation.servlet5'

dd-smoke-tests/apm-tracing-disabled/build.gradle

@@ -1,3 +1,5 @@
+import org.springframework.boot.gradle.tasks.bundling.BootJar
+
 plugins {
   id 'java'
   id 'org.springframework.boot' version '2.7.15'
@@ -23,6 +25,12 @@ dependencies {
 }
 
 tasks.withType(Test).configureEach {
-  dependsOn "bootJar"
-  jvmArgs "-Ddatadog.smoketest.springboot.shadowJar.path=${tasks.bootJar.archiveFile.get()}"
+  def bootJarTask = tasks.named('bootJar', BootJar)
+  dependsOn bootJarTask
+  jvmArgumentProviders.add(new CommandLineArgumentProvider() {
+      @Override
+      Iterable<String> asArguments() {
+        return bootJarTask.map { ["-Ddatadog.smoketest.springboot.shadowJar.path=${it.archiveFile.get()}"] }.get()
+      }
+    })
 }

dd-smoke-tests/appsec/spring-tomcat7/build.gradle

@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
   id 'com.gradleup.shadow'
 }
@@ -21,14 +23,26 @@ dependencies {
 }
 
 tasks.withType(Test).configureEach {
-  dependsOn "shadowJar"
-
-  jvmArgs "-Ddatadog.smoketest.appsec.springtomcat7.shadowJar.path=${tasks.shadowJar.archiveFile.get()}"
+  def shadowJarTask = tasks.named('shadowJar', ShadowJar)
+  dependsOn shadowJarTask
+
+  jvmArgumentProviders.add(new CommandLineArgumentProvider() {
+      @Override
+      Iterable<String> asArguments() {
+        return shadowJarTask.map { ["-Ddatadog.smoketest.appsec.springtomcat7.shadowJar.path=${it.archiveFile.get()}"] }.get()
+      }
+    })
 }
 
-task testRuntimeActivation(type: Test) {
-  jvmArgs '-Dsmoke_test.appsec.enabled=inactive',
-    "-Ddatadog.smoketest.appsec.springtomcat7.shadowJar.path=${tasks.shadowJar.archiveFile.get()}"
+tasks.register('testRuntimeActivation', Test) {
+  def shadowJarTask = tasks.named('shadowJar', ShadowJar)
+  jvmArgs '-Dsmoke_test.appsec.enabled=inactive'
+  jvmArgumentProviders.add(new CommandLineArgumentProvider() {
+      @Override
+      Iterable<String> asArguments() {
+        return shadowJarTask.map { ["-Ddatadog.smoketest.appsec.springtomcat7.shadowJar.path=${it.archiveFile.get()}"] }.get()
+      }
+    })
 }
 
 tasks.named('check') {