diff --git a/.fossa.yml b/.fossa.yml index c81719c2e8c3..855fd3c9a98a 100644 --- a/.fossa.yml +++ b/.fossa.yml @@ -606,7 +606,7 @@ targets: target: ':instrumentation:jetty:jetty-8.0:javaagent' - type: gradle path: ./ - target: ':instrumentation:jetty:jetty-common:javaagent' + target: ':instrumentation:jetty:jetty-common-8.0:javaagent' - type: gradle path: ./ target: ':instrumentation:jetty-httpclient:jetty-httpclient-12.0:javaagent' @@ -1029,7 +1029,7 @@ targets: target: ':instrumentation:tomcat:tomcat-7.0:javaagent' - type: gradle path: ./ - target: ':instrumentation:tomcat:tomcat-common:javaagent' + target: ':instrumentation:tomcat:tomcat-common-7.0:javaagent' - type: gradle path: ./ target: ':instrumentation:tomcat:tomcat-jdbc:javaagent' diff --git a/instrumentation/jetty/README.md b/instrumentation/jetty/README.md index 7d68ceecd89e..d114cc50156f 100644 --- a/instrumentation/jetty/README.md +++ b/instrumentation/jetty/README.md @@ -2,7 +2,7 @@ Jetty support is divided into the following sub-modules: -- `jetty-common:javaagent` contains common type instrumentation and advice helper classes used by +- `jetty-common-8.0:javaagent` contains common type instrumentation and advice helper classes used by the `javaagent` modules of all supported Jetty versions - `jetty-8.0:javaagent` applies Jetty request handler instrumentation for versions `[8, 11)` - `jetty-11.0:javaagent` applies Jetty request handler instrumentation for versions `[11,12)` diff --git a/instrumentation/jetty/jetty-11.0/javaagent/build.gradle.kts b/instrumentation/jetty/jetty-11.0/javaagent/build.gradle.kts index 6596369daaf8..b8d25c55908e 100644 --- a/instrumentation/jetty/jetty-11.0/javaagent/build.gradle.kts +++ b/instrumentation/jetty/jetty-11.0/javaagent/build.gradle.kts @@ -14,7 +14,7 @@ muzzle { dependencies { library("org.eclipse.jetty:jetty-server:11.0.0") - implementation(project(":instrumentation:jetty:jetty-common:javaagent")) + implementation(project(":instrumentation:jetty:jetty-common-8.0:javaagent")) implementation(project(":instrumentation:servlet:servlet-5.0:javaagent")) bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap")) diff --git a/instrumentation/jetty/jetty-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11InstrumentationModule.java b/instrumentation/jetty/jetty-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11InstrumentationModule.java index 7761a4dd7c25..698fb85c3ac5 100644 --- a/instrumentation/jetty/jetty-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11InstrumentationModule.java +++ b/instrumentation/jetty/jetty-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11InstrumentationModule.java @@ -16,7 +16,7 @@ import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.instrumentation.jetty.common.JettyHandlerInstrumentation; +import io.opentelemetry.javaagent.instrumentation.jetty.common.v8_0.JettyHandlerInstrumentation; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import java.util.List; diff --git a/instrumentation/jetty/jetty-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11Singletons.java b/instrumentation/jetty/jetty-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11Singletons.java index 018dc97610e1..b35705d8c4da 100644 --- a/instrumentation/jetty/jetty-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11Singletons.java +++ b/instrumentation/jetty/jetty-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11Singletons.java @@ -10,7 +10,7 @@ import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; import io.opentelemetry.instrumentation.servlet.v5_0.internal.Servlet5Accessor; import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge; -import io.opentelemetry.javaagent.instrumentation.jetty.common.JettyHelper; +import io.opentelemetry.javaagent.instrumentation.jetty.common.v8_0.JettyHelper; import io.opentelemetry.javaagent.instrumentation.servlet.common.AgentServletInstrumenterBuilder; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/instrumentation/jetty/jetty-8.0/javaagent/build.gradle.kts b/instrumentation/jetty/jetty-8.0/javaagent/build.gradle.kts index 0db4ee31c860..ccf6d97648a8 100644 --- a/instrumentation/jetty/jetty-8.0/javaagent/build.gradle.kts +++ b/instrumentation/jetty/jetty-8.0/javaagent/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { library("org.eclipse.jetty:jetty-server:8.0.0.v20110901") - implementation(project(":instrumentation:jetty:jetty-common:javaagent")) + implementation(project(":instrumentation:jetty:jetty-common-8.0:javaagent")) implementation(project(":instrumentation:servlet:servlet-3.0:javaagent")) bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap")) diff --git a/instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8InstrumentationModule.java b/instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8InstrumentationModule.java index 0d59f9f51960..e545fe3be560 100644 --- a/instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8InstrumentationModule.java +++ b/instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8InstrumentationModule.java @@ -16,7 +16,7 @@ import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.instrumentation.jetty.common.JettyHandlerInstrumentation; +import io.opentelemetry.javaagent.instrumentation.jetty.common.v8_0.JettyHandlerInstrumentation; import java.util.List; import javax.annotation.Nullable; import javax.servlet.http.HttpServletRequest; diff --git a/instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8Singletons.java b/instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8Singletons.java index c2a630a0256b..8e78f6ba5a39 100644 --- a/instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8Singletons.java +++ b/instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8Singletons.java @@ -12,7 +12,7 @@ import io.opentelemetry.instrumentation.servlet.v3_0.internal.Servlet3Accessor; import io.opentelemetry.javaagent.bootstrap.executors.PropagatedContext; import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge; -import io.opentelemetry.javaagent.instrumentation.jetty.common.JettyHelper; +import io.opentelemetry.javaagent.instrumentation.jetty.common.v8_0.JettyHelper; import io.opentelemetry.javaagent.instrumentation.servlet.common.AgentServletInstrumenterBuilder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/instrumentation/jetty/jetty-common/javaagent/build.gradle.kts b/instrumentation/jetty/jetty-common-8.0/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/jetty/jetty-common/javaagent/build.gradle.kts rename to instrumentation/jetty/jetty-common-8.0/javaagent/build.gradle.kts diff --git a/instrumentation/jetty/jetty-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/JettyHandlerInstrumentation.java b/instrumentation/jetty/jetty-common-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/v8_0/JettyHandlerInstrumentation.java similarity index 96% rename from instrumentation/jetty/jetty-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/JettyHandlerInstrumentation.java rename to instrumentation/jetty/jetty-common-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/v8_0/JettyHandlerInstrumentation.java index 693f4d3a4d0c..971665424f9b 100644 --- a/instrumentation/jetty/jetty-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/JettyHandlerInstrumentation.java +++ b/instrumentation/jetty/jetty-common-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/v8_0/JettyHandlerInstrumentation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.jetty.common; +package io.opentelemetry.javaagent.instrumentation.jetty.common.v8_0; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface; diff --git a/instrumentation/jetty/jetty-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/JettyHelper.java b/instrumentation/jetty/jetty-common-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/v8_0/JettyHelper.java similarity index 96% rename from instrumentation/jetty/jetty-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/JettyHelper.java rename to instrumentation/jetty/jetty-common-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/v8_0/JettyHelper.java index a0bf18c4bec7..1cf91e717d6f 100644 --- a/instrumentation/jetty/jetty-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/JettyHelper.java +++ b/instrumentation/jetty/jetty-common-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/v8_0/JettyHelper.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.jetty.common; +package io.opentelemetry.javaagent.instrumentation.jetty.common.v8_0; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; diff --git a/instrumentation/jfinal-3.2/javaagent/build.gradle.kts b/instrumentation/jfinal-3.2/javaagent/build.gradle.kts index 743816da6f28..f20133da6693 100644 --- a/instrumentation/jfinal-3.2/javaagent/build.gradle.kts +++ b/instrumentation/jfinal-3.2/javaagent/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { testLibrary("com.jfinal:jetty-server:2019.3") testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent")) testInstrumentation(project(":instrumentation:jetty:jetty-11.0:javaagent")) - testInstrumentation(project(":instrumentation:jetty:jetty-common:javaagent")) + testInstrumentation(project(":instrumentation:jetty:jetty-common-8.0:javaagent")) } tasks.test { diff --git a/instrumentation/tomcat/README.md b/instrumentation/tomcat/README.md index 1b7edec2f80f..e7f5e5a0dc2e 100644 --- a/instrumentation/tomcat/README.md +++ b/instrumentation/tomcat/README.md @@ -2,7 +2,7 @@ Tomcat support is divided into the following sub-modules: -- `tomcat-common:javaagent` contains common type instrumentation, advice helper classes and abstract +- `tomcat-common-7.0:javaagent` contains common type instrumentation, advice helper classes and abstract tracer used by the `javaagent` modules of all supported Tomcat versions - `tomcat-7.0:javaagent` applies Tomcat request handler instrumentation for versions `[7, 10)` - `tomcat-10.0:javaagent` applies Tomcat request handler instrumentation for versions `[10,)` diff --git a/instrumentation/tomcat/tomcat-10.0/javaagent/build.gradle.kts b/instrumentation/tomcat/tomcat-10.0/javaagent/build.gradle.kts index a461209486d5..75c5c827246d 100644 --- a/instrumentation/tomcat/tomcat-10.0/javaagent/build.gradle.kts +++ b/instrumentation/tomcat/tomcat-10.0/javaagent/build.gradle.kts @@ -12,7 +12,7 @@ muzzle { } dependencies { - implementation(project(":instrumentation:tomcat:tomcat-common:javaagent")) + implementation(project(":instrumentation:tomcat:tomcat-common-7.0:javaagent")) implementation(project(":instrumentation:servlet:servlet-5.0:javaagent")) bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap")) diff --git a/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10InstrumentationModule.java b/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10InstrumentationModule.java index 16858c8d7bef..9542650c9bce 100644 --- a/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10InstrumentationModule.java +++ b/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10InstrumentationModule.java @@ -17,7 +17,7 @@ import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.instrumentation.tomcat.common.TomcatServerHandlerInstrumentation; +import io.opentelemetry.javaagent.instrumentation.tomcat.common.v7_0.TomcatServerHandlerInstrumentation; import java.util.List; import javax.annotation.Nullable; import net.bytebuddy.asm.Advice; diff --git a/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10ServletEntityProvider.java b/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10ServletEntityProvider.java index 377d13b25e25..723a8707f2d6 100644 --- a/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10ServletEntityProvider.java +++ b/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10ServletEntityProvider.java @@ -5,7 +5,7 @@ package io.opentelemetry.javaagent.instrumentation.tomcat.v10_0; -import io.opentelemetry.javaagent.instrumentation.tomcat.common.TomcatServletEntityProvider; +import io.opentelemetry.javaagent.instrumentation.tomcat.common.v7_0.TomcatServletEntityProvider; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import javax.annotation.Nullable; diff --git a/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10Singletons.java b/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10Singletons.java index ea117fe0b298..1714667a5c23 100644 --- a/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10Singletons.java +++ b/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10Singletons.java @@ -8,8 +8,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.servlet.v5_0.internal.Servlet5Accessor; import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.Servlet5Singletons; -import io.opentelemetry.javaagent.instrumentation.tomcat.common.TomcatHelper; -import io.opentelemetry.javaagent.instrumentation.tomcat.common.TomcatInstrumenterFactory; +import io.opentelemetry.javaagent.instrumentation.tomcat.common.v7_0.TomcatHelper; +import io.opentelemetry.javaagent.instrumentation.tomcat.common.v7_0.TomcatInstrumenterFactory; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.coyote.Request; diff --git a/instrumentation/tomcat/tomcat-7.0/javaagent/build.gradle.kts b/instrumentation/tomcat/tomcat-7.0/javaagent/build.gradle.kts index 7e43aae79a81..2a8aee843a3b 100644 --- a/instrumentation/tomcat/tomcat-7.0/javaagent/build.gradle.kts +++ b/instrumentation/tomcat/tomcat-7.0/javaagent/build.gradle.kts @@ -15,7 +15,7 @@ muzzle { } dependencies { - implementation(project(":instrumentation:tomcat:tomcat-common:javaagent")) + implementation(project(":instrumentation:tomcat:tomcat-common-7.0:javaagent")) implementation(project(":instrumentation:servlet:servlet-3.0:javaagent")) bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap")) diff --git a/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7InstrumentationModule.java b/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7InstrumentationModule.java index f670bb785323..7a84e2d940b4 100644 --- a/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7InstrumentationModule.java +++ b/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7InstrumentationModule.java @@ -16,7 +16,7 @@ import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; -import io.opentelemetry.javaagent.instrumentation.tomcat.common.TomcatServerHandlerInstrumentation; +import io.opentelemetry.javaagent.instrumentation.tomcat.common.v7_0.TomcatServerHandlerInstrumentation; import java.util.List; import javax.annotation.Nullable; import net.bytebuddy.asm.Advice; diff --git a/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7ServletEntityProvider.java b/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7ServletEntityProvider.java index 774bcc12e7c2..4685ee49e988 100644 --- a/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7ServletEntityProvider.java +++ b/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7ServletEntityProvider.java @@ -5,7 +5,7 @@ package io.opentelemetry.javaagent.instrumentation.tomcat.v7_0; -import io.opentelemetry.javaagent.instrumentation.tomcat.common.TomcatServletEntityProvider; +import io.opentelemetry.javaagent.instrumentation.tomcat.common.v7_0.TomcatServletEntityProvider; import javax.annotation.Nullable; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7Singletons.java b/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7Singletons.java index 3f40a4477ae6..9bfb357b37b6 100644 --- a/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7Singletons.java +++ b/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7Singletons.java @@ -8,8 +8,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.servlet.v3_0.internal.Servlet3Accessor; import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons; -import io.opentelemetry.javaagent.instrumentation.tomcat.common.TomcatHelper; -import io.opentelemetry.javaagent.instrumentation.tomcat.common.TomcatInstrumenterFactory; +import io.opentelemetry.javaagent.instrumentation.tomcat.common.v7_0.TomcatHelper; +import io.opentelemetry.javaagent.instrumentation.tomcat.common.v7_0.TomcatInstrumenterFactory; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.coyote.Request; diff --git a/instrumentation/tomcat/tomcat-common/javaagent/build.gradle.kts b/instrumentation/tomcat/tomcat-common-7.0/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/tomcat/tomcat-common/javaagent/build.gradle.kts rename to instrumentation/tomcat/tomcat-common-7.0/javaagent/build.gradle.kts diff --git a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatHelper.java b/instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatHelper.java similarity index 99% rename from instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatHelper.java rename to instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatHelper.java index 1b2f9dafe6e1..7184e6894fda 100644 --- a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatHelper.java +++ b/instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatHelper.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.tomcat.common; +package io.opentelemetry.javaagent.instrumentation.tomcat.common.v7_0; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; diff --git a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatHttpAttributesGetter.java b/instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatHttpAttributesGetter.java similarity index 98% rename from instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatHttpAttributesGetter.java rename to instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatHttpAttributesGetter.java index e1a3279dc3d5..7c18a69254d0 100644 --- a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatHttpAttributesGetter.java +++ b/instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatHttpAttributesGetter.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.tomcat.common; +package io.opentelemetry.javaagent.instrumentation.tomcat.common.v7_0; -import static io.opentelemetry.javaagent.instrumentation.tomcat.common.TomcatHelper.messageBytesToString; +import static io.opentelemetry.javaagent.instrumentation.tomcat.common.v7_0.TomcatHelper.messageBytesToString; import static java.util.Collections.emptyList; import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter; diff --git a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatInstrumenterFactory.java b/instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatInstrumenterFactory.java similarity index 99% rename from instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatInstrumenterFactory.java rename to instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatInstrumenterFactory.java index 881c4c6b6788..a627d5bf03be 100644 --- a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatInstrumenterFactory.java +++ b/instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatInstrumenterFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.tomcat.common; +package io.opentelemetry.javaagent.instrumentation.tomcat.common.v7_0; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.internal.InstrumenterUtil; diff --git a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatRequestGetter.java b/instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatRequestGetter.java similarity index 99% rename from instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatRequestGetter.java rename to instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatRequestGetter.java index d45cb41450c5..36d4f63f2d17 100644 --- a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatRequestGetter.java +++ b/instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatRequestGetter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.tomcat.common; +package io.opentelemetry.javaagent.instrumentation.tomcat.common.v7_0; import static java.util.Collections.emptyIterator; diff --git a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatServerHandlerInstrumentation.java b/instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatServerHandlerInstrumentation.java similarity index 99% rename from instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatServerHandlerInstrumentation.java rename to instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatServerHandlerInstrumentation.java index 4ce397cd0a61..cb1496b86a7d 100644 --- a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatServerHandlerInstrumentation.java +++ b/instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatServerHandlerInstrumentation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.tomcat.common; +package io.opentelemetry.javaagent.instrumentation.tomcat.common.v7_0; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.named; diff --git a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatServletEntityProvider.java b/instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatServletEntityProvider.java similarity index 99% rename from instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatServletEntityProvider.java rename to instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatServletEntityProvider.java index 5fe39c82b52d..6831aded94a3 100644 --- a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatServletEntityProvider.java +++ b/instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatServletEntityProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.tomcat.common; +package io.opentelemetry.javaagent.instrumentation.tomcat.common.v7_0; import javax.annotation.Nullable; import org.apache.coyote.Request; diff --git a/settings.gradle.kts b/settings.gradle.kts index 0be5f7a233a4..a6f54a387fca 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -400,7 +400,7 @@ include(":instrumentation:jedis:jedis-common-1.4:javaagent") include(":instrumentation:jetty:jetty-8.0:javaagent") include(":instrumentation:jetty:jetty-11.0:javaagent") include(":instrumentation:jetty:jetty-12.0:javaagent") -include(":instrumentation:jetty:jetty-common:javaagent") +include(":instrumentation:jetty:jetty-common-8.0:javaagent") include(":instrumentation:jetty-httpclient:jetty-httpclient-9.2:javaagent") include(":instrumentation:jetty-httpclient:jetty-httpclient-9.2:library") include(":instrumentation:jetty-httpclient:jetty-httpclient-9.2:testing") @@ -698,7 +698,7 @@ include(":instrumentation:thrift-0.13:library") include(":instrumentation:thrift-0.13:testing") include(":instrumentation:tomcat:tomcat-7.0:javaagent") include(":instrumentation:tomcat:tomcat-10.0:javaagent") -include(":instrumentation:tomcat:tomcat-common:javaagent") +include(":instrumentation:tomcat:tomcat-common-7.0:javaagent") include(":instrumentation:tomcat:tomcat-jdbc:javaagent") include(":instrumentation:twilio-6.6:javaagent") include(":instrumentation:undertow-1.4:bootstrap")