Reduce top level instrumentation directories (#4965)

* akka

* dropwizard

* kafka

* reactor

* vertx

instrumentation/akka/akka-http-10.0/javaagent/build.gradle.kts

@@ -48,6 +48,6 @@ dependencies {
 
   // these instrumentations are not needed for the tests to pass
   // they are here to test for context leaks
-  testInstrumentation(project(":instrumentation:akka-actor-2.5:javaagent"))
-  testInstrumentation(project(":instrumentation:akka-actor-fork-join-2.5:javaagent"))
+  testInstrumentation(project(":instrumentation:akka:akka-actor-2.5:javaagent"))
+  testInstrumentation(project(":instrumentation:akka:akka-actor-fork-join-2.5:javaagent"))
 }

instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/build.gradle.kts

@@ -15,13 +15,13 @@ dependencies {
   compileOnly("com.google.auto.value:auto-value-annotations")
   annotationProcessor("com.google.auto.value:auto-value")
 
-  bootstrap(project(":instrumentation:kafka-clients:kafka-clients-0.11:bootstrap"))
-  implementation(project(":instrumentation:kafka-clients:kafka-clients-common:library"))
+  bootstrap(project(":instrumentation:kafka:kafka-clients:kafka-clients-0.11:bootstrap"))
+  implementation(project(":instrumentation:kafka:kafka-clients:kafka-clients-common:library"))
 
   library("org.apache.kafka:kafka-clients:0.11.0.0")
 
   testImplementation("org.testcontainers:kafka")
-  testImplementation(project(":instrumentation:kafka-clients:kafka-clients-0.11:testing"))
+  testImplementation(project(":instrumentation:kafka:kafka-clients:kafka-clients-0.11:testing"))
 }
 
 tasks {

instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientDefaultTest.groovy

@@ -191,7 +191,7 @@ class KafkaClientDefaultTest extends KafkaClientPropagationBaseTest {
     when: "receive messages"
     awaitUntilConsumerIsReady()
     def consumerRecords = consumer.poll(Duration.ofSeconds(5).toMillis())
-    def recordsInPartition = consumerRecords.records(topicPartition)
+    def recordsInPartition = consumerRecords.records(KafkaClientBaseTest.topicPartition)
     recordsInPartition.size() == 1
 
     // iterate over records to generate spans

instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/build.gradle.kts

@@ -7,7 +7,7 @@ dependencies {
 
   implementation("org.apache.kafka:kafka-clients:0.11.0.0")
 
-  implementation(project(":instrumentation:kafka-clients:kafka-clients-common:library"))
+  implementation(project(":instrumentation:kafka:kafka-clients:kafka-clients-common:library"))
 
   implementation("org.testcontainers:kafka")
 }

instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/build.gradle.kts

@@ -3,10 +3,10 @@ plugins {
 }
 
 dependencies {
-  implementation(project(":instrumentation:kafka-clients:kafka-clients-common:library"))
+  implementation(project(":instrumentation:kafka:kafka-clients:kafka-clients-common:library"))
   library("org.apache.kafka:kafka-clients:2.6.0")
 
-  testImplementation(project(":instrumentation:kafka-clients:kafka-clients-0.11:testing"))
+  testImplementation(project(":instrumentation:kafka:kafka-clients:kafka-clients-0.11:testing"))
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.10.2")
 
   testImplementation("org.testcontainers:kafka")

instrumentation/kafka/kafka-streams-0.11/javaagent/build.gradle.kts

@@ -12,13 +12,13 @@ muzzle {
 }
 
 dependencies {
-  bootstrap(project(":instrumentation:kafka-clients:kafka-clients-0.11:bootstrap"))
-  implementation(project(":instrumentation:kafka-clients:kafka-clients-common:library"))
+  bootstrap(project(":instrumentation:kafka:kafka-clients:kafka-clients-0.11:bootstrap"))
+  implementation(project(":instrumentation:kafka:kafka-clients:kafka-clients-common:library"))
 
   library("org.apache.kafka:kafka-streams:0.11.0.0")
 
   // Include kafka-clients instrumentation for tests.
-  testInstrumentation(project(":instrumentation:kafka-clients:kafka-clients-0.11:javaagent"))
+  testInstrumentation(project(":instrumentation:kafka:kafka-clients:kafka-clients-0.11:javaagent"))
 
   testImplementation("org.testcontainers:kafka")
 }