DataDog
diff --git a/‎.gitlab-ci.yml‎
Lines changed: 8 additions & 1 deletion b/‎.gitlab-ci.yml‎
Lines changed: 8 additions & 1 deletion
diff --git a/‎buildSrc/call-site-instrumentation-plugin/src/test/groovy/datadog/trace/plugin/csi/impl/assertion/AssertBuilder.groovy‎
Lines changed: 4 additions & 1 deletion b/‎buildSrc/call-site-instrumentation-plugin/src/test/groovy/datadog/trace/plugin/csi/impl/assertion/AssertBuilder.groovy‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎buildSrc/src/main/groovy/InstrumentPlugin.groovy‎
Lines changed: 9 additions & 10 deletions b/‎buildSrc/src/main/groovy/InstrumentPlugin.groovy‎
Lines changed: 9 additions & 10 deletions
diff --git a/‎buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/tasks/MuzzleTask.kt‎
Lines changed: 5 additions & 0 deletions b/‎buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/tasks/MuzzleTask.kt‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎dd-java-agent/agent-bootstrap/build.gradle‎
Lines changed: 17 additions & 17 deletions b/‎dd-java-agent/agent-bootstrap/build.gradle‎
Lines changed: 17 additions & 17 deletions
diff --git a/‎dd-java-agent/agent-builder/build.gradle‎
Lines changed: 1 addition & 3 deletions b/‎dd-java-agent/agent-builder/build.gradle‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎dd-java-agent/agent-ci-visibility/build.gradle‎
Lines changed: 10 additions & 0 deletions b/‎dd-java-agent/agent-ci-visibility/build.gradle‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎dd-java-agent/agent-debugger/debugger-test-scala/build.gradle‎
Lines changed: 8 additions & 0 deletions b/‎dd-java-agent/agent-debugger/debugger-test-scala/build.gradle‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎dd-java-agent/agent-iast/build.gradle‎
Lines changed: 1 addition & 10 deletions b/‎dd-java-agent/agent-iast/build.gradle‎
Lines changed: 1 addition & 10 deletions
diff --git a/‎dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle‎
Lines changed: 6 additions & 12 deletions b/‎dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle‎
Lines changed: 6 additions & 12 deletions
@@ -256,6 +256,7 @@ build:
     DEPENDENCY_CACHE_POLICY: pull
   script:
     - if [ $CI_PIPELINE_SOURCE == "schedule" ] ; then ./gradlew resolveAndLockAll --write-locks $GRADLE_ARGS; fi
+    - ./gradlew --version
     - ./gradlew clean :dd-java-agent:shadowJar :dd-trace-api:jar :dd-trace-ot:shadowJar -PskipTests $GRADLE_ARGS
     - echo UPSTREAM_TRACER_VERSION=$(java -jar workspace/dd-java-agent/build/libs/*.jar) >> upstream.env
     - echo "BUILD_JOB_NAME=$CI_JOB_NAME" >> build.env
@@ -296,6 +297,7 @@ build_tests:
 
   script:
     - *gitlab_base_ref_params
+    - ./gradlew --version
     - ./gradlew clean $GRADLE_TARGET $GRADLE_PARAMS -PskipTests $GRADLE_ARGS
 
 populate_dep_cache:
@@ -362,7 +364,7 @@ spotless:
   stage: tests
   needs: []
   script:
-    - export JAVA_HOME=$JAVA_11_HOME
+    - ./gradlew --version
     - ./gradlew spotlessCheck $GRADLE_ARGS
 
 test_published_artifacts:
@@ -381,6 +383,7 @@ test_published_artifacts:
     - ./gradlew publishToMavenLocal $GRADLE_ARGS
     - cd test-published-dependencies
     - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx1G -Xms1G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
+    - ./gradlew --version
     - ./gradlew check --info $GRADLE_ARGS
   after_script:
     - *cgroup_info
@@ -401,6 +404,7 @@ test_published_artifacts:
     CACHE_TYPE: lib
   script:
     - *gitlab_base_ref_params
+    - ./gradlew --version
     - ./gradlew $GRADLE_TARGET $GRADLE_PARAMS -PskipTests -PrunBuildSrcTests -PskipSpotless -PtaskPartitionCount=$NORMALIZED_NODE_TOTAL -PtaskPartition=$NORMALIZED_NODE_INDEX $GRADLE_ARGS
   after_script:
     - *cgroup_info
@@ -461,6 +465,7 @@ muzzle:
     CACHE_TYPE: inst
   script:
     - export SKIP_BUILDSCAN="true"
+    - ./gradlew --version
     - ./gradlew :runMuzzle -PtaskPartitionCount=$NORMALIZED_NODE_TOTAL -PtaskPartition=$NORMALIZED_NODE_INDEX $GRADLE_ARGS
   after_script:
     - *cgroup_info
@@ -482,6 +487,7 @@ muzzle-dep-report:
     CACHE_TYPE: inst
   script:
     - export SKIP_BUILDSCAN="true"
+    - ./gradlew --version
     - ./gradlew generateMuzzleReport muzzleInstrumentationReport $GRADLE_ARGS
   after_script:
     - *cgroup_info
@@ -541,6 +547,7 @@ muzzle-dep-report:
       fi
     - *prepare_test_env
     - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM $PROFILER_COMMAND -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp' -Ddatadog.forkedMaxHeapSize=1024M -Ddatadog.forkedMinHeapSize=128M"
+    - ./gradlew --version
     - ./gradlew $GRADLE_TARGET $GRADLE_PARAMS -PtestJvm=$testJvm -PtaskPartitionCount=$NORMALIZED_NODE_TOTAL -PtaskPartition=$NORMALIZED_NODE_INDEX $GRADLE_ARGS --continue || $CONTINUE_ON_FAILURE
   after_script:
     - *restore_pretest_env
 
@@ -59,7 +59,10 @@ class AssertBuilder<C extends CallSiteAssert> {
       return [null, null]
     }
     final isEnabled = type.getMethodsByName('isEnabled').first()
-    final returnStatement = isEnabled.body.get().statements.first.get().asReturnStmt()
+    // JavaParser's NodeList has method getFirst() returning an Optional, however with Java 21's
+    // SequencedCollection, Groovy picks the getFirst() that returns the object itself.
+    // Using `first()` rather than `first` picks the groovy method instead, fixing the situation.
+    final returnStatement = isEnabled.body.get().statements.first().asReturnStmt()
     final enabledMethodCall = returnStatement.expression.get().asMethodCallExpr()
     final enabled = resolveMethod(enabledMethodCall)
     final enabledArgs = enabledMethodCall.getArguments().collect { it.asStringLiteralExpr().asString() }.toSet()
 
@@ -152,17 +152,16 @@ abstract class InstrumentTask extends DefaultTask {
   }
 
   private workQueue() {
-    if (this.javaVersion) {
-      def javaLauncher = this.javaToolchainService.launcherFor { spec ->
-        spec.languageVersion.set(JavaLanguageVersion.of(this.javaVersion))
-      }.get()
-      return this.workerExecutor.processIsolation { spec ->
-        spec.forkOptions { fork ->
-          fork.executable = javaLauncher.executablePath
-        }
+    if (!this.javaVersion) {
+      this.javaVersion = "8"
+    }
+    def javaLauncher = this.javaToolchainService.launcherFor { spec ->
+      spec.languageVersion.set(JavaLanguageVersion.of(this.javaVersion))
+    }.get()
+    return this.workerExecutor.processIsolation { spec ->
+      spec.forkOptions { fork ->
+        fork.executable = javaLauncher.executablePath
       }
-    } else {
-      return this.workerExecutor.noIsolation()
     }
   }
 }
 
@@ -93,12 +93,17 @@ abstract class MuzzleTask @Inject constructor(
       val javaLauncher = javaToolchainService.launcherFor {
         languageVersion.set(JavaLanguageVersion.of(muzzleDirective.javaVersion!!))
       }.get()
+      // Note process isolation leaks gradle dependencies to the child process
+      // and may need additional code on muzzle plugin to filter those out
+      // See https://github.com/gradle/gradle/issues/33987
       workerExecutor.processIsolation {
         forkOptions {
           executable(javaLauncher.executablePath)
         }
       }
     } else {
+      // noIsolation worker is OK for muzzle tasks as their checks will inspect classes outline
+      // and should not be impacted by the actual running JDK.
       workerExecutor.noIsolation()
     }
     workQueue.submit(MuzzleAction::class.java) {
 
@@ -1,17 +1,18 @@
+import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
+
 // The shadowJar of this project will be injected into the JVM's bootstrap classloader
 plugins {
   id 'com.gradleup.shadow'
   id 'me.champeau.jmh'
 }
 
-ext {
-  // need access to sun.* packages
-  skipSettingCompilerRelease = true
-}
-
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: "idea"
 
+tasks.named("compileJava", JavaCompile).configure {
+  configureCompiler(it, 8, JavaVersion.VERSION_1_8, "Need access to sun.* packages")
+}
+
 // FIXME: Improve test coverage.
 minimumBranchCoverage = 0.0
 minimumInstructionCoverage = 0.0
@@ -37,10 +38,8 @@ sourceSets {
   }
 }
 
-compileMain_java11Java.configure {
-  setJavaVersion(it, 11)
-  sourceCompatibility = JavaVersion.VERSION_1_8
-  targetCompatibility = JavaVersion.VERSION_1_8
+tasks.named("compileMain_java11Java", JavaCompile) {
+  configureCompiler(it, 11, JavaVersion.VERSION_1_8)
 }
 
 dependencies {
@@ -52,7 +51,7 @@ tasks.named("jar", Jar) {
   from sourceSets.main_java11.output
 }
 
-tasks.named("forbiddenApisMain_java11") {
+tasks.named("forbiddenApisMain_java11", CheckForbiddenApis) {
   failOnMissingClasses = false
 }
 
@@ -63,14 +62,15 @@ idea {
 }
 
 jmh {
-  jmhVersion = libs.versions.jmh.get()
+  jmhVersion = libs.versions.jmh
   duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
-project.afterEvaluate {
-  tasks.withType(Test).configureEach {
-    if (javaLauncher.get().metadata.languageVersion.asInt() >= 16) {
-      jvmArgs += ['--add-opens', 'java.base/java.net=ALL-UNNAMED'] // for HostNameResolverForkedTest
-    }
-  }
+tasks.withType(Test).configureEach {
+  configureJvmArgs(
+    it,
+    JavaVersion.VERSION_16,
+    ['--add-opens', 'java.base/java.net=ALL-UNNAMED'] // for HostNameResolverForkedTest
+    )
+
 }
@@ -20,9 +20,7 @@ sourceSets {
 }
 
 tasks.named("compileMain_java11Java", JavaCompile) {
-  setJavaVersion(it, 11)
-  sourceCompatibility = JavaVersion.VERSION_1_8
-  targetCompatibility = JavaVersion.VERSION_1_8
+  configureCompiler(it, 11, JavaVersion.VERSION_1_8)
 }
 
 dependencies {
 
@@ -66,3 +66,13 @@ tasks.named("shadowJar", ShadowJar) {
 tasks.named("jar", Jar) {
   archiveClassifier = 'unbundled'
 }
+
+tasks.named("compileTestGroovy") {
+  configureCompiler(
+    it,
+    8,
+    JavaVersion.VERSION_1_8,
+    "Groovy generates synthetic accessors methods from superclass, we don't want that for `MisbehavingClassLoader`," +
+    " otherwise anonymous class has one `loadClass` accessor's signature has `java.lang.Module`"
+    )
+}
@@ -7,3 +7,11 @@ apply from: "$rootDir/gradle/java.gradle"
 dependencies {
   implementation group: 'org.scala-lang', name: 'scala-compiler', version: '2.13.3'
 }
+
+tasks.withType(ScalaCompile).configureEach {
+  // Despite the compatibility matrix, scala compiler doesn't properly
+  // get the right compiler flags with JDK11 toolchain. Using 8 works.
+  // * https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html
+  // * https://github.com/gradle/gradle/issues/19456
+  configureCompiler(it, 8)
+}
@@ -11,17 +11,8 @@ plugins {
 apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/version.gradle"
 
-java {
-  toolchain {
-    languageVersion.set(JavaLanguageVersion.of(11))
-  }
-  sourceCompatibility = JavaVersion.VERSION_1_8
-  targetCompatibility = JavaVersion.VERSION_1_8
-}
-
 tasks.withType(AbstractCompile).configureEach {
-  // ensure no APIs beyond JDK8 are used
-  options.release = 8
+  configureCompiler(it, 11, JavaVersion.VERSION_1_8, "Ensure no APIs beyond JDK8 are used")
 }
 
 // First version with Mac M1 support
 
@@ -4,8 +4,6 @@ ext {
   // By default tests with be compiled for `minJavaVersionForTests` version,
   // but in this case we would like to avoid this since we would like to run with ZULU8
   skipSettingTestJavaVersion = true
-  // need access to jdk.jfr package
-  skipSettingCompilerRelease = true
   excludeJdk = ['SEMERU11', 'SEMERU17']
 }
 
@@ -39,16 +37,12 @@ dependencies {
  * We specify source/target as Java8 to get code that is loadable on Java8 - JFR defs are Java8 compatible.
  * We force IDEA to treat this as Java11 project with 'idea' plugin below.
  */
-[JavaCompile, GroovyCompile].each {
-  tasks.withType(it).configureEach {
-    setJavaVersion(it, 11)
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-    // Disable '-processing' because some annotations are not claimed.
-    // Disable '-options' because we are compiling for java8 without specifying bootstrap - intentionally.
-    // Disable '-path' because we do not have some of the paths seem to be missing.
-    options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'/*, '-Werror'*/])
-  }
+tasks.withType(AbstractCompile).configureEach {
+  configureCompiler(it, 11, JavaVersion.VERSION_1_8)
+  // Disable '-processing' because some annotations are not claimed.
+  // Disable '-options' because we are compiling for java8 without specifying bootstrap - intentionally.
+  // Disable '-path' because we do not have some of the paths seem to be missing.
+  options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'/*, '-Werror'*/])
 }
 
 tasks.named("forbiddenApisMain") {
Original file line number	Diff line number	Diff line change
`@@ -152,17 +152,16 @@ abstract class InstrumentTask extends DefaultTask {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`private workQueue() {`
`155`		`- if (this.javaVersion) {`
`156`		`- def javaLauncher = this.javaToolchainService.launcherFor { spec ->`
`157`		`- spec.languageVersion.set(JavaLanguageVersion.of(this.javaVersion))`
`158`		`- }.get()`
`159`		`- return this.workerExecutor.processIsolation { spec ->`
`160`		`- spec.forkOptions { fork ->`
`161`		`- fork.executable = javaLauncher.executablePath`
`162`		`- }`
	`155`	`+ if (!this.javaVersion) {`
	`156`	`+ this.javaVersion = "8"`
	`157`	`+ }`
	`158`	`+ def javaLauncher = this.javaToolchainService.launcherFor { spec ->`
	`159`	`+ spec.languageVersion.set(JavaLanguageVersion.of(this.javaVersion))`
	`160`	`+ }.get()`
	`161`	`+ return this.workerExecutor.processIsolation { spec ->`
	`162`	`+ spec.forkOptions { fork ->`
	`163`	`+ fork.executable = javaLauncher.executablePath`
`163`	`164`	`}`
`164`		`- } else {`
`165`		`- return this.workerExecutor.noIsolation()`
`166`	`165`	`}`
`167`	`166`	`}`
`168`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,12 +93,17 @@ abstract class MuzzleTask @Inject constructor(`
`93`	`93`	`val javaLauncher = javaToolchainService.launcherFor {`
`94`	`94`	`languageVersion.set(JavaLanguageVersion.of(muzzleDirective.javaVersion!!))`
`95`	`95`	`}.get()`
	`96`	`+ // Note process isolation leaks gradle dependencies to the child process`
	`97`	`+ // and may need additional code on muzzle plugin to filter those out`
	`98`	`+ // See https://github.com/gradle/gradle/issues/33987`
`96`	`99`	`workerExecutor.processIsolation {`
`97`	`100`	`forkOptions {`
`98`	`101`	`executable(javaLauncher.executablePath)`
`99`	`102`	`}`
`100`	`103`	`}`
`101`	`104`	`} else {`
	`105`	`+ // noIsolation worker is OK for muzzle tasks as their checks will inspect classes outline`
	`106`	`+ // and should not be impacted by the actual running JDK.`
`102`	`107`	`workerExecutor.noIsolation()`
`103`	`108`	`}`
`104`	`109`	`workQueue.submit(MuzzleAction::class.java) {`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,7 @@ sourceSets {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`tasks.named("compileMain_java11Java", JavaCompile) {`
`23`		`- setJavaVersion(it, 11)`
`24`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`25`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`23`	`+ configureCompiler(it, 11, JavaVersion.VERSION_1_8)`
`26`	`24`	`}`
`27`	`25`
`28`	`26`	`dependencies {`