Reorganise internal instrumentation to comply with the renaming policy (#10280)

* move internal instrumentation under datadog and classify per product

* exclude the datadog top instrumentation folder from checking

* move graalvm

* update codeowners

Author: amarziali

.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

buildSrc/src/main/kotlin/datadog/gradle/plugin/naming/InstrumentationNamingPlugin.kt

@@ -98,6 +98,10 @@ class InstrumentationNamingPlugin : Plugin<Project> {
         if (moduleName in setOf("build", "src", ".gradle")) {
           return@childLoop
         }
+        // skip the special datadog top level instrumentation directory
+        if (parentName == null && moduleName == "datadog") {
+          return@childLoop
+        }
 
         val childHasBuildFile = hasBuildFile(childDir)
         val nestedModules = childDir.listFiles { file -> file.isDirectory }?.filter { hasBuildFile(it) } ?: emptyList()

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')

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

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
 

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

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')

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'

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]'
 }

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.+'
 }