group netty modules

Author: amarziali

dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle

@@ -56,9 +56,9 @@ dependencies {
   testImplementation group: 'io.grpc', name: 'grpc-stub', version: grpcVersion
   testImplementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
   testImplementation project(':dd-java-agent:instrumentation:grpc-1.5')
-  testImplementation project(':dd-java-agent:instrumentation:netty-3.8')
-  testImplementation project(':dd-java-agent:instrumentation:netty-4.0')
-  testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
+  testImplementation project(':dd-java-agent:instrumentation:netty:netty-3.8')
+  testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.0')
+  testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
 
   latestDepTestImplementation sourceSets.test.output // include the protobuf generated classes
   latestDepTestImplementation group: 'com.linecorp.armeria', name: 'armeria-grpc', version: '1.+'

dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/build.gradle

@@ -33,7 +33,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')
   // Also include netty instrumentation because it is used by aws async client
-  testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
+  testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
   testImplementation group: 'software.amazon.awssdk', name: 'apache-client', version: '2.2.0'
   testImplementation group: 'software.amazon.awssdk', name: 's3', version: '2.2.0'
   testImplementation group: 'software.amazon.awssdk', name: 'rds', version: '2.2.0'
@@ -70,7 +70,7 @@ dependencies {
   latestPayloadTaggingTestImplementation group: 'software.amazon.awssdk', name: 'kinesis', version: '2.18.40'
 
   latestDepTestImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
-  latestDepTestImplementation project(':dd-java-agent:instrumentation:netty-4.1')
+  latestDepTestImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
 
   latestDepTestImplementation group: 'software.amazon.awssdk', name: 'apache-client', version: fixedSdkVersion
   latestDepTestImplementation group: 'software.amazon.awssdk', name: 'apigateway', version: fixedSdkVersion

dd-java-agent/instrumentation/elasticsearch/rest-6.4/build.gradle

@@ -27,7 +27,7 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
   testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0')
   // Netty is used, but it adds complexity to the tests since we're using embedded ES.
-  //testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
+  //testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
 
   testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
   testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'

dd-java-agent/instrumentation/elasticsearch/rest-7/build.gradle

@@ -27,7 +27,7 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
   testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0')
   // Netty is used, but it adds complexity to the tests since we're using embedded ES.
-  //testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
+  //testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
 
   testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
   testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'

dd-java-agent/instrumentation/elasticsearch/transport-5.3/build.gradle

@@ -26,7 +26,7 @@ dependencies {
   implementation project(':dd-java-agent:instrumentation:elasticsearch')
 
   testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0')
-  testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
+  testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
   testImplementation project(':dd-java-agent:instrumentation:spring:spring-data-1.8')
   testImplementation project(':dd-java-agent:instrumentation:elasticsearch:transport')
 

dd-java-agent/instrumentation/elasticsearch/transport-5/build.gradle

@@ -32,7 +32,7 @@ dependencies {
   // Ensure no cross interference
   testImplementation project(':dd-java-agent:instrumentation:elasticsearch:rest-5')
   testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0')
-  testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
+  testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
   testImplementation project(':dd-java-agent:instrumentation:elasticsearch:transport')
 
   testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'

dd-java-agent/instrumentation/elasticsearch/transport-6/build.gradle

@@ -28,7 +28,7 @@ dependencies {
   // Ensure no cross interference
   testImplementation project(':dd-java-agent:instrumentation:elasticsearch:rest-5')
   testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0')
-  testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
+  testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
   testImplementation project(':dd-java-agent:instrumentation:elasticsearch:transport')
 
   testImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.0.0'

dd-java-agent/instrumentation/elasticsearch/transport-7.3/build.gradle

@@ -29,7 +29,7 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:elasticsearch:rest-5')
   testImplementation project(':dd-java-agent:instrumentation:elasticsearch:rest-6.4')
   testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0')
-  testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
+  testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
   testImplementation project(':dd-java-agent:instrumentation:elasticsearch:transport')
 
   testImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '7.3.0'

dd-java-agent/instrumentation/finatra-2.9/build.gradle

@@ -24,7 +24,7 @@ muzzle {
 dependencies {
   compileOnly group: 'com.twitter', name: 'finatra-http_2.11', version: '2.9.0'
 
-  testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
+  testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
 
   testImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '19.12.0'
   testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')

dd-java-agent/instrumentation/micronaut/http-server-netty-2.0/build.gradle

@@ -19,7 +19,7 @@ dependencies {
   // Added to ensure cross compatibility:
   testImplementation project(':dd-java-agent:instrumentation:micronaut:http-server-netty-3.0')
 
-  testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
+  testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
   testImplementation group: 'io.micronaut', name: 'micronaut-http-server-netty', version: '2.0.0'
 
   testAnnotationProcessor "io.micronaut:micronaut-inject-java:2.0.0"