Update task naming in gradle files PT 3 (#9619)

sarahchen6 · bric3 · web-flow · commit 05e3fc32de06 · 2025-10-01T09:37:10.000-04:00
* Agent first batch

* Agent second batch

---------

Co-authored-by: Brice Dutheil &lt;brice.dutheil@gmail.com&gt;
diff --git a/dd-java-agent/agent-bootstrap/build.gradle b/dd-java-agent/agent-bootstrap/build.gradle
@@ -48,11 +48,11 @@ dependencies {
   main_java11CompileOnly sourceSets.main.output
 }
 
-jar {
+tasks.named("jar", Jar) {
   from sourceSets.main_java11.output
 }
 
-forbiddenApisMain_java11 {
+tasks.named("forbiddenApisMain_java11") {
   failOnMissingClasses = false
 }
 
diff --git a/dd-java-agent/agent-builder/build.gradle b/dd-java-agent/agent-builder/build.gradle
@@ -19,7 +19,7 @@ sourceSets {
   }
 }
 
-compileMain_java11Java.configure {
+tasks.named("compileMain_java11Java", JavaCompile) {
   setJavaVersion(it, 11)
   sourceCompatibility = JavaVersion.VERSION_1_8
   targetCompatibility = JavaVersion.VERSION_1_8
@@ -31,11 +31,11 @@ dependencies {
   runtimeOnly sourceSets.main_java11.output
 }
 
-jar {
+tasks.named("jar", Jar) {
   from sourceSets.main_java11.output
 }
 
-forbiddenApisMain_java11 {
+tasks.named("forbiddenApisMain_java11") {
   failOnMissingClasses = false
 }
 
diff --git a/dd-java-agent/agent-ci-visibility/build.gradle b/dd-java-agent/agent-ci-visibility/build.gradle
@@ -63,6 +63,6 @@ tasks.named("shadowJar", ShadowJar) {
   dependencies deps.excludeShared
 }
 
-jar {
+tasks.named("jar", Jar) {
   archiveClassifier = 'unbundled'
 }
diff --git a/dd-java-agent/agent-debugger/build.gradle b/dd-java-agent/agent-debugger/build.gradle
@@ -71,7 +71,7 @@ tasks.named("shadowJar", ShadowJar) {
   }
 }
 
-jar {
+tasks.named("jar", Jar) {
   archiveClassifier = 'unbundled'
   from sourceSets.main.output
 }
diff --git a/dd-java-agent/agent-iast/build.gradle b/dd-java-agent/agent-iast/build.gradle
@@ -79,7 +79,7 @@ tasks.named("shadowJar", ShadowJar) {
   dependencies deps.excludeShared
 }
 
-jar {
+tasks.named("jar", Jar) {
   archiveClassifier = 'unbundled'
 }
 
diff --git a/dd-java-agent/agent-jmxfetch/build.gradle b/dd-java-agent/agent-jmxfetch/build.gradle
@@ -101,7 +101,7 @@ tasks.register('copyMetricConfigs', CopyMetricConfigsTask) {
   outputDirectory = file("$buildDir/integrations-core-resources")
 }
 
-processResources {
+tasks.named("processResources", ProcessResources) {
   dependsOn 'copyMetricConfigs'
   from("$buildDir/integrations-core-resources")
 }
diff --git a/dd-java-agent/agent-llmobs/build.gradle b/dd-java-agent/agent-llmobs/build.gradle
@@ -36,6 +36,6 @@ tasks.named("shadowJar", ShadowJar) {
   dependencies deps.excludeShared
 }
 
-jar {
+tasks.named("jar", Jar) {
   archiveClassifier = 'unbundled'
 }
diff --git a/dd-java-agent/agent-logs-intake/build.gradle b/dd-java-agent/agent-logs-intake/build.gradle
@@ -21,6 +21,6 @@ tasks.named("shadowJar", ShadowJar) {
   dependencies deps.excludeShared
 }
 
-jar {
+tasks.named("jar", Jar) {
   archiveClassifier = 'unbundled'
 }
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/build.gradle b/dd-java-agent/agent-otel/otel-bootstrap/build.gradle
@@ -33,6 +33,7 @@ forbiddenApis {
   failOnMissingClasses = false
   ignoreFailures = true
 }
+
 spotbugs {
   onlyAnalyze = ['none']
 }
@@ -63,6 +64,7 @@ tasks.register('unpackJars', Copy) {
   }
   into compileJava.destinationDirectory
 }
+
 tasks.named('compileJava') {
   dependsOn 'unpackJars'
 }
@@ -106,6 +108,6 @@ tasks.named("shadowJar", ShadowJar) {
   relocate 'datadog.opentelemetry.shim', 'datadog.trace.bootstrap.otel.shim'
 }
 
-jar {
+tasks.named("jar", Jar) {
   archiveClassifier = 'unbundled'
 }
diff --git a/dd-java-agent/agent-profiling/build.gradle b/dd-java-agent/agent-profiling/build.gradle
@@ -44,6 +44,6 @@ tasks.named("shadowJar", ShadowJar) {
   dependencies deps.excludeShared
 }
 
-jar {
+tasks.named("jar", Jar) {
   archiveClassifier = 'unbundled'
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle
@@ -51,7 +51,7 @@ dependencies {
   }
 }
 
-forbiddenApisMain {
+tasks.named("forbiddenApisMain") {
   failOnMissingClasses = false
 }
 
diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle
@@ -43,7 +43,7 @@ tasks.named("compileTestJava", JavaCompile) {
   options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'/*, '-Werror'*/])
 }
 
-forbiddenApisMain {
+tasks.named("forbiddenApisMain") {
   failOnMissingClasses = false
 }
 
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle
@@ -48,7 +48,7 @@ dependencies {
   }
 }
 
-forbiddenApisMain {
+tasks.named("forbiddenApisMain") {
   failOnMissingClasses = false
 }
 
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle b/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle
@@ -57,7 +57,7 @@ configurations.configureEach {
   }
 }
 
-forbiddenApisMain {
+tasks.named("forbiddenApisMain") {
   failOnMissingClasses = false
 }
 
diff --git a/dd-java-agent/agent-tooling/build.gradle b/dd-java-agent/agent-tooling/build.gradle
@@ -70,11 +70,11 @@ jmh {
 compileJmhJava.dependsOn compileTestJava
 compileTestJava.dependsOn 'generateTestClassNameTries'
 
-forbiddenApisJmh {
+tasks.named("forbiddenApisJmh") {
   ignoreFailures = true
 }
 
-forbiddenApisTest_java11 {
+tasks.named("forbiddenApisTest_java11") {
   // it will fail due to missing JDK >= 9 classes
   // java.lang.ClassNotFoundException: java.lang.invoke.StringConcatFactory
   failOnMissingClasses = false
diff --git a/dd-java-agent/appsec/build.gradle b/dd-java-agent/appsec/build.gradle
@@ -31,11 +31,11 @@ tasks.named("shadowJar", ShadowJar) {
   dependencies deps.excludeShared
 }
 
-jar {
+tasks.named("jar", Jar) {
   archiveClassifier = 'unbundled'
 }
 
-processResources {
+tasks.named("processResources", ProcessResources) {
   doLast {
     fileTree(dir: outputs.files.asPath, includes: ['**/*.json']).each {
       it.text = JsonOutput.toJson(new JsonSlurper().parse(it))
@@ -53,7 +53,8 @@ jmh {
     includes = [project.jmhIncludes]
   }
 }
-jmhJar {
+
+tasks.named("jmhJar", Jar) {
   exclude 'org/slf4j/impl/**/*'
 }
 
@@ -96,7 +97,9 @@ ext {
 tasks.withType(Test).configureEach {
   jvmArgs += ['-Ddd.appsec.enabled=true']
 }
+
 def rootDir = project.rootDir
+
 spotless {
   java {
     target 'src/**/*.java'
diff --git a/dd-java-agent/benchmark-integration/jetty-perftest/build.gradle b/dd-java-agent/benchmark-integration/jetty-perftest/build.gradle
@@ -8,7 +8,7 @@ dependencies {
   implementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.4.1.v20170120'
 }
 
-jar {
+tasks.named("jar", Jar) {
   manifest {
     attributes("Main-Class": "datadog.perftest.jetty.JettyPerftest")
   }

Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,11 @@ dependencies {`
`48`	`48`	`main_java11CompileOnly sourceSets.main.output`
`49`	`49`	`}`
`50`	`50`
`51`		`-jar {`
	`51`	`+tasks.named("jar", Jar) {`
`52`	`52`	`from sourceSets.main_java11.output`
`53`	`53`	`}`
`54`	`54`
`55`		`-forbiddenApisMain_java11 {`
	`55`	`+tasks.named("forbiddenApisMain_java11") {`
`56`	`56`	`failOnMissingClasses = false`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ sourceSets {`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
`22`		`-compileMain_java11Java.configure {`
	`22`	`+tasks.named("compileMain_java11Java", JavaCompile) {`
`23`	`23`	`setJavaVersion(it, 11)`
`24`	`24`	`sourceCompatibility = JavaVersion.VERSION_1_8`
`25`	`25`	`targetCompatibility = JavaVersion.VERSION_1_8`
`@@ -31,11 +31,11 @@ dependencies {`
`31`	`31`	`runtimeOnly sourceSets.main_java11.output`
`32`	`32`	`}`
`33`	`33`
`34`		`-jar {`
	`34`	`+tasks.named("jar", Jar) {`
`35`	`35`	`from sourceSets.main_java11.output`
`36`	`36`	`}`
`37`	`37`
`38`		`-forbiddenApisMain_java11 {`
	`38`	`+tasks.named("forbiddenApisMain_java11") {`
`39`	`39`	`failOnMissingClasses = false`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,6 @@ tasks.named("shadowJar", ShadowJar) {`
`63`	`63`	`dependencies deps.excludeShared`
`64`	`64`	`}`
`65`	`65`
`66`		`-jar {`
	`66`	`+tasks.named("jar", Jar) {`
`67`	`67`	`archiveClassifier = 'unbundled'`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ tasks.named("shadowJar", ShadowJar) {`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`-jar {`
	`74`	`+tasks.named("jar", Jar) {`
`75`	`75`	`archiveClassifier = 'unbundled'`
`76`	`76`	`from sourceSets.main.output`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ tasks.named("shadowJar", ShadowJar) {`
`79`	`79`	`dependencies deps.excludeShared`
`80`	`80`	`}`
`81`	`81`
`82`		`-jar {`
	`82`	`+tasks.named("jar", Jar) {`
`83`	`83`	`archiveClassifier = 'unbundled'`
`84`	`84`	`}`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ tasks.register('copyMetricConfigs', CopyMetricConfigsTask) {`
`101`	`101`	`outputDirectory = file("$buildDir/integrations-core-resources")`
`102`	`102`	`}`
`103`	`103`
`104`		`-processResources {`
	`104`	`+tasks.named("processResources", ProcessResources) {`
`105`	`105`	`dependsOn 'copyMetricConfigs'`
`106`	`106`	`from("$buildDir/integrations-core-resources")`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,6 @@ tasks.named("shadowJar", ShadowJar) {`
`36`	`36`	`dependencies deps.excludeShared`
`37`	`37`	`}`
`38`	`38`
`39`		`-jar {`
	`39`	`+tasks.named("jar", Jar) {`
`40`	`40`	`archiveClassifier = 'unbundled'`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ tasks.named("shadowJar", ShadowJar) {`
`21`	`21`	`dependencies deps.excludeShared`
`22`	`22`	`}`
`23`	`23`
`24`		`-jar {`
	`24`	`+tasks.named("jar", Jar) {`
`25`	`25`	`archiveClassifier = 'unbundled'`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ forbiddenApis {`
`33`	`33`	`failOnMissingClasses = false`
`34`	`34`	`ignoreFailures = true`
`35`	`35`	`}`
	`36`	`+`
`36`	`37`	`spotbugs {`
`37`	`38`	`onlyAnalyze = ['none']`
`38`	`39`	`}`
`@@ -63,6 +64,7 @@ tasks.register('unpackJars', Copy) {`
`63`	`64`	`}`
`64`	`65`	`into compileJava.destinationDirectory`
`65`	`66`	`}`
	`67`	`+`
`66`	`68`	`tasks.named('compileJava') {`
`67`	`69`	`dependsOn 'unpackJars'`
`68`	`70`	`}`
`@@ -106,6 +108,6 @@ tasks.named("shadowJar", ShadowJar) {`
`106`	`108`	`relocate 'datadog.opentelemetry.shim', 'datadog.trace.bootstrap.otel.shim'`
`107`	`109`	`}`
`108`	`110`
`109`		`-jar {`
	`111`	`+tasks.named("jar", Jar) {`
`110`	`112`	`archiveClassifier = 'unbundled'`
`111`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,6 @@ tasks.named("shadowJar", ShadowJar) {`
`44`	`44`	`dependencies deps.excludeShared`
`45`	`45`	`}`
`46`	`46`
`47`		`-jar {`
	`47`	`+tasks.named("jar", Jar) {`
`48`	`48`	`archiveClassifier = 'unbundled'`
`49`	`49`	`}`