Use ClassNameTrie from its new location in dd-instrument-java

mcculls · mcculls · commit aa6b425ca8ca · 2025-11-15T21:33:49.000Z
diff --git a/dd-java-agent/agent-bootstrap/build.gradle b/dd-java-agent/agent-bootstrap/build.gradle
@@ -25,7 +25,7 @@ dependencies {
   api project(':dd-java-agent:agent-debugger:debugger-bootstrap')
   api project(':components:environment')
   api project(':components:json')
-  api libs.instrumentjava
+  api libs.instrument.java
   api libs.slf4j
   // ^ Generally a bad idea for libraries, but we're shadowing.
 
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
@@ -1,6 +1,6 @@
 package datadog.trace.bootstrap;
 
-import datadog.trace.util.ClassNameTrie;
+import datadog.instrument.utils.ClassNameTrie;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.DataInputStream;
diff --git a/dd-java-agent/agent-ci-visibility/build.gradle b/dd-java-agent/agent-ci-visibility/build.gradle
@@ -19,6 +19,7 @@ dependencies {
   api libs.slf4j
 
   implementation libs.bundles.asm
+  implementation libs.instrument.java
   implementation group: 'org.jacoco', name: 'org.jacoco.core', version: '0.8.14'
   implementation group: 'org.jacoco', name: 'org.jacoco.report', version: '0.8.14'
 
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java
@@ -1,11 +1,11 @@
 package datadog.trace.civisibility.source.index;
 
+import datadog.instrument.utils.ClassNameTrie;
 import datadog.trace.api.Config;
 import datadog.trace.api.civisibility.domain.Language;
 import datadog.trace.civisibility.ipc.serialization.Serializer;
 import datadog.trace.civisibility.source.SourceResolutionException;
 import datadog.trace.civisibility.source.Utils;
-import datadog.trace.util.ClassNameTrie;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexBuilder.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexBuilder.java
@@ -1,9 +1,9 @@
 package datadog.trace.civisibility.source.index;
 
+import datadog.instrument.utils.ClassNameTrie;
 import datadog.trace.api.Config;
 import datadog.trace.api.civisibility.domain.Language;
 import datadog.trace.civisibility.source.Utils;
-import datadog.trace.util.ClassNameTrie;
 import java.io.IOException;
 import java.nio.file.FileSystem;
 import java.nio.file.FileVisitOption;
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/index/RepoIndexTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/index/RepoIndexTest.groovy
@@ -1,8 +1,8 @@
 package datadog.trace.civisibility.source.index
 
+import datadog.instrument.utils.ClassNameTrie
 import datadog.trace.api.civisibility.domain.Language
 import datadog.trace.civisibility.source.SourceResolutionException
-import datadog.trace.util.ClassNameTrie
 import spock.lang.Specification
 
 class RepoIndexTest extends Specification {
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/build.gradle b/dd-java-agent/agent-debugger/debugger-bootstrap/build.gradle
@@ -10,5 +10,6 @@ minimumBranchCoverage = 0.0
 
 dependencies {
   implementation libs.slf4j
+  implementation libs.instrument.java
   implementation project(':internal-api')
 }
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/Redaction.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/Redaction.java
@@ -1,7 +1,7 @@
 package datadog.trace.bootstrap.debugger.util;
 
+import datadog.instrument.utils.ClassNameTrie;
 import datadog.trace.api.Config;
-import datadog.trace.util.ClassNameTrie;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/AllowListHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/AllowListHelper.java
@@ -1,6 +1,6 @@
 package com.datadog.debugger.agent;
 
-import datadog.trace.util.ClassNameTrie;
+import datadog.instrument.utils.ClassNameTrie;
 import java.util.HashSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DenyListHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DenyListHelper.java
@@ -1,8 +1,8 @@
 package com.datadog.debugger.agent;
 
+import datadog.instrument.utils.ClassNameTrie;
 import datadog.trace.bootstrap.debugger.DebuggerContext;
 import datadog.trace.bootstrap.debugger.util.Redaction;
-import datadog.trace.util.ClassNameTrie;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolAggregator.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymbolAggregator.java
@@ -3,9 +3,9 @@
 import static com.datadog.debugger.symbol.JarScanner.trimPrefixes;
 
 import com.datadog.debugger.sink.SymbolSink;
+import datadog.instrument.utils.ClassNameTrie;
 import datadog.trace.bootstrap.debugger.DebuggerContext;
 import datadog.trace.util.AgentTaskScheduler;
-import datadog.trace.util.ClassNameTrie;
 import datadog.trace.util.Strings;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ClassNameFiltering.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ClassNameFiltering.java
@@ -1,9 +1,9 @@
 package com.datadog.debugger.util;
 
 import com.datadog.debugger.agent.ThirdPartyLibraries;
+import datadog.instrument.utils.ClassNameTrie;
 import datadog.trace.api.Config;
 import datadog.trace.bootstrap.debugger.DebuggerContext.ClassNameFilter;
-import datadog.trace.util.ClassNameTrie;
 import java.util.Collections;
 import java.util.Set;
 import java.util.regex.Pattern;
diff --git a/dd-java-agent/agent-iast/build.gradle b/dd-java-agent/agent-iast/build.gradle
@@ -44,6 +44,7 @@ dependencies {
   implementation project(':internal-api:internal-api-9')
   implementation libs.moshi
   implementation libs.bundles.asm
+  implementation libs.instrument.java
 
   testImplementation project(':utils:test-utils')
   testImplementation project(':dd-java-agent:agent-bootstrap')
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/TrustBoundaryViolationModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sink/TrustBoundaryViolationModuleImpl.java
@@ -2,9 +2,9 @@
 
 import com.datadog.iast.Dependencies;
 import com.datadog.iast.model.VulnerabilityType;
+import datadog.instrument.utils.ClassNameTrie;
 import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.sink.TrustBoundaryViolationModule;
-import datadog.trace.util.ClassNameTrie;
 import java.util.Map;
 import javax.annotation.Nonnull;
 
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/KnownTypesIndex.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/KnownTypesIndex.java
@@ -1,8 +1,8 @@
 package datadog.trace.agent.tooling;
 
+import datadog.instrument.utils.ClassNameTrie;
 import datadog.trace.agent.tooling.bytebuddy.SharedTypePools;
 import datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers;
-import datadog.trace.util.ClassNameTrie;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.DataInputStream;
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/CustomExcludes.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/CustomExcludes.java
@@ -1,7 +1,7 @@
 package datadog.trace.agent.tooling.bytebuddy.matcher;
 
+import datadog.instrument.utils.ClassNameTrie;
 import datadog.trace.api.InstrumenterConfig;
-import datadog.trace.util.ClassNameTrie;
 import java.nio.file.Paths;
 import java.util.List;
 import org.slf4j.Logger;
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -102,7 +102,7 @@ asm-tree = { module = "org.ow2.asm:asm-tree", version.ref = "asm" }
 asm-util = { module = "org.ow2.asm:asm-util", version.ref = "asm" }
 bytebuddy = { module = "net.bytebuddy:byte-buddy", version.ref = "byte-buddy" }
 bytebuddyagent = { module = "net.bytebuddy:byte-buddy-agent", version.ref = "byte-buddy" }
-instrumentjava = { module = "com.datadoghq:dd-instrument-java", version.ref = "instrument-java" }
+instrument-java = { module = "com.datadoghq:dd-instrument-java", version.ref = "instrument-java" }
 
 # Profiling
 jmc-common = { module = "org.openjdk.jmc:common", version.ref = "jmc" }
diff --git a/gradle/tries.gradle b/gradle/tries.gradle
@@ -19,7 +19,7 @@ def configureClassNameTrieTask(exec, sourceSetName) {
   exec.description = "Generate $sourceSetName ClassNameTries from .trie files"
   exec.inputs.files(trieFiles)
   exec.outputs.files(javaFiles)
-  exec.mainClass = 'datadog.trace.util.ClassNameTrie$JavaGenerator'
+  exec.mainClass = 'datadog.instrument.utils.ClassNameTrie$JavaGenerator'
   exec.classpath = sourceSets."$sourceSetName".compileClasspath
   exec.args = [trieDir, javaDir] + trieFiles
 }
diff --git a/internal-api/build.gradle.kts b/internal-api/build.gradle.kts
@@ -6,7 +6,6 @@ plugins {
 }
 
 apply(from = "$rootDir/gradle/java.gradle")
-apply(from = "$rootDir/gradle/tries.gradle")
 
 java {
   toolchain {
@@ -176,8 +175,6 @@ val excludedClassesCoverage by extra(
     "datadog.trace.util.AgentTaskScheduler.ShutdownHook",
     "datadog.trace.util.AgentThreadFactory",
     "datadog.trace.util.AgentThreadFactory.1",
-    "datadog.trace.util.ClassNameTrie.Builder",
-    "datadog.trace.util.ClassNameTrie.JavaGenerator",
     "datadog.trace.util.CollectionUtils",
     "datadog.trace.util.ComparableVersion",
     "datadog.trace.util.ComparableVersion.BigIntegerItem",
diff --git a/internal-api/src/main/java/datadog/trace/util/ClassNameTrie.java b/internal-api/src/main/java/datadog/trace/util/ClassNameTrie.java
diff --git a/internal-api/src/test/groovy/datadog/trace/util/ClassNameTrieTest.groovy b/internal-api/src/test/groovy/datadog/trace/util/ClassNameTrieTest.groovy
diff --git a/internal-api/src/test/resources/tries/test_class_names.trie b/internal-api/src/test/resources/tries/test_class_names.trie

Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,6 @@ minimumBranchCoverage = 0.0`
`10`	`10`
`11`	`11`	`dependencies {`
`12`	`12`	`implementation libs.slf4j`
	`13`	`+ implementation libs.instrument.java`
`13`	`14`	`implementation project(':internal-api')`
`14`	`15`	`}`