diff --git a/instrumentation/jaxrs/jaxrs-1.0/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-1.0/javaagent/build.gradle.kts index 14547ac5ec8a..3051b2a6f2be 100644 --- a/instrumentation/jaxrs/jaxrs-1.0/javaagent/build.gradle.kts +++ b/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") diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/build.gradle.kts index 7ad7e1d7c0a4..475237f64f51 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/build.gradle.kts +++ b/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") diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts index 115dcd15b00a..0f946e6f53aa 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts +++ b/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") diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts index 042b31141eb7..a801e13848f6 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts +++ b/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") diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts index cb4e62584fff..cd56789595c7 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts +++ b/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") diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/build.gradle.kts index 804bf4254a9d..c60aae5bd30f 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/build.gradle.kts +++ b/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") diff --git a/instrumentation/jaxrs/bootstrap/build.gradle.kts b/instrumentation/jaxrs/jaxrs-common/bootstrap/build.gradle.kts similarity index 100% rename from instrumentation/jaxrs/bootstrap/build.gradle.kts rename to instrumentation/jaxrs/jaxrs-common/bootstrap/build.gradle.kts diff --git a/instrumentation/jaxrs/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/jaxrs/ClassHierarchyIterable.java b/instrumentation/jaxrs/jaxrs-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/jaxrs/ClassHierarchyIterable.java similarity index 100% rename from instrumentation/jaxrs/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/jaxrs/ClassHierarchyIterable.java rename to instrumentation/jaxrs/jaxrs-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/jaxrs/ClassHierarchyIterable.java diff --git a/instrumentation/jaxrs/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/jaxrs/JaxrsContextPath.java b/instrumentation/jaxrs/jaxrs-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/jaxrs/JaxrsContextPath.java similarity index 100% rename from instrumentation/jaxrs/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/jaxrs/JaxrsContextPath.java rename to instrumentation/jaxrs/jaxrs-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/jaxrs/JaxrsContextPath.java diff --git a/settings.gradle.kts b/settings.gradle.kts index b9ced3becbe9..7552dec45f34 100644 --- a/settings.gradle.kts +++ b/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")