Merge branch 'master' into alejandro.gonzalez/security-response-id

Author: jandro996

build.gradle.kts

@@ -12,6 +12,7 @@ plugins {
   id("dd-trace-java.ci-jobs")
 
   id("com.diffplug.spotless") version "8.1.0"
+  id("me.champeau.gradle.japicmp") version "0.4.3"
   id("com.github.spotbugs") version "6.4.7"
   id("de.thetaphi.forbiddenapis") version "3.10"
   id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
@@ -156,3 +157,29 @@ testAggregate(
     ":dd-java-agent:agent-debugger"
   )
 )
+
+// JApiCmp configuration example
+// Usage: ./gradlew japicmp -Partifact=groupId:artifactId -Pbaseline=1.0.0 -Ptarget=2.0.0
+tasks.register<me.champeau.gradle.japicmp.JapicmpTask>("japicmp") {
+  val artifact = providers.gradleProperty("artifact").orNull
+  val baseline = providers.gradleProperty("baseline").orNull
+  val target = providers.gradleProperty("target").orNull
+
+  if (artifact != null && baseline != null && target != null) {
+    oldClasspath.from(
+      configurations.detachedConfiguration(
+        dependencies.create("$artifact:$baseline")
+      )
+    )
+    newClasspath.from(
+      configurations.detachedConfiguration(
+        dependencies.create("$artifact:$target")
+      )
+    )
+    onlyModified.set(true)
+    failOnModification.set(false)
+    ignoreMissingClasses.set(true)
+    txtOutputFile.set(layout.buildDirectory.file("reports/japicmp.txt"))
+    htmlOutputFile.set(layout.buildDirectory.file("reports/japicmp.html"))
+  }
+}

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginConfigTest.java

@@ -0,0 +1,43 @@
+package com.datadog.debugger.origin;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import datadog.trace.api.Config;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
+import org.junit.jupiter.api.condition.EnabledOnJre;
+import org.junit.jupiter.api.condition.JRE;
+
+public class CodeOriginConfigTest {
+
+  @EnabledForJreRange(min = JRE.JAVA_25)
+  @Test
+  public void defaultConfigJDK25() {
+    assertTrue(Config.get().isDebuggerCodeOriginEnabled());
+  }
+
+  @EnabledOnJre(JRE.JAVA_21)
+  @Test
+  public void defaultConfigJDK21() {
+    assertFalse(Config.get().isDebuggerCodeOriginEnabled());
+  }
+
+  @EnabledOnJre(JRE.JAVA_17)
+  @Test
+  public void defaultConfigJDK17() {
+    assertFalse(Config.get().isDebuggerCodeOriginEnabled());
+  }
+
+  @EnabledOnJre(JRE.JAVA_11)
+  @Test
+  public void defaultConfigJDK11() {
+    assertFalse(Config.get().isDebuggerCodeOriginEnabled());
+  }
+
+  @EnabledOnJre(JRE.JAVA_8)
+  @Test
+  public void defaultConfigJDK8() {
+    assertFalse(Config.get().isDebuggerCodeOriginEnabled());
+  }
+}

dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle

@@ -120,7 +120,7 @@ dependencies {
 
   iastTestImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures')
   iastTestCompileOnly libs.forbiddenapis
-  iastTestRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core')
+  iastTestRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-common')
   iastTestRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.8')
   iastTestRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
   iastTestRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.2-iast')

dd-java-agent/instrumentation/build.gradle

@@ -79,7 +79,7 @@ subprojects { Project subProj ->
 
   def path = subProj.getPath()
   subProj.plugins.withId("java") {
-    if (!path.equals(':dd-java-agent:instrumentation:vertx:vertx-redis-client-3.9:stubs')) {
+    if (!path.equals(':dd-java-agent:instrumentation:vertx:vertx-redis-client:vertx-redis-client-stubs')) {
       // don't include the redis RequestImpl stub
       parent_project.dependencies {
         implementation project(path)

dd-java-agent/instrumentation/cxf-2.1/build.gradle

@@ -68,8 +68,8 @@ dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-12.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:trace-annotation')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:rs:jakarta-rs-annotations-3')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:rs:jakarta-rs-annotations-3.0')
 
   cxf3LatestDepTestImplementation group: 'org.apache.cxf', name: 'cxf-rt-frontend-jaxrs', version: '3.+'
   cxf3LatestDepTestImplementation group: 'org.apache.cxf', name:'cxf-rt-transports-http-jetty', version: '3.+'

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

@@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/java.gradle"
 //addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {
-  testImplementation project(':dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2')
+  testImplementation project(':dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2.0')
   testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
 
   // First version with DropwizardTestSupport: