Merge branch 'master' into bdu/spotbugs-bump-need-jdk11-min

Author: AlexeyKuznetsov-DD

…d/self.update-system-tests.push.sts.yaml …f.update-system-tests.create-pr.sts.yaml.github/chainguard/self.update-system-tests.push.sts.yaml renamed to .github/chainguard/self.update-system-tests.create-pr.sts.yaml .github/chainguard/self.update-system-tests.push.sts.yaml renamed to .github/chainguard/self.update-system-tests.create-pr.sts.yaml

@@ -53,7 +53,8 @@ jobs:
             exit 0;
           fi
 
-          git commit -a -m "chore: Add version ${{ steps.get-release-version.outputs.VERSION }} to Cloud Foundry"
+          git add --all
+          git commit -m "chore: Add version ${{ steps.get-release-version.outputs.VERSION }} to Cloud Foundry"
           echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
       - name: Push changes
         uses: DataDog/commit-headless@5a0f3876e0fbdd3a86b3e008acf4ec562db59eee # action/v2.0.1

.github/workflows/add-release-to-cloudfoundry.yaml

@@ -15,14 +15,18 @@ jobs:
   create-release-branch:
     runs-on: ubuntu-latest
     permissions:
-      contents: write # Allow pushing the empty release branch
+      # contents: write # Allow pushing the empty release branch
+      contents: read
       id-token: write # Required for OIDC token federation
     steps:
       - uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
         id: octo-sts
         with:
           scope: DataDog/dd-trace-java
-          policy: self.update-system-tests.push
+          policy: self.update-system-tests.create-pr
+
+      - name: Checkout dd-trace-java at tag
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
 
       - name: Determine tag
         id: determine-tag
@@ -42,69 +46,63 @@ jobs:
         id: define-branch
         run: |
           TAG=${{ steps.determine-tag.outputs.tag }}
-          BRANCH="release/${TAG%.0}.x"
-          echo "branch=${BRANCH}" >> "$GITHUB_OUTPUT"
+          echo "branch=release/${TAG%.0}.x" >> "$GITHUB_OUTPUT"
 
-      - name: Checkout dd-trace-java at tag
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
-        with:
-          ref: ${{ github.sha }}
+      # - name: Check if branch already exists
+      #   id: check-branch
+      #   run: |
+      #     BRANCH=${{ steps.define-branch.outputs.branch }}
+      #     if git ls-remote --heads origin "$BRANCH" | grep -q "$BRANCH"; then
+      #       echo "creating_new_branch=false" >> "$GITHUB_OUTPUT"
+      #       echo "Branch $BRANCH already exists - skipping following steps"
+      #     else
+      #       echo "creating_new_branch=true" >> "$GITHUB_OUTPUT"
+      #       echo "Branch $BRANCH does not exist - proceeding with following steps"
+      #     fi
 
-      - name: Check if branch already exists
-        id: check-branch
-        run: |
-          BRANCH=${{ steps.define-branch.outputs.branch }}
-          if git ls-remote --heads origin "$BRANCH" | grep -q "$BRANCH"; then
-            echo "creating_new_branch=false" >> "$GITHUB_OUTPUT"
-            echo "Branch $BRANCH already exists - skipping following steps"
-          else
-            echo "creating_new_branch=true" >> "$GITHUB_OUTPUT"
-            echo "Branch $BRANCH does not exist - proceeding with following steps"
-          fi
+      # - name: Create and push empty release branch
+      #   if: steps.check-branch.outputs.creating_new_branch == 'true'
+      #   run: |
+      #     git checkout -b "${{ steps.define-branch.outputs.branch }}"
+      #     git push -u origin "${{ steps.define-branch.outputs.branch }}"
 
-      - name: Create and push empty release branch
-        if: steps.check-branch.outputs.creating_new_branch == 'true'
-        run: |
-          git checkout -b "${{ steps.define-branch.outputs.branch }}"
-          git push -u origin "${{ steps.define-branch.outputs.branch }}"
+      - name: Update system-tests references to latest commit SHA on main
+        # if: steps.check-branch.outputs.creating_new_branch == 'true'
+        run: BRANCH=main ./tooling/update_system_test_reference.sh
 
       - name: Define temp branch name
-        if: steps.check-branch.outputs.creating_new_branch == 'true'
+        # if: steps.check-branch.outputs.creating_new_branch == 'true'
         id: define-temp-branch
-        run: echo "branch=ci/pin-system-tests-$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
-
-      - name: Update system-tests references to latest commit SHA on main
-        if: steps.check-branch.outputs.creating_new_branch == 'true'
-        run: BRANCH=main ./tooling/update_system_test_reference.sh
+        run: echo "temp-branch=ci/pin-system-tests-$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
 
       - name: Commit changes
-        if: steps.check-branch.outputs.creating_new_branch == 'true'
+        # if: steps.check-branch.outputs.creating_new_branch == 'true'
         id: create-commit
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git commit -m "chore: Pin system-tests for release branch" .github/workflows/run-system-tests.yaml
           echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
-      
+
       - name: Push changes to temp branch
-        if: steps.check-branch.outputs.creating_new_branch == 'true'
+        # if: steps.check-branch.outputs.creating_new_branch == 'true'
         uses: DataDog/commit-headless@5a0f3876e0fbdd3a86b3e008acf4ec562db59eee # action/v2.0.1
         with:
           token: "${{ steps.octo-sts.outputs.token }}"
-          branch: "${{ steps.define-temp-branch.outputs.branch }}"
+          branch: "${{ steps.define-temp-branch.outputs.temp-branch }}"
           head-sha: "${{ github.sha }}"
           create-branch: true
           command: push
           commits: "${{ steps.create-commit.outputs.commit }}"
 
       - name: Create pull request from temp branch to release branch
-        if: steps.check-branch.outputs.creating_new_branch == 'true'
+        # if: steps.check-branch.outputs.creating_new_branch == 'true'
         env:
           GH_TOKEN: ${{ steps.octo-sts.outputs.token }}
         run: |
-          gh pr create  --title "Pin system-tests for ${{ steps.define-branch.outputs.branch }}" \
+          gh pr create --title "Pin system-tests for ${{ steps.define-branch.outputs.branch }}" \
             --base "${{ steps.define-branch.outputs.branch }}" \
-            --head "${{ steps.define-temp-branch.outputs.branch }}" \
+            --head "${{ steps.define-temp-branch.outputs.temp-branch }}" \
             --label "tag: dependencies" \
             --label "tag: no release notes" \
             --body "This PR pins the system-tests reference for the release branch."

.github/workflows/create-release-branch.yaml

@@ -55,7 +55,8 @@ jobs:
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git commit -a -m "chore: Update Gradle dependencies"
+          git add --all
+          git commit -m "chore: Update Gradle dependencies"
           echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
       - name: Push changes
         uses: DataDog/commit-headless@5a0f3876e0fbdd3a86b3e008acf4ec562db59eee # action/v2.0.1

.github/workflows/update-gradle-dependencies.yaml

@@ -970,3 +970,16 @@ create_key:
     expire_in: 13 mos
     paths:
       - pubkeys
+
+validate_supported_configurations_local_file:
+  extends: .validate_supported_configurations_local_file
+  variables:
+    LOCAL_JSON_PATH: "metadata/supported-configurations.json"
+
+update_central_configurations_version_range:
+  extends: .update_central_configurations_version_range
+  variables:
+    LOCAL_REPO_NAME: "dd-trace-java"
+    LOCAL_JSON_PATH: "metadata/supported-configurations.json"
+    LANGUAGE_NAME: "java"
+    MULTIPLE_RELEASE_LINES: "false"

.gitlab-ci.yml

@@ -1,10 +1,12 @@
 import com.diffplug.gradle.spotless.SpotlessExtension
+import datadog.gradle.plugin.ci.testAggregate
 
 plugins {
   id("datadog.gradle-debug")
   id("datadog.dependency-locking")
   id("datadog.tracer-version")
   id("datadog.dump-hanged-test")
+  id("datadog.ci-jobs")
 
   id("com.diffplug.spotless") version "6.13.0"
   id("com.github.spotbugs") version "6.4.4"
@@ -137,4 +139,16 @@ allprojects {
   }
 }
 
-apply(from = "$rootDir/gradle/ci_jobs.gradle")
+testAggregate("smoke", listOf(":dd-smoke-tests"), emptyList())
+testAggregate("instrumentation", listOf(":dd-java-agent:instrumentation"), emptyList())
+testAggregate("profiling", listOf(":dd-java-agent:agent-profiling"), emptyList())
+testAggregate("debugger", listOf(":dd-java-agent:agent-debugger"), forceCoverage = true)
+testAggregate(
+  "base", listOf(":"),
+  listOf(
+    ":dd-java-agent:instrumentation",
+    ":dd-smoke-tests",
+    ":dd-java-agent:agent-profiling",
+    ":dd-java-agent:agent-debugger"
+  )
+)

build.gradle.kts

@@ -0,0 +1,108 @@
+package datadog.gradle.plugin.ci
+
+import org.gradle.api.Project
+import org.gradle.api.Task
+import org.gradle.kotlin.dsl.extra
+
+/**
+ * Checks if a task is affected by git changes
+ */
+internal fun isAffectedBy(baseTask: Task, affectedProjects: Map<Project, Set<String>>): String? {
+    val visited = mutableSetOf<Task>()
+    val queue = mutableListOf(baseTask)
+    
+    while (queue.isNotEmpty()) {
+        val t = queue.removeAt(0)
+        if (visited.contains(t)) {
+            continue
+        }
+        visited.add(t)
+        
+        val affectedTasks = affectedProjects[t.project]
+        if (affectedTasks != null) {
+            if (affectedTasks.contains("all")) {
+                return "${t.project.path}:${t.name}"
+            }
+            if (affectedTasks.contains(t.name)) {
+                return "${t.project.path}:${t.name}"
+            }
+        }
+        
+        t.taskDependencies.getDependencies(t).forEach { queue.add(it) }
+    }
+    return null
+}
+
+/**
+ * Creates a single aggregate root task that depends on matching subproject tasks
+ */
+private fun Project.createRootTask(
+    rootTaskName: String,
+    subProjTaskName: String,
+    includePrefixes: List<String>,
+    excludePrefixes: List<String>,
+    forceCoverage: Boolean
+) {
+    val coverage = forceCoverage || rootProject.hasProperty("checkCoverage")
+    tasks.register(rootTaskName) {
+        subprojects.forEach { subproject ->
+            val activePartition = subproject.extra.get("activePartition") as Boolean
+            if (activePartition &&
+                includePrefixes.any { subproject.path.startsWith(it) } &&
+                !excludePrefixes.any { subproject.path.startsWith(it) }) {
+                
+                val testTask = subproject.tasks.findByName(subProjTaskName)
+                var isAffected = true
+                
+                if (testTask != null) {
+                    val useGitChanges = rootProject.extra.get("useGitChanges") as Boolean
+                    if (useGitChanges) {
+                        @Suppress("UNCHECKED_CAST")
+                        val affectedProjects = rootProject.extra.get("affectedProjects") as Map<Project, Set<String>>
+                        val fileTrigger = isAffectedBy(testTask, affectedProjects)
+                        if (fileTrigger != null) {
+                            logger.warn("Selecting ${subproject.path}:$subProjTaskName (triggered by $fileTrigger)")
+                        } else {
+                            logger.warn("Skipping ${subproject.path}:$subProjTaskName (not affected by changed files)")
+                            isAffected = false
+                        }
+                    }
+                    if (isAffected) {
+                        dependsOn(testTask)
+                    }
+                }
+                
+                if (isAffected && coverage) {
+                    val coverageTask = subproject.tasks.findByName("jacocoTestReport")
+                    if (coverageTask != null) {
+                        dependsOn(coverageTask)
+                    }
+                    val verificationTask = subproject.tasks.findByName("jacocoTestCoverageVerification")
+                    if (verificationTask != null) {
+                        dependsOn(verificationTask)
+                    }
+                }
+            }
+        }
+    }
+}
+
+/**
+ * Creates aggregate test tasks for CI using createRootTask() above
+ * 
+ * Creates three subtasks for the given base task name:
+ * - ${baseTaskName}Test - runs allTests
+ * - ${baseTaskName}LatestDepTest - runs allLatestDepTests
+ * - ${baseTaskName}Check - runs check
+ */
+fun Project.testAggregate(
+    baseTaskName: String,
+    includePrefixes: List<String>,
+    excludePrefixes: List<String> = emptyList(),
+    forceCoverage: Boolean = false
+) {
+    createRootTask("${baseTaskName}Test", "allTests", includePrefixes, excludePrefixes, forceCoverage)
+    createRootTask("${baseTaskName}LatestDepTest", "allLatestDepTests", includePrefixes, excludePrefixes, forceCoverage)
+    createRootTask("${baseTaskName}Check", "check", includePrefixes, excludePrefixes, forceCoverage)
+}
+