From 6884d66c093fffbdcda54d5ca36a5d0e0851edbd Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 22 Dec 2021 10:16:13 -0800 Subject: [PATCH] Reduce top level instrumentation directories (#4965) * akka * dropwizard * kafka * reactor * vertx --- .../akka-actor-2.5/javaagent/build.gradle.kts | 0 .../AkkaActorCellInstrumentation.java | 0 .../AkkaActorInstrumentationModule.java | 0 ...aultSystemMessageQueueInstrumentation.java | 0 .../AkkaDispatcherInstrumentation.java | 0 .../akkaactor/AkkaIgnoredTypesConfigurer.java | 0 .../src/test/groovy/AkkaActorTest.groovy | 0 .../javaagent/src/test/scala/AkkaActors.scala | 0 .../javaagent/build.gradle.kts | 0 ...kkaActorForkJoinInstrumentationModule.java | 0 .../AkkaForkJoinPoolInstrumentation.java | 0 .../AkkaForkJoinTaskInstrumentation.java | 0 .../AkkaExecutorInstrumentationTest.groovy | 0 .../src/test/java/AkkaAsyncChild.java | 0 .../akka-http-10.0/javaagent/build.gradle.kts | 4 +-- .../akkahttp/AkkaHttpUtil.java | 0 .../AkkaHttpClientAttributesExtractor.java | 0 .../AkkaHttpClientInstrumentationModule.java | 0 .../client/AkkaHttpClientSingletons.java | 0 .../AkkaHttpNetAttributesExtractor.java | 0 .../akkahttp/client/FutureWrapper.java | 0 .../client/HttpExtClientInstrumentation.java | 0 .../akkahttp/client/HttpHeaderSetter.java | 0 .../akkahttp/client/OnCompleteHandler.java | 0 .../PoolMasterActorInstrumentation.java | 0 .../AkkaHttpServerAttributesExtractor.java | 0 .../server/AkkaHttpServerHeaders.java | 0 .../AkkaHttpServerInstrumentationModule.java | 0 .../server/AkkaHttpServerSingletons.java | 0 .../server/HttpExtServerInstrumentation.java | 0 .../AkkaHttpClientInstrumentationTest.groovy | 0 .../AkkaHttpServerInstrumentationTest.groovy | 0 .../src/test/resources/application.conf | 0 .../scala/AkkaHttpTestAsyncWebServer.scala | 0 .../scala/AkkaHttpTestSyncWebServer.scala | 0 .../test/scala/AkkaHttpTestWebServer.scala | 0 .../dropwizard-testing/build.gradle.kts | 0 .../test/groovy/DropwizardAsyncTest.groovy | 0 .../src/test/groovy/DropwizardTest.groovy | 0 .../javaagent/build.gradle.kts | 0 .../DropwizardInstrumentationModule.java | 0 .../DropwizardRendererInstrumentation.java | 0 .../dropwizardviews/DropwizardSingletons.java | 0 .../src/test/groovy/ViewRenderTest.groovy | 0 .../src/test/resources/views/ftl/iso88591.ftl | 0 .../src/test/resources/views/ftl/utf8.ftl | 0 .../views/mustache/iso88591.mustache | 0 .../resources/views/mustache/utf8.mustache | 0 .../bootstrap/build.gradle.kts | 0 .../KafkaClientsConsumerProcessTracing.java | 0 .../KafkaClientsConsumerProcessWrapper.java | 0 .../javaagent/build.gradle.kts | 6 ++-- .../ConsumerRecordsInstrumentation.java | 0 .../KafkaClientsInstrumentationModule.java | 0 .../KafkaConsumerInstrumentation.java | 0 .../KafkaProducerInstrumentation.java | 0 .../kafkaclients/KafkaSingletons.java | 0 .../kafkaclients/ProducerCallback.java | 0 .../kafkaclients/TracingIterable.java | 0 .../kafkaclients/TracingIterator.java | 0 .../kafkaclients/TracingList.java | 0 .../KafkaClientDefaultTest.groovy | 2 +- .../KafkaClientPropagationDisabledTest.groovy | 0 ...KafkaClientSuppressReceiveSpansTest.groovy | 0 .../testing/build.gradle.kts | 2 +- .../kafkaclients/KafkaClientBaseTest.groovy | 0 .../KafkaClientPropagationBaseTest.groovy | 0 .../library/build.gradle.kts | 4 +-- .../kafkaclients/KafkaTracing.java | 0 .../kafkaclients/KafkaTracingBuilder.java | 0 .../kafkaclients/TracingConsumer.java | 0 .../TracingConsumerInterceptor.java | 0 .../kafkaclients/TracingProducer.java | 0 .../TracingProducerInterceptor.java | 0 .../kafkaclients/InterceptorsTest.groovy | 0 .../kafkaclients/WrappersTest.groovy | 0 .../library/build.gradle.kts | 0 ...ConsumerAdditionalAttributesExtractor.java | 0 .../KafkaConsumerAttributesExtractor.java | 0 ...nsumerExperimentalAttributesExtractor.java | 0 .../internal/KafkaConsumerRecordGetter.java | 0 .../internal/KafkaConsumerTimeExtractor.java | 0 .../kafka/internal/KafkaHeadersGetter.java | 0 .../kafka/internal/KafkaHeadersSetter.java | 0 .../internal/KafkaInstrumenterFactory.java | 0 ...ProducerAdditionalAttributesExtractor.java | 0 .../KafkaProducerAttributesExtractor.java | 0 .../kafka/internal/KafkaPropagation.java | 0 .../KafkaReceiveAttributesExtractor.java | 0 .../kafka/internal/ReceivedRecords.java | 0 .../instrumentation/kafka/internal/Timer.java | 0 .../javaagent/build.gradle.kts | 6 ++-- .../KafkaStreamsInstrumentationModule.java | 0 .../kafkastreams/KafkaStreamsSingletons.java | 0 .../PartitionGroupInstrumentation.java | 0 .../RecordDeserializerInstrumentation.java | 0 ...NodeRecordDeserializerInstrumentation.java | 0 .../kafkastreams/StateHolder.java | 0 .../StreamTaskInstrumentation.java | 0 .../StreamThreadInstrumentation.java | 0 .../test/groovy/KafkaStreamsBaseTest.groovy | 0 .../groovy/KafkaStreamsDefaultTest.groovy | 6 ++-- ...afkaStreamsSuppressReceiveSpansTest.groovy | 6 ++-- .../lettuce-5.0/javaagent/build.gradle.kts | 2 +- .../lettuce-5.1/javaagent/build.gradle.kts | 2 +- .../lettuce-5.1/library/build.gradle.kts | 2 +- .../play-ws-1.0/javaagent/build.gradle.kts | 4 +-- .../play-ws-2.0/javaagent/build.gradle.kts | 4 +-- .../play-ws-2.1/javaagent/build.gradle.kts | 4 +-- .../play/play-2.4/javaagent/build.gradle.kts | 2 +- .../play/play-2.6/javaagent/build.gradle.kts | 4 +-- .../rabbitmq-2.7/javaagent/build.gradle.kts | 2 +- .../reactor-3.1/javaagent/build.gradle.kts | 4 +-- ...extPropagationOperatorInstrumentation.java | 0 .../reactor/HooksInstrumentation.java | 0 .../reactor/ReactorInstrumentationModule.java | 0 ...pagationOperatorInstrumentationTest.groovy | 0 .../src/test/groovy/ReactorCoreTest.groovy | 0 .../ReactorWithSpanInstrumentationTest.groovy | 0 .../src/test/groovy/SubscriptionTest.groovy | 0 .../reactor/TracedWithSpan.java | 0 .../reactor-3.1/library/build.gradle.kts | 2 +- .../reactor/ContextPropagationOperator.java | 0 .../ContextPropagationOperatorBuilder.java | 0 .../ReactorAsyncOperationEndStrategy.java | 0 ...actorAsyncOperationEndStrategyBuilder.java | 0 .../reactor/TracingSubscriber.java | 0 .../instrumentation/reactor/HooksTest.groovy | 0 ...eactorAsyncOperationEndStrategyTest.groovy | 0 .../reactor/ReactorCoreTest.groovy | 0 .../reactor/SubscriptionTest.groovy | 0 .../reactor-3.1/testing/build.gradle.kts | 0 .../reactor/AbstractReactorCoreTest.groovy | 0 .../reactor/AbstractSubscriptionTest.groovy | 0 .../javaagent/build.gradle.kts | 4 +-- .../reactornetty/v0_9/DecoratorFunctions.java | 0 .../v0_9/HttpClientInstrumentation.java | 0 .../reactornetty/v0_9/MapConnect.java | 0 .../reactornetty/v0_9/OnRequest.java | 0 .../ReactorNettyInstrumentationModule.java | 0 .../AbstractReactorNettyHttpClientTest.groovy | 0 .../ReactorNettyConnectionSpanTest.groovy | 0 .../v0_9/ReactorNettyHttpClientTest.groovy | 0 ...ReactorNettyHttpClientUsingFromTest.groovy | 0 .../javaagent/build.gradle.kts | 6 ++-- .../v1_0/ConnectionRequestAndContext.java | 0 .../reactornetty/v1_0/ConnectionWrapper.java | 0 .../reactornetty/v1_0/DecoratorFunctions.java | 0 .../v1_0/HttpClientInstrumentation.java | 0 .../v1_0/HttpClientRequestHeadersSetter.java | 0 .../HttpResponseReceiverInstrumenter.java | 0 .../reactornetty/v1_0/ReactorContextKeys.java | 0 ...torNettyHttpClientAttributesExtractor.java | 0 .../ReactorNettyInstrumentationModule.java | 0 ...ctorNettyNetClientAttributesExtractor.java | 0 .../v1_0/ReactorNettySingletons.java | 0 .../v1_0/ResponseReceiverInstrumentation.java | 0 .../TransportConnectorInstrumentation.java | 0 .../groovy/ReactorNettyWithSpanTest.groovy | 0 .../AbstractReactorNettyHttpClientTest.groovy | 0 .../v1_0/ReactorNettyClientSslTest.groovy | 0 .../ReactorNettyConnectionSpanTest.groovy | 0 .../v1_0/ReactorNettyHttpClientTest.groovy | 0 ...ReactorNettyHttpClientUsingFromTest.groovy | 0 .../test/reactor/netty/TracedWithSpan.java | 0 .../javaagent/build.gradle.kts | 6 ++-- .../javaagent/build.gradle.kts | 4 +-- .../javaagent/build.gradle.kts | 0 .../client/HttpClientImplInstrumentation.java | 0 .../HttpRequestImplInstrumentation.java | 0 .../client/HttpRequestInstrumentation.java | 0 .../client/Vertx3HttpAttributesExtractor.java | 0 .../VertxClientInstrumentationModule.java | 0 .../v3_0/client/VertxClientSingletons.java | 0 .../vertx/v3_0/client/VertxRequestInfo.java | 0 .../groovy/client/VertxHttpClientTest.groovy | 0 .../java/client/VertxSingleConnection.java | 0 .../javaagent/build.gradle.kts | 0 .../ConnectionManagerInstrumentation.java | 0 .../vertx/v4_0/client/HandlerWrapper.java | 0 .../HttpClientConnectionInstrumentation.java | 0 .../client/HttpRequestInstrumentation.java | 0 .../client/Vertx4HttpAttributesExtractor.java | 0 .../client/Vertx4NetAttributesExtractor.java | 0 .../VertxClientInstrumentationModule.java | 0 .../v4_0/client/VertxClientSingletons.java | 0 .../groovy/client/VertxHttpClientTest.groovy | 0 .../java/client/VertxSingleConnection.java | 0 .../javaagent/build.gradle.kts | 0 .../AbstractVertxHttpAttributesExtractor.java | 0 .../vertx/client/Contexts.java | 0 .../vertx/client/ExceptionHandlerWrapper.java | 0 .../vertx/client/HttpRequestHeaderSetter.java | 0 .../VertxClientInstrumenterFactory.java | 0 .../javaagent/build.gradle.kts | 0 .../VertxReactivePropagationTest.groovy | 0 .../VertxRxCircuitBreakerWebClientTest.groovy | 0 .../groovy/client/VertxRxWebClientTest.groovy | 0 ...VertxRxCircuitBreakerHttpServerTest.groovy | 0 .../server/VertxRxHttpServerTest.groovy | 0 .../java/VertxReactiveWebServer.java | 0 ...VertxRxCircuitBreakerSingleConnection.java | 0 .../java/client/VertxRxSingleConnection.java | 0 .../handler/codec/haproxy/HAProxyMessage.java | 0 .../codec/haproxy/HAProxyProxiedProtocol.java | 0 .../reactive/AsyncResultConsumerWrapper.java | 0 .../reactive/AsyncResultHandlerWrapper.java | 0 .../AsyncResultSingleInstrumentation.java | 0 .../VertxRxInstrumentationModule.java | 0 .../vertx/reactive/package-info.java | 0 .../VertxReactivePropagationTest.groovy | 0 .../VertxRxCircuitBreakerWebClientTest.groovy | 0 .../groovy/client/VertxRxWebClientTest.groovy | 0 ...VertxRxCircuitBreakerHttpServerTest.groovy | 0 .../server/VertxRxHttpServerTest.groovy | 0 .../java/VertxReactiveWebServer.java | 0 ...VertxRxCircuitBreakerSingleConnection.java | 0 .../java/client/VertxRxSingleConnection.java | 0 .../vertx-web-3.0/javaagent/build.gradle.kts | 0 .../server/VertxLatestHttpServerTest.groovy | 0 .../handler/codec/haproxy/HAProxyMessage.java | 0 .../codec/haproxy/HAProxyProxiedProtocol.java | 0 .../java/server/VertxLatestWebServer.java | 0 .../vertx/RouteInstrumentation.java | 0 .../vertx/RoutingContextHandlerWrapper.java | 0 .../vertx/VertxWebInstrumentationModule.java | 0 .../instrumentation/vertx/package-info.java | 0 .../groovy/server/VertxHttpServerTest.groovy | 0 .../java/server/VertxWebServer.java | 0 .../vertx-web-3.0/testing/build.gradle.kts | 0 .../server/AbstractVertxHttpServerTest.groovy | 0 .../java/server/AbstractVertxWebServer.java | 0 settings.gradle.kts | 32 +++++++++---------- 233 files changed, 60 insertions(+), 60 deletions(-) rename instrumentation/{ => akka}/akka-actor-2.5/javaagent/build.gradle.kts (100%) rename instrumentation/{ => akka}/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorCellInstrumentation.java (100%) rename instrumentation/{ => akka}/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorInstrumentationModule.java (100%) rename instrumentation/{ => akka}/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaDefaultSystemMessageQueueInstrumentation.java (100%) rename instrumentation/{ => akka}/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaDispatcherInstrumentation.java (100%) rename instrumentation/{ => akka}/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaIgnoredTypesConfigurer.java (100%) rename instrumentation/{ => akka}/akka-actor-2.5/javaagent/src/test/groovy/AkkaActorTest.groovy (100%) rename instrumentation/{ => akka}/akka-actor-2.5/javaagent/src/test/scala/AkkaActors.scala (100%) rename instrumentation/{ => akka}/akka-actor-fork-join-2.5/javaagent/build.gradle.kts (100%) rename instrumentation/{ => akka}/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorForkJoinInstrumentationModule.java (100%) rename instrumentation/{ => akka}/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaForkJoinPoolInstrumentation.java (100%) rename instrumentation/{ => akka}/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaForkJoinTaskInstrumentation.java (100%) rename instrumentation/{ => akka}/akka-actor-fork-join-2.5/javaagent/src/test/groovy/AkkaExecutorInstrumentationTest.groovy (100%) rename instrumentation/{ => akka}/akka-actor-fork-join-2.5/javaagent/src/test/java/AkkaAsyncChild.java (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/build.gradle.kts (90%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpUtil.java (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientAttributesExtractor.java (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientInstrumentationModule.java (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientSingletons.java (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpNetAttributesExtractor.java (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/FutureWrapper.java (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/HttpExtClientInstrumentation.java (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/HttpHeaderSetter.java (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/OnCompleteHandler.java (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/PoolMasterActorInstrumentation.java (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerAttributesExtractor.java (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerHeaders.java (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerInstrumentationModule.java (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerSingletons.java (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/HttpExtServerInstrumentation.java (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/test/resources/application.conf (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestAsyncWebServer.scala (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestSyncWebServer.scala (100%) rename instrumentation/{ => akka}/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestWebServer.scala (100%) rename instrumentation/{ => dropwizard}/dropwizard-testing/build.gradle.kts (100%) rename instrumentation/{ => dropwizard}/dropwizard-testing/src/test/groovy/DropwizardAsyncTest.groovy (100%) rename instrumentation/{ => dropwizard}/dropwizard-testing/src/test/groovy/DropwizardTest.groovy (100%) rename instrumentation/{ => dropwizard}/dropwizard-views-0.7/javaagent/build.gradle.kts (100%) rename instrumentation/{ => dropwizard}/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardInstrumentationModule.java (100%) rename instrumentation/{ => dropwizard}/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardRendererInstrumentation.java (100%) rename instrumentation/{ => dropwizard}/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardSingletons.java (100%) rename instrumentation/{ => dropwizard}/dropwizard-views-0.7/javaagent/src/test/groovy/ViewRenderTest.groovy (100%) rename instrumentation/{ => dropwizard}/dropwizard-views-0.7/javaagent/src/test/resources/views/ftl/iso88591.ftl (100%) rename instrumentation/{ => dropwizard}/dropwizard-views-0.7/javaagent/src/test/resources/views/ftl/utf8.ftl (100%) rename instrumentation/{ => dropwizard}/dropwizard-views-0.7/javaagent/src/test/resources/views/mustache/iso88591.mustache (100%) rename instrumentation/{ => dropwizard}/dropwizard-views-0.7/javaagent/src/test/resources/views/mustache/utf8.mustache (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-0.11/bootstrap/build.gradle.kts (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-0.11/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/kafka/KafkaClientsConsumerProcessTracing.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-0.11/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/kafka/KafkaClientsConsumerProcessWrapper.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-0.11/javaagent/build.gradle.kts (85%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/ConsumerRecordsInstrumentation.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaClientsInstrumentationModule.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaConsumerInstrumentation.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaProducerInstrumentation.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaSingletons.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/ProducerCallback.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingIterable.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingIterator.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingList.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientDefaultTest.groovy (98%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientPropagationDisabledTest.groovy (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientSuppressReceiveSpansTest.groovy (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-0.11/testing/build.gradle.kts (68%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-0.11/testing/src/main/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientBaseTest.groovy (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-0.11/testing/src/main/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientPropagationBaseTest.groovy (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-2.6/library/build.gradle.kts (73%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/KafkaTracing.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/KafkaTracingBuilder.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingConsumer.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingConsumerInterceptor.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingProducer.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingProducerInterceptor.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-2.6/library/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/InterceptorsTest.groovy (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-2.6/library/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/WrappersTest.groovy (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-common/library/build.gradle.kts (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAdditionalAttributesExtractor.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesExtractor.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerExperimentalAttributesExtractor.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerRecordGetter.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerTimeExtractor.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaHeadersGetter.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaHeadersSetter.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaInstrumenterFactory.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAdditionalAttributesExtractor.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesExtractor.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaPropagation.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaReceiveAttributesExtractor.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/ReceivedRecords.java (100%) rename instrumentation/{ => kafka}/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/Timer.java (100%) rename instrumentation/{ => kafka}/kafka-streams-0.11/javaagent/build.gradle.kts (80%) rename instrumentation/{ => kafka}/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsInstrumentationModule.java (100%) rename instrumentation/{ => kafka}/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsSingletons.java (100%) rename instrumentation/{ => kafka}/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/PartitionGroupInstrumentation.java (100%) rename instrumentation/{ => kafka}/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/RecordDeserializerInstrumentation.java (100%) rename instrumentation/{ => kafka}/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/SourceNodeRecordDeserializerInstrumentation.java (100%) rename instrumentation/{ => kafka}/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/StateHolder.java (100%) rename instrumentation/{ => kafka}/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/StreamTaskInstrumentation.java (100%) rename instrumentation/{ => kafka}/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/StreamThreadInstrumentation.java (100%) rename instrumentation/{ => kafka}/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsBaseTest.groovy (100%) rename instrumentation/{ => kafka}/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy (96%) rename instrumentation/{ => kafka}/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy (95%) rename instrumentation/{ => reactor}/reactor-3.1/javaagent/build.gradle.kts (88%) rename instrumentation/{ => reactor}/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/ContextPropagationOperatorInstrumentation.java (100%) rename instrumentation/{ => reactor}/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/HooksInstrumentation.java (100%) rename instrumentation/{ => reactor}/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/ReactorInstrumentationModule.java (100%) rename instrumentation/{ => reactor}/reactor-3.1/javaagent/src/test/groovy/ContextPropagationOperatorInstrumentationTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-3.1/javaagent/src/test/groovy/ReactorCoreTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-3.1/javaagent/src/test/groovy/ReactorWithSpanInstrumentationTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-3.1/javaagent/src/test/groovy/SubscriptionTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-3.1/javaagent/src/test/java/io/opentelemetry/instrumentation/reactor/TracedWithSpan.java (100%) rename instrumentation/{ => reactor}/reactor-3.1/library/build.gradle.kts (84%) rename instrumentation/{ => reactor}/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ContextPropagationOperator.java (100%) rename instrumentation/{ => reactor}/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ContextPropagationOperatorBuilder.java (100%) rename instrumentation/{ => reactor}/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategy.java (100%) rename instrumentation/{ => reactor}/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategyBuilder.java (100%) rename instrumentation/{ => reactor}/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/TracingSubscriber.java (100%) rename instrumentation/{ => reactor}/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/HooksTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategyTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorCoreTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/SubscriptionTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-3.1/testing/build.gradle.kts (100%) rename instrumentation/{ => reactor}/reactor-3.1/testing/src/main/groovy/io/opentelemetry/instrumentation/reactor/AbstractReactorCoreTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-3.1/testing/src/main/groovy/io/opentelemetry/instrumentation/reactor/AbstractSubscriptionTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts (85%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/DecoratorFunctions.java (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/HttpClientInstrumentation.java (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/MapConnect.java (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/OnRequest.java (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyInstrumentationModule.java (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyHttpClientTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyHttpClientUsingFromTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts (86%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ConnectionRequestAndContext.java (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ConnectionWrapper.java (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/DecoratorFunctions.java (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/HttpClientInstrumentation.java (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/HttpClientRequestHeadersSetter.java (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/HttpResponseReceiverInstrumenter.java (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorContextKeys.java (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientAttributesExtractor.java (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyInstrumentationModule.java (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyNetClientAttributesExtractor.java (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettySingletons.java (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ResponseReceiverInstrumentation.java (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/TransportConnectorInstrumentation.java (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/ReactorNettyWithSpanTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientUsingFromTest.groovy (100%) rename instrumentation/{ => reactor}/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/test/reactor/netty/TracedWithSpan.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/HttpClientImplInstrumentation.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/HttpRequestImplInstrumentation.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/HttpRequestInstrumentation.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/Vertx3HttpAttributesExtractor.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxClientInstrumentationModule.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxClientSingletons.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxRequestInfo.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/groovy/client/VertxHttpClientTest.groovy (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/java/client/VertxSingleConnection.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-4.0/javaagent/build.gradle.kts (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/ConnectionManagerInstrumentation.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/HandlerWrapper.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/HttpClientConnectionInstrumentation.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/HttpRequestInstrumentation.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4HttpAttributesExtractor.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4NetAttributesExtractor.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/VertxClientInstrumentationModule.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/VertxClientSingletons.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-4.0/javaagent/src/test/groovy/client/VertxHttpClientTest.groovy (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-4.0/javaagent/src/test/java/client/VertxSingleConnection.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-common/javaagent/build.gradle.kts (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/AbstractVertxHttpAttributesExtractor.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/Contexts.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/ExceptionHandlerWrapper.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/HttpRequestHeaderSetter.java (100%) rename instrumentation/{ => vertx}/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/VertxClientInstrumenterFactory.java (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/build.gradle.kts (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/client/VertxRxWebClientTest.groovy (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/server/VertxRxCircuitBreakerHttpServerTest.groovy (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/server/VertxRxHttpServerTest.groovy (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/latestDepTest/java/VertxReactiveWebServer.java (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/latestDepTest/java/client/VertxRxCircuitBreakerSingleConnection.java (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/latestDepTest/java/client/VertxRxSingleConnection.java (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyMessage.java (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyProxiedProtocol.java (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/AsyncResultConsumerWrapper.java (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/AsyncResultHandlerWrapper.java (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/AsyncResultSingleInstrumentation.java (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/VertxRxInstrumentationModule.java (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/package-info.java (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/version35Test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/version35Test/groovy/client/VertxRxWebClientTest.groovy (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/version35Test/groovy/server/VertxRxCircuitBreakerHttpServerTest.groovy (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/version35Test/groovy/server/VertxRxHttpServerTest.groovy (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/version35Test/java/VertxReactiveWebServer.java (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/version35Test/java/client/VertxRxCircuitBreakerSingleConnection.java (100%) rename instrumentation/{ => vertx}/vertx-reactive-3.5/javaagent/src/version35Test/java/client/VertxRxSingleConnection.java (100%) rename instrumentation/{ => vertx}/vertx-web-3.0/javaagent/build.gradle.kts (100%) rename instrumentation/{ => vertx}/vertx-web-3.0/javaagent/src/latestDepTest/groovy/server/VertxLatestHttpServerTest.groovy (100%) rename instrumentation/{ => vertx}/vertx-web-3.0/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyMessage.java (100%) rename instrumentation/{ => vertx}/vertx-web-3.0/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyProxiedProtocol.java (100%) rename instrumentation/{ => vertx}/vertx-web-3.0/javaagent/src/latestDepTest/java/server/VertxLatestWebServer.java (100%) rename instrumentation/{ => vertx}/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/RouteInstrumentation.java (100%) rename instrumentation/{ => vertx}/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/RoutingContextHandlerWrapper.java (100%) rename instrumentation/{ => vertx}/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxWebInstrumentationModule.java (100%) rename instrumentation/{ => vertx}/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/package-info.java (100%) rename instrumentation/{ => vertx}/vertx-web-3.0/javaagent/src/version3Test/groovy/server/VertxHttpServerTest.groovy (100%) rename instrumentation/{ => vertx}/vertx-web-3.0/javaagent/src/version3Test/java/server/VertxWebServer.java (100%) rename instrumentation/{ => vertx}/vertx-web-3.0/testing/build.gradle.kts (100%) rename instrumentation/{ => vertx}/vertx-web-3.0/testing/src/main/groovy/server/AbstractVertxHttpServerTest.groovy (100%) rename instrumentation/{ => vertx}/vertx-web-3.0/testing/src/main/java/server/AbstractVertxWebServer.java (100%) diff --git a/instrumentation/akka-actor-2.5/javaagent/build.gradle.kts b/instrumentation/akka/akka-actor-2.5/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/akka-actor-2.5/javaagent/build.gradle.kts rename to instrumentation/akka/akka-actor-2.5/javaagent/build.gradle.kts diff --git a/instrumentation/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorCellInstrumentation.java b/instrumentation/akka/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorCellInstrumentation.java similarity index 100% rename from instrumentation/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorCellInstrumentation.java rename to instrumentation/akka/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorCellInstrumentation.java diff --git a/instrumentation/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorInstrumentationModule.java b/instrumentation/akka/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorInstrumentationModule.java similarity index 100% rename from instrumentation/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorInstrumentationModule.java rename to instrumentation/akka/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorInstrumentationModule.java diff --git a/instrumentation/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaDefaultSystemMessageQueueInstrumentation.java b/instrumentation/akka/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaDefaultSystemMessageQueueInstrumentation.java similarity index 100% rename from instrumentation/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaDefaultSystemMessageQueueInstrumentation.java rename to instrumentation/akka/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaDefaultSystemMessageQueueInstrumentation.java diff --git a/instrumentation/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaDispatcherInstrumentation.java b/instrumentation/akka/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaDispatcherInstrumentation.java similarity index 100% rename from instrumentation/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaDispatcherInstrumentation.java rename to instrumentation/akka/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaDispatcherInstrumentation.java diff --git a/instrumentation/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaIgnoredTypesConfigurer.java b/instrumentation/akka/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaIgnoredTypesConfigurer.java similarity index 100% rename from instrumentation/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaIgnoredTypesConfigurer.java rename to instrumentation/akka/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaIgnoredTypesConfigurer.java diff --git a/instrumentation/akka-actor-2.5/javaagent/src/test/groovy/AkkaActorTest.groovy b/instrumentation/akka/akka-actor-2.5/javaagent/src/test/groovy/AkkaActorTest.groovy similarity index 100% rename from instrumentation/akka-actor-2.5/javaagent/src/test/groovy/AkkaActorTest.groovy rename to instrumentation/akka/akka-actor-2.5/javaagent/src/test/groovy/AkkaActorTest.groovy diff --git a/instrumentation/akka-actor-2.5/javaagent/src/test/scala/AkkaActors.scala b/instrumentation/akka/akka-actor-2.5/javaagent/src/test/scala/AkkaActors.scala similarity index 100% rename from instrumentation/akka-actor-2.5/javaagent/src/test/scala/AkkaActors.scala rename to instrumentation/akka/akka-actor-2.5/javaagent/src/test/scala/AkkaActors.scala diff --git a/instrumentation/akka-actor-fork-join-2.5/javaagent/build.gradle.kts b/instrumentation/akka/akka-actor-fork-join-2.5/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/akka-actor-fork-join-2.5/javaagent/build.gradle.kts rename to instrumentation/akka/akka-actor-fork-join-2.5/javaagent/build.gradle.kts diff --git a/instrumentation/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorForkJoinInstrumentationModule.java b/instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorForkJoinInstrumentationModule.java similarity index 100% rename from instrumentation/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorForkJoinInstrumentationModule.java rename to instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorForkJoinInstrumentationModule.java diff --git a/instrumentation/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaForkJoinPoolInstrumentation.java b/instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaForkJoinPoolInstrumentation.java similarity index 100% rename from instrumentation/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaForkJoinPoolInstrumentation.java rename to instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaForkJoinPoolInstrumentation.java diff --git a/instrumentation/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaForkJoinTaskInstrumentation.java b/instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaForkJoinTaskInstrumentation.java similarity index 100% rename from instrumentation/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaForkJoinTaskInstrumentation.java rename to instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaForkJoinTaskInstrumentation.java diff --git a/instrumentation/akka-actor-fork-join-2.5/javaagent/src/test/groovy/AkkaExecutorInstrumentationTest.groovy b/instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/test/groovy/AkkaExecutorInstrumentationTest.groovy similarity index 100% rename from instrumentation/akka-actor-fork-join-2.5/javaagent/src/test/groovy/AkkaExecutorInstrumentationTest.groovy rename to instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/test/groovy/AkkaExecutorInstrumentationTest.groovy diff --git a/instrumentation/akka-actor-fork-join-2.5/javaagent/src/test/java/AkkaAsyncChild.java b/instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/test/java/AkkaAsyncChild.java similarity index 100% rename from instrumentation/akka-actor-fork-join-2.5/javaagent/src/test/java/AkkaAsyncChild.java rename to instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/test/java/AkkaAsyncChild.java diff --git a/instrumentation/akka-http-10.0/javaagent/build.gradle.kts b/instrumentation/akka/akka-http-10.0/javaagent/build.gradle.kts similarity index 90% rename from instrumentation/akka-http-10.0/javaagent/build.gradle.kts rename to instrumentation/akka/akka-http-10.0/javaagent/build.gradle.kts index 7be4599e88b3..935b7e04797f 100644 --- a/instrumentation/akka-http-10.0/javaagent/build.gradle.kts +++ b/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")) } diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpUtil.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpUtil.java similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpUtil.java rename to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpUtil.java diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientAttributesExtractor.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientAttributesExtractor.java similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientAttributesExtractor.java rename to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientAttributesExtractor.java diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientInstrumentationModule.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientInstrumentationModule.java similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientInstrumentationModule.java rename to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientInstrumentationModule.java diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientSingletons.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientSingletons.java similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientSingletons.java rename to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientSingletons.java diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpNetAttributesExtractor.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpNetAttributesExtractor.java similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpNetAttributesExtractor.java rename to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpNetAttributesExtractor.java diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/FutureWrapper.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/FutureWrapper.java similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/FutureWrapper.java rename to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/FutureWrapper.java diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/HttpExtClientInstrumentation.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/HttpExtClientInstrumentation.java similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/HttpExtClientInstrumentation.java rename to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/HttpExtClientInstrumentation.java diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/HttpHeaderSetter.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/HttpHeaderSetter.java similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/HttpHeaderSetter.java rename to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/HttpHeaderSetter.java diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/OnCompleteHandler.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/OnCompleteHandler.java similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/OnCompleteHandler.java rename to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/OnCompleteHandler.java diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/PoolMasterActorInstrumentation.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/PoolMasterActorInstrumentation.java similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/PoolMasterActorInstrumentation.java rename to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/PoolMasterActorInstrumentation.java diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerAttributesExtractor.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerAttributesExtractor.java similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerAttributesExtractor.java rename to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerAttributesExtractor.java diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerHeaders.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerHeaders.java similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerHeaders.java rename to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerHeaders.java diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerInstrumentationModule.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerInstrumentationModule.java similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerInstrumentationModule.java rename to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerInstrumentationModule.java diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerSingletons.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerSingletons.java similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerSingletons.java rename to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerSingletons.java diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/HttpExtServerInstrumentation.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/HttpExtServerInstrumentation.java similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/HttpExtServerInstrumentation.java rename to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/HttpExtServerInstrumentation.java diff --git a/instrumentation/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy b/instrumentation/akka/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy rename to instrumentation/akka/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy diff --git a/instrumentation/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy b/instrumentation/akka/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy rename to instrumentation/akka/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy diff --git a/instrumentation/akka-http-10.0/javaagent/src/test/resources/application.conf b/instrumentation/akka/akka-http-10.0/javaagent/src/test/resources/application.conf similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/test/resources/application.conf rename to instrumentation/akka/akka-http-10.0/javaagent/src/test/resources/application.conf diff --git a/instrumentation/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestAsyncWebServer.scala b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestAsyncWebServer.scala similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestAsyncWebServer.scala rename to instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestAsyncWebServer.scala diff --git a/instrumentation/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestSyncWebServer.scala b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestSyncWebServer.scala similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestSyncWebServer.scala rename to instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestSyncWebServer.scala diff --git a/instrumentation/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestWebServer.scala b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestWebServer.scala similarity index 100% rename from instrumentation/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestWebServer.scala rename to instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestWebServer.scala diff --git a/instrumentation/dropwizard-testing/build.gradle.kts b/instrumentation/dropwizard/dropwizard-testing/build.gradle.kts similarity index 100% rename from instrumentation/dropwizard-testing/build.gradle.kts rename to instrumentation/dropwizard/dropwizard-testing/build.gradle.kts diff --git a/instrumentation/dropwizard-testing/src/test/groovy/DropwizardAsyncTest.groovy b/instrumentation/dropwizard/dropwizard-testing/src/test/groovy/DropwizardAsyncTest.groovy similarity index 100% rename from instrumentation/dropwizard-testing/src/test/groovy/DropwizardAsyncTest.groovy rename to instrumentation/dropwizard/dropwizard-testing/src/test/groovy/DropwizardAsyncTest.groovy diff --git a/instrumentation/dropwizard-testing/src/test/groovy/DropwizardTest.groovy b/instrumentation/dropwizard/dropwizard-testing/src/test/groovy/DropwizardTest.groovy similarity index 100% rename from instrumentation/dropwizard-testing/src/test/groovy/DropwizardTest.groovy rename to instrumentation/dropwizard/dropwizard-testing/src/test/groovy/DropwizardTest.groovy diff --git a/instrumentation/dropwizard-views-0.7/javaagent/build.gradle.kts b/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/dropwizard-views-0.7/javaagent/build.gradle.kts rename to instrumentation/dropwizard/dropwizard-views-0.7/javaagent/build.gradle.kts diff --git a/instrumentation/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardInstrumentationModule.java b/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardInstrumentationModule.java similarity index 100% rename from instrumentation/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardInstrumentationModule.java rename to instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardInstrumentationModule.java diff --git a/instrumentation/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardRendererInstrumentation.java b/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardRendererInstrumentation.java similarity index 100% rename from instrumentation/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardRendererInstrumentation.java rename to instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardRendererInstrumentation.java diff --git a/instrumentation/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardSingletons.java b/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardSingletons.java similarity index 100% rename from instrumentation/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardSingletons.java rename to instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardSingletons.java diff --git a/instrumentation/dropwizard-views-0.7/javaagent/src/test/groovy/ViewRenderTest.groovy b/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/test/groovy/ViewRenderTest.groovy similarity index 100% rename from instrumentation/dropwizard-views-0.7/javaagent/src/test/groovy/ViewRenderTest.groovy rename to instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/test/groovy/ViewRenderTest.groovy diff --git a/instrumentation/dropwizard-views-0.7/javaagent/src/test/resources/views/ftl/iso88591.ftl b/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/test/resources/views/ftl/iso88591.ftl similarity index 100% rename from instrumentation/dropwizard-views-0.7/javaagent/src/test/resources/views/ftl/iso88591.ftl rename to instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/test/resources/views/ftl/iso88591.ftl diff --git a/instrumentation/dropwizard-views-0.7/javaagent/src/test/resources/views/ftl/utf8.ftl b/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/test/resources/views/ftl/utf8.ftl similarity index 100% rename from instrumentation/dropwizard-views-0.7/javaagent/src/test/resources/views/ftl/utf8.ftl rename to instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/test/resources/views/ftl/utf8.ftl diff --git a/instrumentation/dropwizard-views-0.7/javaagent/src/test/resources/views/mustache/iso88591.mustache b/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/test/resources/views/mustache/iso88591.mustache similarity index 100% rename from instrumentation/dropwizard-views-0.7/javaagent/src/test/resources/views/mustache/iso88591.mustache rename to instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/test/resources/views/mustache/iso88591.mustache diff --git a/instrumentation/dropwizard-views-0.7/javaagent/src/test/resources/views/mustache/utf8.mustache b/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/test/resources/views/mustache/utf8.mustache similarity index 100% rename from instrumentation/dropwizard-views-0.7/javaagent/src/test/resources/views/mustache/utf8.mustache rename to instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/test/resources/views/mustache/utf8.mustache diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/bootstrap/build.gradle.kts b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/bootstrap/build.gradle.kts similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-0.11/bootstrap/build.gradle.kts rename to instrumentation/kafka/kafka-clients/kafka-clients-0.11/bootstrap/build.gradle.kts diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/kafka/KafkaClientsConsumerProcessTracing.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/kafka/KafkaClientsConsumerProcessTracing.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-0.11/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/kafka/KafkaClientsConsumerProcessTracing.java rename to instrumentation/kafka/kafka-clients/kafka-clients-0.11/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/kafka/KafkaClientsConsumerProcessTracing.java diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/kafka/KafkaClientsConsumerProcessWrapper.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/kafka/KafkaClientsConsumerProcessWrapper.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-0.11/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/kafka/KafkaClientsConsumerProcessWrapper.java rename to instrumentation/kafka/kafka-clients/kafka-clients-0.11/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/kafka/KafkaClientsConsumerProcessWrapper.java diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/build.gradle.kts b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/build.gradle.kts similarity index 85% rename from instrumentation/kafka-clients/kafka-clients-0.11/javaagent/build.gradle.kts rename to instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/build.gradle.kts index 2259997c0656..42cfcc1e489b 100644 --- a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/build.gradle.kts +++ b/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 { diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/ConsumerRecordsInstrumentation.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/ConsumerRecordsInstrumentation.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/ConsumerRecordsInstrumentation.java rename to instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/ConsumerRecordsInstrumentation.java diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaClientsInstrumentationModule.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaClientsInstrumentationModule.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaClientsInstrumentationModule.java rename to instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaClientsInstrumentationModule.java diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaConsumerInstrumentation.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaConsumerInstrumentation.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaConsumerInstrumentation.java rename to instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaConsumerInstrumentation.java diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaProducerInstrumentation.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaProducerInstrumentation.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaProducerInstrumentation.java rename to instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaProducerInstrumentation.java diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaSingletons.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaSingletons.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaSingletons.java rename to instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaSingletons.java diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/ProducerCallback.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/ProducerCallback.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/ProducerCallback.java rename to instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/ProducerCallback.java diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingIterable.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingIterable.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingIterable.java rename to instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingIterable.java diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingIterator.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingIterator.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingIterator.java rename to instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingIterator.java diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingList.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingList.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingList.java rename to instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TracingList.java diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientDefaultTest.groovy b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientDefaultTest.groovy similarity index 98% rename from instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientDefaultTest.groovy rename to instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientDefaultTest.groovy index 165ff6294b99..949bb594d7b1 100644 --- a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientDefaultTest.groovy +++ b/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 diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientPropagationDisabledTest.groovy b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientPropagationDisabledTest.groovy similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientPropagationDisabledTest.groovy rename to instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientPropagationDisabledTest.groovy diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientSuppressReceiveSpansTest.groovy b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientSuppressReceiveSpansTest.groovy similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientSuppressReceiveSpansTest.groovy rename to instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientSuppressReceiveSpansTest.groovy diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/testing/build.gradle.kts b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/build.gradle.kts similarity index 68% rename from instrumentation/kafka-clients/kafka-clients-0.11/testing/build.gradle.kts rename to instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/build.gradle.kts index 2e285b3e9191..b8dc4adc702b 100644 --- a/instrumentation/kafka-clients/kafka-clients-0.11/testing/build.gradle.kts +++ b/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") } diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/testing/src/main/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientBaseTest.groovy b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientBaseTest.groovy similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-0.11/testing/src/main/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientBaseTest.groovy rename to instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientBaseTest.groovy diff --git a/instrumentation/kafka-clients/kafka-clients-0.11/testing/src/main/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientPropagationBaseTest.groovy b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientPropagationBaseTest.groovy similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-0.11/testing/src/main/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientPropagationBaseTest.groovy rename to instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/groovy/io/opentelemetry/instrumentation/kafkaclients/KafkaClientPropagationBaseTest.groovy diff --git a/instrumentation/kafka-clients/kafka-clients-2.6/library/build.gradle.kts b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/build.gradle.kts similarity index 73% rename from instrumentation/kafka-clients/kafka-clients-2.6/library/build.gradle.kts rename to instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/build.gradle.kts index af835920e583..beece7127590 100644 --- a/instrumentation/kafka-clients/kafka-clients-2.6/library/build.gradle.kts +++ b/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") diff --git a/instrumentation/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/KafkaTracing.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/KafkaTracing.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/KafkaTracing.java rename to instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/KafkaTracing.java diff --git a/instrumentation/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/KafkaTracingBuilder.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/KafkaTracingBuilder.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/KafkaTracingBuilder.java rename to instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/KafkaTracingBuilder.java diff --git a/instrumentation/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingConsumer.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingConsumer.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingConsumer.java rename to instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingConsumer.java diff --git a/instrumentation/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingConsumerInterceptor.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingConsumerInterceptor.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingConsumerInterceptor.java rename to instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingConsumerInterceptor.java diff --git a/instrumentation/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingProducer.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingProducer.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingProducer.java rename to instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingProducer.java diff --git a/instrumentation/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingProducerInterceptor.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingProducerInterceptor.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingProducerInterceptor.java rename to instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/TracingProducerInterceptor.java diff --git a/instrumentation/kafka-clients/kafka-clients-2.6/library/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/InterceptorsTest.groovy b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/InterceptorsTest.groovy similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-2.6/library/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/InterceptorsTest.groovy rename to instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/InterceptorsTest.groovy diff --git a/instrumentation/kafka-clients/kafka-clients-2.6/library/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/WrappersTest.groovy b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/WrappersTest.groovy similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-2.6/library/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/WrappersTest.groovy rename to instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/groovy/io/opentelemetry/instrumentation/kafkaclients/WrappersTest.groovy diff --git a/instrumentation/kafka-clients/kafka-clients-common/library/build.gradle.kts b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/build.gradle.kts similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-common/library/build.gradle.kts rename to instrumentation/kafka/kafka-clients/kafka-clients-common/library/build.gradle.kts diff --git a/instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAdditionalAttributesExtractor.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAdditionalAttributesExtractor.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAdditionalAttributesExtractor.java rename to instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAdditionalAttributesExtractor.java diff --git a/instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesExtractor.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesExtractor.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesExtractor.java rename to instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesExtractor.java diff --git a/instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerExperimentalAttributesExtractor.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerExperimentalAttributesExtractor.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerExperimentalAttributesExtractor.java rename to instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerExperimentalAttributesExtractor.java diff --git a/instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerRecordGetter.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerRecordGetter.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerRecordGetter.java rename to instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerRecordGetter.java diff --git a/instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerTimeExtractor.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerTimeExtractor.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerTimeExtractor.java rename to instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerTimeExtractor.java diff --git a/instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaHeadersGetter.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaHeadersGetter.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaHeadersGetter.java rename to instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaHeadersGetter.java diff --git a/instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaHeadersSetter.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaHeadersSetter.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaHeadersSetter.java rename to instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaHeadersSetter.java diff --git a/instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaInstrumenterFactory.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaInstrumenterFactory.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaInstrumenterFactory.java rename to instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaInstrumenterFactory.java diff --git a/instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAdditionalAttributesExtractor.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAdditionalAttributesExtractor.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAdditionalAttributesExtractor.java rename to instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAdditionalAttributesExtractor.java diff --git a/instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesExtractor.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesExtractor.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesExtractor.java rename to instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesExtractor.java diff --git a/instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaPropagation.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaPropagation.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaPropagation.java rename to instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaPropagation.java diff --git a/instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaReceiveAttributesExtractor.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaReceiveAttributesExtractor.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaReceiveAttributesExtractor.java rename to instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaReceiveAttributesExtractor.java diff --git a/instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/ReceivedRecords.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/ReceivedRecords.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/ReceivedRecords.java rename to instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/ReceivedRecords.java diff --git a/instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/Timer.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/Timer.java similarity index 100% rename from instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/Timer.java rename to instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/Timer.java diff --git a/instrumentation/kafka-streams-0.11/javaagent/build.gradle.kts b/instrumentation/kafka/kafka-streams-0.11/javaagent/build.gradle.kts similarity index 80% rename from instrumentation/kafka-streams-0.11/javaagent/build.gradle.kts rename to instrumentation/kafka/kafka-streams-0.11/javaagent/build.gradle.kts index d633ee0a7637..506e630388e4 100644 --- a/instrumentation/kafka-streams-0.11/javaagent/build.gradle.kts +++ b/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") } diff --git a/instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsInstrumentationModule.java b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsInstrumentationModule.java similarity index 100% rename from instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsInstrumentationModule.java rename to instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsInstrumentationModule.java diff --git a/instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsSingletons.java b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsSingletons.java similarity index 100% rename from instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsSingletons.java rename to instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsSingletons.java diff --git a/instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/PartitionGroupInstrumentation.java b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/PartitionGroupInstrumentation.java similarity index 100% rename from instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/PartitionGroupInstrumentation.java rename to instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/PartitionGroupInstrumentation.java diff --git a/instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/RecordDeserializerInstrumentation.java b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/RecordDeserializerInstrumentation.java similarity index 100% rename from instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/RecordDeserializerInstrumentation.java rename to instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/RecordDeserializerInstrumentation.java diff --git a/instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/SourceNodeRecordDeserializerInstrumentation.java b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/SourceNodeRecordDeserializerInstrumentation.java similarity index 100% rename from instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/SourceNodeRecordDeserializerInstrumentation.java rename to instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/SourceNodeRecordDeserializerInstrumentation.java diff --git a/instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/StateHolder.java b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/StateHolder.java similarity index 100% rename from instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/StateHolder.java rename to instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/StateHolder.java diff --git a/instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/StreamTaskInstrumentation.java b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/StreamTaskInstrumentation.java similarity index 100% rename from instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/StreamTaskInstrumentation.java rename to instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/StreamTaskInstrumentation.java diff --git a/instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/StreamThreadInstrumentation.java b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/StreamThreadInstrumentation.java similarity index 100% rename from instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/StreamThreadInstrumentation.java rename to instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/StreamThreadInstrumentation.java diff --git a/instrumentation/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsBaseTest.groovy b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsBaseTest.groovy similarity index 100% rename from instrumentation/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsBaseTest.groovy rename to instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsBaseTest.groovy diff --git a/instrumentation/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy similarity index 96% rename from instrumentation/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy rename to instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy index ffd40b7afaff..4b7a38f4df68 100644 --- a/instrumentation/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy +++ b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/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/instrumentation/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy similarity index 95% rename from instrumentation/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy rename to instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy index 216e9d01d53c..a73ce55234ca 100644 --- a/instrumentation/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy +++ b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.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 index 7c0bfb37bb72..d1937138ace3 100644 --- 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().configureEach { diff --git a/instrumentation/lettuce/lettuce-5.1/javaagent/build.gradle.kts b/instrumentation/lettuce/lettuce-5.1/javaagent/build.gradle.kts index 84050a2d5020..0f5277dcb2bc 100644 --- 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 index 9d8241fc5d31..716295f4e574 100644 --- 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 index 754fa1d7763e..c052173b1069 100644 --- 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 index 63f991fe9a98..7d17c7375de6 100644 --- 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 index 32fc7508aee4..53c9b8632a89 100644 --- 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 index 8e9f05cf0039..d25a2fc1de54 100644 --- 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 index 31a3509f09b6..7a180379d067 100644 --- 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 index e7365ffe4de4..b21b83824dea 100644 --- 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/instrumentation/reactor-3.1/javaagent/build.gradle.kts b/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts similarity index 88% rename from instrumentation/reactor-3.1/javaagent/build.gradle.kts rename to instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts index b19017ed569d..7fb51121f9dd 100644 --- a/instrumentation/reactor-3.1/javaagent/build.gradle.kts +++ b/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts @@ -18,7 +18,7 @@ tasks.withType().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/instrumentation/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/ContextPropagationOperatorInstrumentation.java b/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/ContextPropagationOperatorInstrumentation.java similarity index 100% rename from instrumentation/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/ContextPropagationOperatorInstrumentation.java rename to instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/ContextPropagationOperatorInstrumentation.java diff --git a/instrumentation/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/HooksInstrumentation.java b/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/HooksInstrumentation.java similarity index 100% rename from instrumentation/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/HooksInstrumentation.java rename to instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/HooksInstrumentation.java diff --git a/instrumentation/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/ReactorInstrumentationModule.java b/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/ReactorInstrumentationModule.java similarity index 100% rename from instrumentation/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/ReactorInstrumentationModule.java rename to instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/ReactorInstrumentationModule.java diff --git a/instrumentation/reactor-3.1/javaagent/src/test/groovy/ContextPropagationOperatorInstrumentationTest.groovy b/instrumentation/reactor/reactor-3.1/javaagent/src/test/groovy/ContextPropagationOperatorInstrumentationTest.groovy similarity index 100% rename from instrumentation/reactor-3.1/javaagent/src/test/groovy/ContextPropagationOperatorInstrumentationTest.groovy rename to instrumentation/reactor/reactor-3.1/javaagent/src/test/groovy/ContextPropagationOperatorInstrumentationTest.groovy diff --git a/instrumentation/reactor-3.1/javaagent/src/test/groovy/ReactorCoreTest.groovy b/instrumentation/reactor/reactor-3.1/javaagent/src/test/groovy/ReactorCoreTest.groovy similarity index 100% rename from instrumentation/reactor-3.1/javaagent/src/test/groovy/ReactorCoreTest.groovy rename to instrumentation/reactor/reactor-3.1/javaagent/src/test/groovy/ReactorCoreTest.groovy diff --git a/instrumentation/reactor-3.1/javaagent/src/test/groovy/ReactorWithSpanInstrumentationTest.groovy b/instrumentation/reactor/reactor-3.1/javaagent/src/test/groovy/ReactorWithSpanInstrumentationTest.groovy similarity index 100% rename from instrumentation/reactor-3.1/javaagent/src/test/groovy/ReactorWithSpanInstrumentationTest.groovy rename to instrumentation/reactor/reactor-3.1/javaagent/src/test/groovy/ReactorWithSpanInstrumentationTest.groovy diff --git a/instrumentation/reactor-3.1/javaagent/src/test/groovy/SubscriptionTest.groovy b/instrumentation/reactor/reactor-3.1/javaagent/src/test/groovy/SubscriptionTest.groovy similarity index 100% rename from instrumentation/reactor-3.1/javaagent/src/test/groovy/SubscriptionTest.groovy rename to instrumentation/reactor/reactor-3.1/javaagent/src/test/groovy/SubscriptionTest.groovy diff --git a/instrumentation/reactor-3.1/javaagent/src/test/java/io/opentelemetry/instrumentation/reactor/TracedWithSpan.java b/instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/instrumentation/reactor/TracedWithSpan.java similarity index 100% rename from instrumentation/reactor-3.1/javaagent/src/test/java/io/opentelemetry/instrumentation/reactor/TracedWithSpan.java rename to instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/instrumentation/reactor/TracedWithSpan.java diff --git a/instrumentation/reactor-3.1/library/build.gradle.kts b/instrumentation/reactor/reactor-3.1/library/build.gradle.kts similarity index 84% rename from instrumentation/reactor-3.1/library/build.gradle.kts rename to instrumentation/reactor/reactor-3.1/library/build.gradle.kts index 14f62e855336..cf71da585bab 100644 --- a/instrumentation/reactor-3.1/library/build.gradle.kts +++ b/instrumentation/reactor/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/instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ContextPropagationOperator.java b/instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ContextPropagationOperator.java similarity index 100% rename from instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ContextPropagationOperator.java rename to instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ContextPropagationOperator.java diff --git a/instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ContextPropagationOperatorBuilder.java b/instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ContextPropagationOperatorBuilder.java similarity index 100% rename from instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ContextPropagationOperatorBuilder.java rename to instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ContextPropagationOperatorBuilder.java diff --git a/instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategy.java b/instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategy.java similarity index 100% rename from instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategy.java rename to instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategy.java diff --git a/instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategyBuilder.java b/instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategyBuilder.java similarity index 100% rename from instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategyBuilder.java rename to instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategyBuilder.java diff --git a/instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/TracingSubscriber.java b/instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/TracingSubscriber.java similarity index 100% rename from instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/TracingSubscriber.java rename to instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/TracingSubscriber.java diff --git a/instrumentation/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/HooksTest.groovy b/instrumentation/reactor/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/HooksTest.groovy similarity index 100% rename from instrumentation/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/HooksTest.groovy rename to instrumentation/reactor/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/HooksTest.groovy diff --git a/instrumentation/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategyTest.groovy b/instrumentation/reactor/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategyTest.groovy similarity index 100% rename from instrumentation/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategyTest.groovy rename to instrumentation/reactor/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategyTest.groovy diff --git a/instrumentation/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorCoreTest.groovy b/instrumentation/reactor/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorCoreTest.groovy similarity index 100% rename from instrumentation/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorCoreTest.groovy rename to instrumentation/reactor/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorCoreTest.groovy diff --git a/instrumentation/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/SubscriptionTest.groovy b/instrumentation/reactor/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/SubscriptionTest.groovy similarity index 100% rename from instrumentation/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/SubscriptionTest.groovy rename to instrumentation/reactor/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/SubscriptionTest.groovy diff --git a/instrumentation/reactor-3.1/testing/build.gradle.kts b/instrumentation/reactor/reactor-3.1/testing/build.gradle.kts similarity index 100% rename from instrumentation/reactor-3.1/testing/build.gradle.kts rename to instrumentation/reactor/reactor-3.1/testing/build.gradle.kts diff --git a/instrumentation/reactor-3.1/testing/src/main/groovy/io/opentelemetry/instrumentation/reactor/AbstractReactorCoreTest.groovy b/instrumentation/reactor/reactor-3.1/testing/src/main/groovy/io/opentelemetry/instrumentation/reactor/AbstractReactorCoreTest.groovy similarity index 100% rename from instrumentation/reactor-3.1/testing/src/main/groovy/io/opentelemetry/instrumentation/reactor/AbstractReactorCoreTest.groovy rename to instrumentation/reactor/reactor-3.1/testing/src/main/groovy/io/opentelemetry/instrumentation/reactor/AbstractReactorCoreTest.groovy diff --git a/instrumentation/reactor-3.1/testing/src/main/groovy/io/opentelemetry/instrumentation/reactor/AbstractSubscriptionTest.groovy b/instrumentation/reactor/reactor-3.1/testing/src/main/groovy/io/opentelemetry/instrumentation/reactor/AbstractSubscriptionTest.groovy similarity index 100% rename from instrumentation/reactor-3.1/testing/src/main/groovy/io/opentelemetry/instrumentation/reactor/AbstractSubscriptionTest.groovy rename to instrumentation/reactor/reactor-3.1/testing/src/main/groovy/io/opentelemetry/instrumentation/reactor/AbstractSubscriptionTest.groovy diff --git a/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts similarity index 85% rename from instrumentation/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts rename to instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts index b3bf76977779..c88f9f1a6c91 100644 --- a/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts +++ b/instrumentation/reactor/reactor-netty/reactor-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/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/DecoratorFunctions.java b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/DecoratorFunctions.java similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/DecoratorFunctions.java rename to instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/DecoratorFunctions.java diff --git a/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/HttpClientInstrumentation.java b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/HttpClientInstrumentation.java similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/HttpClientInstrumentation.java rename to instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/HttpClientInstrumentation.java diff --git a/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/MapConnect.java b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/MapConnect.java similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/MapConnect.java rename to instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/MapConnect.java diff --git a/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/OnRequest.java b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/OnRequest.java similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/OnRequest.java rename to instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/OnRequest.java diff --git a/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyInstrumentationModule.java b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyInstrumentationModule.java similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyInstrumentationModule.java rename to instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyInstrumentationModule.java diff --git a/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.groovy b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.groovy similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.groovy rename to instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.groovy diff --git a/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.groovy b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.groovy similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.groovy rename to instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.groovy diff --git a/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyHttpClientTest.groovy b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyHttpClientTest.groovy similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyHttpClientTest.groovy rename to instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyHttpClientTest.groovy diff --git a/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyHttpClientUsingFromTest.groovy b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyHttpClientUsingFromTest.groovy similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyHttpClientUsingFromTest.groovy rename to instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyHttpClientUsingFromTest.groovy diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts similarity index 86% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts index 2a12f952cca8..7be45859667d 100644 --- a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts +++ b/instrumentation/reactor/reactor-netty/reactor-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/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ConnectionRequestAndContext.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ConnectionRequestAndContext.java similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ConnectionRequestAndContext.java rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ConnectionRequestAndContext.java diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ConnectionWrapper.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ConnectionWrapper.java similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ConnectionWrapper.java rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ConnectionWrapper.java diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/DecoratorFunctions.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/DecoratorFunctions.java similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/DecoratorFunctions.java rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/DecoratorFunctions.java diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/HttpClientInstrumentation.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/HttpClientInstrumentation.java similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/HttpClientInstrumentation.java rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/HttpClientInstrumentation.java diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/HttpClientRequestHeadersSetter.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/HttpClientRequestHeadersSetter.java similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/HttpClientRequestHeadersSetter.java rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/HttpClientRequestHeadersSetter.java diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/HttpResponseReceiverInstrumenter.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/HttpResponseReceiverInstrumenter.java similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/HttpResponseReceiverInstrumenter.java rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/HttpResponseReceiverInstrumenter.java diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorContextKeys.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorContextKeys.java similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorContextKeys.java rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorContextKeys.java diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientAttributesExtractor.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientAttributesExtractor.java similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientAttributesExtractor.java rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientAttributesExtractor.java diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyInstrumentationModule.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyInstrumentationModule.java similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyInstrumentationModule.java rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyInstrumentationModule.java diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyNetClientAttributesExtractor.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyNetClientAttributesExtractor.java similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyNetClientAttributesExtractor.java rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyNetClientAttributesExtractor.java diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettySingletons.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettySingletons.java similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettySingletons.java rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettySingletons.java diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ResponseReceiverInstrumentation.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ResponseReceiverInstrumentation.java similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ResponseReceiverInstrumentation.java rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ResponseReceiverInstrumentation.java diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/TransportConnectorInstrumentation.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/TransportConnectorInstrumentation.java similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/TransportConnectorInstrumentation.java rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/TransportConnectorInstrumentation.java diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/ReactorNettyWithSpanTest.groovy b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/ReactorNettyWithSpanTest.groovy similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/ReactorNettyWithSpanTest.groovy rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/ReactorNettyWithSpanTest.groovy diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.groovy b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.groovy similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.groovy rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.groovy diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.groovy b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.groovy similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.groovy rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.groovy diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.groovy b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.groovy similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.groovy rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.groovy diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientTest.groovy b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientTest.groovy similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientTest.groovy rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientTest.groovy diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientUsingFromTest.groovy b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientUsingFromTest.groovy similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientUsingFromTest.groovy rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientUsingFromTest.groovy diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/test/reactor/netty/TracedWithSpan.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/test/reactor/netty/TracedWithSpan.java similarity index 100% rename from instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/test/reactor/netty/TracedWithSpan.java rename to instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/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 index 8525bfdd406b..e9448cfeba38 100644 --- 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 index 6a3e1098d2f5..45d286d11fb2 100644 --- 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/instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts rename to instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts diff --git a/instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/HttpClientImplInstrumentation.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/HttpClientImplInstrumentation.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/HttpClientImplInstrumentation.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/HttpClientImplInstrumentation.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/HttpRequestImplInstrumentation.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/HttpRequestImplInstrumentation.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/HttpRequestImplInstrumentation.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/HttpRequestImplInstrumentation.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/HttpRequestInstrumentation.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/HttpRequestInstrumentation.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/HttpRequestInstrumentation.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/HttpRequestInstrumentation.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/Vertx3HttpAttributesExtractor.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/Vertx3HttpAttributesExtractor.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/Vertx3HttpAttributesExtractor.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/Vertx3HttpAttributesExtractor.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxClientInstrumentationModule.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxClientInstrumentationModule.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxClientInstrumentationModule.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxClientInstrumentationModule.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxClientSingletons.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxClientSingletons.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxClientSingletons.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxClientSingletons.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxRequestInfo.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxRequestInfo.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxRequestInfo.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxRequestInfo.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/groovy/client/VertxHttpClientTest.groovy b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/groovy/client/VertxHttpClientTest.groovy similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/groovy/client/VertxHttpClientTest.groovy rename to instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/groovy/client/VertxHttpClientTest.groovy diff --git a/instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/java/client/VertxSingleConnection.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/java/client/VertxSingleConnection.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/java/client/VertxSingleConnection.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/java/client/VertxSingleConnection.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/build.gradle.kts rename to instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/build.gradle.kts diff --git a/instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/ConnectionManagerInstrumentation.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/ConnectionManagerInstrumentation.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/ConnectionManagerInstrumentation.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/ConnectionManagerInstrumentation.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/HandlerWrapper.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/HandlerWrapper.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/HandlerWrapper.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/HandlerWrapper.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/HttpClientConnectionInstrumentation.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/HttpClientConnectionInstrumentation.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/HttpClientConnectionInstrumentation.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/HttpClientConnectionInstrumentation.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/HttpRequestInstrumentation.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/HttpRequestInstrumentation.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/HttpRequestInstrumentation.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/HttpRequestInstrumentation.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4HttpAttributesExtractor.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4HttpAttributesExtractor.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4HttpAttributesExtractor.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4HttpAttributesExtractor.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4NetAttributesExtractor.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4NetAttributesExtractor.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4NetAttributesExtractor.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/Vertx4NetAttributesExtractor.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/VertxClientInstrumentationModule.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/VertxClientInstrumentationModule.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/VertxClientInstrumentationModule.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/VertxClientInstrumentationModule.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/VertxClientSingletons.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/VertxClientSingletons.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/VertxClientSingletons.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/VertxClientSingletons.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/test/groovy/client/VertxHttpClientTest.groovy b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/test/groovy/client/VertxHttpClientTest.groovy similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/test/groovy/client/VertxHttpClientTest.groovy rename to instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/test/groovy/client/VertxHttpClientTest.groovy diff --git a/instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/test/java/client/VertxSingleConnection.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/test/java/client/VertxSingleConnection.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/src/test/java/client/VertxSingleConnection.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/test/java/client/VertxSingleConnection.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-common/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-common/javaagent/build.gradle.kts rename to instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/build.gradle.kts diff --git a/instrumentation/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/AbstractVertxHttpAttributesExtractor.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/AbstractVertxHttpAttributesExtractor.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/AbstractVertxHttpAttributesExtractor.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/AbstractVertxHttpAttributesExtractor.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/Contexts.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/Contexts.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/Contexts.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/Contexts.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/ExceptionHandlerWrapper.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/ExceptionHandlerWrapper.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/ExceptionHandlerWrapper.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/ExceptionHandlerWrapper.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/HttpRequestHeaderSetter.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/HttpRequestHeaderSetter.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/HttpRequestHeaderSetter.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/HttpRequestHeaderSetter.java diff --git a/instrumentation/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/VertxClientInstrumenterFactory.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/VertxClientInstrumenterFactory.java similarity index 100% rename from instrumentation/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/VertxClientInstrumenterFactory.java rename to instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/VertxClientInstrumenterFactory.java diff --git a/instrumentation/vertx-reactive-3.5/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-reactive-3.5/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/build.gradle.kts rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/build.gradle.kts diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/client/VertxRxWebClientTest.groovy b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/client/VertxRxWebClientTest.groovy similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/client/VertxRxWebClientTest.groovy rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/client/VertxRxWebClientTest.groovy diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/server/VertxRxCircuitBreakerHttpServerTest.groovy b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/server/VertxRxCircuitBreakerHttpServerTest.groovy similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/server/VertxRxCircuitBreakerHttpServerTest.groovy rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/server/VertxRxCircuitBreakerHttpServerTest.groovy diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/server/VertxRxHttpServerTest.groovy b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/server/VertxRxHttpServerTest.groovy similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/server/VertxRxHttpServerTest.groovy rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/groovy/server/VertxRxHttpServerTest.groovy diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/java/VertxReactiveWebServer.java b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/java/VertxReactiveWebServer.java similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/java/VertxReactiveWebServer.java rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/java/VertxReactiveWebServer.java diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/java/client/VertxRxCircuitBreakerSingleConnection.java b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/java/client/VertxRxCircuitBreakerSingleConnection.java similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/java/client/VertxRxCircuitBreakerSingleConnection.java rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/java/client/VertxRxCircuitBreakerSingleConnection.java diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/java/client/VertxRxSingleConnection.java b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/java/client/VertxRxSingleConnection.java similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/java/client/VertxRxSingleConnection.java rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/java/client/VertxRxSingleConnection.java diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyMessage.java b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyMessage.java similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyMessage.java rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyMessage.java diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyProxiedProtocol.java b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyProxiedProtocol.java similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyProxiedProtocol.java rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyProxiedProtocol.java diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/AsyncResultConsumerWrapper.java b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/AsyncResultConsumerWrapper.java similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/AsyncResultConsumerWrapper.java rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/AsyncResultConsumerWrapper.java diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/AsyncResultHandlerWrapper.java b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/AsyncResultHandlerWrapper.java similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/AsyncResultHandlerWrapper.java rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/AsyncResultHandlerWrapper.java diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/AsyncResultSingleInstrumentation.java b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/AsyncResultSingleInstrumentation.java similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/AsyncResultSingleInstrumentation.java rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/AsyncResultSingleInstrumentation.java diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/VertxRxInstrumentationModule.java b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/VertxRxInstrumentationModule.java similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/VertxRxInstrumentationModule.java rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/VertxRxInstrumentationModule.java diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/package-info.java b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/package-info.java similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/package-info.java rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/package-info.java diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/version35Test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/version35Test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/groovy/client/VertxRxWebClientTest.groovy b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/version35Test/groovy/client/VertxRxWebClientTest.groovy similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/groovy/client/VertxRxWebClientTest.groovy rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/version35Test/groovy/client/VertxRxWebClientTest.groovy diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/groovy/server/VertxRxCircuitBreakerHttpServerTest.groovy b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/version35Test/groovy/server/VertxRxCircuitBreakerHttpServerTest.groovy similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/groovy/server/VertxRxCircuitBreakerHttpServerTest.groovy rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/version35Test/groovy/server/VertxRxCircuitBreakerHttpServerTest.groovy diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/groovy/server/VertxRxHttpServerTest.groovy b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/version35Test/groovy/server/VertxRxHttpServerTest.groovy similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/groovy/server/VertxRxHttpServerTest.groovy rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/version35Test/groovy/server/VertxRxHttpServerTest.groovy diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/java/VertxReactiveWebServer.java b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/version35Test/java/VertxReactiveWebServer.java similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/java/VertxReactiveWebServer.java rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/version35Test/java/VertxReactiveWebServer.java diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/java/client/VertxRxCircuitBreakerSingleConnection.java b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/version35Test/java/client/VertxRxCircuitBreakerSingleConnection.java similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/java/client/VertxRxCircuitBreakerSingleConnection.java rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/version35Test/java/client/VertxRxCircuitBreakerSingleConnection.java diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/java/client/VertxRxSingleConnection.java b/instrumentation/vertx/vertx-reactive-3.5/javaagent/src/version35Test/java/client/VertxRxSingleConnection.java similarity index 100% rename from instrumentation/vertx-reactive-3.5/javaagent/src/version35Test/java/client/VertxRxSingleConnection.java rename to instrumentation/vertx/vertx-reactive-3.5/javaagent/src/version35Test/java/client/VertxRxSingleConnection.java diff --git a/instrumentation/vertx-web-3.0/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-web-3.0/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/vertx-web-3.0/javaagent/build.gradle.kts rename to instrumentation/vertx/vertx-web-3.0/javaagent/build.gradle.kts diff --git a/instrumentation/vertx-web-3.0/javaagent/src/latestDepTest/groovy/server/VertxLatestHttpServerTest.groovy b/instrumentation/vertx/vertx-web-3.0/javaagent/src/latestDepTest/groovy/server/VertxLatestHttpServerTest.groovy similarity index 100% rename from instrumentation/vertx-web-3.0/javaagent/src/latestDepTest/groovy/server/VertxLatestHttpServerTest.groovy rename to instrumentation/vertx/vertx-web-3.0/javaagent/src/latestDepTest/groovy/server/VertxLatestHttpServerTest.groovy diff --git a/instrumentation/vertx-web-3.0/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyMessage.java b/instrumentation/vertx/vertx-web-3.0/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyMessage.java similarity index 100% rename from instrumentation/vertx-web-3.0/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyMessage.java rename to instrumentation/vertx/vertx-web-3.0/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyMessage.java diff --git a/instrumentation/vertx-web-3.0/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyProxiedProtocol.java b/instrumentation/vertx/vertx-web-3.0/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyProxiedProtocol.java similarity index 100% rename from instrumentation/vertx-web-3.0/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyProxiedProtocol.java rename to instrumentation/vertx/vertx-web-3.0/javaagent/src/latestDepTest/java/io/netty/handler/codec/haproxy/HAProxyProxiedProtocol.java diff --git a/instrumentation/vertx-web-3.0/javaagent/src/latestDepTest/java/server/VertxLatestWebServer.java b/instrumentation/vertx/vertx-web-3.0/javaagent/src/latestDepTest/java/server/VertxLatestWebServer.java similarity index 100% rename from instrumentation/vertx-web-3.0/javaagent/src/latestDepTest/java/server/VertxLatestWebServer.java rename to instrumentation/vertx/vertx-web-3.0/javaagent/src/latestDepTest/java/server/VertxLatestWebServer.java diff --git a/instrumentation/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/RouteInstrumentation.java b/instrumentation/vertx/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/RouteInstrumentation.java similarity index 100% rename from instrumentation/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/RouteInstrumentation.java rename to instrumentation/vertx/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/RouteInstrumentation.java diff --git a/instrumentation/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/RoutingContextHandlerWrapper.java b/instrumentation/vertx/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/RoutingContextHandlerWrapper.java similarity index 100% rename from instrumentation/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/RoutingContextHandlerWrapper.java rename to instrumentation/vertx/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/RoutingContextHandlerWrapper.java diff --git a/instrumentation/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxWebInstrumentationModule.java b/instrumentation/vertx/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxWebInstrumentationModule.java similarity index 100% rename from instrumentation/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxWebInstrumentationModule.java rename to instrumentation/vertx/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxWebInstrumentationModule.java diff --git a/instrumentation/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/package-info.java b/instrumentation/vertx/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/package-info.java similarity index 100% rename from instrumentation/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/package-info.java rename to instrumentation/vertx/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/package-info.java diff --git a/instrumentation/vertx-web-3.0/javaagent/src/version3Test/groovy/server/VertxHttpServerTest.groovy b/instrumentation/vertx/vertx-web-3.0/javaagent/src/version3Test/groovy/server/VertxHttpServerTest.groovy similarity index 100% rename from instrumentation/vertx-web-3.0/javaagent/src/version3Test/groovy/server/VertxHttpServerTest.groovy rename to instrumentation/vertx/vertx-web-3.0/javaagent/src/version3Test/groovy/server/VertxHttpServerTest.groovy diff --git a/instrumentation/vertx-web-3.0/javaagent/src/version3Test/java/server/VertxWebServer.java b/instrumentation/vertx/vertx-web-3.0/javaagent/src/version3Test/java/server/VertxWebServer.java similarity index 100% rename from instrumentation/vertx-web-3.0/javaagent/src/version3Test/java/server/VertxWebServer.java rename to instrumentation/vertx/vertx-web-3.0/javaagent/src/version3Test/java/server/VertxWebServer.java diff --git a/instrumentation/vertx-web-3.0/testing/build.gradle.kts b/instrumentation/vertx/vertx-web-3.0/testing/build.gradle.kts similarity index 100% rename from instrumentation/vertx-web-3.0/testing/build.gradle.kts rename to instrumentation/vertx/vertx-web-3.0/testing/build.gradle.kts diff --git a/instrumentation/vertx-web-3.0/testing/src/main/groovy/server/AbstractVertxHttpServerTest.groovy b/instrumentation/vertx/vertx-web-3.0/testing/src/main/groovy/server/AbstractVertxHttpServerTest.groovy similarity index 100% rename from instrumentation/vertx-web-3.0/testing/src/main/groovy/server/AbstractVertxHttpServerTest.groovy rename to instrumentation/vertx/vertx-web-3.0/testing/src/main/groovy/server/AbstractVertxHttpServerTest.groovy diff --git a/instrumentation/vertx-web-3.0/testing/src/main/java/server/AbstractVertxWebServer.java b/instrumentation/vertx/vertx-web-3.0/testing/src/main/java/server/AbstractVertxWebServer.java similarity index 100% rename from instrumentation/vertx-web-3.0/testing/src/main/java/server/AbstractVertxWebServer.java rename to instrumentation/vertx/vertx-web-3.0/testing/src/main/java/server/AbstractVertxWebServer.java diff --git a/settings.gradle.kts b/settings.gradle.kts index f4401970efce..56c803513689 100644 --- 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")