Merge branch 'master' into rachel.yang/baggage-telemetry

Author: rachelyangdog

.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" | \

dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/AbstractGradleTest.groovy

@@ -34,6 +34,8 @@ class AbstractGradleTest extends CiVisibilitySmokeTest {
   private static final String GRADLE_TEST_RESOURCE_EXTENSION = ".gradleTest"
   private static final String GRADLE_REGULAR_EXTENSION = ".gradle"
 
+  private static final ComparableVersion GRADLE_9 = new ComparableVersion("9.0.0")
+
   @TempDir
   protected Path projectFolder
 
@@ -105,23 +107,23 @@ class AbstractGradleTest extends CiVisibilitySmokeTest {
     } else if (Jvm.current.java17) {
       return gradleVersion.compareTo(new ComparableVersion("7.3")) >= 0
     } else if (Jvm.current.java16) {
-      return gradleVersion.compareTo(new ComparableVersion("7.0")) >= 0
+      return gradleVersion.isWithin(new ComparableVersion("7.0"), GRADLE_9)
     } else if (Jvm.current.java15) {
-      return gradleVersion.compareTo(new ComparableVersion("6.7")) >= 0
+      return gradleVersion.isWithin(new ComparableVersion("6.7"), GRADLE_9)
     } else if (Jvm.current.java14) {
-      return gradleVersion.compareTo(new ComparableVersion("6.3")) >= 0
+      return gradleVersion.isWithin(new ComparableVersion("6.3"), GRADLE_9)
     } else if (Jvm.current.java13) {
-      return gradleVersion.compareTo(new ComparableVersion("6.0")) >= 0
+      return gradleVersion.isWithin(new ComparableVersion("6.0"), GRADLE_9)
     } else if (Jvm.current.java12) {
-      return gradleVersion.compareTo(new ComparableVersion("5.4")) >= 0
+      return gradleVersion.isWithin(new ComparableVersion("5.4"), GRADLE_9)
     } else if (Jvm.current.java11) {
-      return gradleVersion.compareTo(new ComparableVersion("5.0")) >= 0
+      return gradleVersion.isWithin(new ComparableVersion("5.0"), GRADLE_9)
     } else if (Jvm.current.java10) {
-      return gradleVersion.compareTo(new ComparableVersion("4.7")) >= 0
+      return gradleVersion.isWithin(new ComparableVersion("4.7"), GRADLE_9)
     } else if (Jvm.current.java9) {
-      return gradleVersion.compareTo(new ComparableVersion("4.3")) >= 0
+      return gradleVersion.isWithin(new ComparableVersion("4.3"), GRADLE_9)
     } else if (Jvm.current.java8) {
-      return gradleVersion.compareTo(new ComparableVersion("2.0")) >= 0
+      return gradleVersion.isWithin(new ComparableVersion("2.0"), GRADLE_9)
     }
     return false
   }

dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleLauncherSmokeTest.groovy

@@ -2,6 +2,7 @@ package datadog.smoketest
 
 import datadog.communication.util.IOUtils
 import datadog.trace.civisibility.utils.ShellCommandExecutor
+import spock.util.environment.Jvm
 
 /**
  * This test runs Gradle Launcher with the Java Tracer injected
@@ -12,6 +13,7 @@ class GradleLauncherSmokeTest extends AbstractGradleTest {
   private static final int GRADLE_BUILD_TIMEOUT_MILLIS = 90_000
 
   private static final String AGENT_JAR = System.getProperty("datadog.smoketest.agent.shadowJar.path")
+  private static final String JAVA_HOME = buildJavaHome()
 
   def "test Gradle Launcher injects tracer into Gradle Daemon: v#gradleVersion, cmd line - #gradleDaemonCmdLineParams"() {
     given:
@@ -45,18 +47,19 @@ class GradleLauncherSmokeTest extends AbstractGradleTest {
   }
 
   private void givenGradleWrapper(String gradleVersion) {
-    def shellCommandExecutor = new ShellCommandExecutor(projectFolder.toFile(), GRADLE_BUILD_TIMEOUT_MILLIS)
+    def shellCommandExecutor = new ShellCommandExecutor(projectFolder.toFile(), GRADLE_BUILD_TIMEOUT_MILLIS, ["JAVA_HOME": JAVA_HOME])
     shellCommandExecutor.executeCommand(IOUtils::readFully, "./gradlew", "wrapper", "--gradle-version", gradleVersion)
   }
 
   private String whenRunningGradleLauncherWithJavaTracerInjected(String gradleDaemonCmdLineParams) {
     def shellCommandExecutor = new ShellCommandExecutor(projectFolder.toFile(), GRADLE_BUILD_TIMEOUT_MILLIS, [
-      "GRADLE_OPTS"                        : "-javaagent:${AGENT_JAR}".toString(),
-      "DD_CIVISIBILITY_ENABLED"            : "true",
-      "DD_CIVISIBILITY_AGENTLESS_ENABLED"  : "true",
-      "DD_CIVISIBILITY_AGENTLESS_URL"      : "${mockBackend.intakeUrl}".toString(),
-      "DD_CIVISIBILITY_GIT_UPLOAD_ENABLED" : "false",
-      "DD_API_KEY"                         : "dummy"
+      "JAVA_HOME"                         : JAVA_HOME,
+      "GRADLE_OPTS"                       : "-javaagent:${AGENT_JAR}".toString(),
+      "DD_CIVISIBILITY_ENABLED"           : "true",
+      "DD_CIVISIBILITY_AGENTLESS_ENABLED" : "true",
+      "DD_CIVISIBILITY_AGENTLESS_URL"     : "${mockBackend.intakeUrl}".toString(),
+      "DD_CIVISIBILITY_GIT_UPLOAD_ENABLED": "false",
+      "DD_API_KEY"                        : "dummy"
     ])
     String[] command = ["./gradlew", "--no-daemon", "--info"]
     if (gradleDaemonCmdLineParams) {
@@ -74,4 +77,12 @@ class GradleLauncherSmokeTest extends AbstractGradleTest {
     }
     return true
   }
+
+  private static String buildJavaHome() {
+    if (Jvm.current.isJava8()) {
+      return System.getenv("JAVA_8_HOME")
+    } else {
+      return System.getenv("JAVA_" + Jvm.current.getJavaSpecificationVersion() + "_HOME")
+    }
+  }
 }

dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/build.gradleTest

@@ -30,6 +30,7 @@ repositories {
 dependencies {
     testImplementation gradleTestKit()
 
+    testImplementation 'org.junit.platform:junit-platform-launcher'
     testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
 }
 

dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/build.gradleTest

@@ -19,7 +19,7 @@ repositories {
 testing {
     suites {
         test {
-            useJUnitJupiter()
+            useJUnitJupiter('5.9.3')
 
             dependencies {
               implementation 'org.junit.platform:junit-platform-launcher:1.9.3'

internal-api/src/main/java/datadog/trace/util/ComparableVersion.java

@@ -9,6 +9,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
+import javax.annotation.Nonnull;
 
 // backported from org.apache.maven:maven-artifact:3.9.9
 public class ComparableVersion implements Comparable<ComparableVersion> {
@@ -125,6 +126,11 @@ public int compareTo(ComparableVersion o) {
     return this.items.compareTo(o.items);
   }
 
+  /** Checks if the version is in the range {@code [start, end)} */
+  public boolean isWithin(@Nonnull ComparableVersion start, @Nonnull ComparableVersion end) {
+    return compareTo(start) >= 0 && compareTo(end) < 0;
+  }
+
   public String toString() {
     return this.value;
   }