Merge branch 'master' into andrea.marziali/ffm-instrument

Author: amarziali

.github/workflows/update-smoke-test-latest-versions.yaml

@@ -44,8 +44,8 @@ jobs:
           METADATA=$(curl -sf https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/maven-metadata.xml)
           # Get all versions, filter out alpha/beta/rc, take the latest
           VERSION=$(echo "$METADATA" \
-            | xmllint --xpath '//versions/version/text()' - 2>/dev/null \
-            | tr ' ' '\n' \
+            | grep -o '<version>[^<]*</version>' \
+            | sed 's/<[^>]*>//g' \
             | grep -v -E '(alpha|beta|rc)' \
             | sort -V \
             | tail -1)
@@ -62,8 +62,8 @@ jobs:
           METADATA=$(curl -sf https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/maven-metadata.xml)
           # Get all versions, filter out alpha/beta, take the latest
           VERSION=$(echo "$METADATA" \
-            | xmllint --xpath '//versions/version/text()' - 2>/dev/null \
-            | tr ' ' '\n' \
+            | grep -o '<version>[^<]*</version>' \
+            | sed 's/<[^>]*>//g' \
             | grep -v -E '(alpha|beta)' \
             | sort -V \
             | tail -1)
@@ -80,6 +80,11 @@ jobs:
           MAVEN_VERSION: ${{ steps.maven.outputs.version }}
           SUREFIRE_VERSION: ${{ steps.surefire.outputs.version }}
         run: |
+          echo "Writing resolved versions to properties files:"
+          echo "  Gradle:         ${GRADLE_VERSION}"
+          echo "  Maven:          ${MAVEN_VERSION}"
+          echo "  Maven Surefire: ${SUREFIRE_VERSION}"
+
           printf '%s\n' \
             "# Pinned \"latest\" versions for CI Visibility Gradle smoke tests." \
             "# Updated automatically by the update-smoke-test-latest-versions workflow." \
@@ -97,9 +102,14 @@ jobs:
         id: check-changes
         run: |
           if [[ -z "$(git status -s)" ]]; then
-            echo "No changes to commit."
+            echo "No changes detected — pinned versions are already up to date."
             echo "has_changes=false" >> "$GITHUB_OUTPUT"
           else
+            echo "Changes detected in the following files:"
+            git status -s
+            echo ""
+            echo "Diff:"
+            git diff
             echo "has_changes=true" >> "$GITHUB_OUTPUT"
           fi
 

.gitlab/add_final_status.xsl

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+We're using not-that-ideal XSLT here as this change, because it must be done over 17+ repos.
+It's a workaround until this gets integrated into a better place, such as datadog-ci or the backend.
+* ticket: https://datadoghq.atlassian.net/browse/APMSP-2610
+* RFC: https://docs.google.com/document/d/1OaX_h09fCXWmK_1ADrwvilt8Yt5h4WjC7UUAdS3Y3uw/edit?pli=1&tab=t.0#heading=h.tfy5viz7rz2
+-->
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <!-- Identity transform: copy everything as-is by default -->
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <!-- For testcase elements missing dd_tags[test.final_status] inside their properties block -->
+  <xsl:template match="testcase[not(properties/property[@name='dd_tags[test.final_status]'])]">
+    <xsl:copy>
+      <xsl:apply-templates select="@*"/>
+      <xsl:variable name="status">
+        <xsl:choose>
+          <xsl:when test="failure or error">fail</xsl:when>
+          <xsl:when test="skipped">skip</xsl:when>
+          <xsl:otherwise>pass</xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+      <xsl:choose>
+        <xsl:when test="properties">
+          <!-- Inject into existing properties block, preserving child order -->
+          <xsl:for-each select="node()">
+            <xsl:choose>
+              <xsl:when test="self::properties">
+                <properties>
+                  <xsl:apply-templates select="@*|node()"/>
+                  <property name="dd_tags[test.final_status]" value="{$status}"/>
+                </properties>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:apply-templates select="."/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:for-each>
+        </xsl:when>
+        <xsl:otherwise>
+          <!-- No properties block: create one before other children -->
+          <properties>
+            <property name="dd_tags[test.final_status]" value="{$status}"/>
+          </properties>
+          <xsl:apply-templates select="node()"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>

.gitlab/collect_results.sh

@@ -77,6 +77,13 @@ do
   sed -i '/<testcase/ s/@[0-9a-f]\{5,\}/@HASHCODE/g' "$TARGET_DIR/$AGGREGATED_FILE_NAME"
   # Replace random port numbers by marker in testcase XML nodes to get stable test names
   sed -i '/<testcase/ s/localhost:[0-9]\{2,5\}/localhost:PORT/g' "$TARGET_DIR/$AGGREGATED_FILE_NAME"
+
+  # Add dd_tags[test.final_status] property to each testcase
+  xsl_file="$(dirname "$0")/add_final_status.xsl"
+  tmp_file="$(mktemp)"
+  xsltproc --output "$tmp_file" "$xsl_file" "$TARGET_DIR/$AGGREGATED_FILE_NAME"
+  mv "$tmp_file" "$TARGET_DIR/$AGGREGATED_FILE_NAME"
+
   if cmp -s "$RESULT_XML_FILE" "$TARGET_DIR/$AGGREGATED_FILE_NAME"; then
     echo ""
   else

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

@@ -205,6 +205,9 @@ private static String getToolName(final Message current, final List<Message> mes
   }
 
   private boolean isBlockingEnabled(final Options options, final Object isBlockingEnabled) {
+    if (isBlockingEnabled == null) {
+      return false;
+    }
     return options.block() && "true".equalsIgnoreCase(isBlockingEnabled.toString());
   }
 

dd-java-agent/agent-aiguard/src/test/groovy/com/datadog/aiguard/AIGuardInternalTests.groovy

@@ -222,6 +222,51 @@ class AIGuardInternalTests extends DDSpecification {
     suite << TestSuite.build()
   }
 
+  void 'test evaluate block defaults to remote is_blocking_enabled'() {
+    given:
+    def request
+    final call = Mock(Call) {
+      execute() >> {
+        return mockResponse(
+          request,
+          200,
+          [data: [attributes: [action: 'DENY', reason: 'Nope', tags: ['deny_everything'], is_blocking_enabled: remoteBlocking]]]
+          )
+      }
+    }
+    final client = Mock(OkHttpClient) {
+      newCall(_ as Request) >> {
+        request = (Request) it[0]
+        return call
+      }
+    }
+    final aiguard = new AIGuardInternal(URL, HEADERS, client)
+
+    when:
+    Throwable error = null
+    AIGuard.Evaluation eval = null
+    try {
+      eval = aiguard.evaluate(TOOL_CALL, options)
+    } catch (Throwable e) {
+      error = e
+    }
+
+    then:
+    if (shouldBlock) {
+      error instanceof AIGuard.AIGuardAbortError
+      error.action == DENY
+    } else {
+      error == null
+      eval.action == DENY
+    }
+
+    where:
+    options                            | remoteBlocking | shouldBlock
+    AIGuard.Options.DEFAULT            | true           | true
+    AIGuard.Options.DEFAULT            | false          | false
+    new AIGuard.Options().block(false) | true           | false
+  }
+
   void 'test evaluate with API errors'() {
     given:
     final errors = [[status: 400, title: 'Bad request']]

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParser.java

@@ -73,7 +73,7 @@ DBInfo.Builder doParse(final String jdbcUrl, final DBInfo.Builder builder) {
       String instanceName = null;
       final int hostIndex = jdbcUrl.indexOf("://");
 
-      if (hostIndex <= 0) {
+      if (hostIndex <= 0 || jdbcUrl.length() == 3 + hostIndex) {
         return builder;
       }
 

dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/tree/GitClientTest.groovy

@@ -87,10 +87,10 @@ class GitClientTest extends Specification {
 
   def "test is shallow"() {
     given:
-    givenGitRepo("ci/git/shallow/git")
+    givenGitRepos(["ci/git/shallow_with_origin/origin", "ci/git/shallow_with_origin/repo"])
 
     when:
-    def gitClient = givenGitClient()
+    def gitClient = givenGitClient("repo")
     def shallow = gitClient.isShallow()
 
     then:
@@ -111,22 +111,22 @@ class GitClientTest extends Specification {
 
   def "test get upstream branch SHA"() {
     given:
-    givenGitRepo("ci/git/shallow/git")
+    givenGitRepos(["ci/git/shallow_with_origin/origin", "ci/git/shallow_with_origin/repo"])
 
     when:
-    def gitClient = givenGitClient()
+    def gitClient = givenGitClient("repo")
     def upstreamBranch = gitClient.getUpstreamBranchSha()
 
     then:
-    upstreamBranch == "98b944cc44f18bfb78e3021de2999cdcda8efdf6"
+    upstreamBranch == "c76ef954d23f8fdb42dcf2fe956d6af5a31fe7bd"
   }
 
   def "test unshallow: sha-#remoteSha"() {
     given:
-    givenGitRepo("ci/git/shallow/git")
+    givenGitRepos(["ci/git/shallow_with_origin/origin", "ci/git/shallow_with_origin/repo"])
 
     when:
-    def gitClient = givenGitClient()
+    def gitClient = givenGitClient("repo")
     def shallow = gitClient.isShallow()
     def commits = gitClient.getLatestCommits()
 
@@ -209,11 +209,11 @@ class GitClientTest extends Specification {
 
   def "test get commit info with fetching"() {
     given:
-    givenGitRepo("ci/git/shallow/git")
+    givenGitRepos(["ci/git/shallow_with_origin/origin", "ci/git/shallow_with_origin/repo"])
 
     when:
-    def commit = "f4377e97f10c2d58696192b170b2fef2a8464b04"
-    def gitClient = givenGitClient()
+    def commit = "6e55a15a35ad46f74e4203dd42f7797173a6edcb"
+    def gitClient = givenGitClient("repo")
     def commitInfo = gitClient.getCommitInfo(commit, false)
 
     then:
@@ -224,13 +224,13 @@ class GitClientTest extends Specification {
 
     then:
     commitInfo.sha == commit
-    commitInfo.author.name == "sullis"
-    commitInfo.author.email == "github@seansullivan.com"
-    commitInfo.author.iso8601Date == "2023-05-30T07:07:35-07:00"
-    commitInfo.committer.name == "GitHub"
-    commitInfo.committer.email == "noreply@github.com"
-    commitInfo.committer.iso8601Date == "2023-05-30T07:07:35-07:00"
-    commitInfo.fullMessage == "brotli4j 1.12.0 (#1592)"
+    commitInfo.author.name == "Test Author"
+    commitInfo.author.email == "test-author@example.com"
+    commitInfo.author.iso8601Date == "2026-03-12T17:02:46+01:00"
+    commitInfo.committer.name == "Test Author"
+    commitInfo.committer.email == "test-author@example.com"
+    commitInfo.committer.iso8601Date == "2026-03-12T17:02:46+01:00"
+    commitInfo.fullMessage == "Commit message 0"
   }
 
   def "test get latest commits"() {