From 5ecdeba977192d95d279b9c6d982195893ac2978 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 5 Mar 2020 13:42:17 -0800 Subject: [PATCH] Rename jax-rs-* modules (#208) --- .../dropwizard-testing.gradle | 2 +- .../jaxrs-1.0.gradle} | 0 .../jaxrs1/JaxRsAnnotationsDecorator.java | 2 +- .../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 .../jaxrs-2.0-jersey-2.0.gradle} | 4 ++-- .../JerseyRequestContextInstrumentation.java | 0 .../jaxrs-2.0-resteasy-3.0.gradle} | 4 ++-- ...esteasy30RequestContextInstrumentation.java | 0 .../jaxrs-2.0-resteasy-3.1.gradle} | 4 ++-- ...esteasy31RequestContextInstrumentation.java | 0 .../jaxrs-2.0.gradle} | 6 +++--- .../AbstractRequestContextInstrumentation.java | 0 .../ContainerRequestFilterInstrumentation.java | 0 .../DefaultRequestContextInstrumentation.java | 0 .../jaxrs2/JaxRsAnnotationsDecorator.java | 2 +- .../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 .../jaxrs-client-1.1.gradle} | 0 .../jaxrs/v1/InjectAdapter.java | 0 .../jaxrs/v1/JaxRsClientV1Decorator.java | 2 +- .../jaxrs/v1/JaxRsClientV1Instrumentation.java | 0 .../src/test/groovy/JaxRsClientV1Test.groovy | 0 .../jaxrs-client-2.0-jersey-2.0.gradle} | 2 +- ...eyClientConnectionErrorInstrumentation.java | 0 .../jaxrs-client-2.0-resteasy-2.0.gradle} | 2 +- ...syClientConnectionErrorInstrumentation.java | 0 .../jaxrs-client-2.0.gradle} | 4 ++-- .../jaxrs/ClientTracingFeature.java | 0 .../jaxrs/ClientTracingFilter.java | 0 .../instrumentation/jaxrs/InjectAdapter.java | 0 .../jaxrs/JaxRsClientDecorator.java | 2 +- .../jaxrs/JaxRsClientInstrumentation.java | 0 .../groovy/JaxMultithreadedClientTest.groovy | 0 .../test/groovy/JaxRsClientAsyncTest.groovy | 0 .../src/test/groovy/JaxRsClientTest.groovy | 0 settings.gradle | 18 +++++++++--------- 45 files changed, 27 insertions(+), 27 deletions(-) rename instrumentation/{jax-rs-annotations-1.0/jax-rs-annotations-1.0.gradle => jaxrs-1.0/jaxrs-1.0.gradle} (100%) rename instrumentation/{jax-rs-annotations-1.0 => jaxrs-1.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsDecorator.java (99%) rename instrumentation/{jax-rs-annotations-1.0 => jaxrs-1.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-1.0 => jaxrs-1.0}/src/test/groovy/JavaInterfaces.java (100%) rename instrumentation/{jax-rs-annotations-1.0 => jaxrs-1.0}/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy (100%) rename instrumentation/{jax-rs-annotations-1.0 => jaxrs-1.0}/src/test/groovy/JerseyTest.groovy (100%) rename instrumentation/{jax-rs-annotations-1.0 => jaxrs-1.0}/src/test/groovy/JettyTestInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-1.0 => jaxrs-1.0}/src/test/java/Resource.java (100%) rename instrumentation/{jax-rs-annotations-2.0/filter-jersey-2.0/filter-jersey-2.0.gradle => jaxrs-2.0/jaxrs-2.0-jersey-2.0/jaxrs-2.0-jersey-2.0.gradle} (78%) rename instrumentation/{jax-rs-annotations-2.0/filter-jersey-2.0 => jaxrs-2.0/jaxrs-2.0-jersey-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-2.0/filter-resteasy-3.0/filter-resteasy-3.0.gradle => jaxrs-2.0/jaxrs-2.0-resteasy-3.0/jaxrs-2.0-resteasy-3.0.gradle} (84%) rename instrumentation/{jax-rs-annotations-2.0/filter-resteasy-3.0 => jaxrs-2.0/jaxrs-2.0-resteasy-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-2.0/filter-resteasy-3.1/filter-resteasy-3.1.gradle => jaxrs-2.0/jaxrs-2.0-resteasy-3.1/jaxrs-2.0-resteasy-3.1.gradle} (81%) rename instrumentation/{jax-rs-annotations-2.0/filter-resteasy-3.1 => jaxrs-2.0/jaxrs-2.0-resteasy-3.1}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-2.0/jax-rs-annotations-2.0.gradle => jaxrs-2.0/jaxrs-2.0.gradle} (84%) rename instrumentation/{jax-rs-annotations-2.0 => jaxrs-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/AbstractRequestContextInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-2.0 => jaxrs-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/ContainerRequestFilterInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-2.0 => jaxrs-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-2.0 => jaxrs-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsDecorator.java (99%) rename instrumentation/{jax-rs-annotations-2.0 => jaxrs-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-2.0 => jaxrs-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java (100%) rename instrumentation/{jax-rs-annotations-2.0 => jaxrs-2.0}/src/test/groovy/JavaInterfaces.java (100%) rename instrumentation/{jax-rs-annotations-2.0 => jaxrs-2.0}/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy (100%) rename instrumentation/{jax-rs-annotations-2.0 => jaxrs-2.0}/src/test/groovy/JaxRsFilterTest.groovy (100%) rename instrumentation/{jax-rs-annotations-2.0 => jaxrs-2.0}/src/test/java/Resource.java (100%) rename instrumentation/{jax-rs-client-1.1/jax-rs-client-1.1.gradle => jaxrs-client-1.1/jaxrs-client-1.1.gradle} (100%) rename instrumentation/{jax-rs-client-1.1 => jaxrs-client-1.1}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/InjectAdapter.java (100%) rename instrumentation/{jax-rs-client-1.1 => jaxrs-client-1.1}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/JaxRsClientV1Decorator.java (98%) rename instrumentation/{jax-rs-client-1.1 => jaxrs-client-1.1}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java (100%) rename instrumentation/{jax-rs-client-1.1 => jaxrs-client-1.1}/src/test/groovy/JaxRsClientV1Test.groovy (100%) rename instrumentation/{jax-rs-client-2.0/connection-error-handling-jersey/connection-error-handling-jersey.gradle => jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/jaxrs-client-2.0-jersey-2.0.gradle} (82%) rename instrumentation/{jax-rs-client-2.0/connection-error-handling-jersey => jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/connection_error/jersey/JerseyClientConnectionErrorInstrumentation.java (100%) rename instrumentation/{jax-rs-client-2.0/connection-error-handling-resteasy/connection-error-handling-resteasy.gradle => jaxrs-client-2.0/jaxrs-client-2.0-resteasy-2.0/jaxrs-client-2.0-resteasy-2.0.gradle} (82%) rename instrumentation/{jax-rs-client-2.0/connection-error-handling-resteasy => jaxrs-client-2.0/jaxrs-client-2.0-resteasy-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/connection_error/resteasy/ResteasyClientConnectionErrorInstrumentation.java (100%) rename instrumentation/{jax-rs-client-2.0/jax-rs-client-2.0.gradle => jaxrs-client-2.0/jaxrs-client-2.0.gradle} (89%) rename instrumentation/{jax-rs-client-2.0 => jaxrs-client-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/ClientTracingFeature.java (100%) rename instrumentation/{jax-rs-client-2.0 => jaxrs-client-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/ClientTracingFilter.java (100%) rename instrumentation/{jax-rs-client-2.0 => jaxrs-client-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/InjectAdapter.java (100%) rename instrumentation/{jax-rs-client-2.0 => jaxrs-client-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/JaxRsClientDecorator.java (96%) rename instrumentation/{jax-rs-client-2.0 => jaxrs-client-2.0}/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/JaxRsClientInstrumentation.java (100%) rename instrumentation/{jax-rs-client-2.0 => jaxrs-client-2.0}/src/test/groovy/JaxMultithreadedClientTest.groovy (100%) rename instrumentation/{jax-rs-client-2.0 => jaxrs-client-2.0}/src/test/groovy/JaxRsClientAsyncTest.groovy (100%) rename instrumentation/{jax-rs-client-2.0 => jaxrs-client-2.0}/src/test/groovy/JaxRsClientTest.groovy (100%) diff --git a/instrumentation/dropwizard-testing/dropwizard-testing.gradle b/instrumentation/dropwizard-testing/dropwizard-testing.gradle index 6f10cd1b25..ddf6dcf593 100644 --- a/instrumentation/dropwizard-testing/dropwizard-testing.gradle +++ b/instrumentation/dropwizard-testing/dropwizard-testing.gradle @@ -10,7 +10,7 @@ apply from: "${rootDir}/gradle/java.gradle" dependencies { testCompile project(':instrumentation:java-concurrent') - testCompile project(':instrumentation:jax-rs-annotations-2.0') + testCompile project(':instrumentation:jaxrs-2.0') testCompile project(':instrumentation:servlet:request-3.0') // First version with DropwizardTestSupport: diff --git a/instrumentation/jax-rs-annotations-1.0/jax-rs-annotations-1.0.gradle b/instrumentation/jaxrs-1.0/jaxrs-1.0.gradle similarity index 100% rename from instrumentation/jax-rs-annotations-1.0/jax-rs-annotations-1.0.gradle rename to instrumentation/jaxrs-1.0/jaxrs-1.0.gradle diff --git a/instrumentation/jax-rs-annotations-1.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsDecorator.java b/instrumentation/jaxrs-1.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsDecorator.java similarity index 99% rename from instrumentation/jax-rs-annotations-1.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsDecorator.java rename to instrumentation/jaxrs-1.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsDecorator.java index 6410bd2f2a..00161f7860 100644 --- a/instrumentation/jax-rs-annotations-1.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsDecorator.java +++ b/instrumentation/jaxrs-1.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsDecorator.java @@ -39,7 +39,7 @@ public class JaxRsAnnotationsDecorator extends BaseDecorator { private final WeakMap> resourceNames = newWeakMap(); public static final Tracer TRACER = - OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.jax-rs-annotations-1.0"); + OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.jaxrs-1.0"); @Override protected String getSpanType() { diff --git a/instrumentation/jax-rs-annotations-1.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java b/instrumentation/jaxrs-1.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-1.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java rename to instrumentation/jaxrs-1.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-1.0/src/test/groovy/JavaInterfaces.java b/instrumentation/jaxrs-1.0/src/test/groovy/JavaInterfaces.java similarity index 100% rename from instrumentation/jax-rs-annotations-1.0/src/test/groovy/JavaInterfaces.java rename to instrumentation/jaxrs-1.0/src/test/groovy/JavaInterfaces.java diff --git a/instrumentation/jax-rs-annotations-1.0/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy b/instrumentation/jaxrs-1.0/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy similarity index 100% rename from instrumentation/jax-rs-annotations-1.0/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy rename to instrumentation/jaxrs-1.0/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy diff --git a/instrumentation/jax-rs-annotations-1.0/src/test/groovy/JerseyTest.groovy b/instrumentation/jaxrs-1.0/src/test/groovy/JerseyTest.groovy similarity index 100% rename from instrumentation/jax-rs-annotations-1.0/src/test/groovy/JerseyTest.groovy rename to instrumentation/jaxrs-1.0/src/test/groovy/JerseyTest.groovy diff --git a/instrumentation/jax-rs-annotations-1.0/src/test/groovy/JettyTestInstrumentation.java b/instrumentation/jaxrs-1.0/src/test/groovy/JettyTestInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-1.0/src/test/groovy/JettyTestInstrumentation.java rename to instrumentation/jaxrs-1.0/src/test/groovy/JettyTestInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-1.0/src/test/java/Resource.java b/instrumentation/jaxrs-1.0/src/test/java/Resource.java similarity index 100% rename from instrumentation/jax-rs-annotations-1.0/src/test/java/Resource.java rename to instrumentation/jaxrs-1.0/src/test/java/Resource.java diff --git a/instrumentation/jax-rs-annotations-2.0/filter-jersey-2.0/filter-jersey-2.0.gradle b/instrumentation/jaxrs-2.0/jaxrs-2.0-jersey-2.0/jaxrs-2.0-jersey-2.0.gradle similarity index 78% rename from instrumentation/jax-rs-annotations-2.0/filter-jersey-2.0/filter-jersey-2.0.gradle rename to instrumentation/jaxrs-2.0/jaxrs-2.0-jersey-2.0/jaxrs-2.0-jersey-2.0.gradle index 73ab190f6e..4aea334584 100644 --- a/instrumentation/jax-rs-annotations-2.0/filter-jersey-2.0/filter-jersey-2.0.gradle +++ b/instrumentation/jaxrs-2.0/jaxrs-2.0-jersey-2.0/jaxrs-2.0-jersey-2.0.gradle @@ -1,6 +1,6 @@ muzzle { // Cant assert fails because muzzle assumes all instrumentations will fail - // Instrumentations in jax-rs-annotations-2 will pass + // Instrumentations in jaxrs-2.0 will pass pass { group = "org.glassfish.jersey.core" module = "jersey-server" @@ -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.0') + compile project(':instrumentation:jaxrs-2.0') } diff --git a/instrumentation/jax-rs-annotations-2.0/filter-jersey-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java b/instrumentation/jaxrs-2.0/jaxrs-2.0-jersey-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-2.0/filter-jersey-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java rename to instrumentation/jaxrs-2.0/jaxrs-2.0-jersey-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.0/filter-resteasy-3.0.gradle b/instrumentation/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/jaxrs-2.0-resteasy-3.0.gradle similarity index 84% rename from instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.0/filter-resteasy-3.0.gradle rename to instrumentation/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/jaxrs-2.0-resteasy-3.0.gradle index 690ba0772b..53e346272a 100644 --- a/instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.0/filter-resteasy-3.0.gradle +++ b/instrumentation/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/jaxrs-2.0-resteasy-3.0.gradle @@ -1,6 +1,6 @@ muzzle { // Cant assert fails because muzzle assumes all instrumentations will fail - // Instrumentations in jax-rs-annotations-2 will pass + // Instrumentations in jaxrs-2.0 will pass // Resteasy changes a class's package in 3.1.0 then moves it back in 3.5.0 pass { @@ -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.0') + compile project(':instrumentation:jaxrs-2.0') } diff --git a/instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java b/instrumentation/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java rename to instrumentation/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.1/filter-resteasy-3.1.gradle b/instrumentation/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/jaxrs-2.0-resteasy-3.1.gradle similarity index 81% rename from instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.1/filter-resteasy-3.1.gradle rename to instrumentation/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/jaxrs-2.0-resteasy-3.1.gradle index 40859d1b3b..9073e8b026 100644 --- a/instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.1/filter-resteasy-3.1.gradle +++ b/instrumentation/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/jaxrs-2.0-resteasy-3.1.gradle @@ -1,6 +1,6 @@ muzzle { // Cant assert fails because muzzle assumes all instrumentations will fail - // Instrumentations in jax-rs-annotations-2 will pass + // Instrumentations in jaxrs-2.0 will pass // Resteasy changes a class's package in 3.1.0 then moves it back in 3.5.0 pass { @@ -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.0') + compile project(':instrumentation:jaxrs-2.0') } diff --git a/instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java b/instrumentation/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-2.0/filter-resteasy-3.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java rename to instrumentation/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-2.0/jax-rs-annotations-2.0.gradle b/instrumentation/jaxrs-2.0/jaxrs-2.0.gradle similarity index 84% rename from instrumentation/jax-rs-annotations-2.0/jax-rs-annotations-2.0.gradle rename to instrumentation/jaxrs-2.0/jaxrs-2.0.gradle index 75be28c362..89cd5d0fce 100644 --- a/instrumentation/jax-rs-annotations-2.0/jax-rs-annotations-2.0.gradle +++ b/instrumentation/jaxrs-2.0/jaxrs-2.0.gradle @@ -30,9 +30,9 @@ dependencies { testCompile project(':instrumentation:java-concurrent') 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') + testCompile project(':instrumentation:jaxrs-2.0:jaxrs-2.0-jersey-2.0') + testCompile project(':instrumentation:jaxrs-2.0:jaxrs-2.0-resteasy-3.0') + testCompile project(':instrumentation:jaxrs-2.0:jaxrs-2.0-resteasy-3.1') // Jersey // First version with DropwizardTestSupport: diff --git a/instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/AbstractRequestContextInstrumentation.java b/instrumentation/jaxrs-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/AbstractRequestContextInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/AbstractRequestContextInstrumentation.java rename to instrumentation/jaxrs-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/AbstractRequestContextInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/ContainerRequestFilterInstrumentation.java b/instrumentation/jaxrs-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/ContainerRequestFilterInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/ContainerRequestFilterInstrumentation.java rename to instrumentation/jaxrs-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/ContainerRequestFilterInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java b/instrumentation/jaxrs-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java rename to instrumentation/jaxrs-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsDecorator.java b/instrumentation/jaxrs-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsDecorator.java similarity index 99% rename from instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsDecorator.java rename to instrumentation/jaxrs-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsDecorator.java index b5c11498ac..08543ea05e 100644 --- a/instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsDecorator.java +++ b/instrumentation/jaxrs-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsDecorator.java @@ -46,7 +46,7 @@ public class JaxRsAnnotationsDecorator extends BaseDecorator { public static final JaxRsAnnotationsDecorator DECORATE = new JaxRsAnnotationsDecorator(); public static final Tracer TRACER = - OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.jax-rs-annotations-2.0"); + OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.jaxrs-2.0"); private final WeakMap> resourceNames = newWeakMap(); diff --git a/instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java b/instrumentation/jaxrs-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java rename to instrumentation/jaxrs-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java b/instrumentation/jaxrs-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java similarity index 100% rename from instrumentation/jax-rs-annotations-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java rename to instrumentation/jaxrs-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java diff --git a/instrumentation/jax-rs-annotations-2.0/src/test/groovy/JavaInterfaces.java b/instrumentation/jaxrs-2.0/src/test/groovy/JavaInterfaces.java similarity index 100% rename from instrumentation/jax-rs-annotations-2.0/src/test/groovy/JavaInterfaces.java rename to instrumentation/jaxrs-2.0/src/test/groovy/JavaInterfaces.java diff --git a/instrumentation/jax-rs-annotations-2.0/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy b/instrumentation/jaxrs-2.0/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy similarity index 100% rename from instrumentation/jax-rs-annotations-2.0/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy rename to instrumentation/jaxrs-2.0/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy diff --git a/instrumentation/jax-rs-annotations-2.0/src/test/groovy/JaxRsFilterTest.groovy b/instrumentation/jaxrs-2.0/src/test/groovy/JaxRsFilterTest.groovy similarity index 100% rename from instrumentation/jax-rs-annotations-2.0/src/test/groovy/JaxRsFilterTest.groovy rename to instrumentation/jaxrs-2.0/src/test/groovy/JaxRsFilterTest.groovy diff --git a/instrumentation/jax-rs-annotations-2.0/src/test/java/Resource.java b/instrumentation/jaxrs-2.0/src/test/java/Resource.java similarity index 100% rename from instrumentation/jax-rs-annotations-2.0/src/test/java/Resource.java rename to instrumentation/jaxrs-2.0/src/test/java/Resource.java diff --git a/instrumentation/jax-rs-client-1.1/jax-rs-client-1.1.gradle b/instrumentation/jaxrs-client-1.1/jaxrs-client-1.1.gradle similarity index 100% rename from instrumentation/jax-rs-client-1.1/jax-rs-client-1.1.gradle rename to instrumentation/jaxrs-client-1.1/jaxrs-client-1.1.gradle diff --git a/instrumentation/jax-rs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/InjectAdapter.java b/instrumentation/jaxrs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/InjectAdapter.java similarity index 100% rename from instrumentation/jax-rs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/InjectAdapter.java rename to instrumentation/jaxrs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/InjectAdapter.java diff --git a/instrumentation/jax-rs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/JaxRsClientV1Decorator.java b/instrumentation/jaxrs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/JaxRsClientV1Decorator.java similarity index 98% rename from instrumentation/jax-rs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/JaxRsClientV1Decorator.java rename to instrumentation/jaxrs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/JaxRsClientV1Decorator.java index c80756dd56..315409ff8a 100644 --- a/instrumentation/jax-rs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/JaxRsClientV1Decorator.java +++ b/instrumentation/jaxrs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/JaxRsClientV1Decorator.java @@ -26,7 +26,7 @@ public class JaxRsClientV1Decorator extends HttpClientDecorator