Merge branch 'master' into alejandro.gonzalez/weak-randomness-false-positives

jandro996 · web-flow · commit a8c6e1b185e8 · 2025-02-28T08:53:57.000+01:00
diff --git a/.circleci/config.continue.yml.j2 b/.circleci/config.continue.yml.j2
@@ -36,7 +36,7 @@ instrumentation_modules: &instrumentation_modules "dd-java-agent/instrumentation
 debugger_modules: &debugger_modules "dd-java-agent/agent-debugger|dd-java-agent/agent-bootstrap|dd-java-agent/agent-builder|internal-api|communication|dd-trace-core"
 profiling_modules: &profiling_modules "dd-java-agent/agent-profiling"
 
-default_system_tests_commit: &default_system_tests_commit d4974a9d88a10a70a8688afd08697affb5e82261
+default_system_tests_commit: &default_system_tests_commit 0509dbd094c9cbf15f58db96f62276a0adff7efa
 
 parameters:
   nightly:
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/AgentJarIndex.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/AgentJarIndex.java
@@ -142,6 +142,12 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
       if (null != prefixRoot) {
         String entryKey = computeEntryKey(prefixRoot.relativize(file));
         if (null != entryKey) {
+          int existingPrefixId = prefixTrie.apply(entryKey);
+          if (-1 != existingPrefixId && prefixId != existingPrefixId) {
+            log.warn(
+                "Detected duplicate content under '{}'. Ensure your content is under a distinct directory.",
+                entryKey);
+          }
           prefixTrie.put(entryKey, prefixId);
           if (entryKey.endsWith("*")) {
             // optimization: wildcard will match everything under here so can skip
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -29,7 +29,7 @@ moshi = '1.11.0'
 testcontainers = '1.20.1'
 jmc = "8.1.0"
 autoservice = "1.0-rc7"
-ddprof = "1.21.1"
+ddprof = "1.22.0"
 asm = "9.7.1"
 cafe_crypto = "0.1.0"
 lz4 = "1.7.1"
