Rename jax-rs-* modules (#208)
This commit is contained in:
Trask Stalnaker
GitHub
parent
f91549e799
commit
5ecdeba977
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ public class JaxRsAnnotationsDecorator extends BaseDecorator {
|
|||
private final WeakMap<Class, Map<Method, String>> 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() {
|
||||
|
|
@ -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')
|
||||
}
|
||||
|
|
@ -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')
|
||||
}
|
||||
|
|
@ -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')
|
||||
}
|
||||
|
|
@ -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:
|
||||
|
|
@ -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<Class, Map<Method, String>> resourceNames = newWeakMap();
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ public class JaxRsClientV1Decorator extends HttpClientDecorator<ClientRequest, C
|
|||
public static final JaxRsClientV1Decorator DECORATE = new JaxRsClientV1Decorator();
|
||||
|
||||
public static final Tracer TRACER =
|
||||
OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.jax-rs-client-1.1");
|
||||
OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.jaxrs-client-1.1");
|
||||
|
||||
@Override
|
||||
protected String getComponentName() {
|
||||
|
|
@ -11,5 +11,5 @@ apply from: "${rootDir}/gradle/java.gradle"
|
|||
dependencies {
|
||||
compileOnly group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '2.0'
|
||||
|
||||
compile project(':instrumentation:jax-rs-client-2.0')
|
||||
compile project(':instrumentation:jaxrs-client-2.0')
|
||||
}
|
||||
|
|
@ -11,5 +11,5 @@ apply from: "${rootDir}/gradle/java.gradle"
|
|||
dependencies {
|
||||
compileOnly group: 'org.jboss.resteasy', name: 'resteasy-client', version: '3.0.0.Final'
|
||||
|
||||
compile project(':instrumentation:jax-rs-client-2.0')
|
||||
compile project(':instrumentation:jaxrs-client-2.0')
|
||||
}
|
||||
|
|
@ -29,8 +29,8 @@ dependencies {
|
|||
|
||||
testCompile project(':instrumentation:java-concurrent')
|
||||
|
||||
testCompile project(':instrumentation:jax-rs-client-2.0:connection-error-handling-jersey')
|
||||
testCompile project(':instrumentation:jax-rs-client-2.0:connection-error-handling-resteasy')
|
||||
testCompile project(':instrumentation:jaxrs-client-2.0:jaxrs-client-2.0-jersey-2.0')
|
||||
testCompile project(':instrumentation:jaxrs-client-2.0:jaxrs-client-2.0-resteasy-2.0')
|
||||
|
||||
testCompile group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0.1'
|
||||
|
||||
|
|
@ -28,7 +28,7 @@ public class JaxRsClientDecorator
|
|||
|
||||
public static final Tracer TRACER =
|
||||
OpenTelemetry.getTracerFactory()
|
||||
.get("io.opentelemetry.instrumentation.auto.jax-rs-client-2.0");
|
||||
.get("io.opentelemetry.instrumentation.auto.jaxrs-client-2.0");
|
||||
|
||||
@Override
|
||||
protected String getComponentName() {
|
||||
|
|
@ -77,15 +77,15 @@ 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.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'
|
||||
include ':instrumentation:jax-rs-client-2.0:connection-error-handling-resteasy'
|
||||
include ':instrumentation:jaxrs-1.0'
|
||||
include ':instrumentation:jaxrs-2.0'
|
||||
include ':instrumentation:jaxrs-2.0:jaxrs-2.0-jersey-2.0'
|
||||
include ':instrumentation:jaxrs-2.0:jaxrs-2.0-resteasy-3.0'
|
||||
include ':instrumentation:jaxrs-2.0:jaxrs-2.0-resteasy-3.1'
|
||||
include ':instrumentation:jaxrs-client-1.1'
|
||||
include ':instrumentation:jaxrs-client-2.0'
|
||||
include ':instrumentation:jaxrs-client-2.0:jaxrs-client-2.0-jersey-2.0'
|
||||
include ':instrumentation:jaxrs-client-2.0:jaxrs-client-2.0-resteasy-2.0'
|
||||
include ':instrumentation:java-concurrent'
|
||||
include ':instrumentation:java-concurrent:kotlin-testing'
|
||||
include ':instrumentation:java-concurrent:scala-testing'
|
||||
|
|
|
|||
Loading…
Reference in New Issue