Merge branch 'master' into inferred-span-tags

Author: zarirhamza

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

@@ -43,7 +43,7 @@ jobs:
         run: |
           echo "${{ steps.get-release-version.outputs.VERSION }}: ${{ steps.get-release-url.outputs.URL }}" >> index.yml
       - name: Commit and push changes
-        uses: planetscale/ghcommit-action@9400254a26464337cbe5af17c5f25075134e0089 # v0.2.7
+        uses: planetscale/ghcommit-action@b1cac81e65b25c96bc767d2b726b6a6e10d226d0 # v0.2.10
         with:
           commit_message: "chore: Add version ${{ steps.get-release-version.outputs.VERSION }} to Cloud Foundry"
           repo: ${{ github.repository }}

.github/workflows/analyze-changes.yaml

@@ -24,7 +24,7 @@ jobs:
       # Run the static analysis on the staging environment to benefit from the new features not yet released
       - name: Check code meets quality standards (staging)
         id: datadog-static-analysis-staging
-        uses: DataDog/datadog-static-analyzer-github-action@1297a546e6bb268e2ac5bc98a1477d22be335822 # v1
+        uses: DataDog/datadog-static-analyzer-github-action@2707598b1182dce1d1792186477b5b4132338e1c # v1
         with:
           dd_app_key: ${{ secrets.DATADOG_APP_KEY_STAGING }}
           dd_api_key: ${{ secrets.DATADOG_API_KEY_STAGING }}
@@ -49,7 +49,7 @@ jobs:
           submodules: 'recursive'
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: |
             ~/.gradle/caches
@@ -59,7 +59,7 @@ jobs:
             ${{ runner.os }}-gradle-
         
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
         with:
           languages: 'java'
           build-mode: 'manual'
@@ -76,7 +76,7 @@ jobs:
             --build-cache --parallel --stacktrace --no-daemon --max-workers=4
 
       - name: Perform CodeQL Analysis and upload results to GitHub Security tab
-        uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
 
       # For now, CodeQL SARIF results are not supported by Datadog CI
       # - name: Upload results to Datadog CI Static Analysis
@@ -111,7 +111,7 @@ jobs:
           submodules: 'recursive'
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: |
             ~/.gradle/caches
@@ -144,7 +144,7 @@ jobs:
           ls -laR "./workspace/.trivy"
 
       - name: Run Trivy security scanner
-        uses: aquasecurity/trivy-action@18f2510ee396bbf400402947b394f2dd8c87dbb0 # v0.29.0
+        uses: aquasecurity/trivy-action@6c175e9c4083a92bbca2f9724c8a5e33bc2d97a5 # v0.30.0
         with:
           scan-type: rootfs
           scan-ref: './workspace/.trivy/'
@@ -157,7 +157,7 @@ jobs:
           TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
         if: always()
         with:
           sarif_file: 'trivy-results.sarif'

dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/Redaction.java

@@ -117,7 +117,10 @@ static void initKeywords() {
      * based on sentry list: https://github.com/getsentry/sentry-python/blob/fefb454287b771ac31db4e30fa459d9be2f977b8/sentry_sdk/scrubber.py#L17-L58
      */
     KEYWORDS.addAll(PREDEFINED_KEYWORDS);
-    KEYWORDS.removeAll(Config.get().getDynamicInstrumentationRedactionExcludedIdentifiers());
+    // Exclude user defined keywords
+    for (String keyword : Config.get().getDynamicInstrumentationRedactionExcludedIdentifiers()) {
+      KEYWORDS.remove(normalize(keyword));
+    }
   }
 
   public static void addUserDefinedKeywords(Config config) {

dd-java-agent/agent-debugger/debugger-bootstrap/src/test/java/datadog/trace/bootstrap/debugger/util/RedactionTest.java

@@ -58,10 +58,11 @@ public void exclusions() {
     setFieldInConfig(
         config,
         "dynamicInstrumentationRedactionExcludedIdentifiers",
-        new HashSet<>(Arrays.asList("password")));
+        new HashSet<>(Arrays.asList("password", "_2FA")));
     Redaction.initKeywords();
     try {
       assertFalse(Redaction.isRedactedKeyword("password"));
+      assertFalse(Redaction.isRedactedKeyword("_2fa"));
     } finally {
       setFieldInConfig(
           config, "dynamicInstrumentationRedactionExcludedIdentifiers", Collections.emptySet());

dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/DatanucleusDecorator.java

@@ -1,5 +1,6 @@
 package datadog.trace.instrumentation.datanucleus;
 
+import datadog.trace.api.naming.SpanNaming;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
@@ -16,7 +17,8 @@ public class DatanucleusDecorator extends OrmClientDecorator {
   public static final CharSequence DATANUCLEUS_QUERY_DELETE =
       UTF8BytesString.create("datanucleus.query.delete");
   public static final CharSequence JAVA_DATANUCLEUS = UTF8BytesString.create("java-datanucleus");
-
+  private static final String SERVICE_NAME =
+      SpanNaming.instance().namingSchema().database().service("datanucleus");
   public static final DatanucleusDecorator DECORATE = new DatanucleusDecorator();
 
   @Override
@@ -36,7 +38,7 @@ protected CharSequence component() {
 
   @Override
   protected String service() {
-    return "datanucleus";
+    return SERVICE_NAME;
   }
 
   @Override

dd-java-agent/instrumentation/hibernate/src/main/java/datadog/trace/instrumentation/hibernate/HibernateDecorator.java

@@ -1,5 +1,6 @@
 package datadog.trace.instrumentation.hibernate;
 
+import datadog.trace.api.naming.SpanNaming;
 import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.bootstrap.instrumentation.decorator.OrmClientDecorator;
@@ -10,11 +11,13 @@
 
 public class HibernateDecorator extends OrmClientDecorator {
   public static final CharSequence HIBERNATE_SESSION = UTF8BytesString.create("hibernate.session");
+  private static final String SERVICE_NAME =
+      SpanNaming.instance().namingSchema().database().service("hibernate");
   public static final HibernateDecorator DECORATOR = new HibernateDecorator();
 
   @Override
   protected String service() {
-    return "hibernate";
+    return SERVICE_NAME;
   }
 
   @Override

dd-trace-core/src/main/java/datadog/trace/common/sampling/DeterministicSampler.java

@@ -49,7 +49,7 @@ public DeterministicSampler(final double rate) {
   @Override
   public <T extends CoreSpan<T>> boolean sample(final T span) {
     // unsigned 64 bit comparison with cutoff/threshold
-    return getSamplingId(span) * KNUTH_FACTOR + Long.MIN_VALUE < threshold;
+    return getSamplingId(span) * KNUTH_FACTOR + Long.MIN_VALUE <= threshold;
   }
 
   protected abstract <T extends CoreSpan<T>> long getSamplingId(T span);

dd-trace-core/src/test/groovy/datadog/trace/common/sampling/DeterministicTraceSamplerTest.groovy

@@ -121,6 +121,7 @@ class DeterministicTraceSamplerTest extends DDSpecification {
     true     | "9828766684487745566"
     true     | "9908585559158765387"
     true     | "9956202364908137547"
+    true     | "9223372036854775808"
   }
 
   def "test sampling none: #traceId"() {