Refactor multiple modules (#10230)

* remove gradle buildfile from tibco parent

* Refactor undertow

* refactor elasticsearch modules

* rename rmi module

* rename reactor-netty

* move reactive streams

* refactor javax and jakarta mail

* refactor jms modules

* rename weaver

* rename thymeleaf

* move sslsocket to java-net

* Update codeowners

* Exclude undertow-common from linter

Author: amarziali

.github/CODEOWNERS

@@ -51,9 +51,9 @@
 /dd-java-agent/appsec/appsec-test-fixtures/                     @DataDog/asm-java
 /dd-java-agent/instrumentation/*iast*                           @DataDog/asm-java
 /dd-java-agent/instrumentation/*appsec*                         @DataDog/asm-java
-/dd-java-agent/instrumentation/json/                            @DataDog/asm-java
-/dd-java-agent/instrumentation/snakeyaml/                       @DataDog/asm-java
-/dd-java-agent/instrumentation/velocity/                        @DataDog/asm-java
+/dd-java-agent/instrumentation/org-json-20230227/               @DataDog/asm-java
+/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-smoke-tests/iast-util/                                      @DataDog/asm-java
 /dd-smoke-tests/spring-security/                                @DataDog/asm-java
@@ -77,18 +77,17 @@
 
 # @DataDog/ci-app-libraries-java
 /dd-java-agent/agent-ci-visibility/                 @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/cucumber/            @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/jacoco/              @DataDog/ci-app-libraries-java
+/dd-java-agent/instrumentation/cucumber-5.4/        @DataDog/ci-app-libraries-java
+/dd-java-agent/instrumentation/jacoco-0.8.9/        @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/junit                @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/karate/              @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/scalatest/           @DataDog/ci-app-libraries-java
+/dd-java-agent/instrumentation/scalatest-3.0.8/     @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/selenium/            @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/testng/              @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/gradle/              @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/gradle-testing/      @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/maven                @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/maven-surefire/      @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/weaver/              @DataDog/ci-app-libraries-java
+/dd-java-agent/instrumentation/weaver-0.9/          @DataDog/ci-app-libraries-java
 /dd-smoke-tests/gradle/                             @DataDog/ci-app-libraries-java
 /dd-smoke-tests/junit-console/                      @DataDog/ci-app-libraries-java
 /dd-smoke-tests/maven/                              @DataDog/ci-app-libraries-java

buildSrc/src/main/kotlin/datadog/gradle/plugin/config/ConfigInversionLinter.kt

@@ -83,7 +83,7 @@ private fun registerLogEnvVarUsages(target: Project, extension: SupportedTracerC
       include("**/src/main/java/**/*.java")
       exclude("**/build/**", "**/dd-smoke-tests/**")
       // Undertow uses DD_UNDERTOW_CONTINUATION as a legacy key to store an AgentScope. It is not related to an environment variable
-      exclude("dd-java-agent/instrumentation/undertow/src/main/java/datadog/trace/instrumentation/undertow/UndertowDecorator.java")
+      exclude("dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowDecorator.java")
     }
     inputs.files(javaFiles)
     outputs.upToDateWhen { true }

dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/build.gradle

@@ -20,7 +20,7 @@ dependencies {
   // Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
   testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
   testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-sdk-1.11')
-  testImplementation project(':dd-java-agent:instrumentation:jms')
+  testImplementation project(':dd-java-agent:instrumentation:jms:javax-jms-1.1')
 
   // SQS<->JMS testing:
   testImplementation "jakarta.xml.bind:jakarta.xml.bind-api:2.3.2"

dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/build.gradle

@@ -22,7 +22,7 @@ dependencies {
   // Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
   testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
   testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-sdk-2.2')
-  testImplementation project(':dd-java-agent:instrumentation:jms')
+  testImplementation project(':dd-java-agent:instrumentation:jms:javax-jms-1.1')
 
   // SQS<->JMS testing:
   testImplementation group: 'org.elasticmq', name: 'elasticmq-rest-sqs_2.13', version: '1.4.7'

dd-java-agent/instrumentation/couchbase/couchbase-3.1/build.gradle

@@ -20,7 +20,7 @@ dependencies {
   testImplementation group: 'com.couchbase.client', name: 'java-client', version: '3.1.0'
   testImplementation group: 'org.testcontainers', name: 'couchbase', version: libs.versions.testcontainers.get()
   testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1')
-  testImplementation project(':dd-java-agent:instrumentation:reactive-streams')
+  testImplementation project(':dd-java-agent:instrumentation:reactive-streams-1.0')
 
   latestDepTestImplementation group: 'com.couchbase.client', name: 'java-client', version: '3.1.+'
 }

dd-java-agent/instrumentation/couchbase/couchbase-3.2/build.gradle

@@ -19,7 +19,7 @@ dependencies {
 
   testImplementation group: 'com.couchbase.client', name: 'java-client', version: '3.2.0'
   testImplementation group: 'org.testcontainers', name: 'couchbase', version: libs.versions.testcontainers.get()
-  testImplementation project(':dd-java-agent:instrumentation:reactive-streams')
+  testImplementation project(':dd-java-agent:instrumentation:reactive-streams-1.0')
   testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1')
 
   latestDepTestImplementation group: 'com.couchbase.client', name: 'java-client', version: '+'