From efed5ae6823e644af56cc684e70b710f32b7b9de Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 7 Feb 2020 16:34:36 -0800 Subject: [PATCH] Standardize instrumentation module names (#145) * Rename vertx module * Rename glassfish module * Rename google-http-client module * Rename jms module * Rename twilio module * Move dropwizard-testing to top-level Since it's not related to dropwizard-views. * Rename dropwizard-views modules * Rename aws-java-sdk-1.11.0 module * Rename apache-httpasyncclient-4 module * Rename apache-httpclient-4 module * Rename datastax-cassandra-3 module * Rename elasticsearch:rest-5 module * Rename elasticsearch:transport-2 module * Rename elasticsearch:transport-5 module * Rename elasticsearch:transport-6 module * Rename grizzly-2 module * Rename jax-rs-annotations-1 module * Rename jax-rs-annotations-2 module * Rename filter-jersey module * Rename jetty module * Rename lettuce-5 module * Rename okhttp-3 module * Rename play-ws-1 module * Rename play-ws-2 module * Rename rxjava-1 module * Rename request-2 module * Rename request-3 module * Rename spring-webflux-5 module --- .../apache-httpasyncclient-4.0.gradle} | 0 .../ApacheHttpAsyncClientDecorator.java | 0 .../ApacheHttpAsyncClientInstrumentation.java | 0 ...acheHttpClientRedirectInstrumentation.java | 0 .../HttpHeadersInjectAdapter.java | 0 .../ApacheHttpAsyncClientCallbackTest.groovy | 0 ...acheHttpAsyncClientNullCallbackTest.groovy | 0 .../groovy/ApacheHttpAsyncClientTest.groovy | 0 .../src/test/groovy/HttpUriRequest.groovy | 0 .../apache-httpclient-4.0.gradle} | 0 .../ApacheHttpClientDecorator.java | 0 .../ApacheHttpClientInstrumentation.java | 0 .../HostAndRequestAsHttpUriRequest.java | 0 .../HttpHeadersInjectAdapter.java | 0 ...ApacheHttpClientResponseHandlerTest.groovy | 0 .../test/groovy/ApacheHttpClientTest.groovy | 0 .../src/test/groovy/HttpUriRequest.groovy | 0 .../aws-java-sdk-1.11.gradle} | 2 +- .../aws/v0/AWSClientInstrumentation.java | 0 .../aws/v0/AWSHttpClientInstrumentation.java | 0 .../aws/v0/AwsSdkClientDecorator.java | 0 .../aws/v0/OnErrorDecorator.java | 0 .../aws/v0/RequestInstrumentation.java | 0 .../instrumentation/aws/v0/RequestMeta.java | 0 .../aws/v0/TracingRequestHandler.java | 0 .../src/test/groovy/AWSClientTest.groovy | 0 .../groovy/AWSClientTest.groovy | 0 .../aws-java-sdk-2.2/aws-java-sdk-2.2.gradle | 4 +- .../couchbase-2.0/couchbase-2.0.gradle | 2 +- .../couchbase-2.6/couchbase-2.6.gradle | 2 +- .../datastax-cassandra-3.0.gradle} | 0 .../cassandra/CassandraClientDecorator.java | 0 .../CassandraClientInstrumentation.java | 0 .../datastax/cassandra/TracingSession.java | 0 .../test/groovy/CassandraClientTest.groovy | 0 .../dropwizard-testing.gradle} | 4 +- .../test/groovy/DropwizardAsyncTest.groovy | 0 .../src/test/groovy/DropwizardTest.groovy | 0 .../test/groovy/JettyTestInstrumentation.java | 0 .../dropwizard-views-0.7.gradle} | 0 .../view/DropwizardViewInstrumentation.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 .../rest-5.0.gradle} | 4 +- .../Elasticsearch6RestClientTest.groovy | 0 ...asticsearch5RestClientInstrumentation.java | 0 .../elasticsearch5/RestResponseListener.java | 0 .../Elasticsearch5RestClientTest.groovy | 0 .../elasticsearch/rest-6.4/rest-6.4.gradle | 4 +- .../Elasticsearch2NodeClientTest.groovy | 0 .../Elasticsearch2TransportClientTest.groovy | 0 .../groovy/springdata/Config.groovy | 0 .../groovy/springdata/Doc.groovy | 0 .../groovy/springdata/DocRepository.groovy | 0 .../Elasticsearch2SpringRepositoryTest.groovy | 0 .../Elasticsearch2SpringTemplateTest.groovy | 0 ...search2TransportClientInstrumentation.java | 0 .../TransportActionListener.java | 0 .../Elasticsearch2NodeClientTest.groovy | 0 .../Elasticsearch2TransportClientTest.groovy | 0 .../src/test/groovy/springdata/Config.groovy | 0 .../src/test/groovy/springdata/Doc.groovy | 0 .../groovy/springdata/DocRepository.groovy | 0 .../Elasticsearch2SpringRepositoryTest.groovy | 0 .../Elasticsearch2SpringTemplateTest.groovy | 0 .../transport-2.0.gradle} | 6 +- ...search5TransportClientInstrumentation.java | 0 .../TransportActionListener.java | 0 .../Elasticsearch5NodeClientTest.groovy | 0 .../Elasticsearch5TransportClientTest.groovy | 0 .../transport-5.0.gradle} | 4 +- .../transport-5.3/transport-5.3.gradle | 2 +- ...search6TransportClientInstrumentation.java | 0 .../TransportActionListener.java | 0 .../Elasticsearch6NodeClientTest.groovy | 0 .../Elasticsearch6TransportClientTest.groovy | 0 .../transport-6.0.gradle} | 4 +- .../glassfish-3.0.gradle} | 4 +- .../glassfish/GlassFishInstrumentation.java | 0 .../test/groovy/GlassFishServerTest.groovy | 0 .../groovy/GrizzlyTestInstrumentation.java | 0 .../src/test/groovy/TestServlets.java | 0 .../src/test/resources/WEB-INF/web.xml | 0 .../src/test/resources/error.jsp | 0 .../google-http-client-1.19.gradle} | 0 .../GoogleHttpClientDecorator.java | 0 .../GoogleHttpClientInstrumentation.java | 0 .../HeadersInjectAdapter.java | 0 .../googlehttpclient/RequestState.java | 0 .../AbstractGoogleHttpClientTest.groovy | 0 .../groovy/GoogleHttpClientAsyncTest.groovy | 0 .../test/groovy/GoogleHttpClientTest.groovy | 0 .../grizzly-2.0.gradle} | 0 .../grizzly/GrizzlyDecorator.java | 0 .../GrizzlyHttpHandlerInstrumentation.java | 0 .../grizzly/GrizzlyRequestExtractAdapter.java | 0 .../src/test/groovy/GrizzlyAsyncTest.groovy | 0 .../test/groovy/GrizzlyIOStrategyTest.groovy | 0 .../src/test/groovy/GrizzlyTest.groovy | 0 .../groovy/GrizzlyTestInstrumentation.java | 0 .../hystrix-1.4/hystrix-1.4.gradle | 2 +- .../jax-rs-annotations-1.0.gradle} | 0 .../jaxrs1/JaxRsAnnotationsDecorator.java | 0 .../JaxRsAnnotationsInstrumentation.java | 0 .../src/test/groovy/JavaInterfaces.java | 0 ...JaxRsAnnotationsInstrumentationTest.groovy | 0 .../src/test/groovy/JerseyTest.groovy | 0 .../test/groovy/JettyTestInstrumentation.java | 0 .../src/test/java/Resource.java | 0 .../filter-jersey-2.0.gradle} | 2 +- .../JerseyRequestContextInstrumentation.java | 0 .../filter-resteasy-3.0.gradle | 2 +- ...steasy30RequestContextInstrumentation.java | 0 .../filter-resteasy-3.1.gradle | 2 +- ...steasy31RequestContextInstrumentation.java | 0 .../jax-rs-annotations-2.0.gradle} | 8 +-- ...AbstractRequestContextInstrumentation.java | 0 ...ContainerRequestFilterInstrumentation.java | 0 .../DefaultRequestContextInstrumentation.java | 0 .../jaxrs2/JaxRsAnnotationsDecorator.java | 0 .../JaxRsAnnotationsInstrumentation.java | 0 .../JaxRsAsyncResponseInstrumentation.java | 0 .../src/test/groovy/JavaInterfaces.java | 0 ...JaxRsAnnotationsInstrumentationTest.groovy | 0 .../src/test/groovy/JaxRsFilterTest.groovy | 0 .../src/test/java/Resource.java | 0 .../jetty-8.0.gradle} | 0 .../HttpServletRequestExtractAdapter.java | 0 .../jetty8/JettyDecorator.java | 0 .../jetty8/JettyHandlerAdvice.java | 0 .../jetty8/JettyHandlerInstrumentation.java | 0 .../jetty8/TagSettingAsyncListener.java | 0 .../JettyContinuationHandlerTest.groovy | 0 .../src/test/groovy/JettyHandlerTest.groovy | 0 .../test/groovy/JettyTestInstrumentation.java | 0 .../jms.gradle => jms-1.1/jms-1.1.gradle} | 0 .../src/latestDepTest/groovy/JMS2Test.groovy | 0 .../groovy/SpringTemplateJMS2Test.groovy | 0 .../instrumentation/jms/JMSDecorator.java | 0 .../JMSMessageConsumerInstrumentation.java | 0 .../JMSMessageListenerInstrumentation.java | 0 .../JMSMessageProducerInstrumentation.java | 0 .../jms/MessageExtractAdapter.java | 0 .../jms/MessageInjectAdapter.java | 0 .../src/test/groovy/JMS1Test.groovy | 0 .../test/groovy/SpringTemplateJMS1Test.groovy | 0 instrumentation/jsp-2.3/jsp-2.3.gradle | 2 +- .../lettuce-5.0.gradle} | 0 .../LettuceAsyncCommandsInstrumentation.java | 0 .../lettuce/LettuceClientInstrumentation.java | 0 ...ettuceReactiveCommandsInstrumentation.java | 0 .../lettuce/ConnectionFutureAdvice.java | 0 .../lettuce/LettuceAsyncBiFunction.java | 0 .../lettuce/LettuceAsyncCommandsAdvice.java | 0 .../lettuce/LettuceClientDecorator.java | 0 .../lettuce/LettuceInstrumentationUtil.java | 0 .../lettuce/rx/LettuceFluxCreationAdvice.java | 0 .../rx/LettuceFluxTerminationRunnable.java | 0 .../lettuce/rx/LettuceMonoCreationAdvice.java | 0 .../lettuce/rx/LettuceMonoDualConsumer.java | 0 .../test/groovy/LettuceAsyncClientTest.groovy | 0 .../groovy/LettuceReactiveClientTest.groovy | 0 .../test/groovy/LettuceSyncClientTest.groovy | 0 .../okhttp-3.0.gradle} | 0 .../okhttp3/OkHttp3Instrumentation.java | 0 .../okhttp3/OkHttpClientDecorator.java | 0 .../okhttp3/RequestBuilderInjectAdapter.java | 0 .../okhttp3/TracingInterceptor.java | 0 .../src/test/groovy/OkHttp3AsyncTest.groovy | 0 .../src/test/groovy/OkHttp3Test.groovy | 0 .../play-ws-1.0.gradle} | 0 .../playws1/AsyncHandlerWrapper.java | 0 .../playws1/HeadersInjectAdapter.java | 0 .../playws1/PlayWSClientDecorator.java | 0 .../playws1/PlayWSClientInstrumentation.java | 0 .../src/test/groovy/PlayWSClientTest.groovy | 0 .../play-ws-2.0.gradle} | 0 .../playws2/AsyncHandlerWrapper.java | 0 .../playws2/HeadersInjectAdapter.java | 0 .../playws2/PlayWSClientDecorator.java | 0 .../playws2/PlayWSClientInstrumentation.java | 0 .../src/test/groovy/PlayWSClientTest.groovy | 0 .../rxjava-1.0.gradle} | 0 .../rxjava/SpanFinishingSubscription.java | 0 .../rxjava/TracedOnSubscribe.java | 0 .../rxjava/TracedSubscriber.java | 0 .../java/rx/__OpenTelemetryTracingUtil.java | 0 .../request-2.3.gradle} | 0 .../HttpServletRequestExtractAdapter.java | 0 .../servlet2/Servlet2Advice.java | 0 .../servlet2/Servlet2Decorator.java | 0 .../servlet2/Servlet2Instrumentation.java | 0 ...tatusSavingHttpServletResponseWrapper.java | 0 .../src/test/groovy/JettyServlet2Test.groovy | 0 .../groovy/ServletTestInstrumentation.java | 0 .../src/test/groovy/TestServlet2.groovy | 0 .../src/test/resources/realm.properties | 0 .../request-3.0.gradle} | 2 +- .../servlet3/AsyncContextInstrumentation.java | 0 .../HttpServletRequestExtractAdapter.java | 0 .../HttpServletRequestInjectAdapter.java | 0 .../servlet3/Servlet3Advice.java | 0 .../servlet3/Servlet3Decorator.java | 0 .../servlet3/Servlet3Instrumentation.java | 0 .../servlet3/TagSettingAsyncListener.java | 0 .../test/groovy/AbstractServlet3Test.groovy | 0 .../src/test/groovy/JettyServlet3Test.groovy | 0 .../test/groovy/RequestDispatcherServlet.java | 0 .../groovy/ServletTestInstrumentation.java | 0 .../src/test/groovy/TestServlet3.groovy | 0 .../src/test/groovy/TomcatServlet3Test.groovy | 0 .../src/test/resources/realm.properties | 0 instrumentation/servlet/servlet.gradle | 2 +- .../sparkjava-2.3/sparkjava-2.3.gradle | 2 +- .../spring-webflux-5.0.gradle} | 0 .../DefaultWebClientInstrumentation.java | 0 .../AbstractWebfluxInstrumentation.java | 0 .../DispatcherHandlerInstrumentation.java | 0 .../server/HandlerAdapterInstrumentation.java | 0 .../server/RouterFunctionInstrumentation.java | 0 .../client/DefaultWebClientAdvice.java | 0 .../client/HttpHeadersInjectAdapter.java | 0 .../SpringWebfluxHttpClientDecorator.java | 0 .../client/TracingClientResponseMono.java | 0 .../TracingClientResponseSubscriber.java | 0 .../springwebflux/server/AdviceUtils.java | 0 .../server/DispatcherHandlerAdvice.java | 0 .../server/HandlerAdapterAdvice.java | 0 .../server/RouteOnSuccessOrError.java | 0 .../server/RouterFunctionAdvice.java | 0 .../SpringWebfluxHttpServerDecorator.java | 0 .../SingleThreadedSpringWebfluxTest.groovy | 0 .../src/test/groovy/SpringWebfluxTest.groovy | 0 .../client/SpringWebfluxHttpClientTest.groovy | 0 .../src/test/groovy/server/EchoHandler.groovy | 0 .../groovy/server/EchoHandlerFunction.groovy | 0 .../src/test/groovy/server/FooModel.groovy | 0 .../SpringWebFluxTestApplication.groovy | 0 .../test/groovy/server/TestController.groovy | 0 .../test/java/server/RedirectComponent.java | 0 .../src/test/resources/logback.xml | 0 .../spring-webmvc-3.1.gradle | 2 +- .../twilio/TwilioAsyncInstrumentation.java | 0 .../twilio/TwilioClientDecorator.java | 0 .../twilio/TwilioSyncInstrumentation.java | 0 .../test/groovy/test/TwilioClientTest.groovy | 0 .../twilio-6.6.gradle} | 8 +-- .../groovy/client/VertxHttpClientTest.groovy | 0 .../VertxRxCircuitBreakerWebClientTest.groovy | 0 .../groovy/client/VertxRxWebClientTest.groovy | 0 .../NettyServerTestInstrumentation.java | 0 .../groovy/server/VertxHttpServerTest.groovy | 0 ...VertxRxCircuitBreakerHttpServerTest.groovy | 0 .../server/VertxRxHttpServerTest.groovy | 0 .../vertx-testing.gradle} | 0 settings.gradle | 60 +++++++++---------- 259 files changed, 68 insertions(+), 68 deletions(-) rename instrumentation/{apache-httpasyncclient-4/apache-httpasyncclient-4.gradle => apache-httpasyncclient-4.0/apache-httpasyncclient-4.0.gradle} (100%) rename instrumentation/{apache-httpasyncclient-4 => apache-httpasyncclient-4.0}/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientDecorator.java (100%) rename instrumentation/{apache-httpasyncclient-4 => apache-httpasyncclient-4.0}/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java (100%) rename instrumentation/{apache-httpasyncclient-4 => apache-httpasyncclient-4.0}/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java (100%) rename instrumentation/{apache-httpasyncclient-4 => apache-httpasyncclient-4.0}/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/HttpHeadersInjectAdapter.java (100%) rename instrumentation/{apache-httpasyncclient-4 => apache-httpasyncclient-4.0}/src/test/groovy/ApacheHttpAsyncClientCallbackTest.groovy (100%) rename instrumentation/{apache-httpasyncclient-4 => apache-httpasyncclient-4.0}/src/test/groovy/ApacheHttpAsyncClientNullCallbackTest.groovy (100%) rename instrumentation/{apache-httpasyncclient-4 => apache-httpasyncclient-4.0}/src/test/groovy/ApacheHttpAsyncClientTest.groovy (100%) rename instrumentation/{apache-httpasyncclient-4 => apache-httpasyncclient-4.0}/src/test/groovy/HttpUriRequest.groovy (100%) rename instrumentation/{apache-httpclient-4/apache-httpclient-4.gradle => apache-httpclient-4.0/apache-httpclient-4.0.gradle} (100%) rename instrumentation/{apache-httpclient-4 => apache-httpclient-4.0}/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/ApacheHttpClientDecorator.java (100%) rename instrumentation/{apache-httpclient-4 => apache-httpclient-4.0}/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java (100%) rename instrumentation/{apache-httpclient-4 => apache-httpclient-4.0}/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/HostAndRequestAsHttpUriRequest.java (100%) rename instrumentation/{apache-httpclient-4 => apache-httpclient-4.0}/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/HttpHeadersInjectAdapter.java (100%) rename instrumentation/{apache-httpclient-4 => apache-httpclient-4.0}/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy (100%) rename instrumentation/{apache-httpclient-4 => apache-httpclient-4.0}/src/test/groovy/ApacheHttpClientTest.groovy (100%) rename instrumentation/{apache-httpclient-4 => apache-httpclient-4.0}/src/test/groovy/HttpUriRequest.groovy (100%) rename instrumentation/{aws-java-sdk-1.11.0/aws-java-sdk-1.11.0.gradle => aws-java-sdk-1.11/aws-java-sdk-1.11.gradle} (98%) rename instrumentation/{aws-java-sdk-1.11.0 => aws-java-sdk-1.11}/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSClientInstrumentation.java (100%) rename instrumentation/{aws-java-sdk-1.11.0 => aws-java-sdk-1.11}/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSHttpClientInstrumentation.java (100%) rename instrumentation/{aws-java-sdk-1.11.0 => aws-java-sdk-1.11}/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AwsSdkClientDecorator.java (100%) rename instrumentation/{aws-java-sdk-1.11.0 => aws-java-sdk-1.11}/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/OnErrorDecorator.java (100%) rename instrumentation/{aws-java-sdk-1.11.0 => aws-java-sdk-1.11}/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestInstrumentation.java (100%) rename instrumentation/{aws-java-sdk-1.11.0 => aws-java-sdk-1.11}/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestMeta.java (100%) rename instrumentation/{aws-java-sdk-1.11.0 => aws-java-sdk-1.11}/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/TracingRequestHandler.java (100%) rename instrumentation/{aws-java-sdk-1.11.0 => aws-java-sdk-1.11}/src/test/groovy/AWSClientTest.groovy (100%) rename instrumentation/{aws-java-sdk-1.11.0 => aws-java-sdk-1.11}/src/test_before_1_11_106/groovy/AWSClientTest.groovy (100%) rename instrumentation/{datastax-cassandra-3/datastax-cassandra-3.gradle => datastax-cassandra-3.0/datastax-cassandra-3.0.gradle} (100%) rename instrumentation/{datastax-cassandra-3 => datastax-cassandra-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientDecorator.java (100%) rename instrumentation/{datastax-cassandra-3 => datastax-cassandra-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java (100%) rename instrumentation/{datastax-cassandra-3 => datastax-cassandra-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/TracingSession.java (100%) rename instrumentation/{datastax-cassandra-3 => datastax-cassandra-3.0}/src/test/groovy/CassandraClientTest.groovy (100%) rename instrumentation/{dropwizard/dropwizard.gradle => dropwizard-testing/dropwizard-testing.gradle} (85%) 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-testing}/src/test/groovy/JettyTestInstrumentation.java (100%) rename instrumentation/{dropwizard/dropwizard-views/dropwizard-views.gradle => dropwizard-views-0.7/dropwizard-views-0.7.gradle} (100%) rename instrumentation/{dropwizard/dropwizard-views => dropwizard-views-0.7}/src/main/java/io/opentelemetry/auto/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java (100%) rename instrumentation/{dropwizard/dropwizard-views => dropwizard-views-0.7}/src/test/groovy/ViewRenderTest.groovy (100%) rename instrumentation/{dropwizard/dropwizard-views => dropwizard-views-0.7}/src/test/resources/views/ftl/iso88591.ftl (100%) rename instrumentation/{dropwizard/dropwizard-views => dropwizard-views-0.7}/src/test/resources/views/ftl/utf8.ftl (100%) rename instrumentation/{dropwizard/dropwizard-views => dropwizard-views-0.7}/src/test/resources/views/mustache/iso88591.mustache (100%) rename instrumentation/{dropwizard/dropwizard-views => dropwizard-views-0.7}/src/test/resources/views/mustache/utf8.mustache (100%) rename instrumentation/elasticsearch/{rest-5/rest-5.gradle => rest-5.0/rest-5.0.gradle} (95%) rename instrumentation/elasticsearch/{rest-5 => rest-5.0}/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy (100%) rename instrumentation/elasticsearch/{rest-5 => rest-5.0}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java (100%) rename instrumentation/elasticsearch/{rest-5 => rest-5.0}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/RestResponseListener.java (100%) rename instrumentation/elasticsearch/{rest-5 => rest-5.0}/src/test/groovy/Elasticsearch5RestClientTest.groovy (100%) rename instrumentation/elasticsearch/{transport-2 => transport-2.0}/src/latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy (100%) rename instrumentation/elasticsearch/{transport-2 => transport-2.0}/src/latestDepTest/groovy/Elasticsearch2TransportClientTest.groovy (100%) rename instrumentation/elasticsearch/{transport-2 => transport-2.0}/src/latestDepTest/groovy/springdata/Config.groovy (100%) rename instrumentation/elasticsearch/{transport-2 => transport-2.0}/src/latestDepTest/groovy/springdata/Doc.groovy (100%) rename instrumentation/elasticsearch/{transport-2 => transport-2.0}/src/latestDepTest/groovy/springdata/DocRepository.groovy (100%) rename instrumentation/elasticsearch/{transport-2 => transport-2.0}/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy (100%) rename instrumentation/elasticsearch/{transport-2 => transport-2.0}/src/latestDepTest/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy (100%) rename instrumentation/elasticsearch/{transport-2 => transport-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java (100%) rename instrumentation/elasticsearch/{transport-2 => transport-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/TransportActionListener.java (100%) rename instrumentation/elasticsearch/{transport-2 => transport-2.0}/src/test/groovy/Elasticsearch2NodeClientTest.groovy (100%) rename instrumentation/elasticsearch/{transport-2 => transport-2.0}/src/test/groovy/Elasticsearch2TransportClientTest.groovy (100%) rename instrumentation/elasticsearch/{transport-2 => transport-2.0}/src/test/groovy/springdata/Config.groovy (100%) rename instrumentation/elasticsearch/{transport-2 => transport-2.0}/src/test/groovy/springdata/Doc.groovy (100%) rename instrumentation/elasticsearch/{transport-2 => transport-2.0}/src/test/groovy/springdata/DocRepository.groovy (100%) rename instrumentation/elasticsearch/{transport-2 => transport-2.0}/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy (100%) rename instrumentation/elasticsearch/{transport-2 => transport-2.0}/src/test/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy (100%) rename instrumentation/elasticsearch/{transport-2/transport-2.gradle => transport-2.0/transport-2.0.gradle} (95%) rename instrumentation/elasticsearch/{transport-5 => transport-5.0}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java (100%) rename instrumentation/elasticsearch/{transport-5 => transport-5.0}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/TransportActionListener.java (100%) rename instrumentation/elasticsearch/{transport-5 => transport-5.0}/src/test/groovy/Elasticsearch5NodeClientTest.groovy (100%) rename instrumentation/elasticsearch/{transport-5 => transport-5.0}/src/test/groovy/Elasticsearch5TransportClientTest.groovy (100%) rename instrumentation/elasticsearch/{transport-5/transport-5.gradle => transport-5.0/transport-5.0.gradle} (94%) rename instrumentation/elasticsearch/{transport-6 => transport-6.0}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java (100%) rename instrumentation/elasticsearch/{transport-6 => transport-6.0}/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/TransportActionListener.java (100%) rename instrumentation/elasticsearch/{transport-6 => transport-6.0}/src/test/groovy/Elasticsearch6NodeClientTest.groovy (100%) rename instrumentation/elasticsearch/{transport-6 => transport-6.0}/src/test/groovy/Elasticsearch6TransportClientTest.groovy (100%) rename instrumentation/elasticsearch/{transport-6/transport-6.gradle => transport-6.0/transport-6.0.gradle} (95%) rename instrumentation/{glassfish/glassfish.gradle => glassfish-3.0/glassfish-3.0.gradle} (83%) rename instrumentation/{glassfish => glassfish-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/glassfish/GlassFishInstrumentation.java (100%) rename instrumentation/{glassfish => glassfish-3.0}/src/test/groovy/GlassFishServerTest.groovy (100%) rename instrumentation/{glassfish => glassfish-3.0}/src/test/groovy/GrizzlyTestInstrumentation.java (100%) rename instrumentation/{glassfish => glassfish-3.0}/src/test/groovy/TestServlets.java (100%) rename instrumentation/{glassfish => glassfish-3.0}/src/test/resources/WEB-INF/web.xml (100%) rename instrumentation/{glassfish => glassfish-3.0}/src/test/resources/error.jsp (100%) rename instrumentation/{google-http-client/google-http-client.gradle => google-http-client-1.19/google-http-client-1.19.gradle} (100%) rename instrumentation/{google-http-client => google-http-client-1.19}/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/GoogleHttpClientDecorator.java (100%) rename instrumentation/{google-http-client => google-http-client-1.19}/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java (100%) rename instrumentation/{google-http-client => google-http-client-1.19}/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/HeadersInjectAdapter.java (100%) rename instrumentation/{google-http-client => google-http-client-1.19}/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/RequestState.java (100%) rename instrumentation/{google-http-client => google-http-client-1.19}/src/test/groovy/AbstractGoogleHttpClientTest.groovy (100%) rename instrumentation/{google-http-client => google-http-client-1.19}/src/test/groovy/GoogleHttpClientAsyncTest.groovy (100%) rename instrumentation/{google-http-client => google-http-client-1.19}/src/test/groovy/GoogleHttpClientTest.groovy (100%) rename instrumentation/{grizzly-2/grizzly-2.gradle => grizzly-2.0/grizzly-2.0.gradle} (100%) rename instrumentation/{grizzly-2 => grizzly-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/grizzly/GrizzlyDecorator.java (100%) rename instrumentation/{grizzly-2 => grizzly-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java (100%) rename instrumentation/{grizzly-2 => grizzly-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/grizzly/GrizzlyRequestExtractAdapter.java (100%) rename instrumentation/{grizzly-2 => grizzly-2.0}/src/test/groovy/GrizzlyAsyncTest.groovy (100%) rename instrumentation/{grizzly-2 => grizzly-2.0}/src/test/groovy/GrizzlyIOStrategyTest.groovy (100%) rename instrumentation/{grizzly-2 => grizzly-2.0}/src/test/groovy/GrizzlyTest.groovy (100%) rename instrumentation/{grizzly-2 => grizzly-2.0}/src/test/groovy/GrizzlyTestInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-1/jax-rs-annotations-1.gradle => jax-rs-annotations-1.0/jax-rs-annotations-1.0.gradle} (100%) rename instrumentation/{jax-rs-annotations-1 => jax-rs-annotations-1.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsDecorator.java (100%) rename instrumentation/{jax-rs-annotations-1 => jax-rs-annotations-1.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-1 => jax-rs-annotations-1.0}/src/test/groovy/JavaInterfaces.java (100%) rename instrumentation/{jax-rs-annotations-1 => jax-rs-annotations-1.0}/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy (100%) rename instrumentation/{jax-rs-annotations-1 => jax-rs-annotations-1.0}/src/test/groovy/JerseyTest.groovy (100%) rename instrumentation/{jax-rs-annotations-1 => jax-rs-annotations-1.0}/src/test/groovy/JettyTestInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-1 => jax-rs-annotations-1.0}/src/test/java/Resource.java (100%) rename instrumentation/{jax-rs-annotations-2/filter-jersey/filter-jersey.gradle => jax-rs-annotations-2.0/filter-jersey-2.0/filter-jersey-2.0.gradle} (88%) rename instrumentation/{jax-rs-annotations-2/filter-jersey => jax-rs-annotations-2.0/filter-jersey-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-2 => jax-rs-annotations-2.0}/filter-resteasy-3.0/filter-resteasy-3.0.gradle (91%) rename instrumentation/{jax-rs-annotations-2 => jax-rs-annotations-2.0}/filter-resteasy-3.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-2 => jax-rs-annotations-2.0}/filter-resteasy-3.1/filter-resteasy-3.1.gradle (90%) rename instrumentation/{jax-rs-annotations-2 => jax-rs-annotations-2.0}/filter-resteasy-3.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-2/jax-rs-annotations-2.gradle => jax-rs-annotations-2.0/jax-rs-annotations-2.0.gradle} (80%) rename instrumentation/{jax-rs-annotations-2 => jax-rs-annotations-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/AbstractRequestContextInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-2 => jax-rs-annotations-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/ContainerRequestFilterInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-2 => jax-rs-annotations-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-2 => jax-rs-annotations-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsDecorator.java (100%) rename instrumentation/{jax-rs-annotations-2 => jax-rs-annotations-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-2 => jax-rs-annotations-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-2 => jax-rs-annotations-2.0}/src/test/groovy/JavaInterfaces.java (100%) rename instrumentation/{jax-rs-annotations-2 => jax-rs-annotations-2.0}/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy (100%) rename instrumentation/{jax-rs-annotations-2 => jax-rs-annotations-2.0}/src/test/groovy/JaxRsFilterTest.groovy (100%) rename instrumentation/{jax-rs-annotations-2 => jax-rs-annotations-2.0}/src/test/java/Resource.java (100%) rename instrumentation/{jetty-8/jetty-8.gradle => jetty-8.0/jetty-8.0.gradle} (100%) rename instrumentation/{jetty-8 => jetty-8.0}/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/HttpServletRequestExtractAdapter.java (100%) rename instrumentation/{jetty-8 => jetty-8.0}/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/JettyDecorator.java (100%) rename instrumentation/{jetty-8 => jetty-8.0}/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/JettyHandlerAdvice.java (100%) rename instrumentation/{jetty-8 => jetty-8.0}/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/JettyHandlerInstrumentation.java (100%) rename instrumentation/{jetty-8 => jetty-8.0}/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/TagSettingAsyncListener.java (100%) rename instrumentation/{jetty-8 => jetty-8.0}/src/test/groovy/JettyContinuationHandlerTest.groovy (100%) rename instrumentation/{jetty-8 => jetty-8.0}/src/test/groovy/JettyHandlerTest.groovy (100%) rename instrumentation/{jetty-8 => jetty-8.0}/src/test/groovy/JettyTestInstrumentation.java (100%) rename instrumentation/{jms/jms.gradle => jms-1.1/jms-1.1.gradle} (100%) rename instrumentation/{jms => jms-1.1}/src/latestDepTest/groovy/JMS2Test.groovy (100%) rename instrumentation/{jms => jms-1.1}/src/latestDepTest/groovy/SpringTemplateJMS2Test.groovy (100%) rename instrumentation/{jms => jms-1.1}/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSDecorator.java (100%) rename instrumentation/{jms => jms-1.1}/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSMessageConsumerInstrumentation.java (100%) rename instrumentation/{jms => jms-1.1}/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSMessageListenerInstrumentation.java (100%) rename instrumentation/{jms => jms-1.1}/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSMessageProducerInstrumentation.java (100%) rename instrumentation/{jms => jms-1.1}/src/main/java/io/opentelemetry/auto/instrumentation/jms/MessageExtractAdapter.java (100%) rename instrumentation/{jms => jms-1.1}/src/main/java/io/opentelemetry/auto/instrumentation/jms/MessageInjectAdapter.java (100%) rename instrumentation/{jms => jms-1.1}/src/test/groovy/JMS1Test.groovy (100%) rename instrumentation/{jms => jms-1.1}/src/test/groovy/SpringTemplateJMS1Test.groovy (100%) rename instrumentation/{lettuce-5/lettuce-5.gradle => lettuce-5.0/lettuce-5.0.gradle} (100%) rename instrumentation/{lettuce-5 => lettuce-5.0}/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/LettuceAsyncCommandsInstrumentation.java (100%) rename instrumentation/{lettuce-5 => lettuce-5.0}/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/LettuceClientInstrumentation.java (100%) rename instrumentation/{lettuce-5 => lettuce-5.0}/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/LettuceReactiveCommandsInstrumentation.java (100%) rename instrumentation/{lettuce-5 => lettuce-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/ConnectionFutureAdvice.java (100%) rename instrumentation/{lettuce-5 => lettuce-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceAsyncBiFunction.java (100%) rename instrumentation/{lettuce-5 => lettuce-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceAsyncCommandsAdvice.java (100%) rename instrumentation/{lettuce-5 => lettuce-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceClientDecorator.java (100%) rename instrumentation/{lettuce-5 => lettuce-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceInstrumentationUtil.java (100%) rename instrumentation/{lettuce-5 => lettuce-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceFluxCreationAdvice.java (100%) rename instrumentation/{lettuce-5 => lettuce-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceFluxTerminationRunnable.java (100%) rename instrumentation/{lettuce-5 => lettuce-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceMonoCreationAdvice.java (100%) rename instrumentation/{lettuce-5 => lettuce-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceMonoDualConsumer.java (100%) rename instrumentation/{lettuce-5 => lettuce-5.0}/src/test/groovy/LettuceAsyncClientTest.groovy (100%) rename instrumentation/{lettuce-5 => lettuce-5.0}/src/test/groovy/LettuceReactiveClientTest.groovy (100%) rename instrumentation/{lettuce-5 => lettuce-5.0}/src/test/groovy/LettuceSyncClientTest.groovy (100%) rename instrumentation/{okhttp-3/okhttp-3.gradle => okhttp-3.0/okhttp-3.0.gradle} (100%) rename instrumentation/{okhttp-3 => okhttp-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/OkHttp3Instrumentation.java (100%) rename instrumentation/{okhttp-3 => okhttp-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/OkHttpClientDecorator.java (100%) rename instrumentation/{okhttp-3 => okhttp-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/RequestBuilderInjectAdapter.java (100%) rename instrumentation/{okhttp-3 => okhttp-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/TracingInterceptor.java (100%) rename instrumentation/{okhttp-3 => okhttp-3.0}/src/test/groovy/OkHttp3AsyncTest.groovy (100%) rename instrumentation/{okhttp-3 => okhttp-3.0}/src/test/groovy/OkHttp3Test.groovy (100%) rename instrumentation/{play-ws-1/play-ws-1.gradle => play-ws-1.0/play-ws-1.0.gradle} (100%) rename instrumentation/{play-ws-1 => play-ws-1.0}/src/main/java/io/opentelemetry/auto/instrumentation/playws1/AsyncHandlerWrapper.java (100%) rename instrumentation/{play-ws-1 => play-ws-1.0}/src/main/java/io/opentelemetry/auto/instrumentation/playws1/HeadersInjectAdapter.java (100%) rename instrumentation/{play-ws-1 => play-ws-1.0}/src/main/java/io/opentelemetry/auto/instrumentation/playws1/PlayWSClientDecorator.java (100%) rename instrumentation/{play-ws-1 => play-ws-1.0}/src/main/java/io/opentelemetry/auto/instrumentation/playws1/PlayWSClientInstrumentation.java (100%) rename instrumentation/{play-ws-1 => play-ws-1.0}/src/test/groovy/PlayWSClientTest.groovy (100%) rename instrumentation/{play-ws-2/play-ws-2.gradle => play-ws-2.0/play-ws-2.0.gradle} (100%) rename instrumentation/{play-ws-2 => play-ws-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/playws2/AsyncHandlerWrapper.java (100%) rename instrumentation/{play-ws-2 => play-ws-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/playws2/HeadersInjectAdapter.java (100%) rename instrumentation/{play-ws-2 => play-ws-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/playws2/PlayWSClientDecorator.java (100%) rename instrumentation/{play-ws-2 => play-ws-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/playws2/PlayWSClientInstrumentation.java (100%) rename instrumentation/{play-ws-2 => play-ws-2.0}/src/test/groovy/PlayWSClientTest.groovy (100%) rename instrumentation/{rxjava-1/rxjava-1.gradle => rxjava-1.0/rxjava-1.0.gradle} (100%) rename instrumentation/{rxjava-1 => rxjava-1.0}/src/main/java/io/opentelemetry/auto/instrumentation/rxjava/SpanFinishingSubscription.java (100%) rename instrumentation/{rxjava-1 => rxjava-1.0}/src/main/java/io/opentelemetry/auto/instrumentation/rxjava/TracedOnSubscribe.java (100%) rename instrumentation/{rxjava-1 => rxjava-1.0}/src/main/java/io/opentelemetry/auto/instrumentation/rxjava/TracedSubscriber.java (100%) rename instrumentation/{rxjava-1 => rxjava-1.0}/src/main/java/rx/__OpenTelemetryTracingUtil.java (100%) rename instrumentation/servlet/{request-2/request-2.gradle => request-2.3/request-2.3.gradle} (100%) rename instrumentation/servlet/{request-2 => request-2.3}/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/HttpServletRequestExtractAdapter.java (100%) rename instrumentation/servlet/{request-2 => request-2.3}/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/Servlet2Advice.java (100%) rename instrumentation/servlet/{request-2 => request-2.3}/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/Servlet2Decorator.java (100%) rename instrumentation/servlet/{request-2 => request-2.3}/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/Servlet2Instrumentation.java (100%) rename instrumentation/servlet/{request-2 => request-2.3}/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/StatusSavingHttpServletResponseWrapper.java (100%) rename instrumentation/servlet/{request-2 => request-2.3}/src/test/groovy/JettyServlet2Test.groovy (100%) rename instrumentation/servlet/{request-2 => request-2.3}/src/test/groovy/ServletTestInstrumentation.java (100%) rename instrumentation/servlet/{request-2 => request-2.3}/src/test/groovy/TestServlet2.groovy (100%) rename instrumentation/servlet/{request-2 => request-2.3}/src/test/resources/realm.properties (100%) rename instrumentation/servlet/{request-3/request-3.gradle => request-3.0/request-3.0.gradle} (94%) rename instrumentation/servlet/{request-3 => request-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/AsyncContextInstrumentation.java (100%) rename instrumentation/servlet/{request-3 => request-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/HttpServletRequestExtractAdapter.java (100%) rename instrumentation/servlet/{request-3 => request-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/HttpServletRequestInjectAdapter.java (100%) rename instrumentation/servlet/{request-3 => request-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/Servlet3Advice.java (100%) rename instrumentation/servlet/{request-3 => request-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/Servlet3Decorator.java (100%) rename instrumentation/servlet/{request-3 => request-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/Servlet3Instrumentation.java (100%) rename instrumentation/servlet/{request-3 => request-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/TagSettingAsyncListener.java (100%) rename instrumentation/servlet/{request-3 => request-3.0}/src/test/groovy/AbstractServlet3Test.groovy (100%) rename instrumentation/servlet/{request-3 => request-3.0}/src/test/groovy/JettyServlet3Test.groovy (100%) rename instrumentation/servlet/{request-3 => request-3.0}/src/test/groovy/RequestDispatcherServlet.java (100%) rename instrumentation/servlet/{request-3 => request-3.0}/src/test/groovy/ServletTestInstrumentation.java (100%) rename instrumentation/servlet/{request-3 => request-3.0}/src/test/groovy/TestServlet3.groovy (100%) rename instrumentation/servlet/{request-3 => request-3.0}/src/test/groovy/TomcatServlet3Test.groovy (100%) rename instrumentation/servlet/{request-3 => request-3.0}/src/test/resources/realm.properties (100%) rename instrumentation/{spring-webflux-5/spring-webflux-5.gradle => spring-webflux-5.0/spring-webflux-5.0.gradle} (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/client/DefaultWebClientInstrumentation.java (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/AbstractWebfluxInstrumentation.java (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerInstrumentation.java (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterInstrumentation.java (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionInstrumentation.java (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/DefaultWebClientAdvice.java (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/HttpHeadersInjectAdapter.java (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/SpringWebfluxHttpClientDecorator.java (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/TracingClientResponseMono.java (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/TracingClientResponseSubscriber.java (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/AdviceUtils.java (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterAdvice.java (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/RouteOnSuccessOrError.java (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionAdvice.java (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/test/groovy/SingleThreadedSpringWebfluxTest.groovy (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/test/groovy/SpringWebfluxTest.groovy (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/test/groovy/client/SpringWebfluxHttpClientTest.groovy (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/test/groovy/server/EchoHandler.groovy (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/test/groovy/server/EchoHandlerFunction.groovy (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/test/groovy/server/FooModel.groovy (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/test/groovy/server/SpringWebFluxTestApplication.groovy (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/test/groovy/server/TestController.groovy (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/test/java/server/RedirectComponent.java (100%) rename instrumentation/{spring-webflux-5 => spring-webflux-5.0}/src/test/resources/logback.xml (100%) rename instrumentation/{twilio => twilio-6.6}/src/main/java/io/opentelemetry/auto/instrumentation/twilio/TwilioAsyncInstrumentation.java (100%) rename instrumentation/{twilio => twilio-6.6}/src/main/java/io/opentelemetry/auto/instrumentation/twilio/TwilioClientDecorator.java (100%) rename instrumentation/{twilio => twilio-6.6}/src/main/java/io/opentelemetry/auto/instrumentation/twilio/TwilioSyncInstrumentation.java (100%) rename instrumentation/{twilio => twilio-6.6}/src/test/groovy/test/TwilioClientTest.groovy (100%) rename instrumentation/{twilio/twilio.gradle => twilio-6.6/twilio-6.6.gradle} (75%) rename instrumentation/{vertx => vertx-testing}/src/test/groovy/client/VertxHttpClientTest.groovy (100%) rename instrumentation/{vertx => vertx-testing}/src/test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy (100%) rename instrumentation/{vertx => vertx-testing}/src/test/groovy/client/VertxRxWebClientTest.groovy (100%) rename instrumentation/{vertx => vertx-testing}/src/test/groovy/server/NettyServerTestInstrumentation.java (100%) rename instrumentation/{vertx => vertx-testing}/src/test/groovy/server/VertxHttpServerTest.groovy (100%) rename instrumentation/{vertx => vertx-testing}/src/test/groovy/server/VertxRxCircuitBreakerHttpServerTest.groovy (100%) rename instrumentation/{vertx => vertx-testing}/src/test/groovy/server/VertxRxHttpServerTest.groovy (100%) rename instrumentation/{vertx/vertx.gradle => vertx-testing/vertx-testing.gradle} (100%) diff --git a/instrumentation/apache-httpasyncclient-4/apache-httpasyncclient-4.gradle b/instrumentation/apache-httpasyncclient-4.0/apache-httpasyncclient-4.0.gradle similarity index 100% rename from instrumentation/apache-httpasyncclient-4/apache-httpasyncclient-4.gradle rename to instrumentation/apache-httpasyncclient-4.0/apache-httpasyncclient-4.0.gradle diff --git a/instrumentation/apache-httpasyncclient-4/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientDecorator.java b/instrumentation/apache-httpasyncclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientDecorator.java similarity index 100% rename from instrumentation/apache-httpasyncclient-4/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientDecorator.java rename to instrumentation/apache-httpasyncclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientDecorator.java diff --git a/instrumentation/apache-httpasyncclient-4/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java b/instrumentation/apache-httpasyncclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java similarity index 100% rename from instrumentation/apache-httpasyncclient-4/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java rename to instrumentation/apache-httpasyncclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java diff --git a/instrumentation/apache-httpasyncclient-4/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java b/instrumentation/apache-httpasyncclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java similarity index 100% rename from instrumentation/apache-httpasyncclient-4/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java rename to instrumentation/apache-httpasyncclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java diff --git a/instrumentation/apache-httpasyncclient-4/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/HttpHeadersInjectAdapter.java b/instrumentation/apache-httpasyncclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/HttpHeadersInjectAdapter.java similarity index 100% rename from instrumentation/apache-httpasyncclient-4/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/HttpHeadersInjectAdapter.java rename to instrumentation/apache-httpasyncclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpasyncclient/HttpHeadersInjectAdapter.java diff --git a/instrumentation/apache-httpasyncclient-4/src/test/groovy/ApacheHttpAsyncClientCallbackTest.groovy b/instrumentation/apache-httpasyncclient-4.0/src/test/groovy/ApacheHttpAsyncClientCallbackTest.groovy similarity index 100% rename from instrumentation/apache-httpasyncclient-4/src/test/groovy/ApacheHttpAsyncClientCallbackTest.groovy rename to instrumentation/apache-httpasyncclient-4.0/src/test/groovy/ApacheHttpAsyncClientCallbackTest.groovy diff --git a/instrumentation/apache-httpasyncclient-4/src/test/groovy/ApacheHttpAsyncClientNullCallbackTest.groovy b/instrumentation/apache-httpasyncclient-4.0/src/test/groovy/ApacheHttpAsyncClientNullCallbackTest.groovy similarity index 100% rename from instrumentation/apache-httpasyncclient-4/src/test/groovy/ApacheHttpAsyncClientNullCallbackTest.groovy rename to instrumentation/apache-httpasyncclient-4.0/src/test/groovy/ApacheHttpAsyncClientNullCallbackTest.groovy diff --git a/instrumentation/apache-httpasyncclient-4/src/test/groovy/ApacheHttpAsyncClientTest.groovy b/instrumentation/apache-httpasyncclient-4.0/src/test/groovy/ApacheHttpAsyncClientTest.groovy similarity index 100% rename from instrumentation/apache-httpasyncclient-4/src/test/groovy/ApacheHttpAsyncClientTest.groovy rename to instrumentation/apache-httpasyncclient-4.0/src/test/groovy/ApacheHttpAsyncClientTest.groovy diff --git a/instrumentation/apache-httpasyncclient-4/src/test/groovy/HttpUriRequest.groovy b/instrumentation/apache-httpasyncclient-4.0/src/test/groovy/HttpUriRequest.groovy similarity index 100% rename from instrumentation/apache-httpasyncclient-4/src/test/groovy/HttpUriRequest.groovy rename to instrumentation/apache-httpasyncclient-4.0/src/test/groovy/HttpUriRequest.groovy diff --git a/instrumentation/apache-httpclient-4/apache-httpclient-4.gradle b/instrumentation/apache-httpclient-4.0/apache-httpclient-4.0.gradle similarity index 100% rename from instrumentation/apache-httpclient-4/apache-httpclient-4.gradle rename to instrumentation/apache-httpclient-4.0/apache-httpclient-4.0.gradle diff --git a/instrumentation/apache-httpclient-4/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/ApacheHttpClientDecorator.java b/instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/ApacheHttpClientDecorator.java similarity index 100% rename from instrumentation/apache-httpclient-4/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/ApacheHttpClientDecorator.java rename to instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/ApacheHttpClientDecorator.java diff --git a/instrumentation/apache-httpclient-4/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java b/instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java similarity index 100% rename from instrumentation/apache-httpclient-4/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java rename to instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java diff --git a/instrumentation/apache-httpclient-4/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/HostAndRequestAsHttpUriRequest.java b/instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/HostAndRequestAsHttpUriRequest.java similarity index 100% rename from instrumentation/apache-httpclient-4/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/HostAndRequestAsHttpUriRequest.java rename to instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/HostAndRequestAsHttpUriRequest.java diff --git a/instrumentation/apache-httpclient-4/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/HttpHeadersInjectAdapter.java b/instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/HttpHeadersInjectAdapter.java similarity index 100% rename from instrumentation/apache-httpclient-4/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/HttpHeadersInjectAdapter.java rename to instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/HttpHeadersInjectAdapter.java diff --git a/instrumentation/apache-httpclient-4/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy b/instrumentation/apache-httpclient-4.0/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy similarity index 100% rename from instrumentation/apache-httpclient-4/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy rename to instrumentation/apache-httpclient-4.0/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy diff --git a/instrumentation/apache-httpclient-4/src/test/groovy/ApacheHttpClientTest.groovy b/instrumentation/apache-httpclient-4.0/src/test/groovy/ApacheHttpClientTest.groovy similarity index 100% rename from instrumentation/apache-httpclient-4/src/test/groovy/ApacheHttpClientTest.groovy rename to instrumentation/apache-httpclient-4.0/src/test/groovy/ApacheHttpClientTest.groovy diff --git a/instrumentation/apache-httpclient-4/src/test/groovy/HttpUriRequest.groovy b/instrumentation/apache-httpclient-4.0/src/test/groovy/HttpUriRequest.groovy similarity index 100% rename from instrumentation/apache-httpclient-4/src/test/groovy/HttpUriRequest.groovy rename to instrumentation/apache-httpclient-4.0/src/test/groovy/HttpUriRequest.groovy diff --git a/instrumentation/aws-java-sdk-1.11.0/aws-java-sdk-1.11.0.gradle b/instrumentation/aws-java-sdk-1.11/aws-java-sdk-1.11.gradle similarity index 98% rename from instrumentation/aws-java-sdk-1.11.0/aws-java-sdk-1.11.0.gradle rename to instrumentation/aws-java-sdk-1.11/aws-java-sdk-1.11.gradle index ff0d0013e1..74039bd53b 100644 --- a/instrumentation/aws-java-sdk-1.11.0/aws-java-sdk-1.11.0.gradle +++ b/instrumentation/aws-java-sdk-1.11/aws-java-sdk-1.11.gradle @@ -38,7 +38,7 @@ dependencies { compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.0' // Include httpclient instrumentation for testing because it is a dependency for aws-sdk. - testCompile project(':instrumentation:apache-httpclient-4') + testCompile project(':instrumentation:apache-httpclient-4.0') testCompile group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.106' testCompile group: 'com.amazonaws', name: 'aws-java-sdk-rds', version: '1.11.106' testCompile group: 'com.amazonaws', name: 'aws-java-sdk-ec2', version: '1.11.106' diff --git a/instrumentation/aws-java-sdk-1.11.0/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSClientInstrumentation.java b/instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSClientInstrumentation.java similarity index 100% rename from instrumentation/aws-java-sdk-1.11.0/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSClientInstrumentation.java rename to instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSClientInstrumentation.java diff --git a/instrumentation/aws-java-sdk-1.11.0/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSHttpClientInstrumentation.java b/instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSHttpClientInstrumentation.java similarity index 100% rename from instrumentation/aws-java-sdk-1.11.0/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSHttpClientInstrumentation.java rename to instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSHttpClientInstrumentation.java diff --git a/instrumentation/aws-java-sdk-1.11.0/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AwsSdkClientDecorator.java b/instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AwsSdkClientDecorator.java similarity index 100% rename from instrumentation/aws-java-sdk-1.11.0/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AwsSdkClientDecorator.java rename to instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AwsSdkClientDecorator.java diff --git a/instrumentation/aws-java-sdk-1.11.0/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/OnErrorDecorator.java b/instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/OnErrorDecorator.java similarity index 100% rename from instrumentation/aws-java-sdk-1.11.0/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/OnErrorDecorator.java rename to instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/OnErrorDecorator.java diff --git a/instrumentation/aws-java-sdk-1.11.0/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestInstrumentation.java b/instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestInstrumentation.java similarity index 100% rename from instrumentation/aws-java-sdk-1.11.0/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestInstrumentation.java rename to instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestInstrumentation.java diff --git a/instrumentation/aws-java-sdk-1.11.0/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestMeta.java b/instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestMeta.java similarity index 100% rename from instrumentation/aws-java-sdk-1.11.0/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestMeta.java rename to instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestMeta.java diff --git a/instrumentation/aws-java-sdk-1.11.0/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/TracingRequestHandler.java b/instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/TracingRequestHandler.java similarity index 100% rename from instrumentation/aws-java-sdk-1.11.0/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/TracingRequestHandler.java rename to instrumentation/aws-java-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/TracingRequestHandler.java diff --git a/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/AWSClientTest.groovy b/instrumentation/aws-java-sdk-1.11/src/test/groovy/AWSClientTest.groovy similarity index 100% rename from instrumentation/aws-java-sdk-1.11.0/src/test/groovy/AWSClientTest.groovy rename to instrumentation/aws-java-sdk-1.11/src/test/groovy/AWSClientTest.groovy diff --git a/instrumentation/aws-java-sdk-1.11.0/src/test_before_1_11_106/groovy/AWSClientTest.groovy b/instrumentation/aws-java-sdk-1.11/src/test_before_1_11_106/groovy/AWSClientTest.groovy similarity index 100% rename from instrumentation/aws-java-sdk-1.11.0/src/test_before_1_11_106/groovy/AWSClientTest.groovy rename to instrumentation/aws-java-sdk-1.11/src/test_before_1_11_106/groovy/AWSClientTest.groovy diff --git a/instrumentation/aws-java-sdk-2.2/aws-java-sdk-2.2.gradle b/instrumentation/aws-java-sdk-2.2/aws-java-sdk-2.2.gradle index 08ee2ee0a6..17b1d07eb2 100644 --- a/instrumentation/aws-java-sdk-2.2/aws-java-sdk-2.2.gradle +++ b/instrumentation/aws-java-sdk-2.2/aws-java-sdk-2.2.gradle @@ -23,7 +23,7 @@ dependencies { main_java8CompileOnly group: 'software.amazon.awssdk', name: 'aws-core', version: '2.2.0' // Include httpclient instrumentation for testing because it is a dependency for aws-sdk. - testCompile project(':instrumentation:apache-httpclient-4') + testCompile project(':instrumentation:apache-httpclient-4.0') // Also include netty instrumentation because it is used by aws async client testCompile project(':instrumentation:netty-4.1') // Needed by netty async instrumentation @@ -36,7 +36,7 @@ dependencies { testCompile group: 'software.amazon.awssdk', name: 'dynamodb', version: '2.2.0' testCompile group: 'software.amazon.awssdk', name: 'kinesis', version: '2.2.0' - latestDepTestCompile project(':instrumentation:apache-httpclient-4') + latestDepTestCompile project(':instrumentation:apache-httpclient-4.0') latestDepTestCompile project(':instrumentation:netty-4.1') latestDepTestCompile project(':instrumentation:java-concurrent') diff --git a/instrumentation/couchbase-2.0/couchbase-2.0.gradle b/instrumentation/couchbase-2.0/couchbase-2.0.gradle index c29ccf0d53..33a3dcd2e7 100644 --- a/instrumentation/couchbase-2.0/couchbase-2.0.gradle +++ b/instrumentation/couchbase-2.0/couchbase-2.0.gradle @@ -48,7 +48,7 @@ artifacts { } dependencies { - compile project(':instrumentation:rxjava-1') + compile project(':instrumentation:rxjava-1.0') compileOnly group: 'com.couchbase.client', name: 'java-client', version: '2.0.0' diff --git a/instrumentation/couchbase-2.6/couchbase-2.6.gradle b/instrumentation/couchbase-2.6/couchbase-2.6.gradle index acd2571e7e..4e80fcddaf 100644 --- a/instrumentation/couchbase-2.6/couchbase-2.6.gradle +++ b/instrumentation/couchbase-2.6/couchbase-2.6.gradle @@ -44,7 +44,7 @@ muzzle { } dependencies { - compile project(':instrumentation:rxjava-1') + compile project(':instrumentation:rxjava-1.0') compileOnly group: 'com.couchbase.client', name: 'java-client', version: '2.6.0' diff --git a/instrumentation/datastax-cassandra-3/datastax-cassandra-3.gradle b/instrumentation/datastax-cassandra-3.0/datastax-cassandra-3.0.gradle similarity index 100% rename from instrumentation/datastax-cassandra-3/datastax-cassandra-3.gradle rename to instrumentation/datastax-cassandra-3.0/datastax-cassandra-3.0.gradle diff --git a/instrumentation/datastax-cassandra-3/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientDecorator.java b/instrumentation/datastax-cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientDecorator.java similarity index 100% rename from instrumentation/datastax-cassandra-3/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientDecorator.java rename to instrumentation/datastax-cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientDecorator.java diff --git a/instrumentation/datastax-cassandra-3/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java b/instrumentation/datastax-cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java similarity index 100% rename from instrumentation/datastax-cassandra-3/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java rename to instrumentation/datastax-cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java diff --git a/instrumentation/datastax-cassandra-3/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/TracingSession.java b/instrumentation/datastax-cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/TracingSession.java similarity index 100% rename from instrumentation/datastax-cassandra-3/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/TracingSession.java rename to instrumentation/datastax-cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/TracingSession.java diff --git a/instrumentation/datastax-cassandra-3/src/test/groovy/CassandraClientTest.groovy b/instrumentation/datastax-cassandra-3.0/src/test/groovy/CassandraClientTest.groovy similarity index 100% rename from instrumentation/datastax-cassandra-3/src/test/groovy/CassandraClientTest.groovy rename to instrumentation/datastax-cassandra-3.0/src/test/groovy/CassandraClientTest.groovy diff --git a/instrumentation/dropwizard/dropwizard.gradle b/instrumentation/dropwizard-testing/dropwizard-testing.gradle similarity index 85% rename from instrumentation/dropwizard/dropwizard.gradle rename to instrumentation/dropwizard-testing/dropwizard-testing.gradle index afdc13c4ef..6f10cd1b25 100644 --- a/instrumentation/dropwizard/dropwizard.gradle +++ b/instrumentation/dropwizard-testing/dropwizard-testing.gradle @@ -10,8 +10,8 @@ apply from: "${rootDir}/gradle/java.gradle" dependencies { testCompile project(':instrumentation:java-concurrent') - testCompile project(':instrumentation:jax-rs-annotations-2') - testCompile project(':instrumentation:servlet:request-3') + testCompile project(':instrumentation:jax-rs-annotations-2.0') + testCompile project(':instrumentation:servlet:request-3.0') // First version with DropwizardTestSupport: testCompile group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.8.0' diff --git a/instrumentation/dropwizard/src/test/groovy/DropwizardAsyncTest.groovy b/instrumentation/dropwizard-testing/src/test/groovy/DropwizardAsyncTest.groovy similarity index 100% rename from instrumentation/dropwizard/src/test/groovy/DropwizardAsyncTest.groovy rename to instrumentation/dropwizard-testing/src/test/groovy/DropwizardAsyncTest.groovy diff --git a/instrumentation/dropwizard/src/test/groovy/DropwizardTest.groovy b/instrumentation/dropwizard-testing/src/test/groovy/DropwizardTest.groovy similarity index 100% rename from instrumentation/dropwizard/src/test/groovy/DropwizardTest.groovy rename to instrumentation/dropwizard-testing/src/test/groovy/DropwizardTest.groovy diff --git a/instrumentation/dropwizard/src/test/groovy/JettyTestInstrumentation.java b/instrumentation/dropwizard-testing/src/test/groovy/JettyTestInstrumentation.java similarity index 100% rename from instrumentation/dropwizard/src/test/groovy/JettyTestInstrumentation.java rename to instrumentation/dropwizard-testing/src/test/groovy/JettyTestInstrumentation.java diff --git a/instrumentation/dropwizard/dropwizard-views/dropwizard-views.gradle b/instrumentation/dropwizard-views-0.7/dropwizard-views-0.7.gradle similarity index 100% rename from instrumentation/dropwizard/dropwizard-views/dropwizard-views.gradle rename to instrumentation/dropwizard-views-0.7/dropwizard-views-0.7.gradle diff --git a/instrumentation/dropwizard/dropwizard-views/src/main/java/io/opentelemetry/auto/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java b/instrumentation/dropwizard-views-0.7/src/main/java/io/opentelemetry/auto/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java similarity index 100% rename from instrumentation/dropwizard/dropwizard-views/src/main/java/io/opentelemetry/auto/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java rename to instrumentation/dropwizard-views-0.7/src/main/java/io/opentelemetry/auto/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java diff --git a/instrumentation/dropwizard/dropwizard-views/src/test/groovy/ViewRenderTest.groovy b/instrumentation/dropwizard-views-0.7/src/test/groovy/ViewRenderTest.groovy similarity index 100% rename from instrumentation/dropwizard/dropwizard-views/src/test/groovy/ViewRenderTest.groovy rename to instrumentation/dropwizard-views-0.7/src/test/groovy/ViewRenderTest.groovy diff --git a/instrumentation/dropwizard/dropwizard-views/src/test/resources/views/ftl/iso88591.ftl b/instrumentation/dropwizard-views-0.7/src/test/resources/views/ftl/iso88591.ftl similarity index 100% rename from instrumentation/dropwizard/dropwizard-views/src/test/resources/views/ftl/iso88591.ftl rename to instrumentation/dropwizard-views-0.7/src/test/resources/views/ftl/iso88591.ftl diff --git a/instrumentation/dropwizard/dropwizard-views/src/test/resources/views/ftl/utf8.ftl b/instrumentation/dropwizard-views-0.7/src/test/resources/views/ftl/utf8.ftl similarity index 100% rename from instrumentation/dropwizard/dropwizard-views/src/test/resources/views/ftl/utf8.ftl rename to instrumentation/dropwizard-views-0.7/src/test/resources/views/ftl/utf8.ftl diff --git a/instrumentation/dropwizard/dropwizard-views/src/test/resources/views/mustache/iso88591.mustache b/instrumentation/dropwizard-views-0.7/src/test/resources/views/mustache/iso88591.mustache similarity index 100% rename from instrumentation/dropwizard/dropwizard-views/src/test/resources/views/mustache/iso88591.mustache rename to instrumentation/dropwizard-views-0.7/src/test/resources/views/mustache/iso88591.mustache diff --git a/instrumentation/dropwizard/dropwizard-views/src/test/resources/views/mustache/utf8.mustache b/instrumentation/dropwizard-views-0.7/src/test/resources/views/mustache/utf8.mustache similarity index 100% rename from instrumentation/dropwizard/dropwizard-views/src/test/resources/views/mustache/utf8.mustache rename to instrumentation/dropwizard-views-0.7/src/test/resources/views/mustache/utf8.mustache diff --git a/instrumentation/elasticsearch/rest-5/rest-5.gradle b/instrumentation/elasticsearch/rest-5.0/rest-5.0.gradle similarity index 95% rename from instrumentation/elasticsearch/rest-5/rest-5.gradle rename to instrumentation/elasticsearch/rest-5.0/rest-5.0.gradle index 98a69449a5..635d43f012 100644 --- a/instrumentation/elasticsearch/rest-5/rest-5.gradle +++ b/instrumentation/elasticsearch/rest-5.0/rest-5.0.gradle @@ -31,8 +31,8 @@ dependencies { compile project(':instrumentation:elasticsearch') - testCompile project(':instrumentation:apache-httpclient-4') - testCompile project(':instrumentation:apache-httpasyncclient-4') + testCompile project(':instrumentation:apache-httpclient-4.0') + testCompile project(':instrumentation:apache-httpasyncclient-4.0') testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0' testCompile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0' diff --git a/instrumentation/elasticsearch/rest-5/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy b/instrumentation/elasticsearch/rest-5.0/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/rest-5/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy rename to instrumentation/elasticsearch/rest-5.0/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy diff --git a/instrumentation/elasticsearch/rest-5/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java b/instrumentation/elasticsearch/rest-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java similarity index 100% rename from instrumentation/elasticsearch/rest-5/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java rename to instrumentation/elasticsearch/rest-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java diff --git a/instrumentation/elasticsearch/rest-5/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/RestResponseListener.java b/instrumentation/elasticsearch/rest-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/RestResponseListener.java similarity index 100% rename from instrumentation/elasticsearch/rest-5/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/RestResponseListener.java rename to instrumentation/elasticsearch/rest-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/RestResponseListener.java diff --git a/instrumentation/elasticsearch/rest-5/src/test/groovy/Elasticsearch5RestClientTest.groovy b/instrumentation/elasticsearch/rest-5.0/src/test/groovy/Elasticsearch5RestClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/rest-5/src/test/groovy/Elasticsearch5RestClientTest.groovy rename to instrumentation/elasticsearch/rest-5.0/src/test/groovy/Elasticsearch5RestClientTest.groovy diff --git a/instrumentation/elasticsearch/rest-6.4/rest-6.4.gradle b/instrumentation/elasticsearch/rest-6.4/rest-6.4.gradle index 42c5355f49..75a95879be 100644 --- a/instrumentation/elasticsearch/rest-6.4/rest-6.4.gradle +++ b/instrumentation/elasticsearch/rest-6.4/rest-6.4.gradle @@ -32,8 +32,8 @@ dependencies { compile project(':instrumentation:elasticsearch') - testCompile project(':instrumentation:apache-httpclient-4') - testCompile project(':instrumentation:apache-httpasyncclient-4') + testCompile project(':instrumentation:apache-httpclient-4.0') + testCompile project(':instrumentation:apache-httpasyncclient-4.0') // Netty is used, but it adds complexity to the tests since we're using embedded ES. //testCompile project(':instrumentation:netty-4.1') diff --git a/instrumentation/elasticsearch/transport-2/src/latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy b/instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2/src/latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy rename to instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy diff --git a/instrumentation/elasticsearch/transport-2/src/latestDepTest/groovy/Elasticsearch2TransportClientTest.groovy b/instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/Elasticsearch2TransportClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2/src/latestDepTest/groovy/Elasticsearch2TransportClientTest.groovy rename to instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/Elasticsearch2TransportClientTest.groovy diff --git a/instrumentation/elasticsearch/transport-2/src/latestDepTest/groovy/springdata/Config.groovy b/instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/Config.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2/src/latestDepTest/groovy/springdata/Config.groovy rename to instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/Config.groovy diff --git a/instrumentation/elasticsearch/transport-2/src/latestDepTest/groovy/springdata/Doc.groovy b/instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/Doc.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2/src/latestDepTest/groovy/springdata/Doc.groovy rename to instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/Doc.groovy diff --git a/instrumentation/elasticsearch/transport-2/src/latestDepTest/groovy/springdata/DocRepository.groovy b/instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/DocRepository.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2/src/latestDepTest/groovy/springdata/DocRepository.groovy rename to instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/DocRepository.groovy diff --git a/instrumentation/elasticsearch/transport-2/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy b/instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy rename to instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy diff --git a/instrumentation/elasticsearch/transport-2/src/latestDepTest/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy b/instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2/src/latestDepTest/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy rename to instrumentation/elasticsearch/transport-2.0/src/latestDepTest/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy diff --git a/instrumentation/elasticsearch/transport-2/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java b/instrumentation/elasticsearch/transport-2.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java similarity index 100% rename from instrumentation/elasticsearch/transport-2/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java rename to instrumentation/elasticsearch/transport-2.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java diff --git a/instrumentation/elasticsearch/transport-2/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/TransportActionListener.java b/instrumentation/elasticsearch/transport-2.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/TransportActionListener.java similarity index 100% rename from instrumentation/elasticsearch/transport-2/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/TransportActionListener.java rename to instrumentation/elasticsearch/transport-2.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/TransportActionListener.java diff --git a/instrumentation/elasticsearch/transport-2/src/test/groovy/Elasticsearch2NodeClientTest.groovy b/instrumentation/elasticsearch/transport-2.0/src/test/groovy/Elasticsearch2NodeClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2/src/test/groovy/Elasticsearch2NodeClientTest.groovy rename to instrumentation/elasticsearch/transport-2.0/src/test/groovy/Elasticsearch2NodeClientTest.groovy diff --git a/instrumentation/elasticsearch/transport-2/src/test/groovy/Elasticsearch2TransportClientTest.groovy b/instrumentation/elasticsearch/transport-2.0/src/test/groovy/Elasticsearch2TransportClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2/src/test/groovy/Elasticsearch2TransportClientTest.groovy rename to instrumentation/elasticsearch/transport-2.0/src/test/groovy/Elasticsearch2TransportClientTest.groovy diff --git a/instrumentation/elasticsearch/transport-2/src/test/groovy/springdata/Config.groovy b/instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/Config.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2/src/test/groovy/springdata/Config.groovy rename to instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/Config.groovy diff --git a/instrumentation/elasticsearch/transport-2/src/test/groovy/springdata/Doc.groovy b/instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/Doc.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2/src/test/groovy/springdata/Doc.groovy rename to instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/Doc.groovy diff --git a/instrumentation/elasticsearch/transport-2/src/test/groovy/springdata/DocRepository.groovy b/instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/DocRepository.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2/src/test/groovy/springdata/DocRepository.groovy rename to instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/DocRepository.groovy diff --git a/instrumentation/elasticsearch/transport-2/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy b/instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy rename to instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy diff --git a/instrumentation/elasticsearch/transport-2/src/test/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy b/instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-2/src/test/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy rename to instrumentation/elasticsearch/transport-2.0/src/test/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy diff --git a/instrumentation/elasticsearch/transport-2/transport-2.gradle b/instrumentation/elasticsearch/transport-2.0/transport-2.0.gradle similarity index 95% rename from instrumentation/elasticsearch/transport-2/transport-2.gradle rename to instrumentation/elasticsearch/transport-2.0/transport-2.0.gradle index 833c74e3fa..3123c745e2 100644 --- a/instrumentation/elasticsearch/transport-2/transport-2.gradle +++ b/instrumentation/elasticsearch/transport-2.0/transport-2.0.gradle @@ -27,9 +27,9 @@ dependencies { compile project(':instrumentation:elasticsearch') // Ensure no cross interference - testCompile project(':instrumentation:elasticsearch:rest-5') - testCompile project(':instrumentation:elasticsearch:transport-5') - testCompile project(':instrumentation:apache-httpasyncclient-4') + testCompile project(':instrumentation:elasticsearch:rest-5.0') + testCompile project(':instrumentation:elasticsearch:transport-5.0') + testCompile project(':instrumentation:apache-httpasyncclient-4.0') testCompile group: 'org.elasticsearch', name: 'elasticsearch', version: '2.0.0' diff --git a/instrumentation/elasticsearch/transport-5/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java b/instrumentation/elasticsearch/transport-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java similarity index 100% rename from instrumentation/elasticsearch/transport-5/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java rename to instrumentation/elasticsearch/transport-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java diff --git a/instrumentation/elasticsearch/transport-5/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/TransportActionListener.java b/instrumentation/elasticsearch/transport-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/TransportActionListener.java similarity index 100% rename from instrumentation/elasticsearch/transport-5/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/TransportActionListener.java rename to instrumentation/elasticsearch/transport-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/TransportActionListener.java diff --git a/instrumentation/elasticsearch/transport-5/src/test/groovy/Elasticsearch5NodeClientTest.groovy b/instrumentation/elasticsearch/transport-5.0/src/test/groovy/Elasticsearch5NodeClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-5/src/test/groovy/Elasticsearch5NodeClientTest.groovy rename to instrumentation/elasticsearch/transport-5.0/src/test/groovy/Elasticsearch5NodeClientTest.groovy diff --git a/instrumentation/elasticsearch/transport-5/src/test/groovy/Elasticsearch5TransportClientTest.groovy b/instrumentation/elasticsearch/transport-5.0/src/test/groovy/Elasticsearch5TransportClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-5/src/test/groovy/Elasticsearch5TransportClientTest.groovy rename to instrumentation/elasticsearch/transport-5.0/src/test/groovy/Elasticsearch5TransportClientTest.groovy diff --git a/instrumentation/elasticsearch/transport-5/transport-5.gradle b/instrumentation/elasticsearch/transport-5.0/transport-5.0.gradle similarity index 94% rename from instrumentation/elasticsearch/transport-5/transport-5.gradle rename to instrumentation/elasticsearch/transport-5.0/transport-5.0.gradle index 5238aff491..61dca67460 100644 --- a/instrumentation/elasticsearch/transport-5/transport-5.gradle +++ b/instrumentation/elasticsearch/transport-5.0/transport-5.0.gradle @@ -27,8 +27,8 @@ dependencies { compile project(':instrumentation:elasticsearch') // Ensure no cross interference - testCompile project(':instrumentation:elasticsearch:rest-5') - testCompile project(':instrumentation:apache-httpasyncclient-4') + testCompile project(':instrumentation:elasticsearch:rest-5.0') + testCompile project(':instrumentation:apache-httpasyncclient-4.0') testCompile project(':instrumentation:netty-4.1') testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0' diff --git a/instrumentation/elasticsearch/transport-5.3/transport-5.3.gradle b/instrumentation/elasticsearch/transport-5.3/transport-5.3.gradle index 828074675d..dd0f44d62b 100644 --- a/instrumentation/elasticsearch/transport-5.3/transport-5.3.gradle +++ b/instrumentation/elasticsearch/transport-5.3/transport-5.3.gradle @@ -34,7 +34,7 @@ dependencies { compile project(':instrumentation:elasticsearch') - testCompile project(':instrumentation:apache-httpasyncclient-4') + testCompile project(':instrumentation:apache-httpasyncclient-4.0') testCompile project(':instrumentation:netty-4.1') testCompile project(':instrumentation:spring-data-1.8') diff --git a/instrumentation/elasticsearch/transport-6/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java b/instrumentation/elasticsearch/transport-6.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java similarity index 100% rename from instrumentation/elasticsearch/transport-6/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java rename to instrumentation/elasticsearch/transport-6.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java diff --git a/instrumentation/elasticsearch/transport-6/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/TransportActionListener.java b/instrumentation/elasticsearch/transport-6.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/TransportActionListener.java similarity index 100% rename from instrumentation/elasticsearch/transport-6/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/TransportActionListener.java rename to instrumentation/elasticsearch/transport-6.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/TransportActionListener.java diff --git a/instrumentation/elasticsearch/transport-6/src/test/groovy/Elasticsearch6NodeClientTest.groovy b/instrumentation/elasticsearch/transport-6.0/src/test/groovy/Elasticsearch6NodeClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-6/src/test/groovy/Elasticsearch6NodeClientTest.groovy rename to instrumentation/elasticsearch/transport-6.0/src/test/groovy/Elasticsearch6NodeClientTest.groovy diff --git a/instrumentation/elasticsearch/transport-6/src/test/groovy/Elasticsearch6TransportClientTest.groovy b/instrumentation/elasticsearch/transport-6.0/src/test/groovy/Elasticsearch6TransportClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/transport-6/src/test/groovy/Elasticsearch6TransportClientTest.groovy rename to instrumentation/elasticsearch/transport-6.0/src/test/groovy/Elasticsearch6TransportClientTest.groovy diff --git a/instrumentation/elasticsearch/transport-6/transport-6.gradle b/instrumentation/elasticsearch/transport-6.0/transport-6.0.gradle similarity index 95% rename from instrumentation/elasticsearch/transport-6/transport-6.gradle rename to instrumentation/elasticsearch/transport-6.0/transport-6.0.gradle index 1f6ec35937..f9086a0158 100644 --- a/instrumentation/elasticsearch/transport-6/transport-6.gradle +++ b/instrumentation/elasticsearch/transport-6.0/transport-6.0.gradle @@ -35,8 +35,8 @@ dependencies { compile project(':instrumentation:elasticsearch') // Ensure no cross interference - testCompile project(':instrumentation:elasticsearch:rest-5') - testCompile project(':instrumentation:apache-httpasyncclient-4') + testCompile project(':instrumentation:elasticsearch:rest-5.0') + testCompile project(':instrumentation:apache-httpasyncclient-4.0') testCompile project(':instrumentation:netty-4.1') testCompile group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.0.0' diff --git a/instrumentation/glassfish/glassfish.gradle b/instrumentation/glassfish-3.0/glassfish-3.0.gradle similarity index 83% rename from instrumentation/glassfish/glassfish.gradle rename to instrumentation/glassfish-3.0/glassfish-3.0.gradle index 48e8af1140..84fbff8a5e 100644 --- a/instrumentation/glassfish/glassfish.gradle +++ b/instrumentation/glassfish-3.0/glassfish-3.0.gradle @@ -22,8 +22,8 @@ testSets { } dependencies { - testCompile project(':instrumentation:servlet:request-3') - testCompile project(':instrumentation:grizzly-2') + testCompile project(':instrumentation:servlet:request-3.0') + testCompile project(':instrumentation:grizzly-2.0') testCompile group: 'org.glassfish.main.extras', name: 'glassfish-embedded-all', version: '4.0' latestDepTestCompile group: 'org.glassfish.main.extras', name: 'glassfish-embedded-all', version: '+' diff --git a/instrumentation/glassfish/src/main/java/io/opentelemetry/auto/instrumentation/glassfish/GlassFishInstrumentation.java b/instrumentation/glassfish-3.0/src/main/java/io/opentelemetry/auto/instrumentation/glassfish/GlassFishInstrumentation.java similarity index 100% rename from instrumentation/glassfish/src/main/java/io/opentelemetry/auto/instrumentation/glassfish/GlassFishInstrumentation.java rename to instrumentation/glassfish-3.0/src/main/java/io/opentelemetry/auto/instrumentation/glassfish/GlassFishInstrumentation.java diff --git a/instrumentation/glassfish/src/test/groovy/GlassFishServerTest.groovy b/instrumentation/glassfish-3.0/src/test/groovy/GlassFishServerTest.groovy similarity index 100% rename from instrumentation/glassfish/src/test/groovy/GlassFishServerTest.groovy rename to instrumentation/glassfish-3.0/src/test/groovy/GlassFishServerTest.groovy diff --git a/instrumentation/glassfish/src/test/groovy/GrizzlyTestInstrumentation.java b/instrumentation/glassfish-3.0/src/test/groovy/GrizzlyTestInstrumentation.java similarity index 100% rename from instrumentation/glassfish/src/test/groovy/GrizzlyTestInstrumentation.java rename to instrumentation/glassfish-3.0/src/test/groovy/GrizzlyTestInstrumentation.java diff --git a/instrumentation/glassfish/src/test/groovy/TestServlets.java b/instrumentation/glassfish-3.0/src/test/groovy/TestServlets.java similarity index 100% rename from instrumentation/glassfish/src/test/groovy/TestServlets.java rename to instrumentation/glassfish-3.0/src/test/groovy/TestServlets.java diff --git a/instrumentation/glassfish/src/test/resources/WEB-INF/web.xml b/instrumentation/glassfish-3.0/src/test/resources/WEB-INF/web.xml similarity index 100% rename from instrumentation/glassfish/src/test/resources/WEB-INF/web.xml rename to instrumentation/glassfish-3.0/src/test/resources/WEB-INF/web.xml diff --git a/instrumentation/glassfish/src/test/resources/error.jsp b/instrumentation/glassfish-3.0/src/test/resources/error.jsp similarity index 100% rename from instrumentation/glassfish/src/test/resources/error.jsp rename to instrumentation/glassfish-3.0/src/test/resources/error.jsp diff --git a/instrumentation/google-http-client/google-http-client.gradle b/instrumentation/google-http-client-1.19/google-http-client-1.19.gradle similarity index 100% rename from instrumentation/google-http-client/google-http-client.gradle rename to instrumentation/google-http-client-1.19/google-http-client-1.19.gradle diff --git a/instrumentation/google-http-client/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/GoogleHttpClientDecorator.java b/instrumentation/google-http-client-1.19/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/GoogleHttpClientDecorator.java similarity index 100% rename from instrumentation/google-http-client/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/GoogleHttpClientDecorator.java rename to instrumentation/google-http-client-1.19/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/GoogleHttpClientDecorator.java diff --git a/instrumentation/google-http-client/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java b/instrumentation/google-http-client-1.19/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java similarity index 100% rename from instrumentation/google-http-client/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java rename to instrumentation/google-http-client-1.19/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java diff --git a/instrumentation/google-http-client/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/HeadersInjectAdapter.java b/instrumentation/google-http-client-1.19/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/HeadersInjectAdapter.java similarity index 100% rename from instrumentation/google-http-client/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/HeadersInjectAdapter.java rename to instrumentation/google-http-client-1.19/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/HeadersInjectAdapter.java diff --git a/instrumentation/google-http-client/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/RequestState.java b/instrumentation/google-http-client-1.19/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/RequestState.java similarity index 100% rename from instrumentation/google-http-client/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/RequestState.java rename to instrumentation/google-http-client-1.19/src/main/java/io/opentelemetry/auto/instrumentation/googlehttpclient/RequestState.java diff --git a/instrumentation/google-http-client/src/test/groovy/AbstractGoogleHttpClientTest.groovy b/instrumentation/google-http-client-1.19/src/test/groovy/AbstractGoogleHttpClientTest.groovy similarity index 100% rename from instrumentation/google-http-client/src/test/groovy/AbstractGoogleHttpClientTest.groovy rename to instrumentation/google-http-client-1.19/src/test/groovy/AbstractGoogleHttpClientTest.groovy diff --git a/instrumentation/google-http-client/src/test/groovy/GoogleHttpClientAsyncTest.groovy b/instrumentation/google-http-client-1.19/src/test/groovy/GoogleHttpClientAsyncTest.groovy similarity index 100% rename from instrumentation/google-http-client/src/test/groovy/GoogleHttpClientAsyncTest.groovy rename to instrumentation/google-http-client-1.19/src/test/groovy/GoogleHttpClientAsyncTest.groovy diff --git a/instrumentation/google-http-client/src/test/groovy/GoogleHttpClientTest.groovy b/instrumentation/google-http-client-1.19/src/test/groovy/GoogleHttpClientTest.groovy similarity index 100% rename from instrumentation/google-http-client/src/test/groovy/GoogleHttpClientTest.groovy rename to instrumentation/google-http-client-1.19/src/test/groovy/GoogleHttpClientTest.groovy diff --git a/instrumentation/grizzly-2/grizzly-2.gradle b/instrumentation/grizzly-2.0/grizzly-2.0.gradle similarity index 100% rename from instrumentation/grizzly-2/grizzly-2.gradle rename to instrumentation/grizzly-2.0/grizzly-2.0.gradle diff --git a/instrumentation/grizzly-2/src/main/java/io/opentelemetry/auto/instrumentation/grizzly/GrizzlyDecorator.java b/instrumentation/grizzly-2.0/src/main/java/io/opentelemetry/auto/instrumentation/grizzly/GrizzlyDecorator.java similarity index 100% rename from instrumentation/grizzly-2/src/main/java/io/opentelemetry/auto/instrumentation/grizzly/GrizzlyDecorator.java rename to instrumentation/grizzly-2.0/src/main/java/io/opentelemetry/auto/instrumentation/grizzly/GrizzlyDecorator.java diff --git a/instrumentation/grizzly-2/src/main/java/io/opentelemetry/auto/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java b/instrumentation/grizzly-2.0/src/main/java/io/opentelemetry/auto/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java similarity index 100% rename from instrumentation/grizzly-2/src/main/java/io/opentelemetry/auto/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java rename to instrumentation/grizzly-2.0/src/main/java/io/opentelemetry/auto/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java diff --git a/instrumentation/grizzly-2/src/main/java/io/opentelemetry/auto/instrumentation/grizzly/GrizzlyRequestExtractAdapter.java b/instrumentation/grizzly-2.0/src/main/java/io/opentelemetry/auto/instrumentation/grizzly/GrizzlyRequestExtractAdapter.java similarity index 100% rename from instrumentation/grizzly-2/src/main/java/io/opentelemetry/auto/instrumentation/grizzly/GrizzlyRequestExtractAdapter.java rename to instrumentation/grizzly-2.0/src/main/java/io/opentelemetry/auto/instrumentation/grizzly/GrizzlyRequestExtractAdapter.java diff --git a/instrumentation/grizzly-2/src/test/groovy/GrizzlyAsyncTest.groovy b/instrumentation/grizzly-2.0/src/test/groovy/GrizzlyAsyncTest.groovy similarity index 100% rename from instrumentation/grizzly-2/src/test/groovy/GrizzlyAsyncTest.groovy rename to instrumentation/grizzly-2.0/src/test/groovy/GrizzlyAsyncTest.groovy diff --git a/instrumentation/grizzly-2/src/test/groovy/GrizzlyIOStrategyTest.groovy b/instrumentation/grizzly-2.0/src/test/groovy/GrizzlyIOStrategyTest.groovy similarity index 100% rename from instrumentation/grizzly-2/src/test/groovy/GrizzlyIOStrategyTest.groovy rename to instrumentation/grizzly-2.0/src/test/groovy/GrizzlyIOStrategyTest.groovy diff --git a/instrumentation/grizzly-2/src/test/groovy/GrizzlyTest.groovy b/instrumentation/grizzly-2.0/src/test/groovy/GrizzlyTest.groovy similarity index 100% rename from instrumentation/grizzly-2/src/test/groovy/GrizzlyTest.groovy rename to instrumentation/grizzly-2.0/src/test/groovy/GrizzlyTest.groovy diff --git a/instrumentation/grizzly-2/src/test/groovy/GrizzlyTestInstrumentation.java b/instrumentation/grizzly-2.0/src/test/groovy/GrizzlyTestInstrumentation.java similarity index 100% rename from instrumentation/grizzly-2/src/test/groovy/GrizzlyTestInstrumentation.java rename to instrumentation/grizzly-2.0/src/test/groovy/GrizzlyTestInstrumentation.java diff --git a/instrumentation/hystrix-1.4/hystrix-1.4.gradle b/instrumentation/hystrix-1.4/hystrix-1.4.gradle index 898837936b..db0d82de7b 100644 --- a/instrumentation/hystrix-1.4/hystrix-1.4.gradle +++ b/instrumentation/hystrix-1.4/hystrix-1.4.gradle @@ -17,7 +17,7 @@ testSets { } dependencies { - compile project(':instrumentation:rxjava-1') + compile project(':instrumentation:rxjava-1.0') compileOnly group: 'com.netflix.hystrix', name: 'hystrix-core', version: '1.4.0' compileOnly group: 'io.reactivex', name: 'rxjava', version: '1.0.7' diff --git a/instrumentation/jax-rs-annotations-1/jax-rs-annotations-1.gradle b/instrumentation/jax-rs-annotations-1.0/jax-rs-annotations-1.0.gradle similarity index 100% rename from instrumentation/jax-rs-annotations-1/jax-rs-annotations-1.gradle rename to instrumentation/jax-rs-annotations-1.0/jax-rs-annotations-1.0.gradle diff --git a/instrumentation/jax-rs-annotations-1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsDecorator.java b/instrumentation/jax-rs-annotations-1.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsDecorator.java similarity index 100% rename from instrumentation/jax-rs-annotations-1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsDecorator.java rename to instrumentation/jax-rs-annotations-1.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsDecorator.java diff --git a/instrumentation/jax-rs-annotations-1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java b/instrumentation/jax-rs-annotations-1.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java rename to instrumentation/jax-rs-annotations-1.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-1/src/test/groovy/JavaInterfaces.java b/instrumentation/jax-rs-annotations-1.0/src/test/groovy/JavaInterfaces.java similarity index 100% rename from instrumentation/jax-rs-annotations-1/src/test/groovy/JavaInterfaces.java rename to instrumentation/jax-rs-annotations-1.0/src/test/groovy/JavaInterfaces.java diff --git a/instrumentation/jax-rs-annotations-1/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy b/instrumentation/jax-rs-annotations-1.0/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy similarity index 100% rename from instrumentation/jax-rs-annotations-1/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy rename to instrumentation/jax-rs-annotations-1.0/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy diff --git a/instrumentation/jax-rs-annotations-1/src/test/groovy/JerseyTest.groovy b/instrumentation/jax-rs-annotations-1.0/src/test/groovy/JerseyTest.groovy similarity index 100% rename from instrumentation/jax-rs-annotations-1/src/test/groovy/JerseyTest.groovy rename to instrumentation/jax-rs-annotations-1.0/src/test/groovy/JerseyTest.groovy diff --git a/instrumentation/jax-rs-annotations-1/src/test/groovy/JettyTestInstrumentation.java b/instrumentation/jax-rs-annotations-1.0/src/test/groovy/JettyTestInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-1/src/test/groovy/JettyTestInstrumentation.java rename to instrumentation/jax-rs-annotations-1.0/src/test/groovy/JettyTestInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-1/src/test/java/Resource.java b/instrumentation/jax-rs-annotations-1.0/src/test/java/Resource.java similarity index 100% rename from instrumentation/jax-rs-annotations-1/src/test/java/Resource.java rename to instrumentation/jax-rs-annotations-1.0/src/test/java/Resource.java diff --git a/instrumentation/jax-rs-annotations-2/filter-jersey/filter-jersey.gradle b/instrumentation/jax-rs-annotations-2.0/filter-jersey-2.0/filter-jersey-2.0.gradle similarity index 88% rename from instrumentation/jax-rs-annotations-2/filter-jersey/filter-jersey.gradle rename to instrumentation/jax-rs-annotations-2.0/filter-jersey-2.0/filter-jersey-2.0.gradle index 41f96553d6..73ab190f6e 100644 --- a/instrumentation/jax-rs-annotations-2/filter-jersey/filter-jersey.gradle +++ b/instrumentation/jax-rs-annotations-2.0/filter-jersey-2.0/filter-jersey-2.0.gradle @@ -13,5 +13,5 @@ dependencies { compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0' compileOnly group: 'org.glassfish.jersey.core', name: 'jersey-server', version: '2.0' - compile project(':instrumentation:jax-rs-annotations-2') + compile project(':instrumentation:jax-rs-annotations-2.0') } diff --git a/instrumentation/jax-rs-annotations-2/filter-jersey/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java b/instrumentation/jax-rs-annotations-2.0/filter-jersey-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-2/filter-jersey/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java rename to instrumentation/jax-rs-annotations-2.0/filter-jersey-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-2/filter-resteasy-3.0/filter-resteasy-3.0.gradle b/instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.0/filter-resteasy-3.0.gradle similarity index 91% rename from instrumentation/jax-rs-annotations-2/filter-resteasy-3.0/filter-resteasy-3.0.gradle rename to instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.0/filter-resteasy-3.0.gradle index 513552e359..690ba0772b 100644 --- a/instrumentation/jax-rs-annotations-2/filter-resteasy-3.0/filter-resteasy-3.0.gradle +++ b/instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.0/filter-resteasy-3.0.gradle @@ -21,5 +21,5 @@ dependencies { compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0' compileOnly group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '3.0.0.Final' - compile project(':instrumentation:jax-rs-annotations-2') + compile project(':instrumentation:jax-rs-annotations-2.0') } diff --git a/instrumentation/jax-rs-annotations-2/filter-resteasy-3.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java b/instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-2/filter-resteasy-3.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java rename to instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-2/filter-resteasy-3.1/filter-resteasy-3.1.gradle b/instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.1/filter-resteasy-3.1.gradle similarity index 90% rename from instrumentation/jax-rs-annotations-2/filter-resteasy-3.1/filter-resteasy-3.1.gradle rename to instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.1/filter-resteasy-3.1.gradle index 04b87cc29f..40859d1b3b 100644 --- a/instrumentation/jax-rs-annotations-2/filter-resteasy-3.1/filter-resteasy-3.1.gradle +++ b/instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.1/filter-resteasy-3.1.gradle @@ -15,5 +15,5 @@ dependencies { compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0' compileOnly group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '3.1.0.Final' - compile project(':instrumentation:jax-rs-annotations-2') + compile project(':instrumentation:jax-rs-annotations-2.0') } diff --git a/instrumentation/jax-rs-annotations-2/filter-resteasy-3.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java b/instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-2/filter-resteasy-3.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java rename to instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-2/jax-rs-annotations-2.gradle b/instrumentation/jax-rs-annotations-2.0/jax-rs-annotations-2.0.gradle similarity index 80% rename from instrumentation/jax-rs-annotations-2/jax-rs-annotations-2.gradle rename to instrumentation/jax-rs-annotations-2.0/jax-rs-annotations-2.0.gradle index 75c8616031..75be28c362 100644 --- a/instrumentation/jax-rs-annotations-2/jax-rs-annotations-2.gradle +++ b/instrumentation/jax-rs-annotations-2.0/jax-rs-annotations-2.0.gradle @@ -29,10 +29,10 @@ dependencies { compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0' testCompile project(':instrumentation:java-concurrent') - testCompile project(':instrumentation:servlet:request-3') - testCompile project(':instrumentation:jax-rs-annotations-2:filter-jersey') - testCompile project(':instrumentation:jax-rs-annotations-2:filter-resteasy-3.0') - testCompile project(':instrumentation:jax-rs-annotations-2:filter-resteasy-3.1') + testCompile project(':instrumentation:servlet:request-3.0') + testCompile project(':instrumentation:jax-rs-annotations-2.0:filter-jersey-2.0') + testCompile project(':instrumentation:jax-rs-annotations-2.0:filter-resteasy-3.0') + testCompile project(':instrumentation:jax-rs-annotations-2.0:filter-resteasy-3.1') // Jersey // First version with DropwizardTestSupport: diff --git a/instrumentation/jax-rs-annotations-2/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/AbstractRequestContextInstrumentation.java b/instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/AbstractRequestContextInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-2/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/AbstractRequestContextInstrumentation.java rename to instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/AbstractRequestContextInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-2/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/ContainerRequestFilterInstrumentation.java b/instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/ContainerRequestFilterInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-2/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/ContainerRequestFilterInstrumentation.java rename to instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/ContainerRequestFilterInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-2/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java b/instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-2/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java rename to instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-2/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsDecorator.java b/instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsDecorator.java similarity index 100% rename from instrumentation/jax-rs-annotations-2/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsDecorator.java rename to instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsDecorator.java diff --git a/instrumentation/jax-rs-annotations-2/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java b/instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-2/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java rename to instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-2/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java b/instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-2/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java rename to instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-2/src/test/groovy/JavaInterfaces.java b/instrumentation/jax-rs-annotations-2.0/src/test/groovy/JavaInterfaces.java similarity index 100% rename from instrumentation/jax-rs-annotations-2/src/test/groovy/JavaInterfaces.java rename to instrumentation/jax-rs-annotations-2.0/src/test/groovy/JavaInterfaces.java diff --git a/instrumentation/jax-rs-annotations-2/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy b/instrumentation/jax-rs-annotations-2.0/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy similarity index 100% rename from instrumentation/jax-rs-annotations-2/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy rename to instrumentation/jax-rs-annotations-2.0/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy diff --git a/instrumentation/jax-rs-annotations-2/src/test/groovy/JaxRsFilterTest.groovy b/instrumentation/jax-rs-annotations-2.0/src/test/groovy/JaxRsFilterTest.groovy similarity index 100% rename from instrumentation/jax-rs-annotations-2/src/test/groovy/JaxRsFilterTest.groovy rename to instrumentation/jax-rs-annotations-2.0/src/test/groovy/JaxRsFilterTest.groovy diff --git a/instrumentation/jax-rs-annotations-2/src/test/java/Resource.java b/instrumentation/jax-rs-annotations-2.0/src/test/java/Resource.java similarity index 100% rename from instrumentation/jax-rs-annotations-2/src/test/java/Resource.java rename to instrumentation/jax-rs-annotations-2.0/src/test/java/Resource.java diff --git a/instrumentation/jetty-8/jetty-8.gradle b/instrumentation/jetty-8.0/jetty-8.0.gradle similarity index 100% rename from instrumentation/jetty-8/jetty-8.gradle rename to instrumentation/jetty-8.0/jetty-8.0.gradle diff --git a/instrumentation/jetty-8/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/HttpServletRequestExtractAdapter.java b/instrumentation/jetty-8.0/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/HttpServletRequestExtractAdapter.java similarity index 100% rename from instrumentation/jetty-8/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/HttpServletRequestExtractAdapter.java rename to instrumentation/jetty-8.0/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/HttpServletRequestExtractAdapter.java diff --git a/instrumentation/jetty-8/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/JettyDecorator.java b/instrumentation/jetty-8.0/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/JettyDecorator.java similarity index 100% rename from instrumentation/jetty-8/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/JettyDecorator.java rename to instrumentation/jetty-8.0/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/JettyDecorator.java diff --git a/instrumentation/jetty-8/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/JettyHandlerAdvice.java b/instrumentation/jetty-8.0/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/JettyHandlerAdvice.java similarity index 100% rename from instrumentation/jetty-8/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/JettyHandlerAdvice.java rename to instrumentation/jetty-8.0/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/JettyHandlerAdvice.java diff --git a/instrumentation/jetty-8/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/JettyHandlerInstrumentation.java b/instrumentation/jetty-8.0/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/JettyHandlerInstrumentation.java similarity index 100% rename from instrumentation/jetty-8/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/JettyHandlerInstrumentation.java rename to instrumentation/jetty-8.0/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/JettyHandlerInstrumentation.java diff --git a/instrumentation/jetty-8/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/TagSettingAsyncListener.java b/instrumentation/jetty-8.0/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/TagSettingAsyncListener.java similarity index 100% rename from instrumentation/jetty-8/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/TagSettingAsyncListener.java rename to instrumentation/jetty-8.0/src/main/java/io/opentelemetry/auto/instrumentation/jetty8/TagSettingAsyncListener.java diff --git a/instrumentation/jetty-8/src/test/groovy/JettyContinuationHandlerTest.groovy b/instrumentation/jetty-8.0/src/test/groovy/JettyContinuationHandlerTest.groovy similarity index 100% rename from instrumentation/jetty-8/src/test/groovy/JettyContinuationHandlerTest.groovy rename to instrumentation/jetty-8.0/src/test/groovy/JettyContinuationHandlerTest.groovy diff --git a/instrumentation/jetty-8/src/test/groovy/JettyHandlerTest.groovy b/instrumentation/jetty-8.0/src/test/groovy/JettyHandlerTest.groovy similarity index 100% rename from instrumentation/jetty-8/src/test/groovy/JettyHandlerTest.groovy rename to instrumentation/jetty-8.0/src/test/groovy/JettyHandlerTest.groovy diff --git a/instrumentation/jetty-8/src/test/groovy/JettyTestInstrumentation.java b/instrumentation/jetty-8.0/src/test/groovy/JettyTestInstrumentation.java similarity index 100% rename from instrumentation/jetty-8/src/test/groovy/JettyTestInstrumentation.java rename to instrumentation/jetty-8.0/src/test/groovy/JettyTestInstrumentation.java diff --git a/instrumentation/jms/jms.gradle b/instrumentation/jms-1.1/jms-1.1.gradle similarity index 100% rename from instrumentation/jms/jms.gradle rename to instrumentation/jms-1.1/jms-1.1.gradle diff --git a/instrumentation/jms/src/latestDepTest/groovy/JMS2Test.groovy b/instrumentation/jms-1.1/src/latestDepTest/groovy/JMS2Test.groovy similarity index 100% rename from instrumentation/jms/src/latestDepTest/groovy/JMS2Test.groovy rename to instrumentation/jms-1.1/src/latestDepTest/groovy/JMS2Test.groovy diff --git a/instrumentation/jms/src/latestDepTest/groovy/SpringTemplateJMS2Test.groovy b/instrumentation/jms-1.1/src/latestDepTest/groovy/SpringTemplateJMS2Test.groovy similarity index 100% rename from instrumentation/jms/src/latestDepTest/groovy/SpringTemplateJMS2Test.groovy rename to instrumentation/jms-1.1/src/latestDepTest/groovy/SpringTemplateJMS2Test.groovy diff --git a/instrumentation/jms/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSDecorator.java b/instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSDecorator.java similarity index 100% rename from instrumentation/jms/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSDecorator.java rename to instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSDecorator.java diff --git a/instrumentation/jms/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSMessageConsumerInstrumentation.java b/instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSMessageConsumerInstrumentation.java similarity index 100% rename from instrumentation/jms/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSMessageConsumerInstrumentation.java rename to instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSMessageConsumerInstrumentation.java diff --git a/instrumentation/jms/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSMessageListenerInstrumentation.java b/instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSMessageListenerInstrumentation.java similarity index 100% rename from instrumentation/jms/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSMessageListenerInstrumentation.java rename to instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSMessageListenerInstrumentation.java diff --git a/instrumentation/jms/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSMessageProducerInstrumentation.java b/instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSMessageProducerInstrumentation.java similarity index 100% rename from instrumentation/jms/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSMessageProducerInstrumentation.java rename to instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSMessageProducerInstrumentation.java diff --git a/instrumentation/jms/src/main/java/io/opentelemetry/auto/instrumentation/jms/MessageExtractAdapter.java b/instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/MessageExtractAdapter.java similarity index 100% rename from instrumentation/jms/src/main/java/io/opentelemetry/auto/instrumentation/jms/MessageExtractAdapter.java rename to instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/MessageExtractAdapter.java diff --git a/instrumentation/jms/src/main/java/io/opentelemetry/auto/instrumentation/jms/MessageInjectAdapter.java b/instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/MessageInjectAdapter.java similarity index 100% rename from instrumentation/jms/src/main/java/io/opentelemetry/auto/instrumentation/jms/MessageInjectAdapter.java rename to instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/MessageInjectAdapter.java diff --git a/instrumentation/jms/src/test/groovy/JMS1Test.groovy b/instrumentation/jms-1.1/src/test/groovy/JMS1Test.groovy similarity index 100% rename from instrumentation/jms/src/test/groovy/JMS1Test.groovy rename to instrumentation/jms-1.1/src/test/groovy/JMS1Test.groovy diff --git a/instrumentation/jms/src/test/groovy/SpringTemplateJMS1Test.groovy b/instrumentation/jms-1.1/src/test/groovy/SpringTemplateJMS1Test.groovy similarity index 100% rename from instrumentation/jms/src/test/groovy/SpringTemplateJMS1Test.groovy rename to instrumentation/jms-1.1/src/test/groovy/SpringTemplateJMS1Test.groovy diff --git a/instrumentation/jsp-2.3/jsp-2.3.gradle b/instrumentation/jsp-2.3/jsp-2.3.gradle index 032399c185..64e2d71644 100644 --- a/instrumentation/jsp-2.3/jsp-2.3.gradle +++ b/instrumentation/jsp-2.3/jsp-2.3.gradle @@ -23,7 +23,7 @@ dependencies { compileOnly group: 'javax.servlet.jsp', name: 'javax.servlet.jsp-api', version: '2.3.0' compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0' - testCompile project(':instrumentation:servlet:request-3') + testCompile project(':instrumentation:servlet:request-3.0') // using tomcat 7.0.37 because there seems to be some issues with Tomcat's jar scanning in versions < 7.0.37 // https://stackoverflow.com/questions/23484098/org-apache-tomcat-util-bcel-classfile-classformatexception-invalid-byte-tag-in testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.37' diff --git a/instrumentation/lettuce-5/lettuce-5.gradle b/instrumentation/lettuce-5.0/lettuce-5.0.gradle similarity index 100% rename from instrumentation/lettuce-5/lettuce-5.gradle rename to instrumentation/lettuce-5.0/lettuce-5.0.gradle diff --git a/instrumentation/lettuce-5/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/LettuceAsyncCommandsInstrumentation.java b/instrumentation/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/LettuceAsyncCommandsInstrumentation.java similarity index 100% rename from instrumentation/lettuce-5/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/LettuceAsyncCommandsInstrumentation.java rename to instrumentation/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/LettuceAsyncCommandsInstrumentation.java diff --git a/instrumentation/lettuce-5/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/LettuceClientInstrumentation.java b/instrumentation/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/LettuceClientInstrumentation.java similarity index 100% rename from instrumentation/lettuce-5/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/LettuceClientInstrumentation.java rename to instrumentation/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/LettuceClientInstrumentation.java diff --git a/instrumentation/lettuce-5/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/LettuceReactiveCommandsInstrumentation.java b/instrumentation/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/LettuceReactiveCommandsInstrumentation.java similarity index 100% rename from instrumentation/lettuce-5/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/LettuceReactiveCommandsInstrumentation.java rename to instrumentation/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/LettuceReactiveCommandsInstrumentation.java diff --git a/instrumentation/lettuce-5/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/ConnectionFutureAdvice.java b/instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/ConnectionFutureAdvice.java similarity index 100% rename from instrumentation/lettuce-5/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/ConnectionFutureAdvice.java rename to instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/ConnectionFutureAdvice.java diff --git a/instrumentation/lettuce-5/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceAsyncBiFunction.java b/instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceAsyncBiFunction.java similarity index 100% rename from instrumentation/lettuce-5/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceAsyncBiFunction.java rename to instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceAsyncBiFunction.java diff --git a/instrumentation/lettuce-5/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceAsyncCommandsAdvice.java b/instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceAsyncCommandsAdvice.java similarity index 100% rename from instrumentation/lettuce-5/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceAsyncCommandsAdvice.java rename to instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceAsyncCommandsAdvice.java diff --git a/instrumentation/lettuce-5/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceClientDecorator.java b/instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceClientDecorator.java similarity index 100% rename from instrumentation/lettuce-5/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceClientDecorator.java rename to instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceClientDecorator.java diff --git a/instrumentation/lettuce-5/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceInstrumentationUtil.java b/instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceInstrumentationUtil.java similarity index 100% rename from instrumentation/lettuce-5/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceInstrumentationUtil.java rename to instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceInstrumentationUtil.java diff --git a/instrumentation/lettuce-5/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceFluxCreationAdvice.java b/instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceFluxCreationAdvice.java similarity index 100% rename from instrumentation/lettuce-5/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceFluxCreationAdvice.java rename to instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceFluxCreationAdvice.java diff --git a/instrumentation/lettuce-5/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceFluxTerminationRunnable.java b/instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceFluxTerminationRunnable.java similarity index 100% rename from instrumentation/lettuce-5/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceFluxTerminationRunnable.java rename to instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceFluxTerminationRunnable.java diff --git a/instrumentation/lettuce-5/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceMonoCreationAdvice.java b/instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceMonoCreationAdvice.java similarity index 100% rename from instrumentation/lettuce-5/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceMonoCreationAdvice.java rename to instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceMonoCreationAdvice.java diff --git a/instrumentation/lettuce-5/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceMonoDualConsumer.java b/instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceMonoDualConsumer.java similarity index 100% rename from instrumentation/lettuce-5/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceMonoDualConsumer.java rename to instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/rx/LettuceMonoDualConsumer.java diff --git a/instrumentation/lettuce-5/src/test/groovy/LettuceAsyncClientTest.groovy b/instrumentation/lettuce-5.0/src/test/groovy/LettuceAsyncClientTest.groovy similarity index 100% rename from instrumentation/lettuce-5/src/test/groovy/LettuceAsyncClientTest.groovy rename to instrumentation/lettuce-5.0/src/test/groovy/LettuceAsyncClientTest.groovy diff --git a/instrumentation/lettuce-5/src/test/groovy/LettuceReactiveClientTest.groovy b/instrumentation/lettuce-5.0/src/test/groovy/LettuceReactiveClientTest.groovy similarity index 100% rename from instrumentation/lettuce-5/src/test/groovy/LettuceReactiveClientTest.groovy rename to instrumentation/lettuce-5.0/src/test/groovy/LettuceReactiveClientTest.groovy diff --git a/instrumentation/lettuce-5/src/test/groovy/LettuceSyncClientTest.groovy b/instrumentation/lettuce-5.0/src/test/groovy/LettuceSyncClientTest.groovy similarity index 100% rename from instrumentation/lettuce-5/src/test/groovy/LettuceSyncClientTest.groovy rename to instrumentation/lettuce-5.0/src/test/groovy/LettuceSyncClientTest.groovy diff --git a/instrumentation/okhttp-3/okhttp-3.gradle b/instrumentation/okhttp-3.0/okhttp-3.0.gradle similarity index 100% rename from instrumentation/okhttp-3/okhttp-3.gradle rename to instrumentation/okhttp-3.0/okhttp-3.0.gradle diff --git a/instrumentation/okhttp-3/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/OkHttp3Instrumentation.java b/instrumentation/okhttp-3.0/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/OkHttp3Instrumentation.java similarity index 100% rename from instrumentation/okhttp-3/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/OkHttp3Instrumentation.java rename to instrumentation/okhttp-3.0/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/OkHttp3Instrumentation.java diff --git a/instrumentation/okhttp-3/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/OkHttpClientDecorator.java b/instrumentation/okhttp-3.0/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/OkHttpClientDecorator.java similarity index 100% rename from instrumentation/okhttp-3/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/OkHttpClientDecorator.java rename to instrumentation/okhttp-3.0/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/OkHttpClientDecorator.java diff --git a/instrumentation/okhttp-3/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/RequestBuilderInjectAdapter.java b/instrumentation/okhttp-3.0/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/RequestBuilderInjectAdapter.java similarity index 100% rename from instrumentation/okhttp-3/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/RequestBuilderInjectAdapter.java rename to instrumentation/okhttp-3.0/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/RequestBuilderInjectAdapter.java diff --git a/instrumentation/okhttp-3/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/TracingInterceptor.java b/instrumentation/okhttp-3.0/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/TracingInterceptor.java similarity index 100% rename from instrumentation/okhttp-3/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/TracingInterceptor.java rename to instrumentation/okhttp-3.0/src/main/java/io/opentelemetry/auto/instrumentation/okhttp3/TracingInterceptor.java diff --git a/instrumentation/okhttp-3/src/test/groovy/OkHttp3AsyncTest.groovy b/instrumentation/okhttp-3.0/src/test/groovy/OkHttp3AsyncTest.groovy similarity index 100% rename from instrumentation/okhttp-3/src/test/groovy/OkHttp3AsyncTest.groovy rename to instrumentation/okhttp-3.0/src/test/groovy/OkHttp3AsyncTest.groovy diff --git a/instrumentation/okhttp-3/src/test/groovy/OkHttp3Test.groovy b/instrumentation/okhttp-3.0/src/test/groovy/OkHttp3Test.groovy similarity index 100% rename from instrumentation/okhttp-3/src/test/groovy/OkHttp3Test.groovy rename to instrumentation/okhttp-3.0/src/test/groovy/OkHttp3Test.groovy diff --git a/instrumentation/play-ws-1/play-ws-1.gradle b/instrumentation/play-ws-1.0/play-ws-1.0.gradle similarity index 100% rename from instrumentation/play-ws-1/play-ws-1.gradle rename to instrumentation/play-ws-1.0/play-ws-1.0.gradle diff --git a/instrumentation/play-ws-1/src/main/java/io/opentelemetry/auto/instrumentation/playws1/AsyncHandlerWrapper.java b/instrumentation/play-ws-1.0/src/main/java/io/opentelemetry/auto/instrumentation/playws1/AsyncHandlerWrapper.java similarity index 100% rename from instrumentation/play-ws-1/src/main/java/io/opentelemetry/auto/instrumentation/playws1/AsyncHandlerWrapper.java rename to instrumentation/play-ws-1.0/src/main/java/io/opentelemetry/auto/instrumentation/playws1/AsyncHandlerWrapper.java diff --git a/instrumentation/play-ws-1/src/main/java/io/opentelemetry/auto/instrumentation/playws1/HeadersInjectAdapter.java b/instrumentation/play-ws-1.0/src/main/java/io/opentelemetry/auto/instrumentation/playws1/HeadersInjectAdapter.java similarity index 100% rename from instrumentation/play-ws-1/src/main/java/io/opentelemetry/auto/instrumentation/playws1/HeadersInjectAdapter.java rename to instrumentation/play-ws-1.0/src/main/java/io/opentelemetry/auto/instrumentation/playws1/HeadersInjectAdapter.java diff --git a/instrumentation/play-ws-1/src/main/java/io/opentelemetry/auto/instrumentation/playws1/PlayWSClientDecorator.java b/instrumentation/play-ws-1.0/src/main/java/io/opentelemetry/auto/instrumentation/playws1/PlayWSClientDecorator.java similarity index 100% rename from instrumentation/play-ws-1/src/main/java/io/opentelemetry/auto/instrumentation/playws1/PlayWSClientDecorator.java rename to instrumentation/play-ws-1.0/src/main/java/io/opentelemetry/auto/instrumentation/playws1/PlayWSClientDecorator.java diff --git a/instrumentation/play-ws-1/src/main/java/io/opentelemetry/auto/instrumentation/playws1/PlayWSClientInstrumentation.java b/instrumentation/play-ws-1.0/src/main/java/io/opentelemetry/auto/instrumentation/playws1/PlayWSClientInstrumentation.java similarity index 100% rename from instrumentation/play-ws-1/src/main/java/io/opentelemetry/auto/instrumentation/playws1/PlayWSClientInstrumentation.java rename to instrumentation/play-ws-1.0/src/main/java/io/opentelemetry/auto/instrumentation/playws1/PlayWSClientInstrumentation.java diff --git a/instrumentation/play-ws-1/src/test/groovy/PlayWSClientTest.groovy b/instrumentation/play-ws-1.0/src/test/groovy/PlayWSClientTest.groovy similarity index 100% rename from instrumentation/play-ws-1/src/test/groovy/PlayWSClientTest.groovy rename to instrumentation/play-ws-1.0/src/test/groovy/PlayWSClientTest.groovy diff --git a/instrumentation/play-ws-2/play-ws-2.gradle b/instrumentation/play-ws-2.0/play-ws-2.0.gradle similarity index 100% rename from instrumentation/play-ws-2/play-ws-2.gradle rename to instrumentation/play-ws-2.0/play-ws-2.0.gradle diff --git a/instrumentation/play-ws-2/src/main/java/io/opentelemetry/auto/instrumentation/playws2/AsyncHandlerWrapper.java b/instrumentation/play-ws-2.0/src/main/java/io/opentelemetry/auto/instrumentation/playws2/AsyncHandlerWrapper.java similarity index 100% rename from instrumentation/play-ws-2/src/main/java/io/opentelemetry/auto/instrumentation/playws2/AsyncHandlerWrapper.java rename to instrumentation/play-ws-2.0/src/main/java/io/opentelemetry/auto/instrumentation/playws2/AsyncHandlerWrapper.java diff --git a/instrumentation/play-ws-2/src/main/java/io/opentelemetry/auto/instrumentation/playws2/HeadersInjectAdapter.java b/instrumentation/play-ws-2.0/src/main/java/io/opentelemetry/auto/instrumentation/playws2/HeadersInjectAdapter.java similarity index 100% rename from instrumentation/play-ws-2/src/main/java/io/opentelemetry/auto/instrumentation/playws2/HeadersInjectAdapter.java rename to instrumentation/play-ws-2.0/src/main/java/io/opentelemetry/auto/instrumentation/playws2/HeadersInjectAdapter.java diff --git a/instrumentation/play-ws-2/src/main/java/io/opentelemetry/auto/instrumentation/playws2/PlayWSClientDecorator.java b/instrumentation/play-ws-2.0/src/main/java/io/opentelemetry/auto/instrumentation/playws2/PlayWSClientDecorator.java similarity index 100% rename from instrumentation/play-ws-2/src/main/java/io/opentelemetry/auto/instrumentation/playws2/PlayWSClientDecorator.java rename to instrumentation/play-ws-2.0/src/main/java/io/opentelemetry/auto/instrumentation/playws2/PlayWSClientDecorator.java diff --git a/instrumentation/play-ws-2/src/main/java/io/opentelemetry/auto/instrumentation/playws2/PlayWSClientInstrumentation.java b/instrumentation/play-ws-2.0/src/main/java/io/opentelemetry/auto/instrumentation/playws2/PlayWSClientInstrumentation.java similarity index 100% rename from instrumentation/play-ws-2/src/main/java/io/opentelemetry/auto/instrumentation/playws2/PlayWSClientInstrumentation.java rename to instrumentation/play-ws-2.0/src/main/java/io/opentelemetry/auto/instrumentation/playws2/PlayWSClientInstrumentation.java diff --git a/instrumentation/play-ws-2/src/test/groovy/PlayWSClientTest.groovy b/instrumentation/play-ws-2.0/src/test/groovy/PlayWSClientTest.groovy similarity index 100% rename from instrumentation/play-ws-2/src/test/groovy/PlayWSClientTest.groovy rename to instrumentation/play-ws-2.0/src/test/groovy/PlayWSClientTest.groovy diff --git a/instrumentation/rxjava-1/rxjava-1.gradle b/instrumentation/rxjava-1.0/rxjava-1.0.gradle similarity index 100% rename from instrumentation/rxjava-1/rxjava-1.gradle rename to instrumentation/rxjava-1.0/rxjava-1.0.gradle diff --git a/instrumentation/rxjava-1/src/main/java/io/opentelemetry/auto/instrumentation/rxjava/SpanFinishingSubscription.java b/instrumentation/rxjava-1.0/src/main/java/io/opentelemetry/auto/instrumentation/rxjava/SpanFinishingSubscription.java similarity index 100% rename from instrumentation/rxjava-1/src/main/java/io/opentelemetry/auto/instrumentation/rxjava/SpanFinishingSubscription.java rename to instrumentation/rxjava-1.0/src/main/java/io/opentelemetry/auto/instrumentation/rxjava/SpanFinishingSubscription.java diff --git a/instrumentation/rxjava-1/src/main/java/io/opentelemetry/auto/instrumentation/rxjava/TracedOnSubscribe.java b/instrumentation/rxjava-1.0/src/main/java/io/opentelemetry/auto/instrumentation/rxjava/TracedOnSubscribe.java similarity index 100% rename from instrumentation/rxjava-1/src/main/java/io/opentelemetry/auto/instrumentation/rxjava/TracedOnSubscribe.java rename to instrumentation/rxjava-1.0/src/main/java/io/opentelemetry/auto/instrumentation/rxjava/TracedOnSubscribe.java diff --git a/instrumentation/rxjava-1/src/main/java/io/opentelemetry/auto/instrumentation/rxjava/TracedSubscriber.java b/instrumentation/rxjava-1.0/src/main/java/io/opentelemetry/auto/instrumentation/rxjava/TracedSubscriber.java similarity index 100% rename from instrumentation/rxjava-1/src/main/java/io/opentelemetry/auto/instrumentation/rxjava/TracedSubscriber.java rename to instrumentation/rxjava-1.0/src/main/java/io/opentelemetry/auto/instrumentation/rxjava/TracedSubscriber.java diff --git a/instrumentation/rxjava-1/src/main/java/rx/__OpenTelemetryTracingUtil.java b/instrumentation/rxjava-1.0/src/main/java/rx/__OpenTelemetryTracingUtil.java similarity index 100% rename from instrumentation/rxjava-1/src/main/java/rx/__OpenTelemetryTracingUtil.java rename to instrumentation/rxjava-1.0/src/main/java/rx/__OpenTelemetryTracingUtil.java diff --git a/instrumentation/servlet/request-2/request-2.gradle b/instrumentation/servlet/request-2.3/request-2.3.gradle similarity index 100% rename from instrumentation/servlet/request-2/request-2.gradle rename to instrumentation/servlet/request-2.3/request-2.3.gradle diff --git a/instrumentation/servlet/request-2/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/HttpServletRequestExtractAdapter.java b/instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/HttpServletRequestExtractAdapter.java similarity index 100% rename from instrumentation/servlet/request-2/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/HttpServletRequestExtractAdapter.java rename to instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/HttpServletRequestExtractAdapter.java diff --git a/instrumentation/servlet/request-2/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/Servlet2Advice.java b/instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/Servlet2Advice.java similarity index 100% rename from instrumentation/servlet/request-2/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/Servlet2Advice.java rename to instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/Servlet2Advice.java diff --git a/instrumentation/servlet/request-2/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/Servlet2Decorator.java b/instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/Servlet2Decorator.java similarity index 100% rename from instrumentation/servlet/request-2/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/Servlet2Decorator.java rename to instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/Servlet2Decorator.java diff --git a/instrumentation/servlet/request-2/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/Servlet2Instrumentation.java b/instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/Servlet2Instrumentation.java similarity index 100% rename from instrumentation/servlet/request-2/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/Servlet2Instrumentation.java rename to instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/Servlet2Instrumentation.java diff --git a/instrumentation/servlet/request-2/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/StatusSavingHttpServletResponseWrapper.java b/instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/StatusSavingHttpServletResponseWrapper.java similarity index 100% rename from instrumentation/servlet/request-2/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/StatusSavingHttpServletResponseWrapper.java rename to instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet2/StatusSavingHttpServletResponseWrapper.java diff --git a/instrumentation/servlet/request-2/src/test/groovy/JettyServlet2Test.groovy b/instrumentation/servlet/request-2.3/src/test/groovy/JettyServlet2Test.groovy similarity index 100% rename from instrumentation/servlet/request-2/src/test/groovy/JettyServlet2Test.groovy rename to instrumentation/servlet/request-2.3/src/test/groovy/JettyServlet2Test.groovy diff --git a/instrumentation/servlet/request-2/src/test/groovy/ServletTestInstrumentation.java b/instrumentation/servlet/request-2.3/src/test/groovy/ServletTestInstrumentation.java similarity index 100% rename from instrumentation/servlet/request-2/src/test/groovy/ServletTestInstrumentation.java rename to instrumentation/servlet/request-2.3/src/test/groovy/ServletTestInstrumentation.java diff --git a/instrumentation/servlet/request-2/src/test/groovy/TestServlet2.groovy b/instrumentation/servlet/request-2.3/src/test/groovy/TestServlet2.groovy similarity index 100% rename from instrumentation/servlet/request-2/src/test/groovy/TestServlet2.groovy rename to instrumentation/servlet/request-2.3/src/test/groovy/TestServlet2.groovy diff --git a/instrumentation/servlet/request-2/src/test/resources/realm.properties b/instrumentation/servlet/request-2.3/src/test/resources/realm.properties similarity index 100% rename from instrumentation/servlet/request-2/src/test/resources/realm.properties rename to instrumentation/servlet/request-2.3/src/test/resources/realm.properties diff --git a/instrumentation/servlet/request-3/request-3.gradle b/instrumentation/servlet/request-3.0/request-3.0.gradle similarity index 94% rename from instrumentation/servlet/request-3/request-3.gradle rename to instrumentation/servlet/request-3.0/request-3.0.gradle index eb06690a1b..bdcd104313 100644 --- a/instrumentation/servlet/request-3/request-3.gradle +++ b/instrumentation/servlet/request-3.0/request-3.0.gradle @@ -29,7 +29,7 @@ dependencies { exclude group: 'org.eclipse.jetty', module: 'jetty-server' } testCompile project(':instrumentation:java-concurrent') - testCompile project(':instrumentation:jetty-8') // See if there's any conflicts. + testCompile project(':instrumentation:jetty-8.0') // See if there's any conflicts. testCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.2.0.v20160908' testCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.2.0.v20160908' testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '8.0.41' diff --git a/instrumentation/servlet/request-3/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/AsyncContextInstrumentation.java b/instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/AsyncContextInstrumentation.java similarity index 100% rename from instrumentation/servlet/request-3/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/AsyncContextInstrumentation.java rename to instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/AsyncContextInstrumentation.java diff --git a/instrumentation/servlet/request-3/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/HttpServletRequestExtractAdapter.java b/instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/HttpServletRequestExtractAdapter.java similarity index 100% rename from instrumentation/servlet/request-3/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/HttpServletRequestExtractAdapter.java rename to instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/HttpServletRequestExtractAdapter.java diff --git a/instrumentation/servlet/request-3/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/HttpServletRequestInjectAdapter.java b/instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/HttpServletRequestInjectAdapter.java similarity index 100% rename from instrumentation/servlet/request-3/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/HttpServletRequestInjectAdapter.java rename to instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/HttpServletRequestInjectAdapter.java diff --git a/instrumentation/servlet/request-3/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/Servlet3Advice.java b/instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/Servlet3Advice.java similarity index 100% rename from instrumentation/servlet/request-3/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/Servlet3Advice.java rename to instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/Servlet3Advice.java diff --git a/instrumentation/servlet/request-3/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/Servlet3Decorator.java b/instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/Servlet3Decorator.java similarity index 100% rename from instrumentation/servlet/request-3/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/Servlet3Decorator.java rename to instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/Servlet3Decorator.java diff --git a/instrumentation/servlet/request-3/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/Servlet3Instrumentation.java b/instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/Servlet3Instrumentation.java similarity index 100% rename from instrumentation/servlet/request-3/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/Servlet3Instrumentation.java rename to instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/Servlet3Instrumentation.java diff --git a/instrumentation/servlet/request-3/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/TagSettingAsyncListener.java b/instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/TagSettingAsyncListener.java similarity index 100% rename from instrumentation/servlet/request-3/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/TagSettingAsyncListener.java rename to instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet3/TagSettingAsyncListener.java diff --git a/instrumentation/servlet/request-3/src/test/groovy/AbstractServlet3Test.groovy b/instrumentation/servlet/request-3.0/src/test/groovy/AbstractServlet3Test.groovy similarity index 100% rename from instrumentation/servlet/request-3/src/test/groovy/AbstractServlet3Test.groovy rename to instrumentation/servlet/request-3.0/src/test/groovy/AbstractServlet3Test.groovy diff --git a/instrumentation/servlet/request-3/src/test/groovy/JettyServlet3Test.groovy b/instrumentation/servlet/request-3.0/src/test/groovy/JettyServlet3Test.groovy similarity index 100% rename from instrumentation/servlet/request-3/src/test/groovy/JettyServlet3Test.groovy rename to instrumentation/servlet/request-3.0/src/test/groovy/JettyServlet3Test.groovy diff --git a/instrumentation/servlet/request-3/src/test/groovy/RequestDispatcherServlet.java b/instrumentation/servlet/request-3.0/src/test/groovy/RequestDispatcherServlet.java similarity index 100% rename from instrumentation/servlet/request-3/src/test/groovy/RequestDispatcherServlet.java rename to instrumentation/servlet/request-3.0/src/test/groovy/RequestDispatcherServlet.java diff --git a/instrumentation/servlet/request-3/src/test/groovy/ServletTestInstrumentation.java b/instrumentation/servlet/request-3.0/src/test/groovy/ServletTestInstrumentation.java similarity index 100% rename from instrumentation/servlet/request-3/src/test/groovy/ServletTestInstrumentation.java rename to instrumentation/servlet/request-3.0/src/test/groovy/ServletTestInstrumentation.java diff --git a/instrumentation/servlet/request-3/src/test/groovy/TestServlet3.groovy b/instrumentation/servlet/request-3.0/src/test/groovy/TestServlet3.groovy similarity index 100% rename from instrumentation/servlet/request-3/src/test/groovy/TestServlet3.groovy rename to instrumentation/servlet/request-3.0/src/test/groovy/TestServlet3.groovy diff --git a/instrumentation/servlet/request-3/src/test/groovy/TomcatServlet3Test.groovy b/instrumentation/servlet/request-3.0/src/test/groovy/TomcatServlet3Test.groovy similarity index 100% rename from instrumentation/servlet/request-3/src/test/groovy/TomcatServlet3Test.groovy rename to instrumentation/servlet/request-3.0/src/test/groovy/TomcatServlet3Test.groovy diff --git a/instrumentation/servlet/request-3/src/test/resources/realm.properties b/instrumentation/servlet/request-3.0/src/test/resources/realm.properties similarity index 100% rename from instrumentation/servlet/request-3/src/test/resources/realm.properties rename to instrumentation/servlet/request-3.0/src/test/resources/realm.properties diff --git a/instrumentation/servlet/servlet.gradle b/instrumentation/servlet/servlet.gradle index 7275c9f2a7..3ebc293baf 100644 --- a/instrumentation/servlet/servlet.gradle +++ b/instrumentation/servlet/servlet.gradle @@ -20,7 +20,7 @@ dependencies { testCompile group: 'javax.servlet', name: 'servlet-api', version: '2.3' // servlet request instrumentation required for linking request to response. - testCompile project(':instrumentation:servlet:request-2') + testCompile project(':instrumentation:servlet:request-2.3') // Don't want to conflict with jetty from the test server. testCompile(project(':testing')) { diff --git a/instrumentation/sparkjava-2.3/sparkjava-2.3.gradle b/instrumentation/sparkjava-2.3/sparkjava-2.3.gradle index f9e89e7b3c..7f58ddaffa 100644 --- a/instrumentation/sparkjava-2.3/sparkjava-2.3.gradle +++ b/instrumentation/sparkjava-2.3/sparkjava-2.3.gradle @@ -41,7 +41,7 @@ compileJava { dependencies { compileOnly group: 'com.sparkjava', name: 'spark-core', version: '2.3' - testCompile project(':instrumentation:jetty-8') + testCompile project(':instrumentation:jetty-8.0') testCompile group: 'com.sparkjava', name: 'spark-core', version: '2.4' diff --git a/instrumentation/spring-webflux-5/spring-webflux-5.gradle b/instrumentation/spring-webflux-5.0/spring-webflux-5.0.gradle similarity index 100% rename from instrumentation/spring-webflux-5/spring-webflux-5.gradle rename to instrumentation/spring-webflux-5.0/spring-webflux-5.0.gradle diff --git a/instrumentation/spring-webflux-5/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/client/DefaultWebClientInstrumentation.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/client/DefaultWebClientInstrumentation.java similarity index 100% rename from instrumentation/spring-webflux-5/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/client/DefaultWebClientInstrumentation.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/client/DefaultWebClientInstrumentation.java diff --git a/instrumentation/spring-webflux-5/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/AbstractWebfluxInstrumentation.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/AbstractWebfluxInstrumentation.java similarity index 100% rename from instrumentation/spring-webflux-5/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/AbstractWebfluxInstrumentation.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/AbstractWebfluxInstrumentation.java diff --git a/instrumentation/spring-webflux-5/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerInstrumentation.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerInstrumentation.java similarity index 100% rename from instrumentation/spring-webflux-5/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerInstrumentation.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerInstrumentation.java diff --git a/instrumentation/spring-webflux-5/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterInstrumentation.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterInstrumentation.java similarity index 100% rename from instrumentation/spring-webflux-5/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterInstrumentation.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterInstrumentation.java diff --git a/instrumentation/spring-webflux-5/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionInstrumentation.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionInstrumentation.java similarity index 100% rename from instrumentation/spring-webflux-5/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionInstrumentation.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionInstrumentation.java diff --git a/instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/DefaultWebClientAdvice.java b/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/DefaultWebClientAdvice.java similarity index 100% rename from instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/DefaultWebClientAdvice.java rename to instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/DefaultWebClientAdvice.java diff --git a/instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/HttpHeadersInjectAdapter.java b/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/HttpHeadersInjectAdapter.java similarity index 100% rename from instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/HttpHeadersInjectAdapter.java rename to instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/HttpHeadersInjectAdapter.java diff --git a/instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/SpringWebfluxHttpClientDecorator.java b/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/SpringWebfluxHttpClientDecorator.java similarity index 100% rename from instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/SpringWebfluxHttpClientDecorator.java rename to instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/SpringWebfluxHttpClientDecorator.java diff --git a/instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/TracingClientResponseMono.java b/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/TracingClientResponseMono.java similarity index 100% rename from instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/TracingClientResponseMono.java rename to instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/TracingClientResponseMono.java diff --git a/instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/TracingClientResponseSubscriber.java b/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/TracingClientResponseSubscriber.java similarity index 100% rename from instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/TracingClientResponseSubscriber.java rename to instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/TracingClientResponseSubscriber.java diff --git a/instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/AdviceUtils.java b/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/AdviceUtils.java similarity index 100% rename from instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/AdviceUtils.java rename to instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/AdviceUtils.java diff --git a/instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java b/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java similarity index 100% rename from instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java rename to instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java diff --git a/instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterAdvice.java b/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterAdvice.java similarity index 100% rename from instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterAdvice.java rename to instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterAdvice.java diff --git a/instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/RouteOnSuccessOrError.java b/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/RouteOnSuccessOrError.java similarity index 100% rename from instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/RouteOnSuccessOrError.java rename to instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/RouteOnSuccessOrError.java diff --git a/instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionAdvice.java b/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionAdvice.java similarity index 100% rename from instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionAdvice.java rename to instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionAdvice.java diff --git a/instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java b/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java similarity index 100% rename from instrumentation/spring-webflux-5/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java rename to instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java diff --git a/instrumentation/spring-webflux-5/src/test/groovy/SingleThreadedSpringWebfluxTest.groovy b/instrumentation/spring-webflux-5.0/src/test/groovy/SingleThreadedSpringWebfluxTest.groovy similarity index 100% rename from instrumentation/spring-webflux-5/src/test/groovy/SingleThreadedSpringWebfluxTest.groovy rename to instrumentation/spring-webflux-5.0/src/test/groovy/SingleThreadedSpringWebfluxTest.groovy diff --git a/instrumentation/spring-webflux-5/src/test/groovy/SpringWebfluxTest.groovy b/instrumentation/spring-webflux-5.0/src/test/groovy/SpringWebfluxTest.groovy similarity index 100% rename from instrumentation/spring-webflux-5/src/test/groovy/SpringWebfluxTest.groovy rename to instrumentation/spring-webflux-5.0/src/test/groovy/SpringWebfluxTest.groovy diff --git a/instrumentation/spring-webflux-5/src/test/groovy/client/SpringWebfluxHttpClientTest.groovy b/instrumentation/spring-webflux-5.0/src/test/groovy/client/SpringWebfluxHttpClientTest.groovy similarity index 100% rename from instrumentation/spring-webflux-5/src/test/groovy/client/SpringWebfluxHttpClientTest.groovy rename to instrumentation/spring-webflux-5.0/src/test/groovy/client/SpringWebfluxHttpClientTest.groovy diff --git a/instrumentation/spring-webflux-5/src/test/groovy/server/EchoHandler.groovy b/instrumentation/spring-webflux-5.0/src/test/groovy/server/EchoHandler.groovy similarity index 100% rename from instrumentation/spring-webflux-5/src/test/groovy/server/EchoHandler.groovy rename to instrumentation/spring-webflux-5.0/src/test/groovy/server/EchoHandler.groovy diff --git a/instrumentation/spring-webflux-5/src/test/groovy/server/EchoHandlerFunction.groovy b/instrumentation/spring-webflux-5.0/src/test/groovy/server/EchoHandlerFunction.groovy similarity index 100% rename from instrumentation/spring-webflux-5/src/test/groovy/server/EchoHandlerFunction.groovy rename to instrumentation/spring-webflux-5.0/src/test/groovy/server/EchoHandlerFunction.groovy diff --git a/instrumentation/spring-webflux-5/src/test/groovy/server/FooModel.groovy b/instrumentation/spring-webflux-5.0/src/test/groovy/server/FooModel.groovy similarity index 100% rename from instrumentation/spring-webflux-5/src/test/groovy/server/FooModel.groovy rename to instrumentation/spring-webflux-5.0/src/test/groovy/server/FooModel.groovy diff --git a/instrumentation/spring-webflux-5/src/test/groovy/server/SpringWebFluxTestApplication.groovy b/instrumentation/spring-webflux-5.0/src/test/groovy/server/SpringWebFluxTestApplication.groovy similarity index 100% rename from instrumentation/spring-webflux-5/src/test/groovy/server/SpringWebFluxTestApplication.groovy rename to instrumentation/spring-webflux-5.0/src/test/groovy/server/SpringWebFluxTestApplication.groovy diff --git a/instrumentation/spring-webflux-5/src/test/groovy/server/TestController.groovy b/instrumentation/spring-webflux-5.0/src/test/groovy/server/TestController.groovy similarity index 100% rename from instrumentation/spring-webflux-5/src/test/groovy/server/TestController.groovy rename to instrumentation/spring-webflux-5.0/src/test/groovy/server/TestController.groovy diff --git a/instrumentation/spring-webflux-5/src/test/java/server/RedirectComponent.java b/instrumentation/spring-webflux-5.0/src/test/java/server/RedirectComponent.java similarity index 100% rename from instrumentation/spring-webflux-5/src/test/java/server/RedirectComponent.java rename to instrumentation/spring-webflux-5.0/src/test/java/server/RedirectComponent.java diff --git a/instrumentation/spring-webflux-5/src/test/resources/logback.xml b/instrumentation/spring-webflux-5.0/src/test/resources/logback.xml similarity index 100% rename from instrumentation/spring-webflux-5/src/test/resources/logback.xml rename to instrumentation/spring-webflux-5.0/src/test/resources/logback.xml diff --git a/instrumentation/spring-webmvc-3.1/spring-webmvc-3.1.gradle b/instrumentation/spring-webmvc-3.1/spring-webmvc-3.1.gradle index 9f5e619bc6..8d5dfaad34 100644 --- a/instrumentation/spring-webmvc-3.1/spring-webmvc-3.1.gradle +++ b/instrumentation/spring-webmvc-3.1/spring-webmvc-3.1.gradle @@ -48,7 +48,7 @@ dependencies { } // Include servlet instrumentation for verifying the tomcat requests - testCompile project(':instrumentation:servlet:request-3') + testCompile project(':instrumentation:servlet:request-3.0') testCompile group: 'javax.validation', name: 'validation-api', version: '1.1.0.Final' testCompile group: 'org.hibernate', name: 'hibernate-validator', version: '5.4.2.Final' diff --git a/instrumentation/twilio/src/main/java/io/opentelemetry/auto/instrumentation/twilio/TwilioAsyncInstrumentation.java b/instrumentation/twilio-6.6/src/main/java/io/opentelemetry/auto/instrumentation/twilio/TwilioAsyncInstrumentation.java similarity index 100% rename from instrumentation/twilio/src/main/java/io/opentelemetry/auto/instrumentation/twilio/TwilioAsyncInstrumentation.java rename to instrumentation/twilio-6.6/src/main/java/io/opentelemetry/auto/instrumentation/twilio/TwilioAsyncInstrumentation.java diff --git a/instrumentation/twilio/src/main/java/io/opentelemetry/auto/instrumentation/twilio/TwilioClientDecorator.java b/instrumentation/twilio-6.6/src/main/java/io/opentelemetry/auto/instrumentation/twilio/TwilioClientDecorator.java similarity index 100% rename from instrumentation/twilio/src/main/java/io/opentelemetry/auto/instrumentation/twilio/TwilioClientDecorator.java rename to instrumentation/twilio-6.6/src/main/java/io/opentelemetry/auto/instrumentation/twilio/TwilioClientDecorator.java diff --git a/instrumentation/twilio/src/main/java/io/opentelemetry/auto/instrumentation/twilio/TwilioSyncInstrumentation.java b/instrumentation/twilio-6.6/src/main/java/io/opentelemetry/auto/instrumentation/twilio/TwilioSyncInstrumentation.java similarity index 100% rename from instrumentation/twilio/src/main/java/io/opentelemetry/auto/instrumentation/twilio/TwilioSyncInstrumentation.java rename to instrumentation/twilio-6.6/src/main/java/io/opentelemetry/auto/instrumentation/twilio/TwilioSyncInstrumentation.java diff --git a/instrumentation/twilio/src/test/groovy/test/TwilioClientTest.groovy b/instrumentation/twilio-6.6/src/test/groovy/test/TwilioClientTest.groovy similarity index 100% rename from instrumentation/twilio/src/test/groovy/test/TwilioClientTest.groovy rename to instrumentation/twilio-6.6/src/test/groovy/test/TwilioClientTest.groovy diff --git a/instrumentation/twilio/twilio.gradle b/instrumentation/twilio-6.6/twilio-6.6.gradle similarity index 75% rename from instrumentation/twilio/twilio.gradle rename to instrumentation/twilio-6.6/twilio-6.6.gradle index f1d5fce653..5504ad74bf 100644 --- a/instrumentation/twilio/twilio.gradle +++ b/instrumentation/twilio-6.6/twilio-6.6.gradle @@ -2,7 +2,7 @@ muzzle { pass { group = 'com.twilio.sdk' module = 'twilio' - versions = "(,)" + versions = "[6.6.9,)" // this is first version in maven central (there's a 0.0.1 but that is really 7.14.4) } } @@ -15,10 +15,10 @@ testSets { } dependencies { - compileOnly group: 'com.twilio.sdk', name: 'twilio', version: '0.0.1' + compileOnly group: 'com.twilio.sdk', name: 'twilio', version: '6.6.9' - testCompile group: 'com.twilio.sdk', name: 'twilio', version: '0.0.1' - testCompile project(':instrumentation:apache-httpclient-4') + testCompile group: 'com.twilio.sdk', name: 'twilio', version: '6.6.9' + testCompile project(':instrumentation:apache-httpclient-4.0') testCompile project(':instrumentation:java-concurrent') testCompile group: 'nl.jqno.equalsverifier', name: 'equalsverifier', version: '2.5.2' // Last version to support Java7 diff --git a/instrumentation/vertx/src/test/groovy/client/VertxHttpClientTest.groovy b/instrumentation/vertx-testing/src/test/groovy/client/VertxHttpClientTest.groovy similarity index 100% rename from instrumentation/vertx/src/test/groovy/client/VertxHttpClientTest.groovy rename to instrumentation/vertx-testing/src/test/groovy/client/VertxHttpClientTest.groovy diff --git a/instrumentation/vertx/src/test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy b/instrumentation/vertx-testing/src/test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy similarity index 100% rename from instrumentation/vertx/src/test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy rename to instrumentation/vertx-testing/src/test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy diff --git a/instrumentation/vertx/src/test/groovy/client/VertxRxWebClientTest.groovy b/instrumentation/vertx-testing/src/test/groovy/client/VertxRxWebClientTest.groovy similarity index 100% rename from instrumentation/vertx/src/test/groovy/client/VertxRxWebClientTest.groovy rename to instrumentation/vertx-testing/src/test/groovy/client/VertxRxWebClientTest.groovy diff --git a/instrumentation/vertx/src/test/groovy/server/NettyServerTestInstrumentation.java b/instrumentation/vertx-testing/src/test/groovy/server/NettyServerTestInstrumentation.java similarity index 100% rename from instrumentation/vertx/src/test/groovy/server/NettyServerTestInstrumentation.java rename to instrumentation/vertx-testing/src/test/groovy/server/NettyServerTestInstrumentation.java diff --git a/instrumentation/vertx/src/test/groovy/server/VertxHttpServerTest.groovy b/instrumentation/vertx-testing/src/test/groovy/server/VertxHttpServerTest.groovy similarity index 100% rename from instrumentation/vertx/src/test/groovy/server/VertxHttpServerTest.groovy rename to instrumentation/vertx-testing/src/test/groovy/server/VertxHttpServerTest.groovy diff --git a/instrumentation/vertx/src/test/groovy/server/VertxRxCircuitBreakerHttpServerTest.groovy b/instrumentation/vertx-testing/src/test/groovy/server/VertxRxCircuitBreakerHttpServerTest.groovy similarity index 100% rename from instrumentation/vertx/src/test/groovy/server/VertxRxCircuitBreakerHttpServerTest.groovy rename to instrumentation/vertx-testing/src/test/groovy/server/VertxRxCircuitBreakerHttpServerTest.groovy diff --git a/instrumentation/vertx/src/test/groovy/server/VertxRxHttpServerTest.groovy b/instrumentation/vertx-testing/src/test/groovy/server/VertxRxHttpServerTest.groovy similarity index 100% rename from instrumentation/vertx/src/test/groovy/server/VertxRxHttpServerTest.groovy rename to instrumentation/vertx-testing/src/test/groovy/server/VertxRxHttpServerTest.groovy diff --git a/instrumentation/vertx/vertx.gradle b/instrumentation/vertx-testing/vertx-testing.gradle similarity index 100% rename from instrumentation/vertx/vertx.gradle rename to instrumentation/vertx-testing/vertx-testing.gradle diff --git a/settings.gradle b/settings.gradle index 41d438f0a0..1e1a15dc1d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -39,26 +39,26 @@ include ':smoke-tests:wildfly' // instrumentation: include ':instrumentation:akka-http-10.0' -include ':instrumentation:apache-httpasyncclient-4' -include ':instrumentation:apache-httpclient-4' -include ':instrumentation:aws-java-sdk-1.11.0' +include ':instrumentation:apache-httpasyncclient-4.0' +include ':instrumentation:apache-httpclient-4.0' +include ':instrumentation:aws-java-sdk-1.11' include ':instrumentation:aws-java-sdk-2.2' include ':instrumentation:cdi-1.2' include ':instrumentation:couchbase-2.0' include ':instrumentation:couchbase-2.6' -include ':instrumentation:datastax-cassandra-3' -include ':instrumentation:dropwizard' -include ':instrumentation:dropwizard:dropwizard-views' +include ':instrumentation:datastax-cassandra-3.0' +include ':instrumentation:dropwizard-views-0.7' +include ':instrumentation:dropwizard-testing' include ':instrumentation:elasticsearch' -include ':instrumentation:elasticsearch:rest-5' +include ':instrumentation:elasticsearch:rest-5.0' include ':instrumentation:elasticsearch:rest-6.4' -include ':instrumentation:elasticsearch:transport-2' -include ':instrumentation:elasticsearch:transport-5' +include ':instrumentation:elasticsearch:transport-2.0' +include ':instrumentation:elasticsearch:transport-5.0' include ':instrumentation:elasticsearch:transport-5.3' -include ':instrumentation:elasticsearch:transport-6' -include ':instrumentation:glassfish' -include ':instrumentation:google-http-client' -include ':instrumentation:grizzly-2' +include ':instrumentation:elasticsearch:transport-6.0' +include ':instrumentation:glassfish-3.0' +include ':instrumentation:google-http-client-1.19' +include ':instrumentation:grizzly-2.0' include ':instrumentation:grpc-1.5' include ':instrumentation:hibernate' include ':instrumentation:hibernate:core-3.3' @@ -66,11 +66,11 @@ include ':instrumentation:hibernate:core-4.0' include ':instrumentation:hibernate:core-4.3' include ':instrumentation:http-url-connection' include ':instrumentation:hystrix-1.4' -include ':instrumentation:jax-rs-annotations-1' -include ':instrumentation:jax-rs-annotations-2' -include ':instrumentation:jax-rs-annotations-2:filter-jersey' -include ':instrumentation:jax-rs-annotations-2:filter-resteasy-3.0' -include ':instrumentation:jax-rs-annotations-2:filter-resteasy-3.1' +include ':instrumentation:jax-rs-annotations-1.0' +include ':instrumentation:jax-rs-annotations-2.0' +include ':instrumentation:jax-rs-annotations-2.0:filter-jersey-2.0' +include ':instrumentation:jax-rs-annotations-2.0:filter-resteasy-3.0' +include ':instrumentation:jax-rs-annotations-2.0:filter-resteasy-3.1' include ':instrumentation:jax-rs-client-1.1' include ':instrumentation:jax-rs-client-2.0' include ':instrumentation:jax-rs-client-2.0:connection-error-handling-jersey' @@ -84,12 +84,12 @@ include ':instrumentation:jboss-classloading' include ':instrumentation:jdbc' include ':instrumentation:jedis-1.4' include ':instrumentation:jedis-3.0' -include ':instrumentation:jetty-8' -include ':instrumentation:jms' +include ':instrumentation:jetty-8.0' +include ':instrumentation:jms-1.1' include ':instrumentation:jsp-2.3' include ':instrumentation:kafka-clients-0.11' include ':instrumentation:kafka-streams-0.11' -include ':instrumentation:lettuce-5' +include ':instrumentation:lettuce-5.0' // FIXME this instrumentation relied on scope listener // include ':instrumentation:log4j1' // FIXME this instrumentation relied on scope listener @@ -99,32 +99,32 @@ include ':instrumentation:mongo:driver-3.1' include ':instrumentation:mongo:driver-async-3.3' include ':instrumentation:netty-4.0' include ':instrumentation:netty-4.1' -include ':instrumentation:okhttp-3' +include ':instrumentation:okhttp-3.0' include ':instrumentation:osgi-classloading' include ':instrumentation:play-2.4' include ':instrumentation:play-2.6' -include ':instrumentation:play-ws-1' -include ':instrumentation:play-ws-2' +include ':instrumentation:play-ws-1.0' +include ':instrumentation:play-ws-2.0' include ':instrumentation:play-ws-2.1' include ':instrumentation:rabbitmq-amqp-2.7' include ':instrumentation:ratpack-1.4' include ':instrumentation:reactor-core-3.1' include ':instrumentation:rmi' -include ':instrumentation:rxjava-1' +include ':instrumentation:rxjava-1.0' include ':instrumentation:servlet' -include ':instrumentation:servlet:request-2' -include ':instrumentation:servlet:request-3' +include ':instrumentation:servlet:request-2.3' +include ':instrumentation:servlet:request-3.0' // FIXME this instrumentation relied on scope listener // include ':instrumentation:slf4j-mdc' include ':instrumentation:sparkjava-2.3' include ':instrumentation:spring-data-1.8' include ':instrumentation:spring-webmvc-3.1' -include ':instrumentation:spring-webflux-5' +include ':instrumentation:spring-webflux-5.0' include ':instrumentation:spymemcached-2.12' include ':instrumentation:tomcat-classloading' include ':instrumentation:trace-annotation' -include ':instrumentation:twilio' -include ':instrumentation:vertx' +include ':instrumentation:twilio-6.6' +include ':instrumentation:vertx-testing' // benchmark include ':benchmark'