From 66e6ec35925d0e695d0698b1dd3d0aa50eb71649 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Wed, 31 Dec 2025 15:40:10 +0100 Subject: [PATCH 1/4] move internal instrumentation under datadog and classify per product --- dd-java-agent/agent-iast/build.gradle | 6 +++--- dd-java-agent/instrumentation-testing/build.gradle | 2 +- .../instrumentation/akka/akka-actor-2.5/build.gradle | 2 +- .../akka/akka-http/akka-http-10.0/build.gradle | 4 ++-- .../akka/akka-http/akka-http-10.6/build.gradle | 2 +- .../apache-httpclient-4.0/build.gradle | 2 +- .../instrumentation/commons-codec-1.1/build.gradle | 2 +- .../commons-fileupload-1.5/build.gradle | 2 +- .../commons-lang/commons-lang-2.1/build.gradle | 2 +- .../commons-lang/commons-lang-3.5/build.gradle | 2 +- .../instrumentation/commons-text-1.0/build.gradle | 2 +- dd-java-agent/instrumentation/cxf-2.1/build.gradle | 2 +- .../{ => datadog/asm}/iast-instrumenter/build.gradle | 0 .../asm}/iast-instrumenter/gradle.lockfile | 0 .../iastinstrumenter/IastHardcodedSecretListener.java | 0 .../iastinstrumenter/IastInstrumentation.java | 0 .../iastinstrumenter/SourceMapperImpl.java | 0 .../iastinstrumenter/StratumListener.java | 0 .../iastinstrumenter/service/CallSitesLoader.java | 0 .../telemetry/TelemetryCallSiteSupplier.java | 0 .../iastinstrumenter/iast_exclusion.trie | 0 .../src/test/groovy/AnonymousClassesForkedTest.groovy | 0 .../src/test/groovy/IastExclusionTrieTest.groovy | 0 .../test/groovy/IastInstrumentationForkedTest.groovy | 0 .../src/test/groovy/IastInstrumentationTest.groovy | 0 .../IastHardcodedSecretListenerTest.groovy | 0 .../iastinstrumenter/SourceMapperImplTest.groovy | 0 .../iast-instrumenter/src/test/java/MockCallSites.java | 0 .../src/test/java/MockCallSitesWithTelemetry.java | 0 .../src/test/java/MockRaspCallSites.java | 0 .../iast-instrumenter/src/test/java/OuterClass.java | 0 .../services/datadog.trace.api.appsec.RaspCallSites | 0 .../services/datadog.trace.api.iast.IastCallSites | 0 .../dynamic-instrumentation}/span-origin/build.gradle | 0 .../span-origin/gradle.lockfile | 0 .../codeorigin/CodeOriginInstrumentation.java | 0 .../codeorigin/EntrySpanOriginAdvice.java | 0 .../profiling}/enable-wallclock-profiling/build.gradle | 2 +- .../enable-wallclock-profiling/gradle.lockfile | 0 .../EnableWallclockProfilingInstrumentation.java | 0 .../src/test/groovy/RegistrationForkedTest.groovy | 0 .../profiling}/exception-profiling/build.gradle | 0 .../profiling}/exception-profiling/gradle.lockfile | 0 .../instrumentation/KnownExcludesInstrumentation.java | 0 .../instrumentation/ThrowableInstrumentation.java | 0 .../exceptions/instrumentation/ExclusionAdvice.java | 0 .../instrumentation/ThrowableInstanceAdvice.java | 0 .../jfr/exceptions/KnownExcludesForkedTest.groovy | 0 .../java/com/zaxxer/hikari/pool/ProxyLeakTask.java | 0 .../jfr/exceptions/ExceptionHistogramTest.java | 0 .../jfr/exceptions/ExceptionHistogramTestBridge.java | 0 .../mockito-extensions/org.mockito.plugins.MockMaker | 0 .../tracing}/trace-annotation/build.gradle | 0 .../tracing}/trace-annotation/gradle.lockfile | 0 .../trace_annotation/DoNotTraceAdvice.java | 0 .../DoNotTraceAnnotationInstrumentation.java | 0 .../instrumentation/trace_annotation/TraceAdvice.java | 0 .../TraceAnnotationsInstrumentation.java | 0 .../trace_annotation/TraceConfigInstrumentation.java | 0 .../trace_annotation/TraceDecorator.java | 0 .../test/groovy/ConfiguredTraceAnnotationsTest.groovy | 0 .../src/test/groovy/MeasuredConfigTest.groovy | 0 .../groovy/TraceAnnotationNewOpNameForkedTest.groovy | 0 .../src/test/groovy/TraceAnnotationsAsyncTest.groovy | 0 .../src/test/groovy/TraceAnnotationsTest.groovy | 0 .../src/test/groovy/TraceConfigTest.groovy | 0 .../trace-annotation/src/test/java/OuterClass.java | 0 .../java/dd/test/trace/annotation/DontTraceClass.java | 0 .../java/dd/test/trace/annotation/SayTracedHello.java | 0 .../java/dd/test/trace/annotation/TracedInterface.java | 0 .../java/dd/test/trace/annotation/TracedSubClass.java | 0 .../dd/test/trace/annotation/TracedSuperClass.java | 0 .../freemarker/freemarker-2.3.24/build.gradle | 2 +- .../freemarker/freemarker-2.3.9/build.gradle | 2 +- .../graphql-java/graphql-java-14.0/build.gradle | 2 +- .../graphql-java/graphql-java-20.0/build.gradle | 2 +- dd-java-agent/instrumentation/gson-1.6/build.gradle | 2 +- dd-java-agent/instrumentation/hystrix-1.4/build.gradle | 2 +- .../java-concurrent/java-concurrent-1.8/build.gradle | 2 +- .../java-concurrent/java-concurrent-21.0/build.gradle | 2 +- .../instrumentation/java/java-io-1.8/build.gradle | 2 +- .../java/java-lang/java-lang-1.8/build.gradle | 2 +- .../java/java-lang/java-lang-11.0/build.gradle | 2 +- .../java/java-lang/java-lang-15.0/build.gradle | 2 +- .../java/java-lang/java-lang-17.0/build.gradle | 2 +- .../java/java-lang/java-lang-21.0/build.gradle | 2 +- .../java/java-lang/java-lang-9.0/build.gradle | 2 +- .../java/java-net/java-net-1.8/build.gradle | 2 +- .../java/java-security-1.8/build.gradle | 2 +- .../instrumentation/java/java-util-1.8/build.gradle | 2 +- .../instrumentation/javax-naming-1.0/build.gradle | 2 +- .../instrumentation/javax-xml-1.4/build.gradle | 2 +- dd-java-agent/instrumentation/jdbc/build.gradle | 2 +- .../jetty/jetty-util-9.4.31/build.gradle | 2 +- .../instrumentation/jms/javax-jms-1.1/build.gradle | 2 +- .../kafka/kafka-clients-0.11/build.gradle | 4 ++-- .../kafka/kafka-clients-3.8/build.gradle | 2 +- .../kafka/kafka-connect-0.11/build.gradle | 2 +- .../instrumentation/kotlin-coroutines-1.3/build.gradle | 2 +- dd-java-agent/instrumentation/mail/build.gradle | 2 +- .../mail/jakarta-mail-2.0.1/build.gradle | 2 +- .../micronaut-http-server-netty-common/build.gradle | 2 +- .../instrumentation/okhttp/okhttp-2.2/build.gradle | 2 +- .../instrumentation/okhttp/okhttp-3.0/build.gradle | 2 +- .../instrumentation/org-json-20230227/build.gradle | 2 +- .../instrumentation/owasp-esapi-2.1/build.gradle | 2 +- .../pekko/pekko-concurrent-1.0/build.gradle | 2 +- .../instrumentation/pekko/pekko-http-1.0/build.gradle | 4 ++-- .../instrumentation/reactor-core-3.1/build.gradle | 2 +- .../instrumentation/rxjava/rxjava-2.0/build.gradle | 2 +- .../instrumentation/scala/scala-2.10.7/build.gradle | 2 +- .../scala/scala-concurrent-2.8/build.gradle | 2 +- .../servlet/jakarta-servlet-5.0/build.gradle | 2 +- .../javax-servlet/javax-servlet-3.0/build.gradle | 2 +- .../javax-servlet/javax-servlet-common/build.gradle | 2 +- dd-java-agent/instrumentation/slick-3.2/build.gradle | 2 +- .../instrumentation/spark/spark-common/build.gradle | 2 +- .../spring/spring-boot-1.3/build.gradle | 2 +- .../spring/spring-core-3.2.2/build.gradle | 2 +- .../spring/spring-rabbit-1.5/build.gradle | 2 +- .../spring/spring-scheduling-3.1/build.gradle | 2 +- .../spring-webflux/spring-webflux-5.0/build.gradle | 2 +- .../spring-webflux/spring-webflux-6.0/build.gradle | 2 +- .../spring-webmvc/spring-webmvc-5.3/build.gradle | 2 +- .../spring-webmvc/spring-webmvc-6.0/build.gradle | 4 ++-- .../instrumentation/thymeleaf-3.0/build.gradle | 2 +- .../instrumentation/unbescape-1.1/build.gradle | 2 +- .../instrumentation/velocity-1.5/build.gradle | 2 +- .../instrumentation/vertx/vertx-rx-3.5/build.gradle | 2 +- .../vertx/vertx-web/vertx-web-3.4/build.gradle | 4 ++-- .../vertx/vertx-web/vertx-web-3.5/build.gradle | 2 +- .../vertx/vertx-web/vertx-web-3.9/build.gradle | 4 ++-- .../vertx/vertx-web/vertx-web-4.0/build.gradle | 4 ++-- .../vertx/vertx-web/vertx-web-5.0/build.gradle | 4 ++-- settings.gradle.kts | 10 +++++----- 135 files changed, 90 insertions(+), 90 deletions(-) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/build.gradle (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/IastHardcodedSecretListener.java (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/IastInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/SourceMapperImpl.java (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/StratumListener.java (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/service/CallSitesLoader.java (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/telemetry/TelemetryCallSiteSupplier.java (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/src/main/resources/datadog/trace/instrumentation/iastinstrumenter/iast_exclusion.trie (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/src/test/groovy/AnonymousClassesForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/src/test/groovy/IastExclusionTrieTest.groovy (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/src/test/groovy/IastInstrumentationForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/src/test/groovy/IastInstrumentationTest.groovy (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/src/test/groovy/datadog/trace/instrumentation/iastinstrumenter/IastHardcodedSecretListenerTest.groovy (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/src/test/groovy/datadog/trace/instrumentation/iastinstrumenter/SourceMapperImplTest.groovy (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/src/test/java/MockCallSites.java (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/src/test/java/MockCallSitesWithTelemetry.java (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/src/test/java/MockRaspCallSites.java (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/src/test/java/OuterClass.java (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/src/test/resources/META-INF/services/datadog.trace.api.appsec.RaspCallSites (100%) rename dd-java-agent/instrumentation/{ => datadog/asm}/iast-instrumenter/src/test/resources/META-INF/services/datadog.trace.api.iast.IastCallSites (100%) rename dd-java-agent/instrumentation/{ => datadog/dynamic-instrumentation}/span-origin/build.gradle (100%) rename dd-java-agent/instrumentation/{ => datadog/dynamic-instrumentation}/span-origin/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => datadog/dynamic-instrumentation}/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/CodeOriginInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => datadog/dynamic-instrumentation}/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/EntrySpanOriginAdvice.java (100%) rename dd-java-agent/instrumentation/{ => datadog/profiling}/enable-wallclock-profiling/build.gradle (92%) rename dd-java-agent/instrumentation/{ => datadog/profiling}/enable-wallclock-profiling/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => datadog/profiling}/enable-wallclock-profiling/src/main/java/datadog/trace/instrumentation/wallclock/EnableWallclockProfilingInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => datadog/profiling}/enable-wallclock-profiling/src/test/groovy/RegistrationForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{ => datadog/profiling}/exception-profiling/build.gradle (100%) rename dd-java-agent/instrumentation/{ => datadog/profiling}/exception-profiling/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => datadog/profiling}/exception-profiling/src/main/java/datadog/exceptions/instrumentation/KnownExcludesInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => datadog/profiling}/exception-profiling/src/main/java/datadog/exceptions/instrumentation/ThrowableInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => datadog/profiling}/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ExclusionAdvice.java (100%) rename dd-java-agent/instrumentation/{ => datadog/profiling}/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ThrowableInstanceAdvice.java (100%) rename dd-java-agent/instrumentation/{ => datadog/profiling}/exception-profiling/src/test/groovy/datadog/trace/bootstrap/instrumentation/jfr/exceptions/KnownExcludesForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{ => datadog/profiling}/exception-profiling/src/test/java/com/zaxxer/hikari/pool/ProxyLeakTask.java (100%) rename dd-java-agent/instrumentation/{ => datadog/profiling}/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTest.java (100%) rename dd-java-agent/instrumentation/{ => datadog/profiling}/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTestBridge.java (100%) rename dd-java-agent/instrumentation/{ => datadog/profiling}/exception-profiling/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/build.gradle (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAdvice.java (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAnnotationInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAdvice.java (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceConfigInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceDecorator.java (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/src/test/groovy/ConfiguredTraceAnnotationsTest.groovy (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/src/test/groovy/MeasuredConfigTest.groovy (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/src/test/groovy/TraceAnnotationNewOpNameForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/src/test/groovy/TraceAnnotationsAsyncTest.groovy (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/src/test/groovy/TraceAnnotationsTest.groovy (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/src/test/groovy/TraceConfigTest.groovy (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/src/test/java/OuterClass.java (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/src/test/java/dd/test/trace/annotation/DontTraceClass.java (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/src/test/java/dd/test/trace/annotation/SayTracedHello.java (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/src/test/java/dd/test/trace/annotation/TracedInterface.java (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/src/test/java/dd/test/trace/annotation/TracedSubClass.java (100%) rename dd-java-agent/instrumentation/{ => datadog/tracing}/trace-annotation/src/test/java/dd/test/trace/annotation/TracedSuperClass.java (100%) diff --git a/dd-java-agent/agent-iast/build.gradle b/dd-java-agent/agent-iast/build.gradle index 159ade30593..0efc31336cf 100644 --- a/dd-java-agent/agent-iast/build.gradle +++ b/dd-java-agent/agent-iast/build.gradle @@ -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') @@ -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') diff --git a/dd-java-agent/instrumentation-testing/build.gradle b/dd-java-agent/instrumentation-testing/build.gradle index 076b9d77da5..e7c5df0b109 100644 --- a/dd-java-agent/instrumentation-testing/build.gradle +++ b/dd-java-agent/instrumentation-testing/build.gradle @@ -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 diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle b/dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle index 9cdde62d970..7fef692093b 100644 --- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle +++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle @@ -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 diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle index ea86e8f1df9..eb4aa4a9dd3 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle @@ -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') @@ -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 diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle index 32ede277e73..c327673918f 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle @@ -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') diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle index 2b83612aea0..6c885ce22a2 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle @@ -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' diff --git a/dd-java-agent/instrumentation/commons-codec-1.1/build.gradle b/dd-java-agent/instrumentation/commons-codec-1.1/build.gradle index e63b2a9a804..a21ca0888fc 100644 --- a/dd-java-agent/instrumentation/commons-codec-1.1/build.gradle +++ b/dd-java-agent/instrumentation/commons-codec-1.1/build.gradle @@ -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]' } diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/build.gradle b/dd-java-agent/instrumentation/commons-fileupload-1.5/build.gradle index 8b92d92e1a1..e2216f88c81 100644 --- a/dd-java-agent/instrumentation/commons-fileupload-1.5/build.gradle +++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/build.gradle @@ -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.+' } diff --git a/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/build.gradle b/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/build.gradle index 1873233626d..983c41f9a73 100644 --- a/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/build.gradle +++ b/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/build.gradle @@ -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' } diff --git a/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/build.gradle b/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/build.gradle index 695c4da0e28..dff44f2a85b 100644 --- a/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/build.gradle +++ b/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/build.gradle @@ -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: '+' } diff --git a/dd-java-agent/instrumentation/commons-text-1.0/build.gradle b/dd-java-agent/instrumentation/commons-text-1.0/build.gradle index 8c7c70a5a03..9c43425a876 100644 --- a/dd-java-agent/instrumentation/commons-text-1.0/build.gradle +++ b/dd-java-agent/instrumentation/commons-text-1.0/build.gradle @@ -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: '+' } diff --git a/dd-java-agent/instrumentation/cxf-2.1/build.gradle b/dd-java-agent/instrumentation/cxf-2.1/build.gradle index 89fe7dac976..ef62b3eaefb 100644 --- a/dd-java-agent/instrumentation/cxf-2.1/build.gradle +++ b/dd-java-agent/instrumentation/cxf-2.1/build.gradle @@ -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') diff --git a/dd-java-agent/instrumentation/iast-instrumenter/build.gradle b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/build.gradle rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/build.gradle diff --git a/dd-java-agent/instrumentation/iast-instrumenter/gradle.lockfile b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/gradle.lockfile rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/gradle.lockfile diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/IastHardcodedSecretListener.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/IastHardcodedSecretListener.java similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/IastHardcodedSecretListener.java rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/IastHardcodedSecretListener.java diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/IastInstrumentation.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/IastInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/IastInstrumentation.java rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/IastInstrumentation.java diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/SourceMapperImpl.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/SourceMapperImpl.java similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/SourceMapperImpl.java rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/SourceMapperImpl.java diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/StratumListener.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/StratumListener.java similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/StratumListener.java rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/StratumListener.java diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/service/CallSitesLoader.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/service/CallSitesLoader.java similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/service/CallSitesLoader.java rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/service/CallSitesLoader.java diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/telemetry/TelemetryCallSiteSupplier.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/telemetry/TelemetryCallSiteSupplier.java similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/telemetry/TelemetryCallSiteSupplier.java rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/telemetry/TelemetryCallSiteSupplier.java diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/main/resources/datadog/trace/instrumentation/iastinstrumenter/iast_exclusion.trie b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/resources/datadog/trace/instrumentation/iastinstrumenter/iast_exclusion.trie similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/src/main/resources/datadog/trace/instrumentation/iastinstrumenter/iast_exclusion.trie rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/main/resources/datadog/trace/instrumentation/iastinstrumenter/iast_exclusion.trie diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/test/groovy/AnonymousClassesForkedTest.groovy b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/groovy/AnonymousClassesForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/src/test/groovy/AnonymousClassesForkedTest.groovy rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/groovy/AnonymousClassesForkedTest.groovy diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/test/groovy/IastExclusionTrieTest.groovy b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/groovy/IastExclusionTrieTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/src/test/groovy/IastExclusionTrieTest.groovy rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/groovy/IastExclusionTrieTest.groovy diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/test/groovy/IastInstrumentationForkedTest.groovy b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/groovy/IastInstrumentationForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/src/test/groovy/IastInstrumentationForkedTest.groovy rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/groovy/IastInstrumentationForkedTest.groovy diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/test/groovy/IastInstrumentationTest.groovy b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/groovy/IastInstrumentationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/src/test/groovy/IastInstrumentationTest.groovy rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/groovy/IastInstrumentationTest.groovy diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/test/groovy/datadog/trace/instrumentation/iastinstrumenter/IastHardcodedSecretListenerTest.groovy b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/groovy/datadog/trace/instrumentation/iastinstrumenter/IastHardcodedSecretListenerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/src/test/groovy/datadog/trace/instrumentation/iastinstrumenter/IastHardcodedSecretListenerTest.groovy rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/groovy/datadog/trace/instrumentation/iastinstrumenter/IastHardcodedSecretListenerTest.groovy diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/test/groovy/datadog/trace/instrumentation/iastinstrumenter/SourceMapperImplTest.groovy b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/groovy/datadog/trace/instrumentation/iastinstrumenter/SourceMapperImplTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/src/test/groovy/datadog/trace/instrumentation/iastinstrumenter/SourceMapperImplTest.groovy rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/groovy/datadog/trace/instrumentation/iastinstrumenter/SourceMapperImplTest.groovy diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/test/java/MockCallSites.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/MockCallSites.java similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/src/test/java/MockCallSites.java rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/MockCallSites.java diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/test/java/MockCallSitesWithTelemetry.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/MockCallSitesWithTelemetry.java similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/src/test/java/MockCallSitesWithTelemetry.java rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/MockCallSitesWithTelemetry.java diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/test/java/MockRaspCallSites.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/MockRaspCallSites.java similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/src/test/java/MockRaspCallSites.java rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/MockRaspCallSites.java diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/test/java/OuterClass.java b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/OuterClass.java similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/src/test/java/OuterClass.java rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/java/OuterClass.java diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/test/resources/META-INF/services/datadog.trace.api.appsec.RaspCallSites b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/resources/META-INF/services/datadog.trace.api.appsec.RaspCallSites similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/src/test/resources/META-INF/services/datadog.trace.api.appsec.RaspCallSites rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/resources/META-INF/services/datadog.trace.api.appsec.RaspCallSites diff --git a/dd-java-agent/instrumentation/iast-instrumenter/src/test/resources/META-INF/services/datadog.trace.api.iast.IastCallSites b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/resources/META-INF/services/datadog.trace.api.iast.IastCallSites similarity index 100% rename from dd-java-agent/instrumentation/iast-instrumenter/src/test/resources/META-INF/services/datadog.trace.api.iast.IastCallSites rename to dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/src/test/resources/META-INF/services/datadog.trace.api.iast.IastCallSites diff --git a/dd-java-agent/instrumentation/span-origin/build.gradle b/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/span-origin/build.gradle rename to dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/build.gradle diff --git a/dd-java-agent/instrumentation/span-origin/gradle.lockfile b/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/span-origin/gradle.lockfile rename to dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/gradle.lockfile diff --git a/dd-java-agent/instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/CodeOriginInstrumentation.java b/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/CodeOriginInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/CodeOriginInstrumentation.java rename to dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/CodeOriginInstrumentation.java diff --git a/dd-java-agent/instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/EntrySpanOriginAdvice.java b/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/EntrySpanOriginAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/EntrySpanOriginAdvice.java rename to dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/EntrySpanOriginAdvice.java diff --git a/dd-java-agent/instrumentation/enable-wallclock-profiling/build.gradle b/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/build.gradle similarity index 92% rename from dd-java-agent/instrumentation/enable-wallclock-profiling/build.gradle rename to dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/build.gradle index ea7dd0cbe3d..36417cbdb8d 100644 --- a/dd-java-agent/instrumentation/enable-wallclock-profiling/build.gradle +++ b/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/build.gradle @@ -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' diff --git a/dd-java-agent/instrumentation/enable-wallclock-profiling/gradle.lockfile b/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/enable-wallclock-profiling/gradle.lockfile rename to dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/gradle.lockfile diff --git a/dd-java-agent/instrumentation/enable-wallclock-profiling/src/main/java/datadog/trace/instrumentation/wallclock/EnableWallclockProfilingInstrumentation.java b/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/src/main/java/datadog/trace/instrumentation/wallclock/EnableWallclockProfilingInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/enable-wallclock-profiling/src/main/java/datadog/trace/instrumentation/wallclock/EnableWallclockProfilingInstrumentation.java rename to dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/src/main/java/datadog/trace/instrumentation/wallclock/EnableWallclockProfilingInstrumentation.java diff --git a/dd-java-agent/instrumentation/enable-wallclock-profiling/src/test/groovy/RegistrationForkedTest.groovy b/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/src/test/groovy/RegistrationForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/enable-wallclock-profiling/src/test/groovy/RegistrationForkedTest.groovy rename to dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/src/test/groovy/RegistrationForkedTest.groovy diff --git a/dd-java-agent/instrumentation/exception-profiling/build.gradle b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/exception-profiling/build.gradle rename to dd-java-agent/instrumentation/datadog/profiling/exception-profiling/build.gradle diff --git a/dd-java-agent/instrumentation/exception-profiling/gradle.lockfile b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/exception-profiling/gradle.lockfile rename to dd-java-agent/instrumentation/datadog/profiling/exception-profiling/gradle.lockfile diff --git a/dd-java-agent/instrumentation/exception-profiling/src/main/java/datadog/exceptions/instrumentation/KnownExcludesInstrumentation.java b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java/datadog/exceptions/instrumentation/KnownExcludesInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/exception-profiling/src/main/java/datadog/exceptions/instrumentation/KnownExcludesInstrumentation.java rename to dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java/datadog/exceptions/instrumentation/KnownExcludesInstrumentation.java diff --git a/dd-java-agent/instrumentation/exception-profiling/src/main/java/datadog/exceptions/instrumentation/ThrowableInstrumentation.java b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java/datadog/exceptions/instrumentation/ThrowableInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/exception-profiling/src/main/java/datadog/exceptions/instrumentation/ThrowableInstrumentation.java rename to dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java/datadog/exceptions/instrumentation/ThrowableInstrumentation.java diff --git a/dd-java-agent/instrumentation/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ExclusionAdvice.java b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ExclusionAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ExclusionAdvice.java rename to dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ExclusionAdvice.java diff --git a/dd-java-agent/instrumentation/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ThrowableInstanceAdvice.java b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ThrowableInstanceAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ThrowableInstanceAdvice.java rename to dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/main/java11/datadog/exceptions/instrumentation/ThrowableInstanceAdvice.java diff --git a/dd-java-agent/instrumentation/exception-profiling/src/test/groovy/datadog/trace/bootstrap/instrumentation/jfr/exceptions/KnownExcludesForkedTest.groovy b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/groovy/datadog/trace/bootstrap/instrumentation/jfr/exceptions/KnownExcludesForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/exception-profiling/src/test/groovy/datadog/trace/bootstrap/instrumentation/jfr/exceptions/KnownExcludesForkedTest.groovy rename to dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/groovy/datadog/trace/bootstrap/instrumentation/jfr/exceptions/KnownExcludesForkedTest.groovy diff --git a/dd-java-agent/instrumentation/exception-profiling/src/test/java/com/zaxxer/hikari/pool/ProxyLeakTask.java b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/java/com/zaxxer/hikari/pool/ProxyLeakTask.java similarity index 100% rename from dd-java-agent/instrumentation/exception-profiling/src/test/java/com/zaxxer/hikari/pool/ProxyLeakTask.java rename to dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/java/com/zaxxer/hikari/pool/ProxyLeakTask.java diff --git a/dd-java-agent/instrumentation/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTest.java b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTest.java similarity index 100% rename from dd-java-agent/instrumentation/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTest.java rename to dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTest.java diff --git a/dd-java-agent/instrumentation/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTestBridge.java b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTestBridge.java similarity index 100% rename from dd-java-agent/instrumentation/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTestBridge.java rename to dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTestBridge.java diff --git a/dd-java-agent/instrumentation/exception-profiling/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from dd-java-agent/instrumentation/exception-profiling/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to dd-java-agent/instrumentation/datadog/profiling/exception-profiling/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/dd-java-agent/instrumentation/trace-annotation/build.gradle b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/build.gradle rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/build.gradle diff --git a/dd-java-agent/instrumentation/trace-annotation/gradle.lockfile b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/gradle.lockfile rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/gradle.lockfile diff --git a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAdvice.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAdvice.java rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAdvice.java diff --git a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAnnotationInstrumentation.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAnnotationInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAnnotationInstrumentation.java rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAnnotationInstrumentation.java diff --git a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAdvice.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAdvice.java rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAdvice.java diff --git a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java diff --git a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceConfigInstrumentation.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceConfigInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceConfigInstrumentation.java rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceConfigInstrumentation.java diff --git a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceDecorator.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceDecorator.java rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceDecorator.java diff --git a/dd-java-agent/instrumentation/trace-annotation/src/test/groovy/ConfiguredTraceAnnotationsTest.groovy b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/groovy/ConfiguredTraceAnnotationsTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/src/test/groovy/ConfiguredTraceAnnotationsTest.groovy rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/groovy/ConfiguredTraceAnnotationsTest.groovy diff --git a/dd-java-agent/instrumentation/trace-annotation/src/test/groovy/MeasuredConfigTest.groovy b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/groovy/MeasuredConfigTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/src/test/groovy/MeasuredConfigTest.groovy rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/groovy/MeasuredConfigTest.groovy diff --git a/dd-java-agent/instrumentation/trace-annotation/src/test/groovy/TraceAnnotationNewOpNameForkedTest.groovy b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/groovy/TraceAnnotationNewOpNameForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/src/test/groovy/TraceAnnotationNewOpNameForkedTest.groovy rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/groovy/TraceAnnotationNewOpNameForkedTest.groovy diff --git a/dd-java-agent/instrumentation/trace-annotation/src/test/groovy/TraceAnnotationsAsyncTest.groovy b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/groovy/TraceAnnotationsAsyncTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/src/test/groovy/TraceAnnotationsAsyncTest.groovy rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/groovy/TraceAnnotationsAsyncTest.groovy diff --git a/dd-java-agent/instrumentation/trace-annotation/src/test/groovy/TraceAnnotationsTest.groovy b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/groovy/TraceAnnotationsTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/src/test/groovy/TraceAnnotationsTest.groovy rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/groovy/TraceAnnotationsTest.groovy diff --git a/dd-java-agent/instrumentation/trace-annotation/src/test/groovy/TraceConfigTest.groovy b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/groovy/TraceConfigTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/src/test/groovy/TraceConfigTest.groovy rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/groovy/TraceConfigTest.groovy diff --git a/dd-java-agent/instrumentation/trace-annotation/src/test/java/OuterClass.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/OuterClass.java similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/src/test/java/OuterClass.java rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/OuterClass.java diff --git a/dd-java-agent/instrumentation/trace-annotation/src/test/java/dd/test/trace/annotation/DontTraceClass.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/DontTraceClass.java similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/src/test/java/dd/test/trace/annotation/DontTraceClass.java rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/DontTraceClass.java diff --git a/dd-java-agent/instrumentation/trace-annotation/src/test/java/dd/test/trace/annotation/SayTracedHello.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/SayTracedHello.java similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/src/test/java/dd/test/trace/annotation/SayTracedHello.java rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/SayTracedHello.java diff --git a/dd-java-agent/instrumentation/trace-annotation/src/test/java/dd/test/trace/annotation/TracedInterface.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/TracedInterface.java similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/src/test/java/dd/test/trace/annotation/TracedInterface.java rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/TracedInterface.java diff --git a/dd-java-agent/instrumentation/trace-annotation/src/test/java/dd/test/trace/annotation/TracedSubClass.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/TracedSubClass.java similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/src/test/java/dd/test/trace/annotation/TracedSubClass.java rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/TracedSubClass.java diff --git a/dd-java-agent/instrumentation/trace-annotation/src/test/java/dd/test/trace/annotation/TracedSuperClass.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/TracedSuperClass.java similarity index 100% rename from dd-java-agent/instrumentation/trace-annotation/src/test/java/dd/test/trace/annotation/TracedSuperClass.java rename to dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/test/java/dd/test/trace/annotation/TracedSuperClass.java diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/build.gradle b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/build.gradle index 800286a4e99..9b67fe37a18 100644 --- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/build.gradle +++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/build.gradle @@ -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.+' } diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/build.gradle b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/build.gradle index d94800ca4b6..c45c31ed02c 100644 --- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/build.gradle +++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/build.gradle @@ -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' } diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/build.gradle b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/build.gradle index ae7130eef64..24ba6081193 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/build.gradle +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/build.gradle @@ -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.+' } diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/build.gradle b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/build.gradle index 9d5de093a22..dc042974710 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/build.gradle +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/build.gradle @@ -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.+' diff --git a/dd-java-agent/instrumentation/gson-1.6/build.gradle b/dd-java-agent/instrumentation/gson-1.6/build.gradle index 953d6dec9b9..c393cd38ba8 100644 --- a/dd-java-agent/instrumentation/gson-1.6/build.gradle +++ b/dd-java-agent/instrumentation/gson-1.6/build.gradle @@ -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: '+' } diff --git a/dd-java-agent/instrumentation/hystrix-1.4/build.gradle b/dd-java-agent/instrumentation/hystrix-1.4/build.gradle index dbc71764151..ca8ed022d27 100644 --- a/dd-java-agent/instrumentation/hystrix-1.4/build.gradle +++ b/dd-java-agent/instrumentation/hystrix-1.4/build.gradle @@ -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' diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/build.gradle index 4b80ec8f8ea..ee85bef77fa 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/build.gradle +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/build.gradle @@ -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' diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle index 3fcbb72c79a..7a42cad69ed 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle @@ -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') } diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-io-1.8/build.gradle index 65ece4d65dd..0606b2c3618 100644 --- a/dd-java-agent/instrumentation/java/java-io-1.8/build.gradle +++ b/dd-java-agent/instrumentation/java/java-io-1.8/build.gradle @@ -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' } diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/build.gradle index af30b2b4fbc..5f6b5874f77 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/build.gradle @@ -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' } diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle index 8fceca7fdf6..fa728eb5175 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle @@ -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 { diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle index 4f46b2aa45d..5805396a698 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle @@ -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 { diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle index e923c59c434..0fdc35f364d 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle @@ -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 { diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/build.gradle index e0ec0843b03..97c18d0e083 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/build.gradle @@ -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') } diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/build.gradle index c518a8f279e..23fb07d046e 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/build.gradle @@ -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 { diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/build.gradle index 435803d6d9f..f4b8045cd6d 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/build.gradle +++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/build.gradle @@ -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' } diff --git a/dd-java-agent/instrumentation/java/java-security-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-security-1.8/build.gradle index 98d7a23c5cf..abf666fde8d 100644 --- a/dd-java-agent/instrumentation/java/java-security-1.8/build.gradle +++ b/dd-java-agent/instrumentation/java/java-security-1.8/build.gradle @@ -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' } diff --git a/dd-java-agent/instrumentation/java/java-util-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-util-1.8/build.gradle index 2e64078945d..eb1ac83feba 100644 --- a/dd-java-agent/instrumentation/java/java-util-1.8/build.gradle +++ b/dd-java-agent/instrumentation/java/java-util-1.8/build.gradle @@ -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') } diff --git a/dd-java-agent/instrumentation/javax-naming-1.0/build.gradle b/dd-java-agent/instrumentation/javax-naming-1.0/build.gradle index 2e64078945d..eb1ac83feba 100644 --- a/dd-java-agent/instrumentation/javax-naming-1.0/build.gradle +++ b/dd-java-agent/instrumentation/javax-naming-1.0/build.gradle @@ -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') } diff --git a/dd-java-agent/instrumentation/javax-xml-1.4/build.gradle b/dd-java-agent/instrumentation/javax-xml-1.4/build.gradle index 4df086d704e..a2c17165560 100644 --- a/dd-java-agent/instrumentation/javax-xml-1.4/build.gradle +++ b/dd-java-agent/instrumentation/javax-xml-1.4/build.gradle @@ -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' } diff --git a/dd-java-agent/instrumentation/jdbc/build.gradle b/dd-java-agent/instrumentation/jdbc/build.gradle index fd0ed6c2d63..628d3a81fd3 100644 --- a/dd-java-agent/instrumentation/jdbc/build.gradle +++ b/dd-java-agent/instrumentation/jdbc/build.gradle @@ -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') { diff --git a/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/build.gradle index 4f0eedd47b1..a12459484d7 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/build.gradle @@ -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 } diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/build.gradle b/dd-java-agent/instrumentation/jms/javax-jms-1.1/build.gradle index e919a0bf12e..739bc235846 100644 --- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/build.gradle +++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/build.gradle @@ -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' diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle index f32f4c0c6ad..d94981f3adb 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle @@ -38,7 +38,7 @@ dependencies { testImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures') // IAST testing dependencies - testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') testRuntimeOnly project(':dd-java-agent:instrumentation:java:java-lang:java-lang-1.8') testRuntimeOnly project(':dd-java-agent:instrumentation:java:java-io-1.8') testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-common') @@ -55,7 +55,7 @@ dependencies { // Add kafka version 3.x for IAST iastLatestDepTest3Implementation group: 'org.apache.kafka', name: 'kafka-clients', version: '3.+' iastLatestDepTest3Implementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '3.+' - iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:java:java-lang:java-lang-1.8') iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:java:java-io-1.8') iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-common') diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/build.gradle index 021ca923be9..1857bed17f1 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/build.gradle @@ -33,7 +33,7 @@ tasks.withType(GroovyCompile).configureEach { dependencies { implementation project(':dd-java-agent:instrumentation:kafka:kafka-common') - implementation project(':dd-java-agent:instrumentation:span-origin') + implementation project(':dd-java-agent:instrumentation:datadog:dynamic-instrumentation:span-origin') main_java17CompileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: '3.8.0' main_java17Implementation project(':dd-java-agent:instrumentation:kafka:kafka-common') diff --git a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle index 7a24942b6e7..6671532c659 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle @@ -17,7 +17,7 @@ dependencies { compileOnly group: 'org.apache.kafka', name: 'connect-runtime', version: '0.11.0.0' testImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures') - testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') testRuntimeOnly project(':dd-java-agent:instrumentation:java:java-lang:java-lang-1.8') testRuntimeOnly project(':dd-java-agent:instrumentation:java:java-io-1.8') testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-common') diff --git a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/build.gradle b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/build.gradle index a72d7971dd8..261c652bffc 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/build.gradle +++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/build.gradle @@ -58,7 +58,7 @@ dependencies { testFixturesImplementation libs.kotlin testFixturesImplementation libs.coroutines testFixturesApi project(':dd-trace-api') - testFixturesApi project(':dd-java-agent:instrumentation:trace-annotation') + testFixturesApi project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation') testFixturesApi project(':dd-java-agent:instrumentation-testing') testImplementation libs.kotlin diff --git a/dd-java-agent/instrumentation/mail/build.gradle b/dd-java-agent/instrumentation/mail/build.gradle index 33e49b42ba6..d663304e94f 100644 --- a/dd-java-agent/instrumentation/mail/build.gradle +++ b/dd-java-agent/instrumentation/mail/build.gradle @@ -11,7 +11,7 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') dependencies { - testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') compileOnly 'javax.mail:javax.mail-api:1.4.4' compileOnly 'com.sun.mail:javax.mail:1.4.4' testImplementation 'com.sun.mail:javax.mail:1.4.4' diff --git a/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/build.gradle b/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/build.gradle index 2e00ea11b75..9bedd56205d 100644 --- a/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/build.gradle +++ b/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/build.gradle @@ -11,7 +11,7 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') dependencies { - testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') compileOnly 'jakarta.mail:jakarta.mail-api:2.0.1' testImplementation 'jakarta.mail:jakarta.mail-api:2.0.1' compileOnly 'com.sun.mail:jakarta.mail:2.0.1' diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/build.gradle b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/build.gradle index 3a18071d009..db3ce8e92cb 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/build.gradle +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/build.gradle @@ -15,5 +15,5 @@ muzzle { dependencies { compileOnly group: 'io.micronaut', name: 'micronaut-http-server-netty', version: '2.0.0' - implementation project(':dd-java-agent:instrumentation:span-origin') + implementation project(':dd-java-agent:instrumentation:datadog:dynamic-instrumentation:span-origin') } diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/build.gradle b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/build.gradle index 9ed60d87cc8..5f22c884db1 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/build.gradle +++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/build.gradle @@ -39,7 +39,7 @@ dependencies { } testImplementation group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0' - testRuntimeOnly(project(':dd-java-agent:instrumentation:iast-instrumenter')) + testRuntimeOnly(project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')) testRuntimeOnly(project(':dd-java-agent:instrumentation:java:java-net:java-net-1.8')) latestDepTestImplementation group: 'com.squareup.okhttp', name: 'okhttp', version: '[2.6,3)' diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/build.gradle b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/build.gradle index 4de2fd042be..5ce7c997f99 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/build.gradle +++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/build.gradle @@ -36,6 +36,6 @@ dependencies { latestDepTestImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '[3.11.0, 4)' latestDepTestImplementation group: 'com.squareup.okio', name: 'okio', version: '1.+' - testRuntimeOnly(project(':dd-java-agent:instrumentation:iast-instrumenter')) + testRuntimeOnly(project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter')) testRuntimeOnly(project(':dd-java-agent:instrumentation:java:java-net:java-net-1.8')) } diff --git a/dd-java-agent/instrumentation/org-json-20230227/build.gradle b/dd-java-agent/instrumentation/org-json-20230227/build.gradle index 8abd99278d5..1660c1f013f 100644 --- a/dd-java-agent/instrumentation/org-json-20230227/build.gradle +++ b/dd-java-agent/instrumentation/org-json-20230227/build.gradle @@ -30,7 +30,7 @@ dependencies { compileOnly group: 'org.json', name: 'json', version: '20230227' testImplementation group: 'org.json', name: 'json', version: '20230227' - testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') testRuntimeOnly project(':dd-java-agent:instrumentation:java:java-io-1.8') //Needed for Reader latestDepTestImplementation group: 'org.json', name: 'json', version: '20250107' // TODO replace with + when APPSEC-58007 solved diff --git a/dd-java-agent/instrumentation/owasp-esapi-2.1/build.gradle b/dd-java-agent/instrumentation/owasp-esapi-2.1/build.gradle index be1a20aaf54..d9af7c46cf9 100644 --- a/dd-java-agent/instrumentation/owasp-esapi-2.1/build.gradle +++ b/dd-java-agent/instrumentation/owasp-esapi-2.1/build.gradle @@ -24,7 +24,7 @@ dependencies { testImplementation group: 'org.owasp.esapi', name: 'esapi', version: '2.1.0' - testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') latestDepTestImplementation group: 'org.owasp.esapi', name: 'esapi', version: '+' } diff --git a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/build.gradle b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/build.gradle index 31f7ec32aea..f69a08031c1 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/build.gradle +++ b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/build.gradle @@ -31,7 +31,7 @@ dependencies { compileOnly group: 'org.apache.pekko', name: "pekko-actor_2.12", version: pekkoVersion testImplementation libs.scala212 - testImplementation project(':dd-java-agent:instrumentation:trace-annotation') + testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation') testImplementation group: 'org.apache.pekko', name: "pekko-actor_2.12", version: pekkoVersion testImplementation group: 'org.apache.pekko', name: "pekko-testkit_2.12", version: pekkoVersion diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle index 631f9e5d012..670814a6b77 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle @@ -51,7 +51,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:pekko:pekko-concurrent-1.0') testImplementation project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8') testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10') @@ -66,7 +66,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.12') - iastTestRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + iastTestRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') latestPekko10TestImplementation libs.scala213 latestPekko10TestImplementation group: 'org.apache.pekko', name: 'pekko-http_2.13', version: '1.0.+' diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/build.gradle b/dd-java-agent/instrumentation/reactor-core-3.1/build.gradle index e0198444178..8abbc16918f 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/build.gradle +++ b/dd-java-agent/instrumentation/reactor-core-3.1/build.gradle @@ -15,7 +15,7 @@ dependencies { compileOnly group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE' - testImplementation project(':dd-java-agent:instrumentation:trace-annotation') + testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation') testImplementation project(':dd-java-agent:instrumentation:reactive-streams-1.0') testImplementation project(':dd-java-agent:instrumentation:opentelemetry:opentelemetry-1.4') testImplementation project(':dd-java-agent:instrumentation:opentelemetry:opentelemetry-annotations-1.20') diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/build.gradle b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/build.gradle index b3e30f1e833..3cd3503b89c 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/build.gradle +++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/build.gradle @@ -15,7 +15,7 @@ dependencies { compileOnly group: 'org.reactivestreams', name: 'reactive-streams', version: '1.0.0' compileOnly group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.0.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:opentelemetry:opentelemetry-annotations-1.20') testImplementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.0.5' diff --git a/dd-java-agent/instrumentation/scala/scala-2.10.7/build.gradle b/dd-java-agent/instrumentation/scala/scala-2.10.7/build.gradle index 3770826f20c..970172cc5ad 100644 --- a/dd-java-agent/instrumentation/scala/scala-2.10.7/build.gradle +++ b/dd-java-agent/instrumentation/scala/scala-2.10.7/build.gradle @@ -16,7 +16,7 @@ dependencies { compileOnly group: 'org.scala-lang', name: 'scala-library', version: '2.10.7' testImplementation group: 'org.scala-lang', name: 'scala-library', version: '2.10.7' testImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures') - testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') } final scalaVersions = [libs.scala211, libs.scala212, libs.scala213, libs.scala33] diff --git a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/build.gradle b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/build.gradle index de68d5575f4..fbd8731f5e8 100644 --- a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/build.gradle +++ b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/build.gradle @@ -37,7 +37,7 @@ dependencies { compileOnly group: 'org.scala-lang', name: 'scala-library', version: '2.10.7' testImplementation group: 'org.scala-lang', name: 'scala-library', version: '2.10.7' - testImplementation project(':dd-java-agent:instrumentation:trace-annotation') + testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation') latest11TestImplementation group: 'org.scala-lang', name: 'scala-library', version: '2.11.+' latest12TestImplementation group: 'org.scala-lang', name: 'scala-library', version: '2.12.+' diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle index 881c00118ad..93ffdc1a131 100644 --- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle +++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle @@ -55,7 +55,7 @@ dependencies { compileOnly group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '5.0.0' testImplementation group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '5.0.0' testImplementation group: 'jakarta.servlet.jsp', name: 'jakarta.servlet.jsp-api', version: '3.0.0' - testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') javaxClassesToRelocate project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-iast'), { transitive = false diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/build.gradle b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/build.gradle index 0010107eb93..d41f00e0436 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/build.gradle +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/build.gradle @@ -31,7 +31,7 @@ addTestSuiteForDir('latestDepTest', 'test') addTestSuiteForDir('latestDepForkedTest', 'test') dependencies { - testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') // build against 3.1 so we can wrap its additions to ServletInputStream, // but all the other advice in this module is still compatible with 3.0+ diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/build.gradle b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/build.gradle index f4a9e1f4c5e..9dbe7ad653b 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/build.gradle +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/build.gradle @@ -17,7 +17,7 @@ apply plugin: 'dd-trace-java.call-site-instrumentation' dependencies { compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.3' - testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') testImplementation group: 'javax.servlet', name: 'servlet-api', version: '2.3' diff --git a/dd-java-agent/instrumentation/slick-3.2/build.gradle b/dd-java-agent/instrumentation/slick-3.2/build.gradle index 095412dcc7d..a4134bd467d 100644 --- a/dd-java-agent/instrumentation/slick-3.2/build.gradle +++ b/dd-java-agent/instrumentation/slick-3.2/build.gradle @@ -27,7 +27,7 @@ dependencies { testImplementation project(':dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-1.8') testImplementation project(':dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-1.8') - testImplementation project(':dd-java-agent:instrumentation:trace-annotation') + testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation') testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10') testImplementation project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8') testImplementation project(':dd-java-agent:instrumentation:jdbc') diff --git a/dd-java-agent/instrumentation/spark/spark-common/build.gradle b/dd-java-agent/instrumentation/spark/spark-common/build.gradle index 7553d0f4fb2..84dd5cca6a5 100644 --- a/dd-java-agent/instrumentation/spark/spark-common/build.gradle +++ b/dd-java-agent/instrumentation/spark/spark-common/build.gradle @@ -15,7 +15,7 @@ dependencies { testFixturesImplementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.14.0' testFixturesApi project(':dd-trace-api') - testFixturesApi project(':dd-java-agent:instrumentation:trace-annotation') + testFixturesApi project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation') testFixturesApi project(':dd-java-agent:instrumentation-testing') testFixturesCompileOnly group: 'org.apache.spark', name: 'spark-core_2.12', version: '2.4.0' diff --git a/dd-java-agent/instrumentation/spring/spring-boot-1.3/build.gradle b/dd-java-agent/instrumentation/spring/spring-boot-1.3/build.gradle index 26dd765c94b..63904ad24cc 100644 --- a/dd-java-agent/instrumentation/spring/spring-boot-1.3/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-boot-1.3/build.gradle @@ -28,7 +28,7 @@ addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "test") configureGroovyCompiler(17, "compileLatestDepTestGroovy", "compileBoot3TestGroovy") dependencies { - implementation project(':dd-java-agent:instrumentation:span-origin') + implementation project(':dd-java-agent:instrumentation:datadog:dynamic-instrumentation:span-origin') compileOnly group: 'org.springframework.boot', name: 'spring-boot', version: '1.3.0.RELEASE' testImplementation group: 'org.springframework.boot', name: 'spring-boot', version: '1.3.0.RELEASE' diff --git a/dd-java-agent/instrumentation/spring/spring-core-3.2.2/build.gradle b/dd-java-agent/instrumentation/spring/spring-core-3.2.2/build.gradle index 70258ccb85b..61399ab0426 100644 --- a/dd-java-agent/instrumentation/spring/spring-core-3.2.2/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-core-3.2.2/build.gradle @@ -14,6 +14,6 @@ addTestSuiteForDir('latestDepTest', 'test') dependencies { compileOnly group: 'org.springframework', name: 'spring-beans', version: '3.2.2.RELEASE' testImplementation group: 'org.springframework', name: 'spring-beans', version: '3.2.2.RELEASE' - testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') latestDepTestImplementation group: 'org.unbescape', name: 'unbescape', version: '+' } diff --git a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/build.gradle b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/build.gradle index 4cc71d35bc0..cfc3fc1facd 100644 --- a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/build.gradle @@ -16,7 +16,7 @@ dependencies { compileOnly group: 'org.springframework.amqp', name: 'spring-rabbit', version: '2.0.0.RELEASE' compileOnly group: 'org.springframework.amqp', name: 'spring-amqp', version: '2.0.0.RELEASE' - testImplementation project(':dd-java-agent:instrumentation:trace-annotation') + testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation') testImplementation project(':dd-java-agent:instrumentation:rabbitmq-amqp-2.7') testImplementation group: 'org.testcontainers', name: 'rabbitmq', version: libs.versions.testcontainers.get() diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle index 03b31be626a..a90ff8163e2 100644 --- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle @@ -47,7 +47,7 @@ dependencies { compileOnly group: 'org.springframework', name: 'spring-context', version: '5.0.0.RELEASE' testImplementation group: 'org.springframework', name: 'spring-context', version: '5.0.0.RELEASE' - testImplementation project(':dd-java-agent:instrumentation:trace-annotation') + testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation') testImplementation group: 'net.javacrumbs.shedlock', name: 'shedlock-spring', version: '4.21.0' testImplementation group: 'net.javacrumbs.shedlock', name: 'shedlock-provider-jdbc-template', version: '4.21.0' diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle index 59d1ce105e1..ae9f332895f 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle @@ -79,7 +79,7 @@ dependencies { compileOnly group: 'org.springframework', name: 'spring-webflux', version: '5.0.0.RELEASE' compileOnly group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.4' - testImplementation project(':dd-java-agent:instrumentation:trace-annotation') + testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation') testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation project(':dd-java-agent:instrumentation:netty:netty-promise-4.0') testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1') diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle index 702401d08c3..862078e6661 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle @@ -25,7 +25,7 @@ tasks.named("iastTest", Test) { dependencies { testImplementation project(':dd-java-agent:instrumentation:spring:spring-webflux:spring-webflux-5.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:netty:netty-4.1') testImplementation project(':dd-java-agent:instrumentation:netty:netty-promise-4.0') testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1') diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/build.gradle b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/build.gradle index df112e975a7..1fba7948298 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/build.gradle @@ -26,5 +26,5 @@ dependencies { testImplementation(libs.spock.spring) - testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') } diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle index 6653fb340a4..95fde4e327f 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle @@ -31,8 +31,8 @@ dependencies { main_java17CompileOnly(group: 'org.springframework', name: 'spring-webmvc', version: '6.0.0') main_java17CompileOnly group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '5.0.0' - implementation project(':dd-java-agent:instrumentation:span-origin') - main_java17Implementation project(':dd-java-agent:instrumentation:span-origin') + implementation project(':dd-java-agent:instrumentation:datadog:dynamic-instrumentation:span-origin') + main_java17Implementation project(':dd-java-agent:instrumentation:datadog:dynamic-instrumentation:span-origin') testImplementation(project(':dd-java-agent:instrumentation-testing')) { exclude(module: 'jetty-server') // incompatible servlet api diff --git a/dd-java-agent/instrumentation/thymeleaf-3.0/build.gradle b/dd-java-agent/instrumentation/thymeleaf-3.0/build.gradle index 609b9e4e63a..e3a1385d75d 100644 --- a/dd-java-agent/instrumentation/thymeleaf-3.0/build.gradle +++ b/dd-java-agent/instrumentation/thymeleaf-3.0/build.gradle @@ -17,7 +17,7 @@ dependencies { testImplementation group: 'org.thymeleaf', name: 'thymeleaf', version: '3.0.0.RELEASE' - testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') latestDepTestImplementation group: 'org.thymeleaf', name: 'thymeleaf', version: '+' } diff --git a/dd-java-agent/instrumentation/unbescape-1.1/build.gradle b/dd-java-agent/instrumentation/unbescape-1.1/build.gradle index 926f10a7ee1..f566ec1c04c 100644 --- a/dd-java-agent/instrumentation/unbescape-1.1/build.gradle +++ b/dd-java-agent/instrumentation/unbescape-1.1/build.gradle @@ -17,7 +17,7 @@ dependencies { testImplementation group: 'org.unbescape', name: 'unbescape', version: '1.1.0.RELEASE' - testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') latestDepTestImplementation group: 'org.unbescape', name: 'unbescape', version: '+' } diff --git a/dd-java-agent/instrumentation/velocity-1.5/build.gradle b/dd-java-agent/instrumentation/velocity-1.5/build.gradle index 702b6a110d9..2a15f1f5759 100644 --- a/dd-java-agent/instrumentation/velocity-1.5/build.gradle +++ b/dd-java-agent/instrumentation/velocity-1.5/build.gradle @@ -9,7 +9,7 @@ dependencies { testImplementation group: 'org.apache.velocity', name: 'velocity', version: '1.5' testImplementation group: 'org.apache.velocity', name: 'velocity-tools', version: '1.3' - testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') latestDepTestImplementation group: 'org.apache.velocity', name: 'velocity', version: '+' latestDepTestImplementation group: 'org.apache.velocity', name: 'velocity-tools', version: '+' diff --git a/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/build.gradle index 8c98c54be0c..7caeb34629d 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/build.gradle @@ -9,7 +9,7 @@ tasks.named("latestDepTest", Test) { dependencies { testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') - testImplementation project(':dd-java-agent:instrumentation:trace-annotation') + testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation') testImplementation project(':dd-java-agent:instrumentation:vertx:vertx-web:vertx-web-3.4') testImplementation project(path: '::dd-java-agent:instrumentation:vertx:vertx-web:vertx-web-3.4', configuration: 'testArtifacts') diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/build.gradle index 2652d8fb60b..6a0d64a5900 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/build.gradle @@ -34,9 +34,9 @@ dependencies { compileOnly group: 'io.vertx', name: 'vertx-web', version: '3.4.0' testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') - testImplementation project(':dd-java-agent:instrumentation:trace-annotation') + testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation') testImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures') - testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') testImplementation group: 'io.vertx', name: 'vertx-web', version: '3.4.0' diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/build.gradle index 53b4908a296..15fdca5ca49 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/build.gradle @@ -34,7 +34,7 @@ dependencies { compileOnly group: 'io.vertx', name: 'vertx-web', version: '3.5.0' testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') - testImplementation project(':dd-java-agent:instrumentation:trace-annotation') + testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation') testImplementation group: 'io.vertx', name: 'vertx-web', version: '3.5.0' diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/build.gradle index e63c87ef52c..0a08edcc355 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/build.gradle @@ -30,7 +30,7 @@ dependencies { compileOnly group: 'io.vertx', name: 'vertx-web', version: '3.9.0' testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') - testImplementation project(':dd-java-agent:instrumentation:trace-annotation') + testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation') testImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures') testImplementation group: 'io.vertx', name: 'vertx-web', version: '3.9.0' @@ -38,5 +38,5 @@ dependencies { testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-common') testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-buffer-4.0') - testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') } diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/build.gradle index fdc35ed1178..096110203b4 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/build.gradle @@ -36,9 +36,9 @@ dependencies { compileOnly group: 'io.vertx', name: 'vertx-web', version: '4.0.0' testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') - testImplementation project(':dd-java-agent:instrumentation:trace-annotation') + testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation') testImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures') - testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') testImplementation group: 'io.vertx', name: 'vertx-web', version: '4.0.0' testImplementation group: 'io.vertx', name: 'vertx-web-client', version: '4.0.0' diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle index cb2988ff952..3470f74a725 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle @@ -40,9 +40,9 @@ dependencies { testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation project(':dd-java-agent:instrumentation:vertx:vertx-web:vertx-web-4.0') - testImplementation project(':dd-java-agent:instrumentation:trace-annotation') + testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation') testImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures') - testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') + testRuntimeOnly project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter') testImplementation group: 'io.vertx', name: 'vertx-web', version: vertxVersion testImplementation group: 'io.vertx', name: 'vertx-web-client', version: vertxVersion diff --git a/settings.gradle.kts b/settings.gradle.kts index 0ce925c46a0..2b4f79200c4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -314,6 +314,11 @@ include( ":dd-java-agent:instrumentation:couchbase:couchbase-3.2", ":dd-java-agent:instrumentation:cucumber-5.4", ":dd-java-agent:instrumentation:cxf-2.1", + ":dd-java-agent:instrumentation:datadog:asm:iast-instrumenter", + ":dd-java-agent:instrumentation:datadog:dynamic-instrumentation:span-origin", + ":dd-java-agent:instrumentation:datadog:profiling:enable-wallclock-profiling", + ":dd-java-agent:instrumentation:datadog:profiling:exception-profiling", + ":dd-java-agent:instrumentation:datadog:tracing:trace-annotation", ":dd-java-agent:instrumentation:datanucleus-4.0.5", ":dd-java-agent:instrumentation:datastax-cassandra:datastax-cassandra-3.0", ":dd-java-agent:instrumentation:datastax-cassandra:datastax-cassandra-3.8", @@ -330,8 +335,6 @@ include( ":dd-java-agent:instrumentation:elasticsearch:elasticsearch-transport:elasticsearch-transport-7.3", ":dd-java-agent:instrumentation:elasticsearch:elasticsearch-transport:elasticsearch-transport-common", ":dd-java-agent:instrumentation:elasticsearch:elasticsearch-common", - ":dd-java-agent:instrumentation:enable-wallclock-profiling", - ":dd-java-agent:instrumentation:exception-profiling", ":dd-java-agent:instrumentation:finatra-2.9", ":dd-java-agent:instrumentation:freemarker:freemarker-2.3.24", ":dd-java-agent:instrumentation:freemarker:freemarker-2.3.9", @@ -359,7 +362,6 @@ include( ":dd-java-agent:instrumentation:hibernate:hibernate-core-4.0", ":dd-java-agent:instrumentation:hibernate:hibernate-core-4.3", ":dd-java-agent:instrumentation:hystrix-1.4", - ":dd-java-agent:instrumentation:iast-instrumenter", ":dd-java-agent:instrumentation:ignite-2.0", ":dd-java-agent:instrumentation:jackson-core:jackson-core-1.9.13", ":dd-java-agent:instrumentation:jackson-core:jackson-core-2.0", @@ -543,7 +545,6 @@ include( ":dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-iast", ":dd-java-agent:instrumentation:slick-3.2", ":dd-java-agent:instrumentation:snakeyaml-1.33", - ":dd-java-agent:instrumentation:span-origin", ":dd-java-agent:instrumentation:spark:spark-common", ":dd-java-agent:instrumentation:spark:spark_2.12", ":dd-java-agent:instrumentation:spark:spark_2.13", @@ -583,7 +584,6 @@ include( ":dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-6.0", ":dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-7.0", ":dd-java-agent:instrumentation:tomcat:tomcat-common", - ":dd-java-agent:instrumentation:trace-annotation", ":dd-java-agent:instrumentation:twilio-0.0.1", ":dd-java-agent:instrumentation:unbescape-1.1", ":dd-java-agent:instrumentation:undertow:undertow-2.0", From e8771aaac0e6f4deda3c355ba59ccf5a412fe878 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Wed, 31 Dec 2025 15:55:41 +0100 Subject: [PATCH 2/4] exclude the datadog top instrumentation folder from checking --- .../gradle/plugin/naming/InstrumentationNamingPlugin.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/buildSrc/src/main/kotlin/datadog/gradle/plugin/naming/InstrumentationNamingPlugin.kt b/buildSrc/src/main/kotlin/datadog/gradle/plugin/naming/InstrumentationNamingPlugin.kt index b8c4ac9a1fa..e19c1b7c758 100644 --- a/buildSrc/src/main/kotlin/datadog/gradle/plugin/naming/InstrumentationNamingPlugin.kt +++ b/buildSrc/src/main/kotlin/datadog/gradle/plugin/naming/InstrumentationNamingPlugin.kt @@ -98,6 +98,10 @@ class InstrumentationNamingPlugin : Plugin { if (moduleName in setOf("build", "src", ".gradle")) { return@childLoop } + // skip the special datadog top level instrumentation directory + if (parentName == null && moduleName == "datadog") { + return@childLoop + } val childHasBuildFile = hasBuildFile(childDir) val nestedModules = childDir.listFiles { file -> file.isDirectory }?.filter { hasBuildFile(it) } ?: emptyList() From eca675192607689deb2a66c6eaa24eedd3393449 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Wed, 31 Dec 2025 15:59:13 +0100 Subject: [PATCH 3/4] move graalvm --- .../{native-image => graal-native-image-20.0}/build.gradle | 0 .../{native-image => graal-native-image-20.0}/gradle.lockfile | 0 .../graal/nativeimage/AbstractNativeImageInstrumentation.java | 0 .../AnnotationSubstitutionProcessorInstrumentation.java | 0 .../graal/nativeimage/LinkAtBuildTimeInstrumentation.java | 0 .../nativeimage/NativeImageGeneratorRunnerInstrumentation.java | 0 .../graal/nativeimage/ResourcesFeatureInstrumentation.java | 0 .../Target_com_datadog_profiling_agent_ProcessContext.java | 0 .../Target_datadog_jctools_util_UnsafeRefArrayAccess.java | 0 .../graal/nativeimage/Target_org_datadog_jmxfetch_App.java | 0 .../graal/nativeimage/Target_org_datadog_jmxfetch_Status.java | 0 .../Target_org_datadog_jmxfetch_reporter_JsonReporter.java | 0 .../graal/nativeimage/VMRuntimeInstrumentation.java | 0 .../instrumentation/graal/nativeimage/DeleteFieldAdvice.java | 0 settings.gradle.kts | 2 +- 15 files changed, 1 insertion(+), 1 deletion(-) rename dd-java-agent/instrumentation/graal/{native-image => graal-native-image-20.0}/build.gradle (100%) rename dd-java-agent/instrumentation/graal/{native-image => graal-native-image-20.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/graal/{native-image => graal-native-image-20.0}/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AbstractNativeImageInstrumentation.java (100%) rename dd-java-agent/instrumentation/graal/{native-image => graal-native-image-20.0}/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AnnotationSubstitutionProcessorInstrumentation.java (100%) rename dd-java-agent/instrumentation/graal/{native-image => graal-native-image-20.0}/src/main/java/datadog/trace/instrumentation/graal/nativeimage/LinkAtBuildTimeInstrumentation.java (100%) rename dd-java-agent/instrumentation/graal/{native-image => graal-native-image-20.0}/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java (100%) rename dd-java-agent/instrumentation/graal/{native-image => graal-native-image-20.0}/src/main/java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java (100%) rename dd-java-agent/instrumentation/graal/{native-image => graal-native-image-20.0}/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_com_datadog_profiling_agent_ProcessContext.java (100%) rename dd-java-agent/instrumentation/graal/{native-image => graal-native-image-20.0}/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_datadog_jctools_util_UnsafeRefArrayAccess.java (100%) rename dd-java-agent/instrumentation/graal/{native-image => graal-native-image-20.0}/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_App.java (100%) rename dd-java-agent/instrumentation/graal/{native-image => graal-native-image-20.0}/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_Status.java (100%) rename dd-java-agent/instrumentation/graal/{native-image => graal-native-image-20.0}/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_reporter_JsonReporter.java (100%) rename dd-java-agent/instrumentation/graal/{native-image => graal-native-image-20.0}/src/main/java/datadog/trace/instrumentation/graal/nativeimage/VMRuntimeInstrumentation.java (100%) rename dd-java-agent/instrumentation/graal/{native-image => graal-native-image-20.0}/src/main/java11/datadog/trace/instrumentation/graal/nativeimage/DeleteFieldAdvice.java (100%) diff --git a/dd-java-agent/instrumentation/graal/native-image/build.gradle b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/graal/native-image/build.gradle rename to dd-java-agent/instrumentation/graal/graal-native-image-20.0/build.gradle diff --git a/dd-java-agent/instrumentation/graal/native-image/gradle.lockfile b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/graal/native-image/gradle.lockfile rename to dd-java-agent/instrumentation/graal/graal-native-image-20.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AbstractNativeImageInstrumentation.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AbstractNativeImageInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AbstractNativeImageInstrumentation.java rename to dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AbstractNativeImageInstrumentation.java diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AnnotationSubstitutionProcessorInstrumentation.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AnnotationSubstitutionProcessorInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AnnotationSubstitutionProcessorInstrumentation.java rename to dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AnnotationSubstitutionProcessorInstrumentation.java diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/LinkAtBuildTimeInstrumentation.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/LinkAtBuildTimeInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/LinkAtBuildTimeInstrumentation.java rename to dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/LinkAtBuildTimeInstrumentation.java diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java rename to dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java rename to dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_com_datadog_profiling_agent_ProcessContext.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_com_datadog_profiling_agent_ProcessContext.java similarity index 100% rename from dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_com_datadog_profiling_agent_ProcessContext.java rename to dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_com_datadog_profiling_agent_ProcessContext.java diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_datadog_jctools_util_UnsafeRefArrayAccess.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_datadog_jctools_util_UnsafeRefArrayAccess.java similarity index 100% rename from dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_datadog_jctools_util_UnsafeRefArrayAccess.java rename to dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_datadog_jctools_util_UnsafeRefArrayAccess.java diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_App.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_App.java similarity index 100% rename from dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_App.java rename to dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_App.java diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_Status.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_Status.java similarity index 100% rename from dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_Status.java rename to dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_Status.java diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_reporter_JsonReporter.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_reporter_JsonReporter.java similarity index 100% rename from dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_reporter_JsonReporter.java rename to dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_org_datadog_jmxfetch_reporter_JsonReporter.java diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/VMRuntimeInstrumentation.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/VMRuntimeInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/VMRuntimeInstrumentation.java rename to dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/VMRuntimeInstrumentation.java diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java11/datadog/trace/instrumentation/graal/nativeimage/DeleteFieldAdvice.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java11/datadog/trace/instrumentation/graal/nativeimage/DeleteFieldAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/graal/native-image/src/main/java11/datadog/trace/instrumentation/graal/nativeimage/DeleteFieldAdvice.java rename to dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java11/datadog/trace/instrumentation/graal/nativeimage/DeleteFieldAdvice.java diff --git a/settings.gradle.kts b/settings.gradle.kts index 2b4f79200c4..dce5e19e2b2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -341,7 +341,7 @@ include( ":dd-java-agent:instrumentation:glassfish-3.0", ":dd-java-agent:instrumentation:google-http-client-1.19", ":dd-java-agent:instrumentation:google-pubsub-1.116", - ":dd-java-agent:instrumentation:graal:native-image", + ":dd-java-agent:instrumentation:graal:graal-native-image-20.0", ":dd-java-agent:instrumentation:gradle-testing-5.1", ":dd-java-agent:instrumentation:gradle:gradle-3.0", ":dd-java-agent:instrumentation:gradle:gradle-8.3", From efb10497fcefbe93c169fcdd3632a0bf4386affb Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Wed, 31 Dec 2025 16:02:04 +0100 Subject: [PATCH 4/4] update codeowners --- .github/CODEOWNERS | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index abb76f9c1b9..68cd20360cd 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -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 @@ -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 @@ -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