Regroup jdk related instrumentations

Author: amarziali

.github/CODEOWNERS

@@ -117,7 +117,7 @@
 /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/java-directbytebuffer/                                       @DataDog/profiling-java
+/dd-java-agent/instrumentation/jdk/jdk-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
 /dd-trace-api/src/main/java/datadog/trace/api/profiling                                     @DataDog/profiling-java

dd-java-agent/agent-iast/build.gradle

@@ -68,7 +68,7 @@ dependencies {
   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:java-lang')
+  jmh project(':dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-1.8')
 
   compileOnly('org.jetbrains:annotations:24.0.0')
   errorprone('com.uber.nullaway:nullaway:0.10.15')

dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle

@@ -41,8 +41,8 @@ dependencies {
   iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0'))
   iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:apache-httpcore:apache-httpcore-4.0'))
   iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-common'))
-  iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java-lang'))
-  iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java-net'))
+  iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-1.8'))
+  iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jdk:jdk-java-net:jdk-java-net-1.8'))
   iastIntegrationTestRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
 
   v41IastIntegrationTestImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.1'

dd-java-agent/instrumentation/build.gradle

@@ -83,8 +83,8 @@ subprojects { Project subProj ->
       compileOnly libs.autoservice.annotation
 
       // Include instrumentations instrumenting core JDK classes to ensure interoperability with other instrumentation
-      testImplementation project(':dd-java-agent:instrumentation:java-concurrent')
-      testImplementation project(':dd-java-agent:instrumentation:java-concurrent:java-completablefuture')
+      testImplementation project(':dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-1.8')
+      testImplementation project(':dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-1.8')
       // FIXME: we should enable this, but currently this fails tests for google http client
       //testImplementation project(':dd-java-agent:instrumentation:http-url-connection')
       testImplementation project(':dd-java-agent:instrumentation:classloading')