Merge branch 'master' into mhlidd/add_integration_gradle_task

Author: mhlidd

.claude/skills/migrate-groovy-to-java/SKILL.md

@@ -20,6 +20,7 @@ When converting Groovy code to Java code, make sure that:
 - `@TableTest` and `@MethodSource` may be combined on the same `@ParameterizedTest` when most cases are tabular but a few cases require programmatic setup.
 - In combined mode, keep table-friendly cases in `@TableTest`, and put only non-tabular/complex cases in `@MethodSource`.
 - If `@TableTest` is not viable for the test at all, use `@MethodSource` only.
+- If `@TableTest` was successfully used and if the `@ParameterizedTest` is not used to specify the test name, `@ParameterizedTest` can then be removed as `@TableTest` replace it fully.
 - For `@MethodSource`, name the arguments method `<testMethodName>Arguments` (camelCase, e.g. `testMethodArguments`) and return `Stream<Arguments>` using `Stream.of(...)` and `arguments(...)` with static import.
 - Ensure parameterized test names are human-readable (i.e. no hashcodes); instead add a description string as the first `Arguments.arguments(...)` value or index the test case
 - When converting tuples, create a light dedicated structure instead to keep the typing system

.github/CODEOWNERS

@@ -45,10 +45,14 @@
 /internal-api/src/test/groovy/datadog/trace/api/sampling        @DataDog/apm-sdk-capabilities-java
 
 # @DataDog/apm-serverless
-/dd-trace-core/src/main/java/datadog/trace/lambda/              @DataDog/apm-serverless
-/dd-trace-core/src/test/groovy/datadog/trace/lambda/            @DataDog/apm-serverless
-**/InferredProxy*.java                                          @DataDog/apm-serverless
-**/InferredProxy*.groovy                                        @DataDog/apm-serverless
+/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/    @DataDog/apm-serverless
+/dd-java-agent/instrumentation/azure-functions/                         @DataDog/apm-serverless
+/dd-java-agent/instrumentation/azure-functions-1.2.2/                   @DataDog/apm-serverless
+/dd-trace-core/src/main/java/datadog/trace/lambda/                      @DataDog/apm-serverless
+/dd-trace-core/src/test/groovy/datadog/trace/lambda/                    @DataDog/apm-serverless
+/utils/container-utils/                                                 @DataDog/apm-serverless
+**/InferredProxy*.java                                                  @DataDog/apm-serverless
+**/InferredProxy*.groovy                                                @DataDog/apm-serverless
 
 # @DataDog/apm-lang-platform-java
 /.github/                               @DataDog/apm-lang-platform-java

.gitlab-ci.yml

@@ -43,6 +43,10 @@ variables:
     description: "Enable flaky tests"
     value: "false"
 
+  # One pipeline injection package size ratchet
+  OCI_PACKAGE_MAX_SIZE_BYTES: 40_000_000
+  LIB_INJECTION_IMAGE_MAX_SIZE_BYTES: 40_000_000
+
 # trigger new commit cancel
 workflow:
   auto_cancel:

.gitlab/TagInitializationErrors.java

@@ -0,0 +1,114 @@
+import org.w3c.dom.Element;
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.File;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/// Tags intermediate `initializationError` retries with `dd_tags[test.final_status]=skip`.
+///
+/// Gradle generates synthetic "initializationError" testcases in JUnit reports for setup methods.
+/// When a setup is retried and eventually succeeds, multiple testcases are created, with only the
+/// last one passing. All intermediate attempts are marked skip so Test Optimization is not misled.
+///
+/// For any suite with multiple `initializationError` test cases (when retries occurred), all entries
+/// but the last one are tagged by this script with `dd_tags[test.final_status]=skip`. The last
+/// entry is left unmodified, allowing **Test Optimization** to apply its default status inference based
+/// on the actual outcome. Files with only one (or zero) `initializationError` test cases are left unmodified.
+///
+/// Before:
+/// 
+/// ```
+/// <testcase name="initializationError" />
+/// ```
+/// 
+/// After:
+/// 
+/// ```
+/// <testcase name="initializationError">
+///   <properties>
+///     <property name="dd_tags[test.final_status]" value="skip" /> 
+///   </properties>
+/// </testcase>
+/// ```
+/// 
+/// Usage (Java 25): `java TagInitializationErrors.java junit-report.xml`
+
+class TagInitializationErrors {
+  public static void main(String[] args) throws Exception {
+    if (args.length == 0) {
+      System.err.println("Usage: java TagInitializationErrors.java <xml-file>");
+      System.exit(1);
+    }
+    var xmlFile = new File(args[0]);
+    if (!xmlFile.exists()) {
+      System.err.println("File not found: " + xmlFile);
+      System.exit(1);
+    }
+    var dbf = DocumentBuilderFactory.newInstance();
+    dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+    dbf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+    dbf.setFeature("http://xml.org/sax/features/external-general-entities", false);
+    dbf.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+    dbf.setExpandEntityReferences(false);
+    var doc = dbf.newDocumentBuilder().parse(xmlFile);
+    var testcases = doc.getElementsByTagName("testcase");
+    Map<String, List<Element>> byClassname = new LinkedHashMap<>();
+    for (int i = 0; i < testcases.getLength(); i++) {
+      var e = (Element) testcases.item(i);
+      if ("initializationError".equals(e.getAttribute("name"))) {
+        byClassname.computeIfAbsent(e.getAttribute("classname"), k -> new ArrayList<>()).add(e);
+      }
+    }
+    boolean modified = false;
+    for (var group : byClassname.values()) {
+      if (group.size() <= 1) continue;
+      for (int i = 0; i < group.size() - 1; i++) {
+        var testcase = group.get(i);
+        var existingProperties = testcase.getElementsByTagName("properties");
+        if (existingProperties.getLength() > 0) {
+          var props = (Element) existingProperties.item(0);
+          var existingProps = props.getElementsByTagName("property");
+          boolean alreadyTagged = false;
+          for (int j = 0; j < existingProps.getLength(); j++) {
+            if ("dd_tags[test.final_status]".equals(((Element) existingProps.item(j)).getAttribute("name"))) {
+              alreadyTagged = true;
+              break;
+            }
+          }
+          if (alreadyTagged) continue;
+          var property = doc.createElement("property");
+          property.setAttribute("name", "dd_tags[test.final_status]");
+          property.setAttribute("value", "skip");
+          props.appendChild(property);
+        } else {
+          var properties = doc.createElement("properties");
+          var property = doc.createElement("property");
+          property.setAttribute("name", "dd_tags[test.final_status]");
+          property.setAttribute("value", "skip");
+          properties.appendChild(property);
+          testcase.appendChild(properties);
+        }
+        modified = true;
+      }
+    }
+    if (!modified) return;
+    var tmpFile = File.createTempFile("TagInitializationErrors", ".xml", xmlFile.getParentFile());
+    try {
+      var transformer = TransformerFactory.newInstance().newTransformer();
+      transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+      transformer.transform(new DOMSource(doc), new StreamResult(tmpFile));
+      Files.move(tmpFile.toPath(), xmlFile.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+    } catch (Exception e) {
+      tmpFile.delete();
+      throw e;
+    }
+  }
+}

.gitlab/collect_results.sh

@@ -90,6 +90,9 @@ do
     echo " (non-stable test names detected)"
   fi
 
+  echo "Add dd_tags[test.final_status] property on retried synthetics testcase initializationErrors"
+  $JAVA_25_HOME/bin/java "$(dirname "$0")/TagInitializationErrors.java" "$TARGET_DIR/$AGGREGATED_FILE_NAME"
+
   echo "Add dd_tags[test.final_status] property to each testcase on $TARGET_DIR/$AGGREGATED_FILE_NAME"
   xsl_file="$(dirname "$0")/add_final_status.xsl"
   tmp_file="$(mktemp)"

build.gradle.kts

@@ -13,7 +13,7 @@ plugins {
 
   id("com.diffplug.spotless") version "8.4.0"
   id("me.champeau.gradle.japicmp") version "0.4.3"
-  id("com.github.spotbugs") version "6.4.8"
+  id("com.github.spotbugs") version "6.5.0"
   id("de.thetaphi.forbiddenapis") version "3.10"
   id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
   id("com.gradleup.shadow") version "8.3.9" apply false

buildSrc/src/main/kotlin/datadog/gradle/plugin/ci/CIJobsExtensions.kt

@@ -22,6 +22,12 @@ val Project.isInSelectedSlot: Provider<Boolean>
       return@map true
     }
 
+    // When CI_NODE_INDEX or CI_NODE_TOTAL is unset in non-parallel jobs, one part may be empty (e.g. slot="/1") — treat as no filtering
+    if (parts[0].isBlank() || parts[1].isBlank()) {
+      project.logger.info("Incomplete slot value '{}', CI_NODE_INDEX or CI_NODE_TOTAL not set. Treating all projects as selected.", slot)
+      return@map true
+    }
+
     val selectedSlot = parts[0].toIntOrNull()
     val totalSlots = parts[1].toIntOrNull()
 

communication/gradle.lockfile

@@ -36,7 +36,7 @@ com.thoughtworks.qdox:qdox:1.12.1=codenarc
 commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.20.0=spotbugs
-de.thetaphi:forbiddenapis:3.10=compileClasspath
+de.thetaphi:forbiddenapis:3.10=compileClasspath,testCompileClasspath,testRuntimeClasspath
 io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
 jaxen:jaxen:2.0.0=spotbugs
 junit:junit:4.12=testCompileClasspath,testRuntimeClasspath

dd-java-agent/agent-aiguard/gradle.lockfile

@@ -36,7 +36,7 @@ com.vaadin.external.google:android-json:0.0.20131108.vaadin1=testCompileClasspat
 commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.20.0=spotbugs
-de.thetaphi:forbiddenapis:3.10=compileClasspath
+de.thetaphi:forbiddenapis:3.10=compileClasspath,testCompileClasspath,testRuntimeClasspath
 io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
 jaxen:jaxen:2.0.0=spotbugs
 net.bytebuddy:byte-buddy-agent:1.18.3=testCompileClasspath,testRuntimeClasspath

dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java

@@ -69,6 +69,7 @@ public BadConfigurationException(final String message) {
   static final String ACTION_TAG = "ai_guard.action";
   static final String REASON_TAG = "ai_guard.reason";
   static final String BLOCKED_TAG = "ai_guard.blocked";
+  static final String EVENT_TAG = "ai_guard.event";
   static final String META_STRUCT_TAG = "ai_guard";
   static final String META_STRUCT_MESSAGES = "messages";
   static final String META_STRUCT_CATEGORIES = "attack_categories";
@@ -227,6 +228,7 @@ public Evaluation evaluate(final List<Message> messages, final Options options)
     final AgentSpan localRootSpan = span.getLocalRootSpan();
     if (localRootSpan != null) {
       localRootSpan.setTag(Tags.AI_GUARD_KEEP, true);
+      localRootSpan.setTag(EVENT_TAG, true);
     }
     try (final AgentScope scope = tracer.activateSpan(span)) {
       final Message last = messages.get(messages.size() - 1);