diff --git a/.github/scripts/check-package-names.sh b/.github/scripts/check-package-names.sh index cdd597c43841..c14d4f7b6da7 100755 --- a/.github/scripts/check-package-names.sh +++ b/.github/scripts/check-package-names.sh @@ -13,9 +13,6 @@ for dir in $(find instrumentation -name "*.java" | grep library/src/main/java | if [[ "$module_name" == "runtime-telemetry" ]]; then continue fi - if [[ "$module_name" == "servlet-common" ]]; then - continue - fi if [[ "$module_name" == "graphql-java-common-12.0" ]]; then continue fi @@ -39,8 +36,9 @@ for dir in $(find instrumentation -name "*.java" | grep library/src/main/java | # - lettuce-common # - netty-common # - resources + # - servlet-common # - servlet-common-javax - if [[ ! "$module_name" =~ [0-9]$ && "$module_name" != "jdbc" && "$module_name" != "lettuce-common" && "$module_name" != "netty-common" && "$module_name" != "resources" && "$module_name" != "servlet-common-javax" ]]; then + if [[ ! "$module_name" =~ [0-9]$ && "$module_name" != "jdbc" && "$module_name" != "lettuce-common" && "$module_name" != "netty-common" && "$module_name" != "resources" && "$module_name" != "servlet-common" && "$module_name" != "servlet-common-javax" ]]; then echo "module name doesn't have a base version: $dir" exit 1 fi 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 698fb85c3ac5..04afba3d07c8 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 @@ -12,7 +12,7 @@ import com.google.auto.service.AutoService; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; 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 b35705d8c4da..eb593df66ef2 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 @@ -6,8 +6,8 @@ package io.opentelemetry.javaagent.instrumentation.jetty.v11_0; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.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.v8_0.JettyHelper; 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 e545fe3be560..08166a7f1c81 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 @@ -12,7 +12,7 @@ import com.google.auto.service.AutoService; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; 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 8e78f6ba5a39..34ef41842ad5 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 @@ -7,8 +7,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.util.VirtualField; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext; import io.opentelemetry.instrumentation.servlet.v3_0.internal.Servlet3Accessor; import io.opentelemetry.javaagent.bootstrap.executors.PropagatedContext; import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge; diff --git a/instrumentation/jetty/jetty-common-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/v8_0/JettyHelper.java b/instrumentation/jetty/jetty-common-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/v8_0/JettyHelper.java index 1cf91e717d6f..2f8f60a2511f 100644 --- a/instrumentation/jetty/jetty-common-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/v8_0/JettyHelper.java +++ b/instrumentation/jetty/jetty-common-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/common/v8_0/JettyHelper.java @@ -8,9 +8,9 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.servlet.internal.ServletAccessor; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletAccessor; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext; import io.opentelemetry.javaagent.instrumentation.servlet.common.ServletHelper; import javax.annotation.Nullable; diff --git a/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/LibertyHelper.java b/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/LibertyHelper.java index 0e7ff0638826..031bd44f217d 100644 --- a/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/LibertyHelper.java +++ b/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/LibertyHelper.java @@ -8,9 +8,9 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.servlet.internal.ServletAccessor; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletAccessor; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext; import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge; import io.opentelemetry.javaagent.instrumentation.servlet.common.ServletHelper; import javax.annotation.Nullable; diff --git a/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/LibertySingletons.java b/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/LibertySingletons.java index 252fff3b67e0..ad48caf58cf5 100644 --- a/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/LibertySingletons.java +++ b/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/LibertySingletons.java @@ -6,8 +6,8 @@ package io.opentelemetry.javaagent.instrumentation.liberty.v20_0; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext; import io.opentelemetry.instrumentation.servlet.v3_0.internal.Servlet3Accessor; import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge; import io.opentelemetry.javaagent.instrumentation.servlet.common.AgentServletInstrumenterBuilder; diff --git a/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/LibertyWebAppInstrumentation.java b/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/LibertyWebAppInstrumentation.java index b77f987c03f1..0cfd096f5158 100644 --- a/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/LibertyWebAppInstrumentation.java +++ b/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/LibertyWebAppInstrumentation.java @@ -11,7 +11,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge; import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; diff --git a/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/ThreadLocalContext.java b/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/ThreadLocalContext.java index 9aa065c06cdd..51e139dbb5c0 100644 --- a/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/ThreadLocalContext.java +++ b/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/ThreadLocalContext.java @@ -7,7 +7,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; import javax.annotation.Nullable; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Accessor.java b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Accessor.java index e70174691e98..d7bda02d34a6 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Accessor.java +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Accessor.java @@ -7,8 +7,8 @@ import static java.util.Collections.emptyList; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletAsyncListener; import io.opentelemetry.instrumentation.servlet.common.javax.JavaxServletAccessor; -import io.opentelemetry.instrumentation.servlet.internal.ServletAsyncListener; import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseMutator; import java.util.List; import javax.annotation.Nullable; diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Advice.java b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Advice.java index c978f796a7f3..666359de19c5 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Advice.java +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Advice.java @@ -10,7 +10,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; import io.opentelemetry.javaagent.bootstrap.CallDepth; import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder; import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge; diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Helper.java b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Helper.java index 11361f216ed7..3f3fb0c7d1d0 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Helper.java +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Helper.java @@ -7,8 +7,8 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext; import io.opentelemetry.javaagent.instrumentation.servlet.common.BaseServletHelper; import javax.annotation.Nullable; import javax.servlet.http.HttpServletRequest; diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpAttributesGetter.java b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpAttributesGetter.java index e113c8274f32..ed2d96aae126 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpAttributesGetter.java +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpAttributesGetter.java @@ -5,10 +5,10 @@ package io.opentelemetry.javaagent.instrumentation.servlet.v2_2; -import io.opentelemetry.instrumentation.servlet.internal.ServletAccessor; -import io.opentelemetry.instrumentation.servlet.internal.ServletHttpAttributesGetter; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletAccessor; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletHttpAttributesGetter; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext; import javax.annotation.Nullable; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Singletons.java b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Singletons.java index f61005574f3b..af4e0869f30e 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Singletons.java +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Singletons.java @@ -9,8 +9,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor; import io.opentelemetry.instrumentation.api.util.VirtualField; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext; import io.opentelemetry.javaagent.instrumentation.servlet.common.AgentServletInstrumenterBuilder; import io.opentelemetry.javaagent.instrumentation.servlet.common.response.ResponseInstrumenterFactory; import javax.servlet.ServletResponse; diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2SpanNameExtractor.java b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2SpanNameExtractor.java index ea78399476f2..26e9612b2e7a 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2SpanNameExtractor.java +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2SpanNameExtractor.java @@ -6,8 +6,8 @@ package io.opentelemetry.javaagent.instrumentation.servlet.v2_2; import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor; -import io.opentelemetry.instrumentation.servlet.internal.ServletAccessor; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletAccessor; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig; import java.util.Set; diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Advice.java b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Advice.java index ec4ae0420184..81dff706597e 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Advice.java +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Advice.java @@ -10,7 +10,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; import io.opentelemetry.javaagent.bootstrap.CallDepth; import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder; import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge; diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Singletons.java b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Singletons.java index 5000f340f0e1..7fe67c967d94 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Singletons.java +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Singletons.java @@ -8,8 +8,8 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.util.ClassAndMethod; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.util.VirtualField; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext; import io.opentelemetry.instrumentation.servlet.v3_0.internal.Servlet3Accessor; import io.opentelemetry.javaagent.bootstrap.servlet.ExperimentalSnippetHolder; import io.opentelemetry.javaagent.bootstrap.servlet.MappingResolver; diff --git a/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTelemetry.java b/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTelemetry.java index e40c6080cc01..421648efd0d2 100644 --- a/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTelemetry.java +++ b/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTelemetry.java @@ -7,8 +7,8 @@ import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext; import io.opentelemetry.instrumentation.servlet.v3_0.internal.Servlet3TelemetryFilter; import javax.servlet.Filter; import javax.servlet.http.HttpServletRequest; diff --git a/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTelemetryBuilder.java b/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTelemetryBuilder.java index cb5a264d5cb6..d527470cb9a4 100644 --- a/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTelemetryBuilder.java +++ b/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTelemetryBuilder.java @@ -18,10 +18,10 @@ import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder; import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter; import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractor; -import io.opentelemetry.instrumentation.servlet.internal.ServletHttpAttributesGetter; -import io.opentelemetry.instrumentation.servlet.internal.ServletInstrumenterBuilder; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletHttpAttributesGetter; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletInstrumenterBuilder; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext; import io.opentelemetry.instrumentation.servlet.v3_0.internal.Experimental; import io.opentelemetry.instrumentation.servlet.v3_0.internal.Servlet3Accessor; import java.util.Collection; diff --git a/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/internal/Servlet3Accessor.java b/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/internal/Servlet3Accessor.java index e0599feb4e3a..606d3cd5f4dd 100644 --- a/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/internal/Servlet3Accessor.java +++ b/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/internal/Servlet3Accessor.java @@ -7,8 +7,8 @@ import static java.util.Collections.emptyList; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletAsyncListener; import io.opentelemetry.instrumentation.servlet.common.javax.JavaxServletAccessor; -import io.opentelemetry.instrumentation.servlet.internal.ServletAsyncListener; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/internal/Servlet3TelemetryFilter.java b/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/internal/Servlet3TelemetryFilter.java index e80029263e66..bf9146392c09 100644 --- a/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/internal/Servlet3TelemetryFilter.java +++ b/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/internal/Servlet3TelemetryFilter.java @@ -10,8 +10,8 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; import javax.annotation.Nullable; diff --git a/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/Servlet5Singletons.java b/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/Servlet5Singletons.java index 12108f287e44..8b584129a77f 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/Servlet5Singletons.java +++ b/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/Servlet5Singletons.java @@ -8,8 +8,8 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.util.ClassAndMethod; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.util.VirtualField; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext; import io.opentelemetry.instrumentation.servlet.v5_0.internal.Servlet5Accessor; import io.opentelemetry.javaagent.bootstrap.servlet.ExperimentalSnippetHolder; import io.opentelemetry.javaagent.bootstrap.servlet.MappingResolver; diff --git a/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/service/JakartaServletServiceAdvice.java b/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/service/JakartaServletServiceAdvice.java index 0676b5b184e7..9d98255a2d85 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/service/JakartaServletServiceAdvice.java +++ b/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/service/JakartaServletServiceAdvice.java @@ -10,7 +10,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; import io.opentelemetry.javaagent.bootstrap.CallDepth; import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder; import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge; diff --git a/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/ServletTelemetry.java b/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/ServletTelemetry.java index c4c8471cbbf7..bf0edb8caba0 100644 --- a/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/ServletTelemetry.java +++ b/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/ServletTelemetry.java @@ -7,8 +7,8 @@ import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext; import io.opentelemetry.instrumentation.servlet.v5_0.internal.Servlet5TelemetryFilter; import jakarta.servlet.Filter; import jakarta.servlet.http.HttpServletRequest; diff --git a/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/ServletTelemetryBuilder.java b/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/ServletTelemetryBuilder.java index 4cd12aa4adb4..6c92568a4f1d 100644 --- a/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/ServletTelemetryBuilder.java +++ b/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/ServletTelemetryBuilder.java @@ -18,10 +18,10 @@ import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder; import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter; import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractor; -import io.opentelemetry.instrumentation.servlet.internal.ServletHttpAttributesGetter; -import io.opentelemetry.instrumentation.servlet.internal.ServletInstrumenterBuilder; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletHttpAttributesGetter; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletInstrumenterBuilder; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext; import io.opentelemetry.instrumentation.servlet.v5_0.internal.Experimental; import io.opentelemetry.instrumentation.servlet.v5_0.internal.Servlet5Accessor; import jakarta.servlet.http.HttpServletRequest; diff --git a/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/internal/Servlet5Accessor.java b/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/internal/Servlet5Accessor.java index 62864773503c..3d8f87cd5e76 100644 --- a/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/internal/Servlet5Accessor.java +++ b/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/internal/Servlet5Accessor.java @@ -8,8 +8,8 @@ import static java.util.Arrays.asList; import static java.util.Collections.emptyList; -import io.opentelemetry.instrumentation.servlet.internal.ServletAccessor; -import io.opentelemetry.instrumentation.servlet.internal.ServletAsyncListener; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletAccessor; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletAsyncListener; import jakarta.servlet.AsyncEvent; import jakarta.servlet.AsyncListener; import jakarta.servlet.ServletException; diff --git a/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/internal/Servlet5TelemetryFilter.java b/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/internal/Servlet5TelemetryFilter.java index 65ed92ea2984..1b2fd2f6bc9c 100644 --- a/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/internal/Servlet5TelemetryFilter.java +++ b/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/internal/Servlet5TelemetryFilter.java @@ -10,8 +10,8 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext; import jakarta.servlet.AsyncContext; import jakarta.servlet.AsyncEvent; import jakarta.servlet.AsyncListener; diff --git a/instrumentation/servlet/servlet-common-javax/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/javax/JavaxServletAccessor.java b/instrumentation/servlet/servlet-common-javax/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/javax/JavaxServletAccessor.java index 0904b709bb11..c786bf136e79 100644 --- a/instrumentation/servlet/servlet-common-javax/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/javax/JavaxServletAccessor.java +++ b/instrumentation/servlet/servlet-common-javax/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/javax/JavaxServletAccessor.java @@ -8,7 +8,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.emptyList; -import io.opentelemetry.instrumentation.servlet.internal.ServletAccessor; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletAccessor; import java.security.Principal; import java.util.Collections; import java.util.Enumeration; diff --git a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/AgentServletInstrumenterBuilder.java b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/AgentServletInstrumenterBuilder.java index 0262c67228c2..9f408fc60550 100644 --- a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/AgentServletInstrumenterBuilder.java +++ b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/AgentServletInstrumenterBuilder.java @@ -15,11 +15,11 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor; import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter; import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractor; -import io.opentelemetry.instrumentation.servlet.internal.ServletAccessor; -import io.opentelemetry.instrumentation.servlet.internal.ServletHttpAttributesGetter; -import io.opentelemetry.instrumentation.servlet.internal.ServletInstrumenterBuilder; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletAccessor; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletHttpAttributesGetter; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletInstrumenterBuilder; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext; import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig; import java.util.ArrayList; import java.util.List; diff --git a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/AsyncRequestCompletionListener.java b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/AsyncRequestCompletionListener.java index ca46dc8807a1..8bfa25fc09a6 100644 --- a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/AsyncRequestCompletionListener.java +++ b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/AsyncRequestCompletionListener.java @@ -7,9 +7,9 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.servlet.internal.ServletAsyncListener; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletAsyncListener; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext; import java.util.concurrent.atomic.AtomicBoolean; class AsyncRequestCompletionListener implements ServletAsyncListener { diff --git a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/BaseServletHelper.java b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/BaseServletHelper.java index a2119ab48667..db28f111e0d3 100644 --- a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/BaseServletHelper.java +++ b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/BaseServletHelper.java @@ -18,11 +18,11 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.instrumenter.LocalRootSpan; import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute; -import io.opentelemetry.instrumentation.servlet.internal.ServletAccessor; -import io.opentelemetry.instrumentation.servlet.internal.ServletAdditionalAttributesExtractor; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestParametersExtractor; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletAccessor; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletAdditionalAttributesExtractor; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestParametersExtractor; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext; import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig; import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge; import io.opentelemetry.javaagent.bootstrap.servlet.MappingResolver; diff --git a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/ServletHelper.java b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/ServletHelper.java index 49bcd7e8ab41..1dbff08a2d9a 100644 --- a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/ServletHelper.java +++ b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/ServletHelper.java @@ -8,9 +8,9 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.servlet.internal.ServletAccessor; -import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext; -import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletAccessor; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletRequestContext; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletResponseContext; import io.opentelemetry.javaagent.bootstrap.servlet.ServletAsyncContext; import javax.annotation.Nullable; diff --git a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/ServletSpanNameProvider.java b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/ServletSpanNameProvider.java index a536166abdf7..63721d995cbf 100644 --- a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/ServletSpanNameProvider.java +++ b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/ServletSpanNameProvider.java @@ -7,7 +7,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteBiGetter; -import io.opentelemetry.instrumentation.servlet.internal.ServletAccessor; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletAccessor; import io.opentelemetry.javaagent.bootstrap.servlet.MappingResolver; import io.opentelemetry.javaagent.bootstrap.servlet.ServletContextPath; import javax.annotation.Nullable; diff --git a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletAccessor.java b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletAccessor.java similarity index 97% rename from instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletAccessor.java rename to instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletAccessor.java index 31e72fbc293c..fec3bca3624c 100644 --- a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletAccessor.java +++ b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletAccessor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.servlet.internal; +package io.opentelemetry.instrumentation.servlet.common.internal; import java.security.Principal; import java.util.List; diff --git a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletAdditionalAttributesExtractor.java b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletAdditionalAttributesExtractor.java similarity index 97% rename from instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletAdditionalAttributesExtractor.java rename to instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletAdditionalAttributesExtractor.java index c7675ce1e609..5912815925e5 100644 --- a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletAdditionalAttributesExtractor.java +++ b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletAdditionalAttributesExtractor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.servlet.internal; +package io.opentelemetry.instrumentation.servlet.common.internal; import static io.opentelemetry.api.common.AttributeKey.longKey; diff --git a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletAsyncListener.java b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletAsyncListener.java similarity index 87% rename from instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletAsyncListener.java rename to instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletAsyncListener.java index f956f2700b98..50738028245c 100644 --- a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletAsyncListener.java +++ b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletAsyncListener.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.servlet.internal; +package io.opentelemetry.instrumentation.servlet.common.internal; import javax.annotation.Nullable; diff --git a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletErrorCauseExtractor.java b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletErrorCauseExtractor.java similarity index 92% rename from instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletErrorCauseExtractor.java rename to instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletErrorCauseExtractor.java index 0155431a4539..ea0254c89125 100644 --- a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletErrorCauseExtractor.java +++ b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletErrorCauseExtractor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.servlet.internal; +package io.opentelemetry.instrumentation.servlet.common.internal; import io.opentelemetry.instrumentation.api.instrumenter.ErrorCauseExtractor; diff --git a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletHttpAttributesGetter.java b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletHttpAttributesGetter.java similarity index 98% rename from instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletHttpAttributesGetter.java rename to instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletHttpAttributesGetter.java index ae90c1347d2c..c282ea649226 100644 --- a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletHttpAttributesGetter.java +++ b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletHttpAttributesGetter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.servlet.internal; +package io.opentelemetry.instrumentation.servlet.common.internal; import static java.util.Collections.emptyList; diff --git a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletInstrumenterBuilder.java b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletInstrumenterBuilder.java similarity index 98% rename from instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletInstrumenterBuilder.java rename to instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletInstrumenterBuilder.java index 0f38cdae0a19..eefc4ed72785 100644 --- a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletInstrumenterBuilder.java +++ b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletInstrumenterBuilder.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.servlet.internal; +package io.opentelemetry.instrumentation.servlet.common.internal; import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.opentelemetry.api.OpenTelemetry; diff --git a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletRequestContext.java b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletRequestContext.java similarity index 85% rename from instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletRequestContext.java rename to instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletRequestContext.java index c0ccdc97e198..cbe4f640c8d0 100644 --- a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletRequestContext.java +++ b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletRequestContext.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.servlet.internal; +package io.opentelemetry.instrumentation.servlet.common.internal; /** * This class is internal and is hence not for public use. Its APIs are unstable and can change at diff --git a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletRequestGetter.java b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletRequestGetter.java similarity index 94% rename from instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletRequestGetter.java rename to instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletRequestGetter.java index 828de1f5b17a..84bcd316710e 100644 --- a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletRequestGetter.java +++ b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletRequestGetter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.servlet.internal; +package io.opentelemetry.instrumentation.servlet.common.internal; import static java.util.Collections.emptyIterator; diff --git a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletRequestParametersExtractor.java b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletRequestParametersExtractor.java similarity index 97% rename from instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletRequestParametersExtractor.java rename to instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletRequestParametersExtractor.java index 22cd33592fab..3165b0a04f9f 100644 --- a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletRequestParametersExtractor.java +++ b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletRequestParametersExtractor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.servlet.internal; +package io.opentelemetry.instrumentation.servlet.common.internal; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.AttributesBuilder; diff --git a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletResponseContext.java b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletResponseContext.java similarity index 94% rename from instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletResponseContext.java rename to instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletResponseContext.java index 494f9e3e1872..240c2d6df789 100644 --- a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletResponseContext.java +++ b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/common/internal/ServletResponseContext.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.servlet.internal; +package io.opentelemetry.instrumentation.servlet.common.internal; import static java.util.Objects.requireNonNull; diff --git a/instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatInstrumenterFactory.java b/instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatInstrumenterFactory.java index a627d5bf03be..fd981817771c 100644 --- a/instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatInstrumenterFactory.java +++ b/instrumentation/tomcat/tomcat-common-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/v7_0/TomcatInstrumenterFactory.java @@ -7,8 +7,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.internal.InstrumenterUtil; -import io.opentelemetry.instrumentation.servlet.internal.ServletAccessor; -import io.opentelemetry.instrumentation.servlet.internal.ServletErrorCauseExtractor; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletAccessor; +import io.opentelemetry.instrumentation.servlet.common.internal.ServletErrorCauseExtractor; import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters; import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge; import org.apache.coyote.Request;