Reduce top level instrumentation directories (#4965)

* akka * dropwizard * kafka * reactor * vertx
open-telemetry · Dec 22, 2021 · 6884d66 · 6884d66
1 parent 9e3bd5c
commit 6884d66
Show file tree

Hide file tree

Showing 233 changed files with 60 additions and 60 deletions.
diff --git a/...akka-actor-2.5/javaagent/build.gradle.kts → ...akka-actor-2.5/javaagent/build.gradle.kts b/...akka-actor-2.5/javaagent/build.gradle.kts → ...akka-actor-2.5/javaagent/build.gradle.kts
diff --git a/...kaactor/AkkaActorCellInstrumentation.java → ...kaactor/AkkaActorCellInstrumentation.java b/...kaactor/AkkaActorCellInstrumentation.java → ...kaactor/AkkaActorCellInstrumentation.java
diff --git a/...actor/AkkaActorInstrumentationModule.java → ...actor/AkkaActorInstrumentationModule.java b/...actor/AkkaActorInstrumentationModule.java → ...actor/AkkaActorInstrumentationModule.java
diff --git a/...ultSystemMessageQueueInstrumentation.java → ...ultSystemMessageQueueInstrumentation.java b/...ultSystemMessageQueueInstrumentation.java → ...ultSystemMessageQueueInstrumentation.java
diff --git a/...aactor/AkkaDispatcherInstrumentation.java → ...aactor/AkkaDispatcherInstrumentation.java b/...aactor/AkkaDispatcherInstrumentation.java → ...aactor/AkkaDispatcherInstrumentation.java
diff --git a/...akkaactor/AkkaIgnoredTypesConfigurer.java → ...akkaactor/AkkaIgnoredTypesConfigurer.java b/...akkaactor/AkkaIgnoredTypesConfigurer.java → ...akkaactor/AkkaIgnoredTypesConfigurer.java
diff --git a/...gent/src/test/groovy/AkkaActorTest.groovy → ...gent/src/test/groovy/AkkaActorTest.groovy b/...gent/src/test/groovy/AkkaActorTest.groovy → ...gent/src/test/groovy/AkkaActorTest.groovy
diff --git a/...javaagent/src/test/scala/AkkaActors.scala → ...javaagent/src/test/scala/AkkaActors.scala b/...javaagent/src/test/scala/AkkaActors.scala → ...javaagent/src/test/scala/AkkaActors.scala
diff --git a/...-fork-join-2.5/javaagent/build.gradle.kts → ...-fork-join-2.5/javaagent/build.gradle.kts b/...-fork-join-2.5/javaagent/build.gradle.kts → ...-fork-join-2.5/javaagent/build.gradle.kts
diff --git a/...kaActorForkJoinInstrumentationModule.java → ...kaActorForkJoinInstrumentationModule.java b/...kaActorForkJoinInstrumentationModule.java → ...kaActorForkJoinInstrumentationModule.java
diff --git a/...ctor/AkkaForkJoinPoolInstrumentation.java → ...ctor/AkkaForkJoinPoolInstrumentation.java b/...ctor/AkkaForkJoinPoolInstrumentation.java → ...ctor/AkkaForkJoinPoolInstrumentation.java
diff --git a/...ctor/AkkaForkJoinTaskInstrumentation.java → ...ctor/AkkaForkJoinTaskInstrumentation.java b/...ctor/AkkaForkJoinTaskInstrumentation.java → ...ctor/AkkaForkJoinTaskInstrumentation.java
diff --git a/...vy/AkkaExecutorInstrumentationTest.groovy → ...vy/AkkaExecutorInstrumentationTest.groovy b/...vy/AkkaExecutorInstrumentationTest.groovy → ...vy/AkkaExecutorInstrumentationTest.groovy
diff --git a/...vaagent/src/test/java/AkkaAsyncChild.java → ...vaagent/src/test/java/AkkaAsyncChild.java b/...vaagent/src/test/java/AkkaAsyncChild.java → ...vaagent/src/test/java/AkkaAsyncChild.java
diff --git a/...akka-http-10.0/javaagent/build.gradle.kts → ...akka-http-10.0/javaagent/build.gradle.kts b/...akka-http-10.0/javaagent/build.gradle.kts → ...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"))
 }
diff --git a/...nstrumentation/akkahttp/AkkaHttpUtil.java → ...nstrumentation/akkahttp/AkkaHttpUtil.java b/...nstrumentation/akkahttp/AkkaHttpUtil.java → ...nstrumentation/akkahttp/AkkaHttpUtil.java
diff --git a/...nt/AkkaHttpClientAttributesExtractor.java → ...nt/AkkaHttpClientAttributesExtractor.java b/...nt/AkkaHttpClientAttributesExtractor.java → ...nt/AkkaHttpClientAttributesExtractor.java
diff --git a/.../AkkaHttpClientInstrumentationModule.java → .../AkkaHttpClientInstrumentationModule.java b/.../AkkaHttpClientInstrumentationModule.java → .../AkkaHttpClientInstrumentationModule.java
diff --git a/...http/client/AkkaHttpClientSingletons.java → ...http/client/AkkaHttpClientSingletons.java b/...http/client/AkkaHttpClientSingletons.java → ...http/client/AkkaHttpClientSingletons.java
diff --git a/...lient/AkkaHttpNetAttributesExtractor.java → ...lient/AkkaHttpNetAttributesExtractor.java b/...lient/AkkaHttpNetAttributesExtractor.java → ...lient/AkkaHttpNetAttributesExtractor.java
diff --git a/...tation/akkahttp/client/FutureWrapper.java → ...tation/akkahttp/client/FutureWrapper.java b/...tation/akkahttp/client/FutureWrapper.java → ...tation/akkahttp/client/FutureWrapper.java
diff --git a/.../client/HttpExtClientInstrumentation.java → .../client/HttpExtClientInstrumentation.java b/.../client/HttpExtClientInstrumentation.java → .../client/HttpExtClientInstrumentation.java
diff --git a/...ion/akkahttp/client/HttpHeaderSetter.java → ...ion/akkahttp/client/HttpHeaderSetter.java b/...ion/akkahttp/client/HttpHeaderSetter.java → ...ion/akkahttp/client/HttpHeaderSetter.java
diff --git a/...on/akkahttp/client/OnCompleteHandler.java → ...on/akkahttp/client/OnCompleteHandler.java b/...on/akkahttp/client/OnCompleteHandler.java → ...on/akkahttp/client/OnCompleteHandler.java
diff --git a/...lient/PoolMasterActorInstrumentation.java → ...lient/PoolMasterActorInstrumentation.java b/...lient/PoolMasterActorInstrumentation.java → ...lient/PoolMasterActorInstrumentation.java
diff --git a/...er/AkkaHttpServerAttributesExtractor.java → ...er/AkkaHttpServerAttributesExtractor.java b/...er/AkkaHttpServerAttributesExtractor.java → ...er/AkkaHttpServerAttributesExtractor.java
diff --git a/...kkahttp/server/AkkaHttpServerHeaders.java → ...kkahttp/server/AkkaHttpServerHeaders.java b/...kkahttp/server/AkkaHttpServerHeaders.java → ...kkahttp/server/AkkaHttpServerHeaders.java
diff --git a/.../AkkaHttpServerInstrumentationModule.java → .../AkkaHttpServerInstrumentationModule.java b/.../AkkaHttpServerInstrumentationModule.java → .../AkkaHttpServerInstrumentationModule.java
diff --git a/...http/server/AkkaHttpServerSingletons.java → ...http/server/AkkaHttpServerSingletons.java b/...http/server/AkkaHttpServerSingletons.java → ...http/server/AkkaHttpServerSingletons.java
diff --git a/.../server/HttpExtServerInstrumentation.java → .../server/HttpExtServerInstrumentation.java b/.../server/HttpExtServerInstrumentation.java → .../server/HttpExtServerInstrumentation.java
diff --git a/.../AkkaHttpClientInstrumentationTest.groovy → .../AkkaHttpClientInstrumentationTest.groovy b/.../AkkaHttpClientInstrumentationTest.groovy → .../AkkaHttpClientInstrumentationTest.groovy
diff --git a/.../AkkaHttpServerInstrumentationTest.groovy → .../AkkaHttpServerInstrumentationTest.groovy b/.../AkkaHttpServerInstrumentationTest.groovy → .../AkkaHttpServerInstrumentationTest.groovy
diff --git a/...agent/src/test/resources/application.conf → ...agent/src/test/resources/application.conf b/...agent/src/test/resources/application.conf → ...agent/src/test/resources/application.conf
diff --git a/...st/scala/AkkaHttpTestAsyncWebServer.scala → ...st/scala/AkkaHttpTestAsyncWebServer.scala b/...st/scala/AkkaHttpTestAsyncWebServer.scala → ...st/scala/AkkaHttpTestAsyncWebServer.scala
diff --git a/...est/scala/AkkaHttpTestSyncWebServer.scala → ...est/scala/AkkaHttpTestSyncWebServer.scala b/...est/scala/AkkaHttpTestSyncWebServer.scala → ...est/scala/AkkaHttpTestSyncWebServer.scala
diff --git a/...rc/test/scala/AkkaHttpTestWebServer.scala → ...rc/test/scala/AkkaHttpTestWebServer.scala b/...rc/test/scala/AkkaHttpTestWebServer.scala → ...rc/test/scala/AkkaHttpTestWebServer.scala
diff --git a/...ation/dropwizard-testing/build.gradle.kts → ...izard/dropwizard-testing/build.gradle.kts b/...ation/dropwizard-testing/build.gradle.kts → ...izard/dropwizard-testing/build.gradle.kts
diff --git a/...rc/test/groovy/DropwizardAsyncTest.groovy → ...rc/test/groovy/DropwizardAsyncTest.groovy b/...rc/test/groovy/DropwizardAsyncTest.groovy → ...rc/test/groovy/DropwizardAsyncTest.groovy
diff --git a/...ing/src/test/groovy/DropwizardTest.groovy → ...ing/src/test/groovy/DropwizardTest.groovy b/...ing/src/test/groovy/DropwizardTest.groovy → ...ing/src/test/groovy/DropwizardTest.groovy
diff --git a/...zard-views-0.7/javaagent/build.gradle.kts → ...zard-views-0.7/javaagent/build.gradle.kts b/...zard-views-0.7/javaagent/build.gradle.kts → ...zard-views-0.7/javaagent/build.gradle.kts
diff --git a/...iews/DropwizardInstrumentationModule.java → ...iews/DropwizardInstrumentationModule.java b/...iews/DropwizardInstrumentationModule.java → ...iews/DropwizardInstrumentationModule.java
diff --git a/...ws/DropwizardRendererInstrumentation.java → ...ws/DropwizardRendererInstrumentation.java b/...ws/DropwizardRendererInstrumentation.java → ...ws/DropwizardRendererInstrumentation.java
diff --git a/...dropwizardviews/DropwizardSingletons.java → ...dropwizardviews/DropwizardSingletons.java b/...dropwizardviews/DropwizardSingletons.java → ...dropwizardviews/DropwizardSingletons.java
diff --git a/...ent/src/test/groovy/ViewRenderTest.groovy → ...ent/src/test/groovy/ViewRenderTest.groovy b/...ent/src/test/groovy/ViewRenderTest.groovy → ...ent/src/test/groovy/ViewRenderTest.groovy
diff --git a/...src/test/resources/views/ftl/iso88591.ftl → ...src/test/resources/views/ftl/iso88591.ftl b/...src/test/resources/views/ftl/iso88591.ftl → ...src/test/resources/views/ftl/iso88591.ftl
diff --git a/...ent/src/test/resources/views/ftl/utf8.ftl → ...ent/src/test/resources/views/ftl/utf8.ftl b/...ent/src/test/resources/views/ftl/utf8.ftl → ...ent/src/test/resources/views/ftl/utf8.ftl
diff --git a/...esources/views/mustache/iso88591.mustache → ...esources/views/mustache/iso88591.mustache b/...esources/views/mustache/iso88591.mustache → ...esources/views/mustache/iso88591.mustache
diff --git a/...st/resources/views/mustache/utf8.mustache → ...st/resources/views/mustache/utf8.mustache b/...st/resources/views/mustache/utf8.mustache → ...st/resources/views/mustache/utf8.mustache
diff --git a/...a-clients-0.11/bootstrap/build.gradle.kts → ...a-clients-0.11/bootstrap/build.gradle.kts b/...a-clients-0.11/bootstrap/build.gradle.kts → ...a-clients-0.11/bootstrap/build.gradle.kts
diff --git a/...a/KafkaClientsConsumerProcessTracing.java → ...a/KafkaClientsConsumerProcessTracing.java b/...a/KafkaClientsConsumerProcessTracing.java → ...a/KafkaClientsConsumerProcessTracing.java
diff --git a/...a/KafkaClientsConsumerProcessWrapper.java → ...a/KafkaClientsConsumerProcessWrapper.java b/...a/KafkaClientsConsumerProcessWrapper.java → ...a/KafkaClientsConsumerProcessWrapper.java
diff --git a/...a-clients-0.11/javaagent/build.gradle.kts → ...a-clients-0.11/javaagent/build.gradle.kts b/...a-clients-0.11/javaagent/build.gradle.kts → ...a-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 {

diff --git a/...ients/ConsumerRecordsInstrumentation.java → ...ients/ConsumerRecordsInstrumentation.java b/...ients/ConsumerRecordsInstrumentation.java → ...ients/ConsumerRecordsInstrumentation.java
diff --git a/...ts/KafkaClientsInstrumentationModule.java → ...ts/KafkaClientsInstrumentationModule.java b/...ts/KafkaClientsInstrumentationModule.java → ...ts/KafkaClientsInstrumentationModule.java
diff --git a/...clients/KafkaConsumerInstrumentation.java → ...clients/KafkaConsumerInstrumentation.java b/...clients/KafkaConsumerInstrumentation.java → ...clients/KafkaConsumerInstrumentation.java
diff --git a/...clients/KafkaProducerInstrumentation.java → ...clients/KafkaProducerInstrumentation.java b/...clients/KafkaProducerInstrumentation.java → ...clients/KafkaProducerInstrumentation.java
diff --git a/...ntation/kafkaclients/KafkaSingletons.java → ...ntation/kafkaclients/KafkaSingletons.java b/...ntation/kafkaclients/KafkaSingletons.java → ...ntation/kafkaclients/KafkaSingletons.java
diff --git a/...tation/kafkaclients/ProducerCallback.java → ...tation/kafkaclients/ProducerCallback.java b/...tation/kafkaclients/ProducerCallback.java → ...tation/kafkaclients/ProducerCallback.java
diff --git a/...ntation/kafkaclients/TracingIterable.java → ...ntation/kafkaclients/TracingIterable.java b/...ntation/kafkaclients/TracingIterable.java → ...ntation/kafkaclients/TracingIterable.java
diff --git a/...ntation/kafkaclients/TracingIterator.java → ...ntation/kafkaclients/TracingIterator.java b/...ntation/kafkaclients/TracingIterator.java → ...ntation/kafkaclients/TracingIterator.java
diff --git a/...rumentation/kafkaclients/TracingList.java → ...rumentation/kafkaclients/TracingList.java b/...rumentation/kafkaclients/TracingList.java → ...rumentation/kafkaclients/TracingList.java
diff --git a/...afkaclients/KafkaClientDefaultTest.groovy → ...afkaclients/KafkaClientDefaultTest.groovy b/...afkaclients/KafkaClientDefaultTest.groovy → ...afkaclients/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

diff --git a/...KafkaClientPropagationDisabledTest.groovy → ...KafkaClientPropagationDisabledTest.groovy b/...KafkaClientPropagationDisabledTest.groovy → ...KafkaClientPropagationDisabledTest.groovy
diff --git a/...afkaClientSuppressReceiveSpansTest.groovy → ...afkaClientSuppressReceiveSpansTest.groovy b/...afkaClientSuppressReceiveSpansTest.groovy → ...afkaClientSuppressReceiveSpansTest.groovy
diff --git a/...fka-clients-0.11/testing/build.gradle.kts → ...fka-clients-0.11/testing/build.gradle.kts b/...fka-clients-0.11/testing/build.gradle.kts → ...fka-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")
 }
diff --git a/...n/kafkaclients/KafkaClientBaseTest.groovy → ...n/kafkaclients/KafkaClientBaseTest.groovy b/...n/kafkaclients/KafkaClientBaseTest.groovy → ...n/kafkaclients/KafkaClientBaseTest.groovy
diff --git a/...nts/KafkaClientPropagationBaseTest.groovy → ...nts/KafkaClientPropagationBaseTest.groovy b/...nts/KafkaClientPropagationBaseTest.groovy → ...nts/KafkaClientPropagationBaseTest.groovy
diff --git a/...afka-clients-2.6/library/build.gradle.kts → ...afka-clients-2.6/library/build.gradle.kts b/...afka-clients-2.6/library/build.gradle.kts → ...afka-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")

diff --git a/...umentation/kafkaclients/KafkaTracing.java → ...umentation/kafkaclients/KafkaTracing.java b/...umentation/kafkaclients/KafkaTracing.java → ...umentation/kafkaclients/KafkaTracing.java
diff --git a/...ion/kafkaclients/KafkaTracingBuilder.java → ...ion/kafkaclients/KafkaTracingBuilder.java b/...ion/kafkaclients/KafkaTracingBuilder.java → ...ion/kafkaclients/KafkaTracingBuilder.java
diff --git a/...ntation/kafkaclients/TracingConsumer.java → ...ntation/kafkaclients/TracingConsumer.java b/...ntation/kafkaclients/TracingConsumer.java → ...ntation/kafkaclients/TracingConsumer.java
diff --git a/...kaclients/TracingConsumerInterceptor.java → ...kaclients/TracingConsumerInterceptor.java b/...kaclients/TracingConsumerInterceptor.java → ...kaclients/TracingConsumerInterceptor.java
diff --git a/...ntation/kafkaclients/TracingProducer.java → ...ntation/kafkaclients/TracingProducer.java b/...ntation/kafkaclients/TracingProducer.java → ...ntation/kafkaclients/TracingProducer.java
diff --git a/...kaclients/TracingProducerInterceptor.java → ...kaclients/TracingProducerInterceptor.java b/...kaclients/TracingProducerInterceptor.java → ...kaclients/TracingProducerInterceptor.java
diff --git a/...tion/kafkaclients/InterceptorsTest.groovy → ...tion/kafkaclients/InterceptorsTest.groovy b/...tion/kafkaclients/InterceptorsTest.groovy → ...tion/kafkaclients/InterceptorsTest.groovy
diff --git a/...entation/kafkaclients/WrappersTest.groovy → ...entation/kafkaclients/WrappersTest.groovy b/...entation/kafkaclients/WrappersTest.groovy → ...entation/kafkaclients/WrappersTest.groovy
diff --git a/...a-clients-common/library/build.gradle.kts → ...a-clients-common/library/build.gradle.kts b/...a-clients-common/library/build.gradle.kts → ...a-clients-common/library/build.gradle.kts
diff --git a/...onsumerAdditionalAttributesExtractor.java → ...onsumerAdditionalAttributesExtractor.java b/...onsumerAdditionalAttributesExtractor.java → ...onsumerAdditionalAttributesExtractor.java
diff --git a/...nal/KafkaConsumerAttributesExtractor.java → ...nal/KafkaConsumerAttributesExtractor.java b/...nal/KafkaConsumerAttributesExtractor.java → ...nal/KafkaConsumerAttributesExtractor.java
diff --git a/...sumerExperimentalAttributesExtractor.java → ...sumerExperimentalAttributesExtractor.java b/...sumerExperimentalAttributesExtractor.java → ...sumerExperimentalAttributesExtractor.java
diff --git a/...a/internal/KafkaConsumerRecordGetter.java → ...a/internal/KafkaConsumerRecordGetter.java b/...a/internal/KafkaConsumerRecordGetter.java → ...a/internal/KafkaConsumerRecordGetter.java
diff --git a/.../internal/KafkaConsumerTimeExtractor.java → .../internal/KafkaConsumerTimeExtractor.java b/.../internal/KafkaConsumerTimeExtractor.java → .../internal/KafkaConsumerTimeExtractor.java
diff --git a/...on/kafka/internal/KafkaHeadersGetter.java → ...on/kafka/internal/KafkaHeadersGetter.java b/...on/kafka/internal/KafkaHeadersGetter.java → ...on/kafka/internal/KafkaHeadersGetter.java
diff --git a/...on/kafka/internal/KafkaHeadersSetter.java → ...on/kafka/internal/KafkaHeadersSetter.java b/...on/kafka/internal/KafkaHeadersSetter.java → ...on/kafka/internal/KafkaHeadersSetter.java
diff --git a/...ka/internal/KafkaInstrumenterFactory.java → ...ka/internal/KafkaInstrumenterFactory.java b/...ka/internal/KafkaInstrumenterFactory.java → ...ka/internal/KafkaInstrumenterFactory.java
diff --git a/...roducerAdditionalAttributesExtractor.java → ...roducerAdditionalAttributesExtractor.java b/...roducerAdditionalAttributesExtractor.java → ...roducerAdditionalAttributesExtractor.java
diff --git a/...nal/KafkaProducerAttributesExtractor.java → ...nal/KafkaProducerAttributesExtractor.java b/...nal/KafkaProducerAttributesExtractor.java → ...nal/KafkaProducerAttributesExtractor.java
diff --git a/...tion/kafka/internal/KafkaPropagation.java → ...tion/kafka/internal/KafkaPropagation.java b/...tion/kafka/internal/KafkaPropagation.java → ...tion/kafka/internal/KafkaPropagation.java
diff --git a/...rnal/KafkaReceiveAttributesExtractor.java → ...rnal/KafkaReceiveAttributesExtractor.java b/...rnal/KafkaReceiveAttributesExtractor.java → ...rnal/KafkaReceiveAttributesExtractor.java
diff --git a/...ation/kafka/internal/ReceivedRecords.java → ...ation/kafka/internal/ReceivedRecords.java b/...ation/kafka/internal/ReceivedRecords.java → ...ation/kafka/internal/ReceivedRecords.java
diff --git a/...instrumentation/kafka/internal/Timer.java → ...instrumentation/kafka/internal/Timer.java b/...instrumentation/kafka/internal/Timer.java → ...instrumentation/kafka/internal/Timer.java
diff --git a/...a-streams-0.11/javaagent/build.gradle.kts → ...a-streams-0.11/javaagent/build.gradle.kts b/...a-streams-0.11/javaagent/build.gradle.kts → ...a-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")
 }

diff --git a/...ms/KafkaStreamsInstrumentationModule.java → ...ms/KafkaStreamsInstrumentationModule.java b/...ms/KafkaStreamsInstrumentationModule.java → ...ms/KafkaStreamsInstrumentationModule.java
diff --git a/.../kafkastreams/KafkaStreamsSingletons.java → .../kafkastreams/KafkaStreamsSingletons.java b/.../kafkastreams/KafkaStreamsSingletons.java → .../kafkastreams/KafkaStreamsSingletons.java
diff --git a/...treams/PartitionGroupInstrumentation.java → ...treams/PartitionGroupInstrumentation.java b/...treams/PartitionGroupInstrumentation.java → ...treams/PartitionGroupInstrumentation.java
diff --git a/...ms/RecordDeserializerInstrumentation.java → ...ms/RecordDeserializerInstrumentation.java b/...ms/RecordDeserializerInstrumentation.java → ...ms/RecordDeserializerInstrumentation.java
diff --git a/...odeRecordDeserializerInstrumentation.java → ...odeRecordDeserializerInstrumentation.java b/...odeRecordDeserializerInstrumentation.java → ...odeRecordDeserializerInstrumentation.java
diff --git a/...rumentation/kafkastreams/StateHolder.java → ...rumentation/kafkastreams/StateHolder.java b/...rumentation/kafkastreams/StateHolder.java → ...rumentation/kafkastreams/StateHolder.java
diff --git a/...fkastreams/StreamTaskInstrumentation.java → ...fkastreams/StreamTaskInstrumentation.java b/...fkastreams/StreamTaskInstrumentation.java → ...fkastreams/StreamTaskInstrumentation.java
diff --git a/...astreams/StreamThreadInstrumentation.java → ...astreams/StreamThreadInstrumentation.java b/...astreams/StreamThreadInstrumentation.java → ...astreams/StreamThreadInstrumentation.java
diff --git a/...c/test/groovy/KafkaStreamsBaseTest.groovy → ...c/test/groovy/KafkaStreamsBaseTest.groovy b/...c/test/groovy/KafkaStreamsBaseTest.groovy → ...c/test/groovy/KafkaStreamsBaseTest.groovy
diff --git a/...est/groovy/KafkaStreamsDefaultTest.groovy → ...est/groovy/KafkaStreamsDefaultTest.groovy b/...est/groovy/KafkaStreamsDefaultTest.groovy → ...est/groovy/KafkaStreamsDefaultTest.groovy
@@ -27,7 +27,7 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest {
   def "test kafka produce and consume with streams in-between"() {
     setup:
     def config = new Properties()
-    config.putAll(producerProps(kafka.bootstrapServers))
+    config.putAll(producerProps(KafkaStreamsBaseTest.kafka.bootstrapServers))
     config.put(StreamsConfig.APPLICATION_ID_CONFIG, "test-application")
     config.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, Serdes.Integer().getClass().getName())
     config.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, Serdes.String().getClass().getName())
@@ -65,11 +65,11 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest {
 
     when:
     String greeting = "TESTING TESTING 123!"
-    producer.send(new ProducerRecord<>(STREAM_PENDING, greeting))
+    KafkaStreamsBaseTest.producer.send(new ProducerRecord<>(STREAM_PENDING, greeting))
 
     then:
     awaitUntilConsumerIsReady()
-    def records = consumer.poll(Duration.ofSeconds(10).toMillis())
+    def records = KafkaStreamsBaseTest.consumer.poll(Duration.ofSeconds(10).toMillis())
     Headers receivedHeaders = null
     for (record in records) {
       Span.current().setAttribute("testing", 123)

diff --git a/...fkaStreamsSuppressReceiveSpansTest.groovy → ...fkaStreamsSuppressReceiveSpansTest.groovy b/...fkaStreamsSuppressReceiveSpansTest.groovy → ...fkaStreamsSuppressReceiveSpansTest.groovy
@@ -27,7 +27,7 @@ class KafkaStreamsSuppressReceiveSpansTest extends KafkaStreamsBaseTest {
   def "test kafka produce and consume with streams in-between"() {
     setup:
     def config = new Properties()
-    config.putAll(producerProps(kafka.bootstrapServers))
+    config.putAll(producerProps(KafkaStreamsBaseTest.kafka.bootstrapServers))
     config.put(StreamsConfig.APPLICATION_ID_CONFIG, "test-application")
     config.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, Serdes.Integer().getClass().getName())
     config.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, Serdes.String().getClass().getName())
@@ -65,11 +65,11 @@ class KafkaStreamsSuppressReceiveSpansTest extends KafkaStreamsBaseTest {
 
     when:
     String greeting = "TESTING TESTING 123!"
-    producer.send(new ProducerRecord<>(STREAM_PENDING, greeting))
+    KafkaStreamsBaseTest.producer.send(new ProducerRecord<>(STREAM_PENDING, greeting))
 
     then:
     // check that the message was received
-    def records = consumer.poll(Duration.ofSeconds(10).toMillis())
+    def records = KafkaStreamsBaseTest.consumer.poll(Duration.ofSeconds(10).toMillis())
     Headers receivedHeaders = null
     for (record in records) {
       Span.current().setAttribute("testing", 123)

diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/build.gradle.kts b/instrumentation/lettuce/lettuce-5.0/javaagent/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
   implementation(project(":instrumentation:lettuce:lettuce-common:library"))
 
   testImplementation("io.lettuce:lettuce-core:5.0.0.RELEASE")
-  testInstrumentation(project(":instrumentation:reactor-3.1:javaagent"))
+  testInstrumentation(project(":instrumentation:reactor:reactor-3.1:javaagent"))
 }
 
 tasks.withType<Test>().configureEach {

diff --git a/instrumentation/lettuce/lettuce-5.1/javaagent/build.gradle.kts b/instrumentation/lettuce/lettuce-5.1/javaagent/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
 
   // Only 5.2+ will have command arguments in the db.statement tag.
   testLibrary("io.lettuce:lettuce-core:5.2.0.RELEASE")
-  testInstrumentation(project(":instrumentation:reactor-3.1:javaagent"))
+  testInstrumentation(project(":instrumentation:reactor:reactor-3.1:javaagent"))
 }
 
 tasks {

diff --git a/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts b/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
   implementation(project(":instrumentation:lettuce:lettuce-common:library"))
 
   testImplementation(project(":instrumentation:lettuce:lettuce-5.1:testing"))
-  testImplementation(project(":instrumentation:reactor-3.1:library"))
+  testImplementation(project(":instrumentation:reactor:reactor-3.1:library"))
 }
 
 tasks {

diff --git a/instrumentation/play-ws/play-ws-1.0/javaagent/build.gradle.kts b/instrumentation/play-ws/play-ws-1.0/javaagent/build.gradle.kts
@@ -34,8 +34,8 @@ dependencies {
   // These are to ensure cross compatibility
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
-  testInstrumentation(project(":instrumentation:akka-http-10.0:javaagent"))
-  testInstrumentation(project(":instrumentation:akka-actor-2.5:javaagent"))
+  testInstrumentation(project(":instrumentation:akka:akka-http-10.0:javaagent"))
+  testInstrumentation(project(":instrumentation:akka:akka-actor-2.5:javaagent"))
 
   latestDepTestLibrary("com.typesafe.play:play-ahc-ws-standalone_$scalaVersion:1.+")
 }
diff --git a/instrumentation/play-ws/play-ws-2.0/javaagent/build.gradle.kts b/instrumentation/play-ws/play-ws-2.0/javaagent/build.gradle.kts
@@ -40,8 +40,8 @@ dependencies {
   // These are to ensure cross compatibility
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
-  testInstrumentation(project(":instrumentation:akka-http-10.0:javaagent"))
-  testInstrumentation(project(":instrumentation:akka-actor-2.5:javaagent"))
+  testInstrumentation(project(":instrumentation:akka:akka-http-10.0:javaagent"))
+  testInstrumentation(project(":instrumentation:akka:akka-actor-2.5:javaagent"))
 
   latestDepTestLibrary("com.typesafe.play:play-ahc-ws-standalone_$scalaVersion:2.0.+")
 }
diff --git a/instrumentation/play-ws/play-ws-2.1/javaagent/build.gradle.kts b/instrumentation/play-ws/play-ws-2.1/javaagent/build.gradle.kts
@@ -39,6 +39,6 @@ dependencies {
   // These are to ensure cross compatibility
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
-  testInstrumentation(project(":instrumentation:akka-http-10.0:javaagent"))
-  testInstrumentation(project(":instrumentation:akka-actor-2.5:javaagent"))
+  testInstrumentation(project(":instrumentation:akka:akka-http-10.0:javaagent"))
+  testInstrumentation(project(":instrumentation:akka:akka-actor-2.5:javaagent"))
 }
diff --git a/instrumentation/play/play-2.4/javaagent/build.gradle.kts b/instrumentation/play/play-2.4/javaagent/build.gradle.kts
@@ -36,7 +36,7 @@ dependencies {
 
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
-  testInstrumentation(project(":instrumentation:akka-http-10.0:javaagent"))
+  testInstrumentation(project(":instrumentation:akka:akka-http-10.0:javaagent"))
   testInstrumentation(project(":instrumentation:async-http-client:async-http-client-2.0:javaagent"))
 
   // Before 2.5, play used netty 3.x which isn't supported, so for better test consistency, we test with just 2.5

diff --git a/instrumentation/play/play-2.6/javaagent/build.gradle.kts b/instrumentation/play/play-2.6/javaagent/build.gradle.kts
@@ -41,8 +41,8 @@ dependencies {
 
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
-  testInstrumentation(project(":instrumentation:akka-actor-2.5:javaagent"))
-  testInstrumentation(project(":instrumentation:akka-http-10.0:javaagent"))
+  testInstrumentation(project(":instrumentation:akka:akka-actor-2.5:javaagent"))
+  testInstrumentation(project(":instrumentation:akka:akka-http-10.0:javaagent"))
 
   testLibrary("com.typesafe.play:play-java_$scalaVersion:$playVersion")
   // TODO: Play WS is a separately versioned library starting with 2.6 and needs separate instrumentation.

diff --git a/instrumentation/rabbitmq-2.7/javaagent/build.gradle.kts b/instrumentation/rabbitmq-2.7/javaagent/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
     exclude("com.rabbitmq", "amqp-client")
   }
 
-  testInstrumentation(project(":instrumentation:reactor-3.1:javaagent"))
+  testInstrumentation(project(":instrumentation:reactor:reactor-3.1:javaagent"))
 
   testLibrary("io.projectreactor.rabbitmq:reactor-rabbitmq:1.0.0.RELEASE")
   // since reactor-rabbitmq:1.5.4 there is only a runtime dependency to reactor-core but spock

diff --git a/...on/reactor-3.1/javaagent/build.gradle.kts → ...or/reactor-3.1/javaagent/build.gradle.kts b/...on/reactor-3.1/javaagent/build.gradle.kts → ...or/reactor-3.1/javaagent/build.gradle.kts
@@ -18,7 +18,7 @@ tasks.withType<Test>().configureEach {
 }
 
 dependencies {
-  implementation(project(":instrumentation:reactor-3.1:library"))
+  implementation(project(":instrumentation:reactor:reactor-3.1:library"))
   library("io.projectreactor:reactor-core:3.1.0.RELEASE")
 
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
@@ -28,7 +28,7 @@ dependencies {
   compileOnly(project(path = ":opentelemetry-api-shaded-for-instrumenting", configuration = "shadow"))
 
   testLibrary("io.projectreactor:reactor-test:3.1.0.RELEASE")
-  testImplementation(project(":instrumentation:reactor-3.1:testing"))
+  testImplementation(project(":instrumentation:reactor:reactor-3.1:testing"))
   testImplementation("io.opentelemetry:opentelemetry-extension-annotations")
 
   // Looks like later versions on reactor need this dependency for some reason even though it is marked as optional.

diff --git a/...xtPropagationOperatorInstrumentation.java → ...xtPropagationOperatorInstrumentation.java b/...xtPropagationOperatorInstrumentation.java → ...xtPropagationOperatorInstrumentation.java
diff --git a/...ntation/reactor/HooksInstrumentation.java → ...ntation/reactor/HooksInstrumentation.java b/...ntation/reactor/HooksInstrumentation.java → ...ntation/reactor/HooksInstrumentation.java
diff --git a/...reactor/ReactorInstrumentationModule.java → ...reactor/ReactorInstrumentationModule.java b/...reactor/ReactorInstrumentationModule.java → ...reactor/ReactorInstrumentationModule.java
diff --git a/...agationOperatorInstrumentationTest.groovy → ...agationOperatorInstrumentationTest.groovy b/...agationOperatorInstrumentationTest.groovy → ...agationOperatorInstrumentationTest.groovy
diff --git a/...nt/src/test/groovy/ReactorCoreTest.groovy → ...nt/src/test/groovy/ReactorCoreTest.groovy b/...nt/src/test/groovy/ReactorCoreTest.groovy → ...nt/src/test/groovy/ReactorCoreTest.groovy
diff --git a/...ReactorWithSpanInstrumentationTest.groovy → ...ReactorWithSpanInstrumentationTest.groovy b/...ReactorWithSpanInstrumentationTest.groovy → ...ReactorWithSpanInstrumentationTest.groovy
diff --git a/...t/src/test/groovy/SubscriptionTest.groovy → ...t/src/test/groovy/SubscriptionTest.groovy b/...t/src/test/groovy/SubscriptionTest.groovy → ...t/src/test/groovy/SubscriptionTest.groovy
diff --git a/...strumentation/reactor/TracedWithSpan.java → ...strumentation/reactor/TracedWithSpan.java b/...strumentation/reactor/TracedWithSpan.java → ...strumentation/reactor/TracedWithSpan.java
diff --git a/...tion/reactor-3.1/library/build.gradle.kts → ...ctor/reactor-3.1/library/build.gradle.kts b/...tion/reactor-3.1/library/build.gradle.kts → ...ctor/reactor-3.1/library/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
   implementation(project(":instrumentation-api-annotation-support"))
   testLibrary("io.projectreactor:reactor-test:3.1.0.RELEASE")
 
-  testImplementation(project(":instrumentation:reactor-3.1:testing"))
+  testImplementation(project(":instrumentation:reactor:reactor-3.1:testing"))
 
   // Looks like later versions on reactor need this dependency for some reason even though it is marked as optional.
   latestDepTestLibrary("io.micrometer:micrometer-core:1.+")

diff --git a/...n/reactor/ContextPropagationOperator.java → ...n/reactor/ContextPropagationOperator.java b/...n/reactor/ContextPropagationOperator.java → ...n/reactor/ContextPropagationOperator.java
diff --git a/...or/ContextPropagationOperatorBuilder.java → ...or/ContextPropagationOperatorBuilder.java b/...or/ContextPropagationOperatorBuilder.java → ...or/ContextPropagationOperatorBuilder.java
diff --git a/...tor/ReactorAsyncOperationEndStrategy.java → ...tor/ReactorAsyncOperationEndStrategy.java b/...tor/ReactorAsyncOperationEndStrategy.java → ...tor/ReactorAsyncOperationEndStrategy.java
diff --git a/...ctorAsyncOperationEndStrategyBuilder.java → ...ctorAsyncOperationEndStrategyBuilder.java b/...ctorAsyncOperationEndStrategyBuilder.java → ...ctorAsyncOperationEndStrategyBuilder.java
diff --git a/...umentation/reactor/TracingSubscriber.java → ...umentation/reactor/TracingSubscriber.java b/...umentation/reactor/TracingSubscriber.java → ...umentation/reactor/TracingSubscriber.java
diff --git a/.../instrumentation/reactor/HooksTest.groovy → .../instrumentation/reactor/HooksTest.groovy b/.../instrumentation/reactor/HooksTest.groovy → .../instrumentation/reactor/HooksTest.groovy
diff --git a/...actorAsyncOperationEndStrategyTest.groovy → ...actorAsyncOperationEndStrategyTest.groovy b/...actorAsyncOperationEndStrategyTest.groovy → ...actorAsyncOperationEndStrategyTest.groovy
diff --git a/...umentation/reactor/ReactorCoreTest.groovy → ...umentation/reactor/ReactorCoreTest.groovy b/...umentation/reactor/ReactorCoreTest.groovy → ...umentation/reactor/ReactorCoreTest.groovy
diff --git a/...mentation/reactor/SubscriptionTest.groovy → ...mentation/reactor/SubscriptionTest.groovy b/...mentation/reactor/SubscriptionTest.groovy → ...mentation/reactor/SubscriptionTest.groovy
diff --git a/...tion/reactor-3.1/testing/build.gradle.kts → ...ctor/reactor-3.1/testing/build.gradle.kts b/...tion/reactor-3.1/testing/build.gradle.kts → ...ctor/reactor-3.1/testing/build.gradle.kts
diff --git a/...on/reactor/AbstractReactorCoreTest.groovy → ...on/reactor/AbstractReactorCoreTest.groovy b/...on/reactor/AbstractReactorCoreTest.groovy → ...on/reactor/AbstractReactorCoreTest.groovy
diff --git a/...n/reactor/AbstractSubscriptionTest.groovy → ...n/reactor/AbstractSubscriptionTest.groovy b/...n/reactor/AbstractSubscriptionTest.groovy → ...n/reactor/AbstractSubscriptionTest.groovy
diff --git a/...ctor-netty-0.9/javaagent/build.gradle.kts → ...ctor-netty-0.9/javaagent/build.gradle.kts b/...ctor-netty-0.9/javaagent/build.gradle.kts → ...ctor-netty-0.9/javaagent/build.gradle.kts
@@ -19,9 +19,9 @@ dependencies {
   implementation(project(":instrumentation:netty:netty-4.1-common:javaagent"))
   library("io.projectreactor.netty:reactor-netty:0.9.0.RELEASE")
 
-  testInstrumentation(project(":instrumentation:reactor-netty:reactor-netty-1.0:javaagent"))
+  testInstrumentation(project(":instrumentation:reactor:reactor-netty:reactor-netty-1.0:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
-  testInstrumentation(project(":instrumentation:reactor-3.1:javaagent"))
+  testInstrumentation(project(":instrumentation:reactor:reactor-3.1:javaagent"))
 
   latestDepTestLibrary("io.projectreactor.netty:reactor-netty:(,1.0.0)")
 }

diff --git a/...reactornetty/v0_9/DecoratorFunctions.java → ...reactornetty/v0_9/DecoratorFunctions.java b/...reactornetty/v0_9/DecoratorFunctions.java → ...reactornetty/v0_9/DecoratorFunctions.java
diff --git a/...netty/v0_9/HttpClientInstrumentation.java → ...netty/v0_9/HttpClientInstrumentation.java b/...netty/v0_9/HttpClientInstrumentation.java → ...netty/v0_9/HttpClientInstrumentation.java
diff --git a/...ntation/reactornetty/v0_9/MapConnect.java → ...ntation/reactornetty/v0_9/MapConnect.java b/...ntation/reactornetty/v0_9/MapConnect.java → ...ntation/reactornetty/v0_9/MapConnect.java
diff --git a/...entation/reactornetty/v0_9/OnRequest.java → ...entation/reactornetty/v0_9/OnRequest.java b/...entation/reactornetty/v0_9/OnRequest.java → ...entation/reactornetty/v0_9/OnRequest.java
diff --git a/..._9/ReactorNettyInstrumentationModule.java → ..._9/ReactorNettyInstrumentationModule.java b/..._9/ReactorNettyInstrumentationModule.java → ..._9/ReactorNettyInstrumentationModule.java
diff --git a/...AbstractReactorNettyHttpClientTest.groovy → ...AbstractReactorNettyHttpClientTest.groovy b/...AbstractReactorNettyHttpClientTest.groovy → ...AbstractReactorNettyHttpClientTest.groovy
diff --git a/...0_9/ReactorNettyConnectionSpanTest.groovy → ...0_9/ReactorNettyConnectionSpanTest.groovy b/...0_9/ReactorNettyConnectionSpanTest.groovy → ...0_9/ReactorNettyConnectionSpanTest.groovy
diff --git a/...ty/v0_9/ReactorNettyHttpClientTest.groovy → ...ty/v0_9/ReactorNettyHttpClientTest.groovy b/...ty/v0_9/ReactorNettyHttpClientTest.groovy → ...ty/v0_9/ReactorNettyHttpClientTest.groovy
diff --git a/...eactorNettyHttpClientUsingFromTest.groovy → ...eactorNettyHttpClientUsingFromTest.groovy b/...eactorNettyHttpClientUsingFromTest.groovy → ...eactorNettyHttpClientUsingFromTest.groovy
diff --git a/...ctor-netty-1.0/javaagent/build.gradle.kts → ...ctor-netty-1.0/javaagent/build.gradle.kts b/...ctor-netty-1.0/javaagent/build.gradle.kts → ...ctor-netty-1.0/javaagent/build.gradle.kts
@@ -21,13 +21,13 @@ dependencies {
   annotationProcessor("com.google.auto.value:auto-value")
 
   implementation(project(":instrumentation:netty:netty-4.1-common:javaagent"))
-  implementation(project(":instrumentation:reactor-3.1:library"))
+  implementation(project(":instrumentation:reactor:reactor-3.1:library"))
 
   library("io.projectreactor.netty:reactor-netty-http:1.0.0")
 
-  testInstrumentation(project(":instrumentation:reactor-netty:reactor-netty-0.9:javaagent"))
+  testInstrumentation(project(":instrumentation:reactor:reactor-netty:reactor-netty-0.9:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
-  testInstrumentation(project(":instrumentation:reactor-3.1:javaagent"))
+  testInstrumentation(project(":instrumentation:reactor:reactor-3.1:javaagent"))
 
   testLibrary("io.projectreactor:reactor-test:3.1.0.RELEASE")
   testImplementation("io.opentelemetry:opentelemetry-extension-annotations")

diff --git a/...tty/v1_0/ConnectionRequestAndContext.java → ...tty/v1_0/ConnectionRequestAndContext.java b/...tty/v1_0/ConnectionRequestAndContext.java → ...tty/v1_0/ConnectionRequestAndContext.java
diff --git a/.../reactornetty/v1_0/ConnectionWrapper.java → .../reactornetty/v1_0/ConnectionWrapper.java b/.../reactornetty/v1_0/ConnectionWrapper.java → .../reactornetty/v1_0/ConnectionWrapper.java
diff --git a/...reactornetty/v1_0/DecoratorFunctions.java → ...reactornetty/v1_0/DecoratorFunctions.java b/...reactornetty/v1_0/DecoratorFunctions.java → ...reactornetty/v1_0/DecoratorFunctions.java
diff --git a/...netty/v1_0/HttpClientInstrumentation.java → ...netty/v1_0/HttpClientInstrumentation.java b/...netty/v1_0/HttpClientInstrumentation.java → ...netty/v1_0/HttpClientInstrumentation.java
diff --git a/.../v1_0/HttpClientRequestHeadersSetter.java → .../v1_0/HttpClientRequestHeadersSetter.java b/.../v1_0/HttpClientRequestHeadersSetter.java → .../v1_0/HttpClientRequestHeadersSetter.java
diff --git a/...1_0/HttpResponseReceiverInstrumenter.java → ...1_0/HttpResponseReceiverInstrumenter.java b/...1_0/HttpResponseReceiverInstrumenter.java → ...1_0/HttpResponseReceiverInstrumenter.java
diff --git a/...reactornetty/v1_0/ReactorContextKeys.java → ...reactornetty/v1_0/ReactorContextKeys.java b/...reactornetty/v1_0/ReactorContextKeys.java → ...reactornetty/v1_0/ReactorContextKeys.java
diff --git a/...orNettyHttpClientAttributesExtractor.java → ...orNettyHttpClientAttributesExtractor.java b/...orNettyHttpClientAttributesExtractor.java → ...orNettyHttpClientAttributesExtractor.java
diff --git a/..._0/ReactorNettyInstrumentationModule.java → ..._0/ReactorNettyInstrumentationModule.java b/..._0/ReactorNettyInstrumentationModule.java → ..._0/ReactorNettyInstrumentationModule.java
diff --git a/...torNettyNetClientAttributesExtractor.java → ...torNettyNetClientAttributesExtractor.java b/...torNettyNetClientAttributesExtractor.java → ...torNettyNetClientAttributesExtractor.java
diff --git a/...tornetty/v1_0/ReactorNettySingletons.java → ...tornetty/v1_0/ReactorNettySingletons.java b/...tornetty/v1_0/ReactorNettySingletons.java → ...tornetty/v1_0/ReactorNettySingletons.java
diff --git a/...v1_0/ResponseReceiverInstrumentation.java → ...v1_0/ResponseReceiverInstrumentation.java b/...v1_0/ResponseReceiverInstrumentation.java → ...v1_0/ResponseReceiverInstrumentation.java
diff --git a/..._0/TransportConnectorInstrumentation.java → ..._0/TransportConnectorInstrumentation.java b/..._0/TransportConnectorInstrumentation.java → ..._0/TransportConnectorInstrumentation.java
diff --git a/...st/groovy/ReactorNettyWithSpanTest.groovy → ...st/groovy/ReactorNettyWithSpanTest.groovy b/...st/groovy/ReactorNettyWithSpanTest.groovy → ...st/groovy/ReactorNettyWithSpanTest.groovy
diff --git a/...AbstractReactorNettyHttpClientTest.groovy → ...AbstractReactorNettyHttpClientTest.groovy b/...AbstractReactorNettyHttpClientTest.groovy → ...AbstractReactorNettyHttpClientTest.groovy
diff --git a/...tty/v1_0/ReactorNettyClientSslTest.groovy → ...tty/v1_0/ReactorNettyClientSslTest.groovy b/...tty/v1_0/ReactorNettyClientSslTest.groovy → ...tty/v1_0/ReactorNettyClientSslTest.groovy
diff --git a/...1_0/ReactorNettyConnectionSpanTest.groovy → ...1_0/ReactorNettyConnectionSpanTest.groovy b/...1_0/ReactorNettyConnectionSpanTest.groovy → ...1_0/ReactorNettyConnectionSpanTest.groovy
diff --git a/...ty/v1_0/ReactorNettyHttpClientTest.groovy → ...ty/v1_0/ReactorNettyHttpClientTest.groovy b/...ty/v1_0/ReactorNettyHttpClientTest.groovy → ...ty/v1_0/ReactorNettyHttpClientTest.groovy
diff --git a/...eactorNettyHttpClientUsingFromTest.groovy → ...eactorNettyHttpClientUsingFromTest.groovy b/...eactorNettyHttpClientUsingFromTest.groovy → ...eactorNettyHttpClientUsingFromTest.groovy
diff --git a/...ry/test/reactor/netty/TracedWithSpan.java → ...ry/test/reactor/netty/TracedWithSpan.java b/...ry/test/reactor/netty/TracedWithSpan.java → ...ry/test/reactor/netty/TracedWithSpan.java
diff --git a/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts b/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts
@@ -15,12 +15,12 @@ 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.springframework.kafka:spring-kafka:2.7.0")
 
-  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")
 

diff --git a/instrumentation/spring/spring-webflux-5.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-webflux-5.0/javaagent/build.gradle.kts
@@ -46,8 +46,8 @@ dependencies {
   compileOnly("io.projectreactor.ipc:reactor-netty:0.7.0.RELEASE")
 
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
-  testInstrumentation(project(":instrumentation:reactor-3.1:javaagent"))
-  testInstrumentation(project(":instrumentation:reactor-netty:reactor-netty-1.0:javaagent"))
+  testInstrumentation(project(":instrumentation:reactor:reactor-3.1:javaagent"))
+  testInstrumentation(project(":instrumentation:reactor:reactor-netty:reactor-netty-1.0:javaagent"))
 
   // Compile with both old and new netty packages since our test references both for old and
   // latest dep tests.

diff --git a/...ttp-client-3.0/javaagent/build.gradle.kts → ...ttp-client-3.0/javaagent/build.gradle.kts b/...ttp-client-3.0/javaagent/build.gradle.kts → ...ttp-client-3.0/javaagent/build.gradle.kts
diff --git a/...client/HttpClientImplInstrumentation.java → ...client/HttpClientImplInstrumentation.java b/...client/HttpClientImplInstrumentation.java → ...client/HttpClientImplInstrumentation.java
diff --git a/...lient/HttpRequestImplInstrumentation.java → ...lient/HttpRequestImplInstrumentation.java b/...lient/HttpRequestImplInstrumentation.java → ...lient/HttpRequestImplInstrumentation.java
diff --git a/..._0/client/HttpRequestInstrumentation.java → ..._0/client/HttpRequestInstrumentation.java b/..._0/client/HttpRequestInstrumentation.java → ..._0/client/HttpRequestInstrumentation.java
diff --git a/...client/Vertx3HttpAttributesExtractor.java → ...client/Vertx3HttpAttributesExtractor.java b/...client/Vertx3HttpAttributesExtractor.java → ...client/Vertx3HttpAttributesExtractor.java
diff --git a/...ent/VertxClientInstrumentationModule.java → ...ent/VertxClientInstrumentationModule.java b/...ent/VertxClientInstrumentationModule.java → ...ent/VertxClientInstrumentationModule.java
diff --git a/...tx/v3_0/client/VertxClientSingletons.java → ...tx/v3_0/client/VertxClientSingletons.java b/...tx/v3_0/client/VertxClientSingletons.java → ...tx/v3_0/client/VertxClientSingletons.java
diff --git a/...n/vertx/v3_0/client/VertxRequestInfo.java → ...n/vertx/v3_0/client/VertxRequestInfo.java b/...n/vertx/v3_0/client/VertxRequestInfo.java → ...n/vertx/v3_0/client/VertxRequestInfo.java
diff --git a/.../groovy/client/VertxHttpClientTest.groovy → .../groovy/client/VertxHttpClientTest.groovy b/.../groovy/client/VertxHttpClientTest.groovy → .../groovy/client/VertxHttpClientTest.groovy
diff --git a/...st/java/client/VertxSingleConnection.java → ...st/java/client/VertxSingleConnection.java b/...st/java/client/VertxSingleConnection.java → ...st/java/client/VertxSingleConnection.java
diff --git a/...ttp-client-4.0/javaagent/build.gradle.kts → ...ttp-client-4.0/javaagent/build.gradle.kts b/...ttp-client-4.0/javaagent/build.gradle.kts → ...ttp-client-4.0/javaagent/build.gradle.kts
diff --git a/...ent/ConnectionManagerInstrumentation.java → ...ent/ConnectionManagerInstrumentation.java b/...ent/ConnectionManagerInstrumentation.java → ...ent/ConnectionManagerInstrumentation.java
diff --git a/...ion/vertx/v4_0/client/HandlerWrapper.java → ...ion/vertx/v4_0/client/HandlerWrapper.java b/...ion/vertx/v4_0/client/HandlerWrapper.java → ...ion/vertx/v4_0/client/HandlerWrapper.java
diff --git a/.../HttpClientConnectionInstrumentation.java → .../HttpClientConnectionInstrumentation.java b/.../HttpClientConnectionInstrumentation.java → .../HttpClientConnectionInstrumentation.java
diff --git a/..._0/client/HttpRequestInstrumentation.java → ..._0/client/HttpRequestInstrumentation.java b/..._0/client/HttpRequestInstrumentation.java → ..._0/client/HttpRequestInstrumentation.java
diff --git a/...client/Vertx4HttpAttributesExtractor.java → ...client/Vertx4HttpAttributesExtractor.java b/...client/Vertx4HttpAttributesExtractor.java → ...client/Vertx4HttpAttributesExtractor.java
diff --git a/.../client/Vertx4NetAttributesExtractor.java → .../client/Vertx4NetAttributesExtractor.java b/.../client/Vertx4NetAttributesExtractor.java → .../client/Vertx4NetAttributesExtractor.java
diff --git a/...ent/VertxClientInstrumentationModule.java → ...ent/VertxClientInstrumentationModule.java b/...ent/VertxClientInstrumentationModule.java → ...ent/VertxClientInstrumentationModule.java
diff --git a/...tx/v4_0/client/VertxClientSingletons.java → ...tx/v4_0/client/VertxClientSingletons.java b/...tx/v4_0/client/VertxClientSingletons.java → ...tx/v4_0/client/VertxClientSingletons.java
diff --git a/.../groovy/client/VertxHttpClientTest.groovy → .../groovy/client/VertxHttpClientTest.groovy b/.../groovy/client/VertxHttpClientTest.groovy → .../groovy/client/VertxHttpClientTest.groovy
diff --git a/...st/java/client/VertxSingleConnection.java → ...st/java/client/VertxSingleConnection.java b/...st/java/client/VertxSingleConnection.java → ...st/java/client/VertxSingleConnection.java
diff --git a/...-client-common/javaagent/build.gradle.kts → ...-client-common/javaagent/build.gradle.kts b/...-client-common/javaagent/build.gradle.kts → ...-client-common/javaagent/build.gradle.kts
diff --git a/...AbstractVertxHttpAttributesExtractor.java → ...AbstractVertxHttpAttributesExtractor.java b/...AbstractVertxHttpAttributesExtractor.java → ...AbstractVertxHttpAttributesExtractor.java
diff --git a/...nstrumentation/vertx/client/Contexts.java → ...nstrumentation/vertx/client/Contexts.java b/...nstrumentation/vertx/client/Contexts.java → ...nstrumentation/vertx/client/Contexts.java
diff --git a/...vertx/client/ExceptionHandlerWrapper.java → ...vertx/client/ExceptionHandlerWrapper.java b/...vertx/client/ExceptionHandlerWrapper.java → ...vertx/client/ExceptionHandlerWrapper.java
diff --git a/...vertx/client/HttpRequestHeaderSetter.java → ...vertx/client/HttpRequestHeaderSetter.java b/...vertx/client/HttpRequestHeaderSetter.java → ...vertx/client/HttpRequestHeaderSetter.java
diff --git a/...lient/VertxClientInstrumenterFactory.java → ...lient/VertxClientInstrumenterFactory.java b/...lient/VertxClientInstrumenterFactory.java → ...lient/VertxClientInstrumenterFactory.java
diff --git a/...x-reactive-3.5/javaagent/build.gradle.kts → ...x-reactive-3.5/javaagent/build.gradle.kts b/...x-reactive-3.5/javaagent/build.gradle.kts → ...x-reactive-3.5/javaagent/build.gradle.kts
diff --git a/...roovy/VertxReactivePropagationTest.groovy → ...roovy/VertxReactivePropagationTest.groovy b/...roovy/VertxReactivePropagationTest.groovy → ...roovy/VertxReactivePropagationTest.groovy
diff --git a/...VertxRxCircuitBreakerWebClientTest.groovy → ...VertxRxCircuitBreakerWebClientTest.groovy b/...VertxRxCircuitBreakerWebClientTest.groovy → ...VertxRxCircuitBreakerWebClientTest.groovy
diff --git a/...groovy/client/VertxRxWebClientTest.groovy → ...groovy/client/VertxRxWebClientTest.groovy b/...groovy/client/VertxRxWebClientTest.groovy → ...groovy/client/VertxRxWebClientTest.groovy
diff --git a/...ertxRxCircuitBreakerHttpServerTest.groovy → ...ertxRxCircuitBreakerHttpServerTest.groovy b/...ertxRxCircuitBreakerHttpServerTest.groovy → ...ertxRxCircuitBreakerHttpServerTest.groovy
diff --git a/...roovy/server/VertxRxHttpServerTest.groovy → ...roovy/server/VertxRxHttpServerTest.groovy b/...roovy/server/VertxRxHttpServerTest.groovy → ...roovy/server/VertxRxHttpServerTest.groovy
diff --git a/...tDepTest/java/VertxReactiveWebServer.java → ...tDepTest/java/VertxReactiveWebServer.java b/...tDepTest/java/VertxReactiveWebServer.java → ...tDepTest/java/VertxReactiveWebServer.java
diff --git a/...ertxRxCircuitBreakerSingleConnection.java → ...ertxRxCircuitBreakerSingleConnection.java b/...ertxRxCircuitBreakerSingleConnection.java → ...ertxRxCircuitBreakerSingleConnection.java
diff --git a/.../java/client/VertxRxSingleConnection.java → .../java/client/VertxRxSingleConnection.java b/.../java/client/VertxRxSingleConnection.java → .../java/client/VertxRxSingleConnection.java
diff --git a/...handler/codec/haproxy/HAProxyMessage.java → ...handler/codec/haproxy/HAProxyMessage.java b/...handler/codec/haproxy/HAProxyMessage.java → ...handler/codec/haproxy/HAProxyMessage.java
diff --git a/...codec/haproxy/HAProxyProxiedProtocol.java → ...codec/haproxy/HAProxyProxiedProtocol.java b/...codec/haproxy/HAProxyProxiedProtocol.java → ...codec/haproxy/HAProxyProxiedProtocol.java
diff --git a/.../reactive/AsyncResultConsumerWrapper.java → .../reactive/AsyncResultConsumerWrapper.java b/.../reactive/AsyncResultConsumerWrapper.java → .../reactive/AsyncResultConsumerWrapper.java
diff --git a/...x/reactive/AsyncResultHandlerWrapper.java → ...x/reactive/AsyncResultHandlerWrapper.java b/...x/reactive/AsyncResultHandlerWrapper.java → ...x/reactive/AsyncResultHandlerWrapper.java
diff --git a/...ive/AsyncResultSingleInstrumentation.java → ...ive/AsyncResultSingleInstrumentation.java b/...ive/AsyncResultSingleInstrumentation.java → ...ive/AsyncResultSingleInstrumentation.java
diff --git a/...eactive/VertxRxInstrumentationModule.java → ...eactive/VertxRxInstrumentationModule.java b/...eactive/VertxRxInstrumentationModule.java → ...eactive/VertxRxInstrumentationModule.java
diff --git a/...entation/vertx/reactive/package-info.java → ...entation/vertx/reactive/package-info.java b/...entation/vertx/reactive/package-info.java → ...entation/vertx/reactive/package-info.java
diff --git a/...roovy/VertxReactivePropagationTest.groovy → ...roovy/VertxReactivePropagationTest.groovy b/...roovy/VertxReactivePropagationTest.groovy → ...roovy/VertxReactivePropagationTest.groovy
diff --git a/...VertxRxCircuitBreakerWebClientTest.groovy → ...VertxRxCircuitBreakerWebClientTest.groovy b/...VertxRxCircuitBreakerWebClientTest.groovy → ...VertxRxCircuitBreakerWebClientTest.groovy
diff --git a/...groovy/client/VertxRxWebClientTest.groovy → ...groovy/client/VertxRxWebClientTest.groovy b/...groovy/client/VertxRxWebClientTest.groovy → ...groovy/client/VertxRxWebClientTest.groovy
diff --git a/...ertxRxCircuitBreakerHttpServerTest.groovy → ...ertxRxCircuitBreakerHttpServerTest.groovy b/...ertxRxCircuitBreakerHttpServerTest.groovy → ...ertxRxCircuitBreakerHttpServerTest.groovy
diff --git a/...roovy/server/VertxRxHttpServerTest.groovy → ...roovy/server/VertxRxHttpServerTest.groovy b/...roovy/server/VertxRxHttpServerTest.groovy → ...roovy/server/VertxRxHttpServerTest.groovy
diff --git a/...on35Test/java/VertxReactiveWebServer.java → ...on35Test/java/VertxReactiveWebServer.java b/...on35Test/java/VertxReactiveWebServer.java → ...on35Test/java/VertxReactiveWebServer.java
diff --git a/...ertxRxCircuitBreakerSingleConnection.java → ...ertxRxCircuitBreakerSingleConnection.java b/...ertxRxCircuitBreakerSingleConnection.java → ...ertxRxCircuitBreakerSingleConnection.java
diff --git a/.../java/client/VertxRxSingleConnection.java → .../java/client/VertxRxSingleConnection.java b/.../java/client/VertxRxSingleConnection.java → .../java/client/VertxRxSingleConnection.java
diff --git a/.../vertx-web-3.0/javaagent/build.gradle.kts → .../vertx-web-3.0/javaagent/build.gradle.kts b/.../vertx-web-3.0/javaagent/build.gradle.kts → .../vertx-web-3.0/javaagent/build.gradle.kts
diff --git a/...y/server/VertxLatestHttpServerTest.groovy → ...y/server/VertxLatestHttpServerTest.groovy b/...y/server/VertxLatestHttpServerTest.groovy → ...y/server/VertxLatestHttpServerTest.groovy
diff --git a/...handler/codec/haproxy/HAProxyMessage.java → ...handler/codec/haproxy/HAProxyMessage.java b/...handler/codec/haproxy/HAProxyMessage.java → ...handler/codec/haproxy/HAProxyMessage.java
diff --git a/...codec/haproxy/HAProxyProxiedProtocol.java → ...codec/haproxy/HAProxyProxiedProtocol.java b/...codec/haproxy/HAProxyProxiedProtocol.java → ...codec/haproxy/HAProxyProxiedProtocol.java
diff --git a/...est/java/server/VertxLatestWebServer.java → ...est/java/server/VertxLatestWebServer.java b/...est/java/server/VertxLatestWebServer.java → ...est/java/server/VertxLatestWebServer.java
diff --git a/...mentation/vertx/RouteInstrumentation.java → ...mentation/vertx/RouteInstrumentation.java b/...mentation/vertx/RouteInstrumentation.java → ...mentation/vertx/RouteInstrumentation.java
diff --git a/...n/vertx/RoutingContextHandlerWrapper.java → ...n/vertx/RoutingContextHandlerWrapper.java b/...n/vertx/RoutingContextHandlerWrapper.java → ...n/vertx/RoutingContextHandlerWrapper.java
diff --git a/.../vertx/VertxWebInstrumentationModule.java → .../vertx/VertxWebInstrumentationModule.java b/.../vertx/VertxWebInstrumentationModule.java → .../vertx/VertxWebInstrumentationModule.java
diff --git a/...t/instrumentation/vertx/package-info.java → ...t/instrumentation/vertx/package-info.java b/...t/instrumentation/vertx/package-info.java → ...t/instrumentation/vertx/package-info.java
diff --git a/.../groovy/server/VertxHttpServerTest.groovy → .../groovy/server/VertxHttpServerTest.groovy b/.../groovy/server/VertxHttpServerTest.groovy → .../groovy/server/VertxHttpServerTest.groovy
diff --git a/...sion3Test/java/server/VertxWebServer.java → ...sion3Test/java/server/VertxWebServer.java b/...sion3Test/java/server/VertxWebServer.java → ...sion3Test/java/server/VertxWebServer.java
diff --git a/...on/vertx-web-3.0/testing/build.gradle.kts → ...tx/vertx-web-3.0/testing/build.gradle.kts b/...on/vertx-web-3.0/testing/build.gradle.kts → ...tx/vertx-web-3.0/testing/build.gradle.kts
diff --git a/...server/AbstractVertxHttpServerTest.groovy → ...server/AbstractVertxHttpServerTest.groovy b/...server/AbstractVertxHttpServerTest.groovy → ...server/AbstractVertxHttpServerTest.groovy
diff --git a/...n/java/server/AbstractVertxWebServer.java → ...n/java/server/AbstractVertxWebServer.java b/...n/java/server/AbstractVertxWebServer.java → ...n/java/server/AbstractVertxWebServer.java
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -114,9 +114,9 @@ include(":testing-common:library-for-integration-tests")
 // smoke tests
 include(":smoke-tests")
 
-include(":instrumentation:akka-actor-2.5:javaagent")
-include(":instrumentation:akka-actor-fork-join-2.5:javaagent")
-include(":instrumentation:akka-http-10.0:javaagent")
+include(":instrumentation:akka:akka-actor-2.5:javaagent")
+include(":instrumentation:akka:akka-actor-fork-join-2.5:javaagent")
+include(":instrumentation:akka:akka-http-10.0:javaagent")
 include(":instrumentation:apache-camel-2.20:javaagent")
 include(":instrumentation:apache-camel-2.20:javaagent-unit-tests")
 include(":instrumentation:apache-dubbo-2.7:javaagent")
@@ -167,8 +167,8 @@ include(":instrumentation:couchbase:couchbase-3.1.6:tracing-opentelemetry-shaded
 include(":instrumentation:couchbase:couchbase-3.2:javaagent")
 include(":instrumentation:couchbase:couchbase-3.2:tracing-opentelemetry-shaded")
 include(":instrumentation:couchbase:couchbase-common:testing")
-include(":instrumentation:dropwizard-views-0.7:javaagent")
-include(":instrumentation:dropwizard-testing")
+include(":instrumentation:dropwizard:dropwizard-views-0.7:javaagent")
+include(":instrumentation:dropwizard:dropwizard-testing")
 include(":instrumentation:elasticsearch:elasticsearch-rest-common:javaagent")
 include(":instrumentation:elasticsearch:elasticsearch-rest-5.0:javaagent")
 include(":instrumentation:elasticsearch:elasticsearch-rest-6.4:javaagent")
@@ -249,12 +249,12 @@ include(":instrumentation:jsf:jsf-common:testing")
 include(":instrumentation:jsf:jsf-mojarra-1.2:javaagent")
 include(":instrumentation:jsf:jsf-myfaces-1.2:javaagent")
 include(":instrumentation:jsp-2.3:javaagent")
-include(":instrumentation:kafka-clients:kafka-clients-0.11:bootstrap")
-include(":instrumentation:kafka-clients:kafka-clients-0.11:javaagent")
-include(":instrumentation:kafka-clients:kafka-clients-0.11:testing")
-include(":instrumentation:kafka-clients:kafka-clients-2.6:library")
-include(":instrumentation:kafka-clients:kafka-clients-common:library")
-include(":instrumentation:kafka-streams-0.11:javaagent")
+include(":instrumentation:kafka:kafka-clients:kafka-clients-0.11:bootstrap")
+include(":instrumentation:kafka:kafka-clients:kafka-clients-0.11:javaagent")
+include(":instrumentation:kafka:kafka-clients:kafka-clients-0.11:testing")
+include(":instrumentation:kafka:kafka-clients:kafka-clients-2.6:library")
+include(":instrumentation:kafka:kafka-clients:kafka-clients-common:library")
+include(":instrumentation:kafka:kafka-streams-0.11:javaagent")
 include(":instrumentation:kotlinx-coroutines:javaagent")
 include(":instrumentation:kubernetes-client-7.0:javaagent")
 include(":instrumentation:kubernetes-client-7.0:javaagent-unit-tests")
@@ -318,11 +318,11 @@ include(":instrumentation:rabbitmq-2.7:javaagent")
 include(":instrumentation:ratpack:ratpack-1.4:javaagent")
 include(":instrumentation:ratpack:ratpack-1.4:testing")
 include(":instrumentation:ratpack:ratpack-1.7:library")
-include(":instrumentation:reactor-3.1:javaagent")
-include(":instrumentation:reactor-3.1:library")
-include(":instrumentation:reactor-3.1:testing")
-include(":instrumentation:reactor-netty:reactor-netty-0.9:javaagent")
-include(":instrumentation:reactor-netty:reactor-netty-1.0:javaagent")
+include(":instrumentation:reactor:reactor-3.1:javaagent")
+include(":instrumentation:reactor:reactor-3.1:library")
+include(":instrumentation:reactor:reactor-3.1:testing")
+include(":instrumentation:reactor:reactor-netty:reactor-netty-0.9:javaagent")
+include(":instrumentation:reactor:reactor-netty:reactor-netty-1.0:javaagent")
 include(":instrumentation:rediscala-1.8:javaagent")
 include(":instrumentation:redisson-3.0:javaagent")
 include(":instrumentation:restlet:restlet-1.0:javaagent")