Skip to content

Reorganise internal instrumentation to comply with the renaming policy #10280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amarziali merged 4 commits into from
Dec 31, 2025
Merged

Reorganise internal instrumentation to comply with the renaming policy #10280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66e6ec3
move internal instrumentation under datadog and classify per product
amarziali Dec 31, 2025
e8771aa
exclude the datadog top instrumentation folder from checking
amarziali Dec 31, 2025
eca6751
move graalvm
amarziali Dec 31, 2025
efb1049
update codeowners
amarziali Dec 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
/dd-java-agent/instrumentation/snakeyaml-1.33/ @DataDog/asm-java
/dd-java-agent/instrumentation/velocity-1.5/ @DataDog/asm-java
/dd-java-agent/instrumentation/freemarker/ @DataDog/asm-java
/dd-java-agent/instrumentation/datadog/asm/ @DataDog/asm-java
/dd-smoke-tests/iast-util/ @DataDog/asm-java
/dd-smoke-tests/spring-security/ @DataDog/asm-java
/dd-java-agent/instrumentation/commons-fileupload/ @DataDog/asm-java
Expand Down Expand Up @@ -97,9 +98,11 @@
**/CiVisibility*.groovy @DataDog/ci-app-libraries-java

# @DataDog/debugger-java (Live Debugger)
/dd-java-agent/agent-debugger/ @DataDog/debugger-java
/dd-smoke-tests/debugger-integration-tests/ @DataDog/debugger-java
/internal-api/src/main/java/datadog/trace/api/debugger/ @DataDog/debugger-java
/dd-java-agent/agent-debugger/ @DataDog/debugger-java
/dd-smoke-tests/debugger-integration-tests/ @DataDog/debugger-java
/internal-api/src/main/java/datadog/trace/api/debugger/ @DataDog/debugger-java
/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/ @DataDog/debugger-java


# @DataDog/data-jobs-monitoring
/dd-java-agent/instrumentation/spark/ @DataDog/data-jobs-monitoring
Expand Down Expand Up @@ -137,7 +140,7 @@
# @DataDog/profiling-java
/dd-java-agent/agent-profiling/ @DataDog/profiling-java
/dd-java-agent/agent-crashtracking/ @DataDog/profiling-java
/dd-java-agent/instrumentation/exception-profiling/ @DataDog/profiling-java
/dd-java-agent/instrumentation/datadog/profiling/ @DataDog/profiling-java
/dd-java-agent/instrumentation/java/java-nio-1.8/ @DataDog/profiling-java
/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jfr/ @DataDog/profiling-java
/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/ @DataDog/profiling-java
Expand Down
4 changes: 4 additions & 0 deletions buildSrc/src/main/kotlin/datadog/gradle/plugin/naming/InstrumentationNamingPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ class InstrumentationNamingPlugin : Plugin<Project> {
if (moduleName in setOf("build", "src", ".gradle")) {
return@childLoop
}
// skip the special datadog top level instrumentation directory
if (parentName == null && moduleName == "datadog") {
Copy link
Contributor

@bric3 bric3 Dec 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: Maybe declare the excluded module name in the plugin extension. This can be done in a follow-up PR.

Copy link
Contributor Author

@amarziali amarziali Dec 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the exclusion list works for a single module but not for all its childs. It can be expanded to support this. For this reason I kept it simple and hardcoded in this way. That said this should be the only exception of this kind

return@childLoop
}

val childHasBuildFile = hasBuildFile(childDir)
val nestedModules = childDir.listFiles { file -> file.isDirectory }?.filter { hasBuildFile(it) } ?: emptyList()
Expand Down
6 changes: 3 additions & 3 deletions dd-java-agent/agent-iast/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ protobuf {
dependencies {
api libs.slf4j

compileOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
compileOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')

implementation project(':internal-api')
implementation project(':internal-api:internal-api-9')
Expand All @@ -62,7 +62,7 @@ dependencies {
jmh project(':utils:test-utils')
jmh project(':dd-trace-core')
jmh project(':dd-java-agent:agent-builder')
jmh project(':dd-java-agent:instrumentation:iast-instrumenter')
jmh project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')
jmh project(':dd-java-agent:instrumentation:java:java-lang:java-lang-1.8')

compileOnly('org.jetbrains:annotations:24.0.0')
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation-testing/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies {
implementation(libs.junit.jupiter)
implementation "org.junit.platform:junit-platform-runner:${libs.versions.junit.platform.get()}"

testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')

testImplementation group: 'cglib', name: 'cglib', version: '3.2.5'
// test instrumenting java 1.1 bytecode
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dependencies {
compileOnly group: 'com.typesafe.akka', name: "akka-actor_$scalaVersion", version: akkaVersion

testImplementation libs.scala
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
testImplementation group: 'com.typesafe.akka', name: "akka-actor_$scalaVersion", version: akkaVersion
testImplementation group: 'com.typesafe.akka', name: "akka-testkit_$scalaVersion", version: akkaVersion

Expand Down
4 changes: 2 additions & 2 deletions dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ dependencies {

// These are the common dependencies that are inherited by the other test sets
testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
testImplementation project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10')
Expand All @@ -122,7 +122,7 @@ dependencies {
iastTestCompileOnly libs.forbiddenapis
iastTestRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-common')
iastTestRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.8')
iastTestRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
iastTestRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')
iastTestRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.2-iast')

// There are some internal API changes in 10.1 that we would like to test separately for
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ dependencies {
testImplementation group: 'com.typesafe.akka', name: 'akka-http-jackson_2.13', version: '10.6.0'
testImplementation group: 'com.typesafe.akka', name: 'akka-http-spray-json_2.13', version: '10.6.0'
testImplementation libs.scala213
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
testImplementation project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
testImplementation project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ dependencies {
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0'))
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java:java-lang:java-lang-1.8'))
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java:java-net:java-net-1.8'))
iastIntegrationTestRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
iastIntegrationTestRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')

v41IastIntegrationTestImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.1'
v42IastIntegrationTestImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.2'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/commons-codec-1.1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {

testImplementation group: 'commons-codec', name: 'commons-codec', version: '1.1'

testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')

latestDepTestImplementation group: 'commons-codec', name: 'commons-codec', version: '(1.0,10000000]'
}
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/commons-fileupload-1.5/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ dependencies {
testImplementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.5'
testImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'

testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')
latestDepTestImplementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.+'
}
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {

testImplementation group: 'commons-lang', name: 'commons-lang', version: '2.1'

testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')

latestDepTestImplementation group: 'commons-lang', name: 'commons-lang', version: '2.6'
}
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {

testImplementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'

testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')

latestDepTestImplementation group: 'org.apache.commons', name: 'commons-lang3', version: '+'
}
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/commons-text-1.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {

testImplementation group: 'org.apache.commons', name: 'commons-text', version: '1.0'

testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')

latestDepTestImplementation group: 'org.apache.commons', name: 'commons-text', version: '+'
}
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/cxf-2.1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ dependencies {
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-10.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-12.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:trace-annotation')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
testRuntimeOnly project(':dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:rs:jakarta-rs-annotations-3.0')

Expand Down
0 ...umentation/iast-instrumenter/build.gradle → ...atadog/asm/iast-instrumenter/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...ntation/iast-instrumenter/gradle.lockfile → ...dog/asm/iast-instrumenter/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...rumenter/IastHardcodedSecretListener.java → ...rumenter/IastHardcodedSecretListener.java
View file
Open in desktop
File renamed without changes.
0 ...iastinstrumenter/IastInstrumentation.java → ...iastinstrumenter/IastInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...on/iastinstrumenter/SourceMapperImpl.java → ...on/iastinstrumenter/SourceMapperImpl.java
View file
Open in desktop
File renamed without changes.
0 ...ion/iastinstrumenter/StratumListener.java → ...ion/iastinstrumenter/StratumListener.java
View file
Open in desktop
File renamed without changes.
0 ...instrumenter/service/CallSitesLoader.java → ...instrumenter/service/CallSitesLoader.java
View file
Open in desktop
File renamed without changes.
0 .../telemetry/TelemetryCallSiteSupplier.java → .../telemetry/TelemetryCallSiteSupplier.java
View file
Open in desktop
File renamed without changes.
0 ...tion/iastinstrumenter/iast_exclusion.trie → ...tion/iastinstrumenter/iast_exclusion.trie
View file
Open in desktop
File renamed without changes.
0 .../groovy/AnonymousClassesForkedTest.groovy → .../groovy/AnonymousClassesForkedTest.groovy
View file
Open in desktop
File renamed without changes.
0 .../test/groovy/IastExclusionTrieTest.groovy → .../test/groovy/IastExclusionTrieTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...oovy/IastInstrumentationForkedTest.groovy → ...oovy/IastInstrumentationForkedTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...est/groovy/IastInstrumentationTest.groovy → ...est/groovy/IastInstrumentationTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...er/IastHardcodedSecretListenerTest.groovy → ...er/IastHardcodedSecretListenerTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...tinstrumenter/SourceMapperImplTest.groovy → ...tinstrumenter/SourceMapperImplTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...rumenter/src/test/java/MockCallSites.java → ...rumenter/src/test/java/MockCallSites.java
View file
Open in desktop
File renamed without changes.
0 ...test/java/MockCallSitesWithTelemetry.java → ...test/java/MockCallSitesWithTelemetry.java
View file
Open in desktop
File renamed without changes.
0 ...nter/src/test/java/MockRaspCallSites.java → ...nter/src/test/java/MockRaspCallSites.java
View file
Open in desktop
File renamed without changes.
0 ...nstrumenter/src/test/java/OuterClass.java → ...nstrumenter/src/test/java/OuterClass.java
View file
Open in desktop
File renamed without changes.
0 ...es/datadog.trace.api.appsec.RaspCallSites → ...es/datadog.trace.api.appsec.RaspCallSites
View file
Open in desktop
File renamed without changes.
0 ...ices/datadog.trace.api.iast.IastCallSites → ...ices/datadog.trace.api.iast.IastCallSites
View file
Open in desktop
File renamed without changes.
0 .../instrumentation/span-origin/build.gradle → ...-instrumentation/span-origin/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...strumentation/span-origin/gradle.lockfile → ...strumentation/span-origin/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...codeorigin/CodeOriginInstrumentation.java → ...codeorigin/CodeOriginInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ion/codeorigin/EntrySpanOriginAdvice.java → ...ion/codeorigin/EntrySpanOriginAdvice.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...n/enable-wallclock-profiling/build.gradle → ...g/enable-wallclock-profiling/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ addTestSuiteForDir('latestDepTest', 'test')


dependencies {
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
testImplementation group: 'io.netty', name: 'netty-all', version: '4.1.108.Final'
testImplementation group: 'io.netty', name: 'netty-transport', version: '4.1.108.Final'

Expand Down
0 ...nable-wallclock-profiling/gradle.lockfile → ...nable-wallclock-profiling/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...bleWallclockProfilingInstrumentation.java → ...bleWallclockProfilingInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...test/groovy/RegistrationForkedTest.groovy → ...test/groovy/RegistrationForkedTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...entation/exception-profiling/build.gradle → ...rofiling/exception-profiling/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...ation/exception-profiling/gradle.lockfile → ...iling/exception-profiling/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...ntation/KnownExcludesInstrumentation.java → ...ntation/KnownExcludesInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...rumentation/ThrowableInstrumentation.java → ...rumentation/ThrowableInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ions/instrumentation/ExclusionAdvice.java → ...ions/instrumentation/ExclusionAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...trumentation/ThrowableInstanceAdvice.java → ...trumentation/ThrowableInstanceAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...exceptions/KnownExcludesForkedTest.groovy → ...exceptions/KnownExcludesForkedTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...com/zaxxer/hikari/pool/ProxyLeakTask.java → ...com/zaxxer/hikari/pool/ProxyLeakTask.java
View file
Open in desktop
File renamed without changes.
0 ...fr/exceptions/ExceptionHistogramTest.java → ...fr/exceptions/ExceptionHistogramTest.java
View file
Open in desktop
File renamed without changes.
0 ...eptions/ExceptionHistogramTestBridge.java → ...eptions/ExceptionHistogramTestBridge.java
View file
Open in desktop
File renamed without changes.
0 ...-extensions/org.mockito.plugins.MockMaker → ...-extensions/org.mockito.plugins.MockMaker
View file
Open in desktop
File renamed without changes.
0 ...rumentation/trace-annotation/build.gradle → ...dog/tracing/trace-annotation/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...entation/trace-annotation/gradle.lockfile → .../tracing/trace-annotation/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...on/trace_annotation/DoNotTraceAdvice.java → ...on/trace_annotation/DoNotTraceAdvice.java
View file
Open in desktop
File renamed without changes.
0 .../DoNotTraceAnnotationInstrumentation.java → .../DoNotTraceAnnotationInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ntation/trace_annotation/TraceAdvice.java → ...ntation/trace_annotation/TraceAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...tion/TraceAnnotationsInstrumentation.java → ...tion/TraceAnnotationsInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...nnotation/TraceConfigInstrumentation.java → ...nnotation/TraceConfigInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...tion/trace_annotation/TraceDecorator.java → ...tion/trace_annotation/TraceDecorator.java
View file
Open in desktop
File renamed without changes.
0 ...ovy/ConfiguredTraceAnnotationsTest.groovy → ...ovy/ConfiguredTraceAnnotationsTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...src/test/groovy/MeasuredConfigTest.groovy → ...src/test/groovy/MeasuredConfigTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...TraceAnnotationNewOpNameForkedTest.groovy → ...TraceAnnotationNewOpNameForkedTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...t/groovy/TraceAnnotationsAsyncTest.groovy → ...t/groovy/TraceAnnotationsAsyncTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...c/test/groovy/TraceAnnotationsTest.groovy → ...c/test/groovy/TraceAnnotationsTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...on/src/test/groovy/TraceConfigTest.groovy → ...on/src/test/groovy/TraceConfigTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...-annotation/src/test/java/OuterClass.java → ...-annotation/src/test/java/OuterClass.java
View file
Open in desktop
File renamed without changes.
0 ...test/trace/annotation/DontTraceClass.java → ...test/trace/annotation/DontTraceClass.java
View file
Open in desktop
File renamed without changes.
0 ...test/trace/annotation/SayTracedHello.java → ...test/trace/annotation/SayTracedHello.java
View file
Open in desktop
File renamed without changes.
0 ...est/trace/annotation/TracedInterface.java → ...est/trace/annotation/TracedInterface.java
View file
Open in desktop
File renamed without changes.
0 ...test/trace/annotation/TracedSubClass.java → ...test/trace/annotation/TracedSubClass.java
View file
Open in desktop
File renamed without changes.
0 ...st/trace/annotation/TracedSuperClass.java → ...st/trace/annotation/TracedSuperClass.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
testImplementation group: 'org.freemarker', name: 'freemarker', version: '2.3.24-incubating'
testImplementation project(':dd-java-agent:instrumentation:freemarker:freemarker-2.3.9')

testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')

latestDepTestImplementation group: 'org.freemarker', name: 'freemarker', version: '2.3.+'
}
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {

testImplementation group: 'org.freemarker', name: 'freemarker', version: '2.3.9'

testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')

version2_3_23TestImplementation group: 'org.freemarker', name: 'freemarker', version: '2.3.23'
}
0 ...mentation/graal/native-image/build.gradle → ...raal/graal-native-image-20.0/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...tation/graal/native-image/gradle.lockfile → ...l/graal-native-image-20.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...e/AbstractNativeImageInstrumentation.java → ...e/AbstractNativeImageInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...SubstitutionProcessorInstrumentation.java → ...SubstitutionProcessorInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...image/LinkAtBuildTimeInstrumentation.java → ...image/LinkAtBuildTimeInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...eImageGeneratorRunnerInstrumentation.java → ...eImageGeneratorRunnerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...mage/ResourcesFeatureInstrumentation.java → ...mage/ResourcesFeatureInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...tadog_profiling_agent_ProcessContext.java → ...tadog_profiling_agent_ProcessContext.java
View file
Open in desktop
File renamed without changes.
0 ...og_jctools_util_UnsafeRefArrayAccess.java → ...og_jctools_util_UnsafeRefArrayAccess.java
View file
Open in desktop
File renamed without changes.
0 ...mage/Target_org_datadog_jmxfetch_App.java → ...mage/Target_org_datadog_jmxfetch_App.java
View file
Open in desktop
File renamed without changes.
0 ...e/Target_org_datadog_jmxfetch_Status.java → ...e/Target_org_datadog_jmxfetch_Status.java
View file
Open in desktop
File renamed without changes.
0 ...tadog_jmxfetch_reporter_JsonReporter.java → ...tadog_jmxfetch_reporter_JsonReporter.java
View file
Open in desktop
File renamed without changes.
0 ...nativeimage/VMRuntimeInstrumentation.java → ...nativeimage/VMRuntimeInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 .../graal/nativeimage/DeleteFieldAdvice.java → .../graal/nativeimage/DeleteFieldAdvice.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
implementation project(':dd-java-agent:instrumentation:graphql-java:graphql-java-common')

testImplementation group: 'com.graphql-java', name: 'graphql-java', version: '14.0'
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')

latestDepTestImplementation group: 'com.graphql-java', name: 'graphql-java', version: '19.+'
}
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dependencies {
testImplementation group: 'com.graphql-java', name: 'graphql-java', version: '20.0'
// to test collisions with other instrumentation
testRuntimeOnly project(':dd-java-agent:instrumentation:graphql-java:graphql-java-14.0')
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')

graphql20LatestDepTestImplementation group: 'com.graphql-java', name: 'graphql-java', version: '20.+'
graphql21LatestDepTestImplementation group: 'com.graphql-java', name: 'graphql-java', version: '21.+'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/gson-1.6/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {

testImplementation group: 'com.google.code.gson', name: 'gson', version: '1.6'

testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')

latestDepTestImplementation group: 'com.google.code.gson', name: 'gson', version: '+'
}
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/hystrix-1.4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies {
compileOnly group: 'com.netflix.hystrix', name: 'hystrix-core', version: '1.4.0'
compileOnly group: 'io.reactivex', name: 'rxjava', version: '1.0.7'

testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')

testImplementation group: 'io.reactivex', name: 'rxjava', version: '1.0.7'
testImplementation group: 'com.netflix.hystrix', name: 'hystrix-core', version: '1.4.0'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ tasks.named("compileJava") {
addTestSuiteForDir('latestDepTest', 'test')

dependencies {
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
testImplementation libs.guava
testImplementation group: 'io.netty', name: 'netty-all', version: '4.1.9.Final'
testImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.0'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@ tasks.named("check") {
}

dependencies {
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
}
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/java/java-io-1.8/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ apply plugin: 'dd-trace-java.call-site-instrumentation'
addTestSuiteForDir('latestDepTest', 'test')

dependencies {
testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')
testImplementation group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '9.0.56'
}
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ apply plugin: 'dd-trace-java.call-site-instrumentation'
addTestSuiteForDir('latestDepTest', 'test')

dependencies {
testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')
testImplementation libs.bundles.mockito
testImplementation group: 'org.mockito', name: 'mockito-inline', version: '4.11.0'
}
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ csi {
addTestSuiteForDir('latestDepTest', 'test')

dependencies {
testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')
}

project.tasks.withType(AbstractCompile).configureEach {
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ addTestSuiteForDir('latestDepTest', 'test')

dependencies {
testImplementation(libs.javaparser)
testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')
}

tasks.withType(AbstractCompile).configureEach {
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ csi {
addTestSuiteForDir('latestDepTest', 'test')

dependencies {
testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')
}

project.tasks.withType(AbstractCompile).configureEach {
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ tasks.named("compileTestJava", JavaCompile) {
}

dependencies {
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
}
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ csi {
addTestSuiteForDir('latestDepTest', 'test')

dependencies {
testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')
}

project.tasks.withType(AbstractCompile).configureEach {
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/java/java-net/java-net-1.8/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ apply plugin: 'dd-trace-java.call-site-instrumentation'
addTestSuiteForDir('latestDepTest', 'test')

dependencies {
testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')
testImplementation group: 'org.springframework', name: 'spring-web', version: '4.3.7.RELEASE'
}

Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/java/java-security-1.8/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ tasks.withType(Test).configureEach {

dependencies {
testImplementation project(':dd-java-agent:agent-iast')
testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')
testImplementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.70'
}
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/java/java-util-1.8/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ apply plugin: 'dd-trace-java.call-site-instrumentation'
addTestSuiteForDir('latestDepTest', 'test')

dependencies {
testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')
}
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/javax-naming-1.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ apply plugin: 'dd-trace-java.call-site-instrumentation'
addTestSuiteForDir('latestDepTest', 'test')

dependencies {
testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')
}
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/javax-xml-1.4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ configurations.configureEach {
}

dependencies {
testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')
testImplementation group: 'xalan', name: 'xalan', version: '2.7.0'
}
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/jdbc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dependencies {
testImplementation group: 'org.testcontainers', name:'mssqlserver', version: libs.versions.testcontainers.get()
testImplementation group: 'org.testcontainers', name:'oracle-xe', version: '1.20.4'

testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')

// Test pre jdk 1.6 H2
oldH2TestImplementation(group: 'com.h2database', name: 'h2') {
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ addTestSuiteForDir('latestDepTest', 'test')
dependencies {
compileOnly group: 'org.eclipse.jetty', name: 'jetty-util', version: '9.4.31.v20200723'

testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
testImplementation group: 'org.eclipse.jetty', name: 'jetty-util', version: '9.4.31.v20200723'
latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-util', version: '9.+' // 10+ requires Java 11
}
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/jms/javax-jms-1.1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ tasks.named("latestDepTest", Test) {
dependencies {
compileOnly group: 'javax.jms', name: 'jms-api', version: '1.1-rev-1'

testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
testImplementation group: 'org.apache.activemq.tooling', name: 'activemq-junit', version: '5.14.5'
testImplementation group: 'org.apache.activemq', name: 'activemq-pool', version: '5.14.5'
testImplementation group: 'org.apache.activemq', name: 'activemq-broker', version: '5.14.5'
Expand Down
Loading