chore: Use source set configuration

bric3 · bric3 · commit 594cbb1574ac · 2025-10-30T23:07:04.000-04:00
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle
@@ -1,11 +1,10 @@
-// Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_11
-}
-
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: 'scala'
 
+tracerJava {
+  addSourceSetFor(JavaVersion.VERSION_11)
+}
+
 muzzle {
   pass {
     group = 'com.typesafe.akka'
diff --git a/dd-java-agent/instrumentation/exception-profiling/build.gradle b/dd-java-agent/instrumentation/exception-profiling/build.gradle
@@ -10,6 +10,10 @@ ext {
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: "idea"
 
+tracerJava {
+  addSourceSetFor(JavaVersion.VERSION_11)
+}
+
 dependencies {
   testImplementation 'de.thetaphi:forbiddenapis:3.8'
   testImplementation libs.bundles.junit5
diff --git a/dd-java-agent/instrumentation/graal/native-image/build.gradle b/dd-java-agent/instrumentation/graal/native-image/build.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_11
-}
-
 muzzle {
   pass {
     group = "org.graalvm.nativeimage"
@@ -13,6 +9,10 @@ muzzle {
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: "idea"
 
+tracerJava {
+  addSourceSetFor(JavaVersion.VERSION_11)
+}
+
 ["compileMain_java11Java", "compileTestJava"].each {
   tasks.named(it, JavaCompile) {
     configureCompiler(it, 11, JavaVersion.VERSION_11, "Needs access to module jdk.internal.vm.ci")
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_11
-}
-
 muzzle {
   pass {
     coreJdk('11')
@@ -11,6 +7,9 @@ muzzle {
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: "idea"
 
+tracerJava {
+  addSourceSetFor(JavaVersion.VERSION_11)
+}
 
 tasks.named("compileMain_java11Java", JavaCompile) {
   configureCompiler(it, 11, JavaVersion.VERSION_11)
diff --git a/dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle
@@ -11,6 +11,10 @@ muzzle {
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: "idea"
 
+tracerJava {
+  addSourceSetFor(JavaVersion.VERSION_11)
+}
+
 // Must use Java 11 to build JFR enabled code - there is no JFR in OpenJDK 8 (revisit once JFR in Java 8 is available)
 ["compileMain_java11Java", "compileTestJava"].each { name ->
   tasks.named(name, JavaCompile) {
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/build.gradle
@@ -1,6 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_11
-}
 muzzle {
   pass {
     group = "org.eclipse.jetty"
@@ -23,6 +20,10 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
+tracerJava {
+  addSourceSetFor(JavaVersion.VERSION_11)
+}
+
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteForDir('jetty11Test', 'test')
 addTestSuiteForDir('jetty10LatestDepTest', 'test')
diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/build.gradle
@@ -1,6 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_17
-}
 muzzle {
   pass {
     group = "org.eclipse.jetty"
@@ -13,6 +10,10 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
+tracerJava {
+  addSourceSetFor(JavaVersion.VERSION_17)
+}
+
 addTestSuiteForDir('latestDepTest', 'test')
 
 tasks.named("compileMain_java17Java", JavaCompile) {
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/build.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_11
-}
-
 muzzle {
   pass {
     name = "10_series"
@@ -34,6 +30,10 @@ muzzle {
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: "idea"
 
+tracerJava {
+  addSourceSetFor(JavaVersion.VERSION_11)
+}
+
 addTestSuiteForDir("latestDepTest", "test")
 addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "test")
 
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_11
-}
-
 muzzle {
   pass {
     group = "org.eclipse.jetty"
@@ -14,6 +10,10 @@ apply plugin: 'java-test-fixtures'
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: "idea"
 
+tracerJava {
+  addSourceSetFor(JavaVersion.VERSION_11)
+}
+
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteForDir('latestDepForkedTest', 'test')
 
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_17
-}
-
 muzzle {
   pass {
     group = "org.eclipse.jetty"
@@ -19,6 +15,10 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
+tracerJava {
+  addSourceSetFor(JavaVersion.VERSION_17)
+}
+
 addTestSuiteForDir('latestDepTest', 'test')
 
 // ee8
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/build.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_17
-}
-
 muzzle {
   pass {
     group = "org.apache.kafka"
@@ -14,6 +10,10 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
+tracerJava {
+  addSourceSetFor(JavaVersion.VERSION_17)
+}
+
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
 
diff --git a/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/build.gradle b/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/build.gradle
@@ -1,6 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_17
-}
 muzzle {
   pass {
     group = "io.micronaut"
@@ -12,6 +9,10 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
+tracerJava {
+  addSourceSetFor(JavaVersion.VERSION_17)
+}
+
 addTestSuiteForDir('latestDepTest', 'test')
 
 ["compileMain_java17Java", "compileTestJava", "compileLatestDepTestJava"].each {
diff --git a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/build.gradle b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/build.gradle
@@ -15,12 +15,12 @@ muzzle {
   }
 }
 
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_11
-}
-
 apply from: "$rootDir/gradle/java.gradle"
 
+tracerJava {
+  addSourceSetFor(JavaVersion.VERSION_11)
+}
+
 addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_17
-}
-
 muzzle {
   pass {
     group = 'org.springframework'
@@ -14,6 +10,10 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
+tracerJava {
+  addSourceSetFor(JavaVersion.VERSION_17)
+}
+
 addTestSuiteForDir("latestDepTest", "test")
 
 ["compileMain_java17Java", "compileTestJava", "compileLatestDepTestJava"].each {
diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10/build.gradle b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10/build.gradle
@@ -1,7 +1,3 @@
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_11
-}
-
 muzzle {
   pass {
     name = 'jetty-websocket-10'
@@ -15,6 +11,10 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
+tracerJava {
+  addSourceSetFor(JavaVersion.VERSION_11)
+}
+
 addTestSuite("latestDepTest")
 
 tasks.named("compileMain_java11Java", JavaCompile) {
diff --git a/gradle/java_no_deps.gradle b/gradle/java_no_deps.gradle
@@ -1,3 +1,4 @@
+import datadog.gradle.plugin.testJvmConstraints.TestJvmConstraintsExtension
 import groovy.transform.CompileStatic
 import datadog.gradle.plugin.testJvmConstraints.ProvideJvmArgsOnJvmLauncherVersion
 
diff --git a/internal-api/internal-api-9/build.gradle.kts b/internal-api/internal-api-9/build.gradle.kts
@@ -8,10 +8,12 @@ plugins {
   idea
 }
 
-val minJavaVersionForTests by extra(JavaVersion.VERSION_11)
-
 apply(from = "$rootDir/gradle/java.gradle")
 
+extensions.getByName("tracerJava").withGroovyBuilder {
+  invokeMethod("addSourceSetFor", JavaVersion.VERSION_17)
+}
+
 java {
   toolchain {
     languageVersion = JavaLanguageVersion.of(11)
diff --git a/utils/socket-utils/build.gradle.kts b/utils/socket-utils/build.gradle.kts
@@ -7,10 +7,12 @@ plugins {
   idea
 }
 
-val minJavaVersionForTests by extra(JavaVersion.VERSION_17)
-
 apply(from = "$rootDir/gradle/java.gradle")
 
+extensions.getByName("tracerJava").withGroovyBuilder {
+  this.invokeMethod("addSourceSetFor", arrayOf(JavaVersion.VERSION_17, true))
+}
+
 dependencies {
   implementation(libs.slf4j)
   implementation(project(":internal-api"))
