Add dependency to dd-instrument-java 0.0.2

mcculls · mcculls · commit f94df99f0a7a · 2025-10-14T20:39:14.000+01:00
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/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-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/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
@@ -12,6 +12,7 @@ junit5 = "5.12.2"
 junit-platform = "1.12.2"
 logback = "1.2.13"
 bytebuddy = "1.17.7"
+instrumentjava = "0.0.2"
 scala = "2.11.12" # Last version to support Java 7 (2.12+ require Java 8+)
 scala211 = "2.11.12"
 scala212 = "2.12.18"
@@ -46,6 +47,7 @@ okhttp = { module = "com.datadoghq.okhttp3:okhttp", version.ref = "okhttp" }
 okio = { module = "com.datadoghq.okio:okio", version.ref = "okio" }
 bytebuddy = { module = "net.bytebuddy:byte-buddy", version.ref = "bytebuddy" }
 bytebuddyagent = { module = "net.bytebuddy:byte-buddy-agent", version.ref = "bytebuddy" }
+instrumentjava = { module = "com.datadoghq:dd-instrument-java", version.ref = "instrumentjava" }
 autoservice-processor = { module = "com.google.auto.service:auto-service", version.ref = "autoservice" }
 autoservice-annotation = { module = "com.google.auto.service:auto-service-annotations", version.ref = "autoservice" }
 commons-math = { module = "org.apache.commons:commons-math3", version.ref = "commons" }
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
@@ -175,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",
@@ -256,10 +254,6 @@ val excludedClassesInstructionCoverage by extra(
   )
 )
 
-tasks.compileTestJava {
-  dependsOn("generateTestClassNameTries")
-}
-
 dependencies {
   // references TraceScope and Continuation from public api
   api(project(":dd-trace-api"))
@@ -275,6 +269,8 @@ dependencies {
   // it contains annotations that are also present in the instrumented application classes
   api("com.datadoghq:dd-javac-plugin-client:0.2.2")
 
+  api(variantOf(libs.instrumentjava, { classifier("all") }))
+
   testImplementation("org.snakeyaml:snakeyaml-engine:2.9")
   testImplementation(project(":utils:test-utils"))
   testImplementation(libs.bundles.junit5)
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
