Move jaxrs bootstrap module
MODIFY
instrumentation/jaxrs/jaxrs-1.0/javaagent/build.gradle.kts
instrumentation/jaxrs/jaxrs-1.0/javaagent/build.gradle.kts
@@ -16,7 +16,7 @@ muzzle {
}
dependencies {
- compileOnly(project(":instrumentation:jaxrs:bootstrap"))
+ compileOnly(project(":instrumentation:jaxrs:jaxrs-common:bootstrap"))
compileOnly("javax.ws.rs:jsr311-api:1.1.1")

MODIFY
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/build.gradle.kts
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/build.gradle.kts
@@ -16,7 +16,7 @@ muzzle {
}
dependencies {
- compileOnly(project(":instrumentation:jaxrs:bootstrap"))
+ compileOnly(project(":instrumentation:jaxrs:jaxrs-common:bootstrap"))
compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")

MODIFY
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts
@@ -21,7 +21,7 @@ muzzle {
}
dependencies {
- compileOnly(project(":instrumentation:jaxrs:bootstrap"))
+ compileOnly(project(":instrumentation:jaxrs:jaxrs-common:bootstrap"))
compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")
compileOnly("javax.servlet:javax.servlet-api:3.1.0")

MODIFY
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts
@@ -20,7 +20,7 @@ muzzle {
}
dependencies {
- compileOnly(project(":instrumentation:jaxrs:bootstrap"))
+ compileOnly(project(":instrumentation:jaxrs:jaxrs-common:bootstrap"))
compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")
compileOnly("javax.servlet:javax.servlet-api:3.1.0")

MODIFY
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts
@@ -23,7 +23,7 @@ muzzle {
}
dependencies {
- compileOnly(project(":instrumentation:jaxrs:bootstrap"))
+ compileOnly(project(":instrumentation:jaxrs:jaxrs-common:bootstrap"))
compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")
library("org.jboss.resteasy:resteasy-jaxrs:3.0.0.Final")

MODIFY
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/build.gradle.kts
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
}
dependencies {
- compileOnly(project(":instrumentation:jaxrs:bootstrap"))
+ compileOnly(project(":instrumentation:jaxrs:jaxrs-common:bootstrap"))
compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")
compileOnly("org.jboss.resteasy:resteasy-jaxrs:3.1.0.Final")

RENAME
instrumentation/jaxrs/bootstrap/build.gradle.kts
instrumentation/jaxrs/jaxrs-common/bootstrap/build.gradle.kts
RENAME
instrumentation/jaxrs/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/jaxrs/ClassHierarchyIterable.java
instrumentation/jaxrs/jaxrs-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/jaxrs/ClassHierarchyIterable.java
RENAME
instrumentation/jaxrs/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/jaxrs/JaxrsContextPath.java
instrumentation/jaxrs/jaxrs-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/jaxrs/JaxrsContextPath.java
MODIFY
settings.gradle.kts
settings.gradle.kts
@@ -169,7 +169,7 @@ include(":instrumentation:hibernate:hibernate-procedure-call-4.3:javaagent")
include(":instrumentation:http-url-connection:javaagent")
include(":instrumentation:hystrix-1.4:javaagent")
include(":instrumentation:java-http-client:javaagent")
-include(":instrumentation:jaxrs:bootstrap")
+include(":instrumentation:jaxrs:jaxrs-common:bootstrap")
include(":instrumentation:jaxrs:jaxrs-1.0:javaagent")
include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-arquillian-testing")
include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent")

Move jaxrs bootstrap module (#4448)