[mq] [skip ddci] working branch - merge de1fadf on top of master at 42cdbe9

{"baseBranch":"master","baseCommit":"42cdbe9ce2db837302d873a13605c6977ceee1d6","createdAt":"2026-06-04T18:54:17.153407Z","headSha":"de1fadfcd663702aa232e86c07909ed9e777cfed","id":"d8a67ff6-0a2f-4e14-b84c-0674cee38f2c","priority":"200","pullRequestNumber":"11567","queuedAt":"2026-06-04T18:54:17.152330Z","status":"STATUS_QUEUED"}

Author: gh-worker-dd-mergequeue-cf854d[bot]

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/AgentJarIndex.java

@@ -67,7 +67,7 @@ public String classEntryName(String name) {
 
   /** For testing purposes only. */
   public static AgentJarIndex emptyIndex() {
-    return new AgentJarIndex(new String[0], ClassNameTrie.Builder.EMPTY_TRIE);
+    return new AgentJarIndex(new String[0], ClassNameTrie.EMPTY_TRIE);
   }
 
   public static AgentJarIndex readIndex(JarFile agentJar) {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java

@@ -26,7 +26,7 @@ public class RepoIndex {
 
   static final RepoIndex EMPTY =
       new RepoIndex(
-          ClassNameTrie.Builder.EMPTY_TRIE,
+          ClassNameTrie.EMPTY_TRIE,
           Collections.emptyMap(),
           Collections.emptyList(),
           Collections.emptyList());

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

@@ -104,7 +104,7 @@ public class Redaction {
           "xsrf",
           "xsrftoken");
   private static final Set<String> KEYWORDS = ConcurrentHashMap.newKeySet();
-  private static ClassNameTrie typeTrie = ClassNameTrie.Builder.EMPTY_TRIE;
+  private static ClassNameTrie typeTrie = ClassNameTrie.EMPTY_TRIE;
   private static List<String> redactedClasses;
   private static List<String> redactedPackages;
 
@@ -190,7 +190,7 @@ public static List<String> getRedactedClasses() {
   }
 
   public static void clearUserDefinedTypes() {
-    typeTrie = ClassNameTrie.Builder.EMPTY_TRIE;
+    typeTrie = ClassNameTrie.EMPTY_TRIE;
   }
 
   public static void resetUserDefinedKeywords() {

gradle/libs.versions.toml

@@ -32,7 +32,7 @@ scala33 = "3.3.0"
 autoservice = "1.1.1"
 asm = "9.9.1"
 byte-buddy = "1.18.8"
-instrument-java = "0.0.3"
+instrument-java = "0.0.4"
 
 # Benchmarks
 jmh = "1.37"