Merge branch 'master' into bdu/do-not-include-latest-dep-classpath

Author: bric3

.github/chainguard/self.update-system-tests.create-pr.sts.yaml

@@ -36,6 +36,14 @@ _Action:_ Check the pull request did not introduce unexpected label.
 
 _Recovery:_ Update the pull request or add a comment to trigger the action again.
 
+### 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).
+
+_Action:_ Create a release branch that corresponds to the pushed tag (e.g. "release/vM.N.x").
+
+_Recovery:_ Manually create the branch from the "vM.N.0" git tag.
+
 ### draft-release-notes-on-tag [🔗](draft-release-notes-on-tag.yaml)
 
 _Trigger:_ When creating a tag, or manually (providing a tag)
@@ -61,6 +69,15 @@ _Recovery:_ Manually [close the related milestone and create a new one](https://
 
 _Notes:_ This action will not apply to release candidate versions using `-RC` tags.
 
+### prune-old-pull-requests [🔗](prune-old-pull-requests.yaml)
+
+_Trigger:_ Every month or manually.
+
+_Action:_ Mark as stale and comment on pull requests with no update during the last quarter.
+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).
@@ -93,16 +110,6 @@ _Action:_
 
 _Recovery:_ Check at the milestone for the related issues and update them manually.
 
-
-### prune-old-pull-requests [🔗](prune-old-pull-requests.yaml)
-
-_Trigger:_ Every month or manually.
-
-_Action:_ Mark as stale and comment on pull requests with no update during the last quarter.
-Close them if no following update within a week.
-
-_Recovery:_ Manually trigger the action again.
-
 ## Code Quality and Security
 
 ### analyze-changes [🔗](analyze-changes.yaml)
@@ -122,14 +129,6 @@ _Trigger:_ When creating a PR commits to `master` or a `release/*` branch with a
 
 _Action:_ Notify the PR author through comments that about the Git Submodule update.
 
-### update-gradle-dependencies [🔗](update-gradle-dependencies.yaml)
-
-_Trigger:_ Every week or manually.
-
-_Action:_ Create a PR updating the Grade dependencies and their locking files.
-
-_Recovery:_ Manually trigger the action again.
-
 ### run-system-tests [🔗](run-system-tests.yaml)
 
 _Trigger:_ When pushing commits to `master` or manually.
@@ -138,6 +137,14 @@ _Action:_ Build the Java Client Library and runs [the system tests](https://gith
 
 _Recovery:_ Manually trigger the action on the desired branch.
 
+### update-gradle-dependencies [🔗](update-gradle-dependencies.yaml)
+
+_Trigger:_ Every week or manually.
+
+_Action:_ Create a PR updating the Grade dependencies and their locking files.
+
+_Recovery:_ Manually trigger the action again.
+
 ### update-jmxfetch-submodule [🔗](update-jmxfetch-submodule.yaml)
 
 _Trigger:_ Monthly or manually

.github/workflows/README.md

@@ -1,4 +1,4 @@
-name: Create Release Branch and Pin System-Tests
+name: Create Release Branch
 
 on:
   push:
@@ -15,24 +15,8 @@ jobs:
   create-release-branch:
     runs-on: ubuntu-latest
     permissions:
-      contents: write # Allow pushing the empty release branch
-      id-token: write # Required for OIDC token federation
+      contents: write # Allow pushing the release branch
     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.create-pr
-
-      - name: Checkout dd-trace-java master branch
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
-        with:
-          ref: master
-
-      - name: Get head SHA of master branch
-        id: get-head-sha
-        run: echo "sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
-
       - name: Determine tag
         id: determine-tag
         run: |
@@ -53,61 +37,25 @@ jobs:
           TAG=${{ steps.determine-tag.outputs.tag }}
           echo "branch=release/${TAG%.0}.x" >> "$GITHUB_OUTPUT"
 
-      # - 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: 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'
-        id: define-temp-branch
-        run: echo "temp-branch=ci/pin-system-tests-$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
+      - name: Checkout dd-trace-java at tag
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
+        with:
+          ref: ${{ steps.determine-tag.outputs.tag }}
 
-      - name: Commit changes
-        # if: steps.check-branch.outputs.creating_new_branch == 'true'
-        id: create-commit
+      - name: Check if branch already exists
+        id: check-branch
         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'
-        uses: DataDog/commit-headless@5a0f3876e0fbdd3a86b3e008acf4ec562db59eee # action/v2.0.1
-        with:
-          token: "${{ steps.octo-sts.outputs.token }}"
-          branch: "${{ steps.define-temp-branch.outputs.temp-branch }}"
-          head-sha: "${{ steps.get-head-sha.outputs.sha }}"
-          create-branch: true
-          command: push
-          commits: "${{ steps.create-commit.outputs.commit }}"
+          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 creation"
+          else
+            echo "creating_new_branch=true" >> "$GITHUB_OUTPUT"
+            echo "Branch $BRANCH does not exist - creating it now"
+          fi
 
-      - name: Create pull request from temp branch to release branch
-        # if: steps.check-branch.outputs.creating_new_branch == 'true'
-        env:
-          GH_TOKEN: ${{ steps.octo-sts.outputs.token }}
+      - name: Create and push release branch
+        if: steps.check-branch.outputs.creating_new_branch == 'true'
         run: |
-          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.temp-branch }}" \
-            --label "tag: dependencies" \
-            --label "tag: no release notes" \
-            --body "This PR pins the system-tests reference for the release branch."
+          git checkout -b "${{ steps.define-branch.outputs.branch }}"
+          git push -u origin "${{ steps.define-branch.outputs.branch }}"

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

@@ -28,7 +28,7 @@ variables:
   GRADLE_VERSION: "8.14.3" # 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: "v25.10-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
+  BUILDER_IMAGE_VERSION_PREFIX: "v25.11-" # 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
   PROFILE_TESTS:
@@ -360,6 +360,14 @@ spotless:
     - ./gradlew --version
     - ./gradlew spotlessCheck $GRADLE_ARGS
 
+config-inversion-linter:
+  extends: .gradle_build
+  stage: tests
+  needs: []
+  script:
+    - ./gradlew --version
+    - ./gradlew logEnvVarUsages checkEnvironmentVariablesUsage checkConfigStrings
+
 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

.gitlab-ci.yml

@@ -78,6 +78,8 @@ check-big-regressions:
   rules:
     - if: '$POPULATE_CACHE'
       when: never
+    - if: '$CI_COMMIT_BRANCH =~ /backport-pr-/'
+      when: never
     - if: '$CI_COMMIT_BRANCH !~ /^(master|release\/)/'
       when: on_success
     - when: never

.gitlab/benchmarks.yml

@@ -14,8 +14,9 @@ public ClassLoaderResourcePathLocator(final ClassLoader classLoader, final Strin
   }
 
   @Override
-  public URL locate(String component, String path) {
-    return this.classLoader.getResource(PathUtils.concatPath(component, this.baseResource, path));
+  public URL locate(String optionalComponent, String path) {
+    return this.classLoader.getResource(
+        PathUtils.concatPath(optionalComponent, this.baseResource, path));
   }
 
   @Override

components/native-loader/src/main/java/datadog/nativeloader/ClassLoaderResourcePathLocator.java

@@ -0,0 +1,140 @@
+package datadog.nativeloader;
+
+import java.net.URL;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+
+final class CompositeLibraryLoadingListener extends SafeLibraryLoadingListener {
+  private final Collection<? extends LibraryLoadingListener> listeners;
+
+  CompositeLibraryLoadingListener(LibraryLoadingListener... listeners) {
+    this(Arrays.asList(listeners));
+  }
+
+  CompositeLibraryLoadingListener(Collection<? extends LibraryLoadingListener> listeners) {
+    this.listeners = listeners;
+  }
+
+  @Override
+  public boolean isNop() {
+    return this.listeners.isEmpty();
+  }
+
+  int size() {
+    return this.listeners.size();
+  }
+
+  @Override
+  public void onResolveDynamic(
+      PlatformSpec platformSpec,
+      String optionalComponent,
+      String libName,
+      boolean isPreloaded,
+      URL optionalUrl) {
+    for (LibraryLoadingListener listener : this.listeners) {
+      try {
+        listener.onResolveDynamic(
+            platformSpec, optionalComponent, libName, isPreloaded, optionalUrl);
+      } catch (Throwable ignored) {
+      }
+    }
+  }
+
+  @Override
+  public void onResolveDynamicFailure(
+      PlatformSpec platformSpec,
+      String optionalComponent,
+      String libName,
+      Throwable optionalCause) {
+    for (LibraryLoadingListener listener : this.listeners) {
+      try {
+        listener.onResolveDynamicFailure(platformSpec, optionalComponent, libName, optionalCause);
+      } catch (Throwable ignored) {
+      }
+    }
+  }
+
+  @Override
+  public void onLoad(
+      PlatformSpec platformSpec,
+      String optionalComponent,
+      String libName,
+      boolean isPreloaded,
+      Path optionalLibPath) {
+    for (LibraryLoadingListener listener : this.listeners) {
+      try {
+        listener.onLoad(platformSpec, optionalComponent, libName, isPreloaded, optionalLibPath);
+      } catch (Throwable ignored) {
+      }
+    }
+  }
+
+  @Override
+  public void onLoadFailure(
+      PlatformSpec platformSpec,
+      String optionalComponent,
+      String libName,
+      Throwable optionalCause) {
+    for (LibraryLoadingListener listener : this.listeners) {
+      try {
+        listener.onLoadFailure(platformSpec, optionalComponent, libName, optionalCause);
+      } catch (Throwable ignored) {
+      }
+    }
+  }
+
+  @Override
+  public void onTempFileCreated(
+      PlatformSpec platformSpec, String optionalComponent, String libName, Path tempFile) {
+    for (LibraryLoadingListener listener : this.listeners) {
+      try {
+        listener.onTempFileCreated(platformSpec, optionalComponent, libName, tempFile);
+      } catch (Throwable ignored) {
+      }
+    }
+  }
+
+  @Override
+  public void onTempFileCreationFailure(
+      PlatformSpec platformSpec,
+      String optionalComponent,
+      String libName,
+      Path tempDir,
+      String libExt,
+      Throwable optionalCause) {
+    for (LibraryLoadingListener listener : this.listeners) {
+      try {
+        listener.onTempFileCreationFailure(
+            platformSpec, optionalComponent, libName, tempDir, libExt, optionalCause);
+      } catch (Throwable ignored) {
+      }
+    }
+  }
+
+  @Override
+  public void onTempFileCleanup(
+      PlatformSpec platformSpec, String optionalComponent, String libName, Path tempPath) {
+    for (LibraryLoadingListener listener : this.listeners) {
+      try {
+        listener.onTempFileCleanup(platformSpec, optionalComponent, libName, tempPath);
+      } catch (Throwable ignored) {
+      }
+    }
+  }
+
+  @Override
+  public CompositeLibraryLoadingListener join(LibraryLoadingListener... listeners) {
+    ArrayList<LibraryLoadingListener> combinedListeners =
+        new ArrayList<>(this.listeners.size() + listeners.length);
+    combinedListeners.addAll(this.listeners);
+    combinedListeners.addAll(Arrays.asList(listeners));
+    return new CompositeLibraryLoadingListener(combinedListeners);
+  }
+
+  @Override
+  public String toString() {
+    return this.getClass().getSimpleName() + ":" + this.listeners.toString();
+  }
+}