Merge branch 'master' into alexeyk/protocol-v1-1

Author: AlexeyKuznetsov-DD

.github/workflows/README.md

@@ -91,16 +91,6 @@ Close them if no following update within a week.
 
 _Recovery:_ Manually trigger the action again.
 
-### update-docker-build-image [🔗](update-docker-build-image.yaml)
-
-_Trigger:_ Quarterly released, loosely [a day after the new image tag is created](https://github.com/DataDog/dd-trace-java-docker-build/blob/master/.github/workflows/docker-tag.yml).
-
-_Action:_ Update the Docker build image used in GitLab CI with the latest tag.
-
-_Recovery:_ Download artifacts and upload them manually to the related _download release_.
-
-_Notes:_  Manually trigger the action again given the desired image tag as input.
-
 ### update-download-releases [🔗](update-download-releases.yaml)
 
 _Trigger:_ When a release is published.

.github/workflows/update-docker-build-image.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
 

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

@@ -29,7 +29,8 @@ variables:
   GRADLE_VERSION: "8.14.4" # must match gradle-wrapper.properties
   MAVEN_REPOSITORY_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
   GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
-  BUILDER_IMAGE_VERSION_PREFIX: "v26.02-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
+  BUILDER_IMAGE_REPO: "registry.ddbuild.io/images/mirror/dd-trace-java-docker-build" # images are pinned in images/mirror.lock.yaml in the DataDog/images repo
+  BUILDER_IMAGE_VERSION_PREFIX: "ci-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "ci-" or "123_merge-")
   REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
   DEFAULT_TEST_JVMS: /^(8|11|17|21|25|tip)$/ # the latest "tip" version is 26
   PROFILE_TESTS:
@@ -142,7 +143,7 @@ default:
     fi
 
 .gradle_build: &gradle_build
-  image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}base
+  image: ${BUILDER_IMAGE_REPO}:${BUILDER_IMAGE_VERSION_PREFIX}base
   stage: build
   variables:
     MAVEN_OPTS: "-Xms256M -Xmx1024M"
@@ -218,7 +219,7 @@ default:
 # on the central publisher portal, it invalidates the old one. This check prevents going further.
 # See https://datadoghq.atlassian.net/wiki/x/Oog5OgE
 maven-central-pre-release-check:
-  image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}base
+  image: ${BUILDER_IMAGE_REPO}:${BUILDER_IMAGE_VERSION_PREFIX}base
   stage: .pre
   rules:
     - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+$/'
@@ -399,7 +400,7 @@ config-inversion-linter:
 
 test_published_artifacts:
   extends: .gradle_build
-  image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}7 # Needs Java7 for some tests
+  image: ${BUILDER_IMAGE_REPO}:${BUILDER_IMAGE_VERSION_PREFIX}7 # Needs Java7 for some tests
   stage: tests
   needs: [ build ]
   variables:
@@ -566,7 +567,7 @@ muzzle-dep-report:
 
 .test_job:
   extends: .gradle_build
-  image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}$testJvm
+  image: ${BUILDER_IMAGE_REPO}:${BUILDER_IMAGE_VERSION_PREFIX}$testJvm
   tags: [ "docker-in-docker:amd64" ] # use docker-in-docker runner for testcontainers
   needs: [ build_tests ]
   stage: tests
@@ -794,7 +795,7 @@ test_smoke_semeru8_debugger:
     testJvm: "semeru8"
 
 aggregate_test_counts:
-  image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}base
+  image: ${BUILDER_IMAGE_REPO}:${BUILDER_IMAGE_VERSION_PREFIX}base
   stage: test-summary
   # Note: No explicit 'needs' or 'dependencies' required
   # By default, GitLab CI automatically downloads artifacts from ALL jobs in previous stages

.gitlab-ci.yml

@@ -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-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParser.java

@@ -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"() {