Merge branch 'master' into mhlidd/add_jms_logging

Author: mhlidd

.github/chainguard/self.enforce-datadog-merge-queue.comment-pr.sts.yaml

@@ -0,0 +1,11 @@
+issuer: https://token.actions.githubusercontent.com
+
+subject: repo:DataDog/dd-trace-java:pull_request
+
+claim_pattern:
+  event_name: pull_request
+  job_workflow_ref: DataDog/dd-trace-java/\.github/workflows/enforce-datadog-merge-queue\.yaml@refs/heads/master
+
+permissions:
+  issues: write
+  pull_requests: write

.github/workflows/README.md

@@ -36,6 +36,19 @@ _Action:_ Check the pull request did not introduce unexpected label.
 
 _Recovery:_ Update the pull request or add a comment to trigger the action again.
 
+### enforce-datadog-merge-queue [🔗](enforce-datadog-merge-queue.yaml)
+
+_Trigger:_ When creating or updating a pull request, or when a pull request is added to GitHub merge queue.
+
+_Actions:_
+
+* Pass the `Merge queue check` status check on pull requests so they remain in a mergeable state,
+* When a pull request is enqueued in GitHub merge queue, post a `/merge` comment to trigger the Datadog merge queue,
+* Fail the `Merge queue check` status check on merge groups to prevent GitHub from merging directly.
+
+_Recovery:_ The workflow is expected to fail to block GitHub merge queue.
+This redirects GitHub's "Merge when ready" button to the Datadog merge queue system.
+
 ### create-release-branch [🔗](create-release-branch.yaml)
 
 _Trigger:_ When a git tag matching the pattern "vM.N.0" is pushed (e.g. for a minor release).

.github/workflows/enforce-datadog-merge-queue.yaml

@@ -0,0 +1,40 @@
+name: Enforce Datadog Merge Queue
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, enqueued]
+    branches:
+      - master
+  merge_group:
+
+jobs:
+  enforce_datadog_merge_queue:
+    name: Merge queue check
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write # required for OIDC token federation
+    steps:
+      - name: Block GitHub merge queue
+        if: github.event_name == 'merge_group'
+        run: |
+          echo "Merge is handled by the Datadog merge queue system. Use the /merge command to enqueue your PR for merging."
+          exit 1
+      - name: Get OIDC token
+        if: github.event.action == 'enqueued'
+        uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
+        id: octo-sts
+        with:
+          scope: DataDog/dd-trace-java
+          policy: self.enforce-datadog-merge-queue.comment-pr
+      - name: Post /merge comment
+        if: github.event.action == 'enqueued'
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # 8.0.0
+        with:
+          github-token: ${{ steps.octo-sts.outputs.token }}
+          script: |
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.pull_request.number,
+              body: '/merge'
+            });

.github/workflows/prune-old-pull-requests.yaml

@@ -13,7 +13,7 @@ jobs:
       pull-requests: write
     steps:
     - name: Prune old pull requests
-      uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+      uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
       with:
         days-before-stale: -1 # Disable general stale bot
         days-before-pr-stale: 90 # Only enable stale bot for PRs with no activity for 90 days

.github/workflows/run-system-tests.yaml

@@ -1,6 +1,7 @@
 name: Run system tests
 
 on:
+  merge_group:
   pull_request:
   workflow_dispatch:
   schedule:

.gitlab-ci.yml

@@ -31,7 +31,7 @@ variables:
   GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
   BUILDER_IMAGE_VERSION_PREFIX: "v26.01-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
   REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
-  DEFAULT_TEST_JVMS: /^(8|11|17|21|25)$/ # the latest "stable" version is LTS v25
+  DEFAULT_TEST_JVMS: /^(8|11|17|21|25|stable)$/ # the latest "stable" version is 26
   PROFILE_TESTS:
     description: "Enable profiling of tests"
     value: "false"
@@ -62,15 +62,14 @@ workflow:
       - "17"
       - "21"
       - "25"
-      - "26"
       - "semeru11"
       - "oracle8"
       - "zulu8"
       - "semeru8"
       - "ibm8"
       - "zulu11"
       - "semeru17"
-      # - "stable"
+      - "stable"
     CI_SPLIT: ["1/1"]
 
 # Gitlab doesn't support "parallel" and "parallel:matrix" at the same time
@@ -450,12 +449,16 @@ test_published_artifacts:
     - source .gitlab/gitlab-utils.sh
     - gitlab_section_start "collect-reports" "Collecting reports"
     - .gitlab/collect_reports.sh --destination ./check_reports --move
+    - .gitlab/collect_results.sh
     - gitlab_section_end "collect-reports"
   artifacts:
     when: always
     paths:
       - ./check_reports
+      - ./results
       - '.gradle/daemon/*/*.out.log'
+    reports:
+      junit: results/*.xml
   retry:
     max: 2
     when:
@@ -516,15 +519,21 @@ muzzle:
   after_script:
     - *container_info
     - *cgroup_info
+    - *set_datadog_api_keys
     - source .gitlab/gitlab-utils.sh
     - gitlab_section_start "collect-reports" "Collecting reports"
     - .gitlab/collect_reports.sh
+    - .gitlab/collect_results.sh
+    - .gitlab/upload_ciapp.sh $CACHE_TYPE
     - gitlab_section_end "collect-reports"
   artifacts:
     when: always
     paths:
       - ./reports
+      - ./results
       - '.gradle/daemon/*/*.out.log'
+    reports:
+      junit: results/*.xml
 
 muzzle-dep-report:
   extends: .gradle_build
@@ -588,6 +597,8 @@ muzzle-dep-report:
       when: on_success
     - if: '$CI_COMMIT_BRANCH =~ /^mq-working-branch-/'
       when: on_success
+    - if: '$CI_COMMIT_BRANCH =~ /^gh-readonly-queue/'
+      when: on_success
   script:
     - *gitlab_base_ref_params
     - >

.gitlab/collect_results.sh

@@ -67,15 +67,17 @@ do
   # E.g. for the example path: tomcat-5.5_forkedTest_TEST-TomcatServletV1ForkedTest.xml
   AGGREGATED_FILE_NAME=$(echo "$RESULT_XML_FILE" | rev | cut -d "/" -f 1,2,5 | rev | tr "/" "_")
   echo -n " as $AGGREGATED_FILE_NAME"
-  cp "$RESULT_XML_FILE" "$TEST_RESULTS_DIR/$AGGREGATED_FILE_NAME"
+  TARGET_DIR="$TEST_RESULTS_DIR"
+  mkdir -p "$TARGET_DIR"
+  cp "$RESULT_XML_FILE" "$TARGET_DIR/$AGGREGATED_FILE_NAME"
   # Insert file attribute to testcase XML nodes
   get_source_file
-  sed -i "/<testcase/ s|\(time=\"[^\"]*\"\)|\1 file=\"$file_path\"|g" "$TEST_RESULTS_DIR/$AGGREGATED_FILE_NAME"
+  sed -i "/<testcase/ s|\(time=\"[^\"]*\"\)|\1 file=\"$file_path\"|g" "$TARGET_DIR/$AGGREGATED_FILE_NAME"
   # Replace Java Object hashCode by marker in testcase XML nodes to get stable test names
-  sed -i '/<testcase/ s/@[0-9a-f]\{5,\}/@HASHCODE/g' "$TEST_RESULTS_DIR/$AGGREGATED_FILE_NAME"
+  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' "$TEST_RESULTS_DIR/$AGGREGATED_FILE_NAME"
-  if cmp -s "$RESULT_XML_FILE" "$TEST_RESULTS_DIR/$AGGREGATED_FILE_NAME"; then
+  sed -i '/<testcase/ s/localhost:[0-9]\{2,5\}/localhost:PORT/g' "$TARGET_DIR/$AGGREGATED_FILE_NAME"
+  if cmp -s "$RESULT_XML_FILE" "$TARGET_DIR/$AGGREGATED_FILE_NAME"; then
     echo ""
   else
     echo -n " (non-stable test names detected)"

.gitlab/upload_ciapp.sh

@@ -1,19 +1,27 @@
 #!/usr/bin/env bash
 SERVICE_NAME="dd-trace-java"
 CACHE_TYPE=$1
-TEST_JVM=$2
+TEST_JVM=${2:-}
 
 # CI_JOB_NAME, CI_NODE_INDEX, and CI_NODE_TOTAL are read from GitLab CI environment
 
 # JAVA_???_HOME are set in the base image for each used JDK https://github.com/DataDog/dd-trace-java-docker-build/blob/master/Dockerfile#L86
-JAVA_HOME="JAVA_${TEST_JVM}_HOME"
-JAVA_BIN="${!JAVA_HOME}/bin/java"
-if [ ! -x "$JAVA_BIN" ]; then
-    JAVA_BIN=$(which java)
+JAVA_PROPS=""
+if [ -n "$TEST_JVM" ]; then
+    JAVA_BIN=""
+    if [[ "$TEST_JVM" =~ ^[A-Za-z0-9_]+$ ]]; then
+        JAVA_HOME_VAR="JAVA_${TEST_JVM}_HOME"
+        JAVA_HOME_VALUE="${!JAVA_HOME_VAR}"
+        if [ -n "$JAVA_HOME_VALUE" ] && [ -x "$JAVA_HOME_VALUE/bin/java" ]; then
+            JAVA_BIN="$JAVA_HOME_VALUE/bin/java"
+        fi
+    fi
+    if [ -z "$JAVA_BIN" ]; then
+        JAVA_BIN="$(command -v java)"
+    fi
+    JAVA_PROPS=$($JAVA_BIN -XshowSettings:properties -version 2>&1)
 fi
 
-# Extract Java properties from the JVM used to run the tests
-JAVA_PROPS=$($JAVA_BIN -XshowSettings:properties -version 2>&1)
 java_prop() {
     local PROP_NAME=$1
     echo "$JAVA_PROPS" | grep "$PROP_NAME" | head -n1 | cut -d'=' -f2 | xargs
@@ -27,11 +35,23 @@ junit_upload() {
     # Build custom tags array directly from arguments
     local custom_tags_args=()
 
-    # Extract job base name from CI_JOB_NAME (strip matrix suffix)
+    # Extract job base name from CI_JOB_NAME.
+    # Handles:
+    # - matrix suffix format: "job-name: [value, 1/6]" -> "job-name"
+    # - split suffix format: "job-name 1/6" -> "job-name"
     local job_base_name="${CI_JOB_NAME%%:*}"
+    job_base_name="$(echo "$job_base_name" | sed -E 's/[[:space:]]+[0-9]+\/[0-9]+$//')"
 
     # Add custom test configuration tags
-    custom_tags_args+=(--tags "test.configuration.jvm:${TEST_JVM}")
+    if [ -n "$TEST_JVM" ]; then
+        custom_tags_args+=(--tags "test.configuration.jvm:${TEST_JVM}")
+        custom_tags_args+=(--tags "runtime.name:$(java_prop java.runtime.name)")
+        custom_tags_args+=(--tags "runtime.vendor:$(java_prop java.vendor)")
+        custom_tags_args+=(--tags "runtime.version:$(java_prop java.version)")
+        custom_tags_args+=(--tags "os.architecture:$(java_prop os.arch)")
+        custom_tags_args+=(--tags "os.platform:$(java_prop os.name)")
+        custom_tags_args+=(--tags "os.version:$(java_prop os.version)")
+    fi
     if [ -n "$CI_NODE_INDEX" ] && [ -n "$CI_NODE_TOTAL" ]; then
         custom_tags_args+=(--tags "test.configuration.split:${CI_NODE_INDEX}/${CI_NODE_TOTAL}")
     fi
@@ -43,12 +63,6 @@ junit_upload() {
         datadog-ci junit upload --service $SERVICE_NAME \
         --logs \
         --tags "test.traits:{\"category\":[\"$CACHE_TYPE\"]}" \
-        --tags "runtime.name:$(java_prop java.runtime.name)" \
-        --tags "runtime.vendor:$(java_prop java.vendor)" \
-        --tags "runtime.version:$(java_prop java.version)" \
-        --tags "os.architecture:$(java_prop os.arch)" \
-        --tags "os.platform:$(java_prop os.name)" \
-        --tags "os.version:$(java_prop os.version)" \
         --tags "git.repository_url:https://github.com/DataDog/dd-trace-java" \
         "${custom_tags_args[@]}" \
         ./results

buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/MuzzlePlugin.kt

@@ -120,17 +120,20 @@ class MuzzlePlugin : Plugin<Project> {
     project.afterEvaluate {
       // use runAfter to set up task finalizers in version order
       var runAfter: TaskProvider<MuzzleTask> = muzzleTask
+      val muzzleReportTasks = mutableListOf<TaskProvider<MuzzleTask>>()
 
       project.extensions.getByType<MuzzleExtension>().directives.forEach { directive ->
         project.logger.debug("configuring {}", directive)
 
         if (directive.isCoreJdk) {
           runAfter = addMuzzleTask(directive, null, project, runAfter, muzzleBootstrap, muzzleTooling)
+          muzzleReportTasks.add(runAfter)
         } else {
           val range = resolveVersionRange(directive, system, session)
 
           muzzleDirectiveToArtifacts(directive, range).forEach {
             runAfter = addMuzzleTask(directive, it, project, runAfter, muzzleBootstrap, muzzleTooling)
+            muzzleReportTasks.add(runAfter)
           }
 
           if (directive.assertInverse) {
@@ -139,15 +142,21 @@ class MuzzlePlugin : Plugin<Project> {
 
               muzzleDirectiveToArtifacts(inverseDirective, inverseRange).forEach {
                 runAfter = addMuzzleTask(inverseDirective, it, project, runAfter, muzzleBootstrap, muzzleTooling)
+                muzzleReportTasks.add(runAfter)
               }
             }
           }
         }
         project.logger.info("configured $directive")
       }
 
+      if (muzzleReportTasks.isEmpty() && !project.extensions.getByType<MuzzleExtension>().directives.any { it.assertPass }) {
+        muzzleReportTasks.add(muzzleTask)
+      }
+
       val timingTask = project.tasks.register<MuzzleEndTask>("muzzle-end") {
         startTimeMs.set(startTime)
+        muzzleResultFiles.from(muzzleReportTasks.map { it.flatMap { task -> task.result } })
       }
       // last muzzle task to run
       runAfter.configure {