Merge branch 'master' into mhlidd_update_codeowners

Author: mhlidd

.github/chainguard/self.update-docker-build-image.create-pr.sts.yaml

@@ -0,0 +1,13 @@
+issuer: https://token.actions.githubusercontent.com
+
+subject: repo:DataDog/dd-trace-java:ref:refs/heads/master
+
+claim_pattern:
+  event_name: (schedule|workflow_dispatch)
+  ref: refs/heads/master
+  ref_protected: "true"
+  job_workflow_ref: DataDog/dd-trace-java/\.github/workflows/update-docker-build-image\.yaml@refs/heads/master
+
+permissions:
+  contents: write
+  pull_requests: write

.github/chainguard/self.update-gradle-dependencies.create-pr.sts.yaml

@@ -0,0 +1,13 @@
+issuer: https://token.actions.githubusercontent.com
+
+subject: repo:DataDog/dd-trace-java:ref:refs/heads/master
+
+claim_pattern:
+  event_name: (schedule|workflow_dispatch)
+  ref: refs/heads/master
+  ref_protected: "true"
+  job_workflow_ref: DataDog/dd-trace-java/\.github/workflows/update-gradle-dependencies\.yaml@refs/heads/master
+
+permissions:
+  contents: write
+  pull_requests: write

.github/workflows/update-docker-build-image.yaml

@@ -3,21 +3,27 @@ name: Update Docker Build Image
 on:
   schedule:
     # A day after creating the tag from https://github.com/DataDog/dd-trace-java-docker-build/blob/master/.github/workflows/docker-tag.yml
-    - cron: '0 0 1 2,5,8,11 *'
+    - cron: "0 0 1 2,5,8,11 *"
   workflow_dispatch:
     inputs:
       tag:
-        description: 'The tag to use for the Docker build image'
+        description: "The tag to use for the Docker build image"
         required: true
-        default: 'vYY.MM'
-    
+        default: "vYY.MM"
+
 jobs:
   update-docker-build-image:
     runs-on: ubuntu-latest
     permissions:
-      contents: write # Required to commit and push changes to a new branch
-      pull-requests: write # Required to create a pull request
+      contents: write # Required to create and push branch
+      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-docker-build-image.create-pr
+
       - name: Checkout the repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Download ghcommit CLI
@@ -55,12 +61,12 @@ jobs:
           sed -i '' -E 's|(BUILDER_IMAGE_VERSION_PREFIX:)[^#]*([#].*)|\1 "${{ steps.define-tag.outputs.tag }}-" \2|' .gitlab-ci.yml
       - name: Commit and push changes
         env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          GITHUB_TOKEN: ${{ steps.octo-sts.outputs.token }}
         run: |
           ghcommit --repository ${{ github.repository }} --branch ${{ steps.define-branch.outputs.branch }} --add .gitlab-ci.yml --message "feat(ci): Update Docker build image"
       - name: Create pull request
         env:
-          GH_TOKEN: ${{ github.token }}
+          GH_TOKEN: ${{ steps.octo-sts.outputs.token }}
         run: |
           gh pr create --title "Update Docker build image" \
             --base master \

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

@@ -1,21 +1,27 @@
 name: Update Gradle dependencies
 on:
   schedule:
-    - cron: '0 4 * * 0'
+    - cron: "0 4 * * 0"
   workflow_dispatch:
 
 jobs:
   update-gradle-dependencies:
     runs-on: ubuntu-latest
     name: Update Gradle dependencies
     permissions:
-      contents: write # Required to commit and push changes to a new branch
-      pull-requests: write # Required to create a pull request
+      contents: write # Required to create new branch
+      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-gradle-dependencies.create-pr
+
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
       - name: Download ghcommit CLI
         run: |
           curl https://github.com/planetscale/ghcommit/releases/download/v0.1.48/ghcommit_linux_amd64 -o /usr/local/bin/ghcommit -L
@@ -37,7 +43,7 @@ jobs:
           ./gradlew resolveAndLockAll --write-locks --parallel --stacktrace --no-daemon --max-workers=4
       - name: Commit changes
         env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          GITHUB_TOKEN: ${{ steps.octo-sts.outputs.token }}
         run: |
           GH_ADD_ARGS=""
           COUNT=0
@@ -69,7 +75,7 @@ jobs:
           fi
       - name: Create pull request
         env:
-          GH_TOKEN: ${{ github.token }}
+          GH_TOKEN: ${{ steps.octo-sts.outputs.token }}
         run: |
           # use echo to set a multiline body for the PR
           echo -e "This PR updates the Gradle dependencies. ⚠️ Don't forget to squash commits before merging. ⚠️\n\n- [ ] Update PR title if a code change is needed to support one of those new dependencies" | \

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
   id("com.github.spotbugs") version "5.0.14"
   id("de.thetaphi.forbiddenapis") version "3.8"
 
-  id("org.shipkit.shipkit-auto-version") version "2.1.2"
+  id("tracer-version")
   id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
 
   id("com.gradleup.shadow") version "8.3.6" apply false
@@ -56,11 +56,8 @@ apply(from = rootDir.resolve("gradle/spotless.gradle"))
 
 val compileTask = tasks.register("compile")
 
-val repoVersion = version
-
 allprojects {
   group = "com.datadoghq"
-  version = repoVersion
 
   if (isCI.isPresent) {
     layout.buildDirectory = providers.provider {

buildSrc/build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
   groovy
   `java-gradle-plugin`
   `kotlin-dsl`
+  `jvm-test-suite`
   id("com.diffplug.spotless") version "6.13.0"
 }
 
@@ -25,6 +26,10 @@ gradlePlugin {
       id = "call-site-instrumentation"
       implementationClass = "datadog.gradle.plugin.CallSiteInstrumentationPlugin"
     }
+    create("tracer-version-plugin") {
+      id = "tracer-version"
+      implementationClass = "datadog.gradle.plugin.version.TracerVersionPlugin"
+    }
   }
 }
 
@@ -42,19 +47,46 @@ dependencies {
   implementation("org.eclipse.aether", "aether-transport-http", "1.1.0")
   implementation("org.apache.maven", "maven-aether-provider", "3.3.9")
 
+  implementation("com.github.zafarkhaja:java-semver:0.10.2")
+
   implementation("com.google.guava", "guava", "20.0")
   implementation("org.ow2.asm", "asm", "9.8")
   implementation("org.ow2.asm", "asm-tree", "9.8")
-
-  testImplementation(libs.spock.core)
-  testImplementation(libs.groovy)
 }
 
 tasks.compileKotlin {
   dependsOn(":call-site-instrumentation-plugin:build")
 }
 
-tasks.test {
-  useJUnitPlatform()
-  enabled = project.hasProperty("runBuildSrcTests")
+testing {
+  @Suppress("UnstableApiUsage")
+  suites {
+    val test by getting(JvmTestSuite::class) {
+      dependencies {
+        implementation(libs.spock.core)
+        implementation(libs.groovy)
+      }
+      targets.configureEach {
+        testTask.configure {
+          enabled = project.hasProperty("runBuildSrcTests")
+        }
+      }
+    }
+
+    val integTest by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation(gradleTestKit())
+        implementation("org.assertj:assertj-core:3.25.3")
+      }
+      // Makes the gradle plugin publish its declared plugins to this source set
+      gradlePlugin.testSourceSet(sources)
+    }
+
+    withType(JvmTestSuite::class).configureEach {
+      useJUnitJupiter(libs.versions.junit5)
+      targets.configureEach {
+        testTask
+      }
+    }
+  }
 }