Merge branch 'master' into andrea.marziali/test-union

Author: amarziali

.github/CODEOWNERS

@@ -77,16 +77,14 @@
 /dd-java-agent/agent-ci-visibility/                 @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/cucumber/            @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/jacoco/              @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/junit-4.10/          @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/junit-5.3/           @DataDog/ci-app-libraries-java
+/dd-java-agent/instrumentation/junit                @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/karate/              @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/scalatest/           @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/selenium/            @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/testng/              @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/gradle-3.0/          @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/gradle-8.3/          @DataDog/ci-app-libraries-java
+/dd-java-agent/instrumentation/gradle/              @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/gradle-testing/      @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/maven-3.2.1/         @DataDog/ci-app-libraries-java
+/dd-java-agent/instrumentation/maven                @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/maven-surefire/      @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/weaver/              @DataDog/ci-app-libraries-java
 /dd-smoke-tests/gradle/                             @DataDog/ci-app-libraries-java

dd-java-agent/agent-ci-visibility/build.gradle

@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 buildscript {
   repositories {
     mavenLocal()
@@ -57,7 +59,7 @@ dependencies {
   testImplementation group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.9.6'
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   dependencies deps.excludeShared
 }
 

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

@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
   id 'com.gradleup.shadow'
 }
@@ -62,7 +64,7 @@ dependencies {
   testRuntimeOnly group: 'antlr', name: 'antlr', version: '2.7.7'
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   dependencies deps.excludeShared
   dependencies {
     exclude(project(':dd-java-agent:agent-debugger:debugger-bootstrap'))

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturingTestBase.java

@@ -436,29 +436,11 @@ public static Class<?> compileAndLoad(
       String compilerOutputDir = "/tmp/" + CapturedSnapshotTest.class.getSimpleName() + "-kotlin";
       args.setDestination(compilerOutputDir);
       args.setClasspath(System.getProperty("java.class.path"));
-      // We are currently testing JDK 25-ea, which is not yet generally available. This is causing
-      // Kotlin compilation issues for "25-ea" and "25". Temporarily override java.version "25-ea"
-      // to be the latest generally available JDK version "24".
-      // TODO: Revert this change once JDK 25 is generally available and tested.
-      String originalJavaVersion = System.getProperty("java.version");
-      boolean overrideEAJavaVersion =
-          originalJavaVersion != null && originalJavaVersion.contains("-ea");
-      ExitCode exitCode;
-      try {
-        if (overrideEAJavaVersion) {
-          System.setProperty("java.version", "24");
-        }
-        exitCode =
-            compiler.execImpl(
-                new PrintingMessageCollector(System.out, MessageRenderer.WITHOUT_PATHS, true),
-                Services.EMPTY,
-                args);
-      } finally {
-        // Restore the original java.version if it was overridden (25-ea)
-        if (overrideEAJavaVersion) {
-          System.setProperty("java.version", originalJavaVersion);
-        }
-      }
+      ExitCode exitCode =
+          compiler.execImpl(
+              new PrintingMessageCollector(System.out, MessageRenderer.WITHOUT_PATHS, true),
+              Services.EMPTY,
+              args);
 
       if (exitCode.getCode() != 0) {
         throw new RuntimeException("Kotlin compilation failed");

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

@@ -1,3 +1,4 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import net.ltgt.gradle.errorprone.CheckSeverity
 
 plugins {
@@ -74,7 +75,7 @@ dependencies {
   errorprone('com.google.errorprone:error_prone_core:2.23.0')
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   dependencies deps.excludeShared
 }
 

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

@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 import java.nio.file.Files
 import java.nio.file.attribute.BasicFileAttributes
 import java.util.stream.Collectors
@@ -23,7 +25,7 @@ dependencies {
   api project(':dd-java-agent:agent-bootstrap')
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   dependencies deps.excludeShared
 }
 

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

@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 buildscript {
   repositories {
     mavenCentral()
@@ -30,7 +32,7 @@ dependencies {
   testImplementation project(':dd-java-agent:testing')
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   dependencies deps.excludeShared
 }
 

dd-java-agent/agent-logs-intake/build.gradle

@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
   id 'com.gradleup.shadow'
 }
@@ -15,7 +17,7 @@ dependencies {
   implementation project(':communication')
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   dependencies deps.excludeShared
 }
 

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

@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
   id 'com.gradleup.shadow'
 }
@@ -65,7 +67,7 @@ tasks.named('compileJava') {
   dependsOn 'unpackJars'
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   dependencies deps.excludeShared
 
   include '*.jar'

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

@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
   id 'com.gradleup.shadow'
 }
@@ -38,7 +40,7 @@ configurations {
   }
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   dependencies deps.excludeShared
 }