Batch refactor multiple gradle modules name

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

@@ -38,7 +38,7 @@ artifacts {
 }
 
 dependencies {
-  implementation project(':dd-java-agent:instrumentation:rxjava-1')
+  implementation project(':dd-java-agent:instrumentation:rxjava:rxjava-1.0')
 
   compileOnly group: 'com.couchbase.client', name: 'java-client', version: '2.0.0'
 

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

@@ -34,7 +34,7 @@ muzzle {
 }
 
 dependencies {
-  implementation project(':dd-java-agent:instrumentation:rxjava-1')
+  implementation project(':dd-java-agent:instrumentation:rxjava:rxjava-1.0')
 
   compileOnly group: 'com.couchbase.client', name: 'java-client', version: '2.6.0'
 

dd-java-agent/instrumentation/hystrix-1.4/build.gradle

@@ -11,7 +11,7 @@ apply from: "$rootDir/gradle/java.gradle"
 addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {
-  implementation project(':dd-java-agent:instrumentation:rxjava-1')
+  implementation project(':dd-java-agent:instrumentation:rxjava:rxjava-1.0')
 
   compileOnly group: 'com.netflix.hystrix', name: 'hystrix-core', version: '1.4.0'
   compileOnly group: 'io.reactivex', name: 'rxjava', version: '1.0.7'

dd-java-agent/instrumentation/jedis-3.0/build.gradle → dd-java-agent/instrumentation/jedis/jedis-3.0/build.gradle

@@ -24,7 +24,7 @@ dependencies {
   testImplementation group: 'redis.clients', name: 'jedis', version: '3.3.0'
   // ensures jedis-1.4 instrumentation does not load with jedis 3.0+ by failing
   // the tests in the event it does. The tests will end up with double spans
-  testImplementation project(':dd-java-agent:instrumentation:jedis-1.4')
+  testImplementation project(':dd-java-agent:instrumentation:jedis:jedis-1.4')
 
   latestDepTestImplementation group: 'redis.clients', name: 'jedis', version: '3.+'
 }

dd-java-agent/instrumentation/jedis-4.0/build.gradle → dd-java-agent/instrumentation/jedis/jedis-4.0/build.gradle

@@ -24,8 +24,8 @@ dependencies {
   testImplementation group: 'redis.clients', name: 'jedis', version: '4.0.0'
   // ensures jedis-1.4 and jedis-3.0 instrumentation does not load with jedis 4.0+ by failing
   // the tests in the event it does. The tests will end up with double spans
-  testImplementation project(':dd-java-agent:instrumentation:jedis-1.4')
-  testImplementation project(':dd-java-agent:instrumentation:jedis-3.0')
+  testImplementation project(':dd-java-agent:instrumentation:jedis:jedis-1.4')
+  testImplementation project(':dd-java-agent:instrumentation:jedis:jedis-3.0')
 
   latestDepTestImplementation group: 'redis.clients', name: 'jedis', version: '4.+'
 }

dd-java-agent/instrumentation/log4j2/build.gradle → dd-java-agent/instrumentation/log4j/log4j-2.0/build.gradle

@@ -19,6 +19,13 @@ muzzle {
     assertInverse = true
   }
 
+  pass {
+    name = 'logs-intake'
+    group = 'org.apache.logging.log4j'
+    module = 'log4j-core'
+    versions = '[,3.0.0)'
+  }
+
   pass {
     group = 'org.apache.logging.log4j'
     module = 'log4j-api'

dd-java-agent/instrumentation/log4j2/logs-intake/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java → dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java

@@ -36,6 +36,11 @@ public String[] helperClassNames() {
     return new String[] {packageName + ".DatadogAppender"};
   }
 
+  @Override
+  public String muzzleDirective() {
+    return "logs-intake";
+  }
+
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(

dd-java-agent/instrumentation/pekko-http-1.0/build.gradle → dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle

@@ -52,7 +52,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:pekko-concurrent')
+  testImplementation project(':dd-java-agent:instrumentation:pekko:pekko-concurrent-1.0')
   testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
   testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
   testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')

settings.gradle.kts

@@ -396,9 +396,9 @@ include(
   ":dd-java-agent:instrumentation:jboss-modules",
   ":dd-java-agent:instrumentation:jdbc",
   ":dd-java-agent:instrumentation:jdbc:scalikejdbc",
-  ":dd-java-agent:instrumentation:jedis-1.4",
-  ":dd-java-agent:instrumentation:jedis-3.0",
-  ":dd-java-agent:instrumentation:jedis-4.0",
+  ":dd-java-agent:instrumentation:jedis:jedis-1.4",
+  ":dd-java-agent:instrumentation:jedis:jedis-3.0",
+  ":dd-java-agent:instrumentation:jedis:jedis-4.0",
   ":dd-java-agent:instrumentation:jersey",
   ":dd-java-agent:instrumentation:jersey-2-appsec",
   ":dd-java-agent:instrumentation:jersey-3-appsec",
@@ -437,15 +437,14 @@ include(
   ":dd-java-agent:instrumentation:kafka:kafka-streams-1.0",
   ":dd-java-agent:instrumentation:karate",
   ":dd-java-agent:instrumentation:kotlin-coroutines",
-  ":dd-java-agent:instrumentation:lettuce-4",
-  ":dd-java-agent:instrumentation:lettuce-5",
+  ":dd-java-agent:instrumentation:lettuce:lettuce-4.0",
+  ":dd-java-agent:instrumentation:lettuce:lettuce-5.0",
   ":dd-java-agent:instrumentation:liberty-20",
   ":dd-java-agent:instrumentation:liberty-23",
-  ":dd-java-agent:instrumentation:log4j-2.7",
-  ":dd-java-agent:instrumentation:log4j1",
-  ":dd-java-agent:instrumentation:log4j2",
-  ":dd-java-agent:instrumentation:log4j2:logs-intake",
-  ":dd-java-agent:instrumentation:logback-1",
+  ":dd-java-agent:instrumentation:log4j:log4j-2.7",
+  ":dd-java-agent:instrumentation:log4j:log4j-1.2.4",
+  ":dd-java-agent:instrumentation:log4j:log4j-2.0",
+  ":dd-java-agent:instrumentation:logback-1.0",
   ":dd-java-agent:instrumentation:maven-3.2.1",
   ":dd-java-agent:instrumentation:maven-surefire",
   ":dd-java-agent:instrumentation:micronaut",
@@ -470,8 +469,8 @@ include(
   ":dd-java-agent:instrumentation:netty:netty-buffer-4.0",
   ":dd-java-agent:instrumentation:netty:netty-concurrent-4.0",
   ":dd-java-agent:instrumentation:netty:netty-promise-4.0",
-  ":dd-java-agent:instrumentation:okhttp-2",
-  ":dd-java-agent:instrumentation:okhttp-3",
+  ":dd-java-agent:instrumentation:okhttp:okhttp-2.2",
+  ":dd-java-agent:instrumentation:okhttp:okhttp-3.0",
   ":dd-java-agent:instrumentation:ognl-appsec",
   ":dd-java-agent:instrumentation:opensearch",
   ":dd-java-agent:instrumentation:opensearch:rest",
@@ -485,8 +484,8 @@ include(
   ":dd-java-agent:instrumentation:opentracing:api-0.32",
   ":dd-java-agent:instrumentation:osgi-4.3",
   ":dd-java-agent:instrumentation:owasp-esapi-2",
-  ":dd-java-agent:instrumentation:pekko-concurrent",
-  ":dd-java-agent:instrumentation:pekko-http-1.0",
+  ":dd-java-agent:instrumentation:pekko:pekko-concurrent-1.0",
+  ":dd-java-agent:instrumentation:pekko:pekko-http-1.0",
   ":dd-java-agent:instrumentation:play:play-2.3",
   ":dd-java-agent:instrumentation:play:play-2.4",
   ":dd-java-agent:instrumentation:play:play-2.6",
@@ -506,8 +505,8 @@ include(
   ":dd-java-agent:instrumentation:resteasy-appsec",
   ":dd-java-agent:instrumentation:restlet-2.2",
   ":dd-java-agent:instrumentation:rmi",
-  ":dd-java-agent:instrumentation:rxjava-1",
-  ":dd-java-agent:instrumentation:rxjava-2",
+  ":dd-java-agent:instrumentation:rxjava:rxjava-1.0",
+  ":dd-java-agent:instrumentation:rxjava:rxjava-2.0",
   ":dd-java-agent:instrumentation:scala",
   ":dd-java-agent:instrumentation:scala-concurrent",
   ":dd-java-agent:instrumentation:scala-promise",