diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/ContainerRequestFilterInstrumentation.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/ContainerRequestFilterInstrumentation.java similarity index 96% rename from instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/ContainerRequestFilterInstrumentation.java rename to instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/ContainerRequestFilterInstrumentation.java index c6f47ac9075e..abff25793f1d 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/ContainerRequestFilterInstrumentation.java +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/ContainerRequestFilterInstrumentation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0; +package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.annotations; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface; diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/DefaultRequestContextInstrumentation.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/DefaultRequestContextInstrumentation.java similarity index 91% rename from instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/DefaultRequestContextInstrumentation.java rename to instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/DefaultRequestContextInstrumentation.java index bf93c60f070f..a794ef115d11 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/DefaultRequestContextInstrumentation.java +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/DefaultRequestContextInstrumentation.java @@ -3,16 +3,18 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0; +package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.annotations; import static io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsServerSpanNaming.serverSpanName; -import static io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.JaxrsAnnotationsSingletons.instrumenter; +import static io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.annotations.JaxrsAnnotationsSingletons.instrumenter; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute; import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteSource; import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsConstants; +import io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.common.AbstractRequestContextInstrumentation; +import io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.common.Jaxrs3HandlerData; import jakarta.ws.rs.container.ContainerRequestContext; import java.lang.reflect.Method; import javax.annotation.Nullable; diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAnnotationsInstrumentation.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/JaxrsAnnotationsInstrumentation.java similarity index 96% rename from instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAnnotationsInstrumentation.java rename to instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/JaxrsAnnotationsInstrumentation.java index f42c345c3ce3..ae7aa37246ef 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAnnotationsInstrumentation.java +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/JaxrsAnnotationsInstrumentation.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0; +package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.annotations; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperMethod; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType; import static io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsServerSpanNaming.serverSpanName; -import static io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.JaxrsAnnotationsSingletons.RESPONSE_DATA; -import static io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.JaxrsAnnotationsSingletons.instrumenter; +import static io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.annotations.JaxrsAnnotationsSingletons.RESPONSE_DATA; +import static io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.annotations.JaxrsAnnotationsSingletons.instrumenter; import static net.bytebuddy.matcher.ElementMatchers.declaresMethod; import static net.bytebuddy.matcher.ElementMatchers.isAnnotatedWith; import static net.bytebuddy.matcher.ElementMatchers.isStatic; @@ -27,6 +27,7 @@ import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; import io.opentelemetry.javaagent.instrumentation.jaxrs.AsyncResponseData; import io.opentelemetry.javaagent.instrumentation.jaxrs.CompletionStageFinishCallback; +import io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.common.Jaxrs3HandlerData; import jakarta.ws.rs.Path; import jakarta.ws.rs.container.AsyncResponse; import java.lang.reflect.Method; diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAnnotationsInstrumentationModule.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/JaxrsAnnotationsInstrumentationModule.java similarity index 95% rename from instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAnnotationsInstrumentationModule.java rename to instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/JaxrsAnnotationsInstrumentationModule.java index ae07b392275f..4a2d297c90b7 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAnnotationsInstrumentationModule.java +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/JaxrsAnnotationsInstrumentationModule.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0; +package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.annotations; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static java.util.Arrays.asList; diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAnnotationsSingletons.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/JaxrsAnnotationsSingletons.java similarity index 93% rename from instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAnnotationsSingletons.java rename to instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/JaxrsAnnotationsSingletons.java index 1411b0b25c77..9fe496c7e9d0 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAnnotationsSingletons.java +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/JaxrsAnnotationsSingletons.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0; +package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.annotations; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.util.VirtualField; diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAsyncResponseInstrumentation.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/JaxrsAsyncResponseInstrumentation.java similarity index 95% rename from instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAsyncResponseInstrumentation.java rename to instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/JaxrsAsyncResponseInstrumentation.java index bf2249bbb6a2..c7a343303d21 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAsyncResponseInstrumentation.java +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/JaxrsAsyncResponseInstrumentation.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0; +package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.annotations; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface; -import static io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.JaxrsAnnotationsSingletons.RESPONSE_DATA; -import static io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.JaxrsAnnotationsSingletons.instrumenter; +import static io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.annotations.JaxrsAnnotationsSingletons.RESPONSE_DATA; +import static io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.annotations.JaxrsAnnotationsSingletons.instrumenter; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JavaInterfaces.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/JavaInterfaces.java similarity index 94% rename from instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JavaInterfaces.java rename to instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/JavaInterfaces.java index 91c5ea9d31d2..2b3d7f885372 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JavaInterfaces.java +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/JavaInterfaces.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0; +package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.annotations; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxRs3AnnotationsInstrumentationTest.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/JaxRs3AnnotationsInstrumentationTest.java similarity index 97% rename from instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxRs3AnnotationsInstrumentationTest.java rename to instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/JaxRs3AnnotationsInstrumentationTest.java index 399f5d82c747..95a554128112 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxRs3AnnotationsInstrumentationTest.java +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/annotations/JaxRs3AnnotationsInstrumentationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0; +package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.annotations; import static io.opentelemetry.instrumentation.test.utils.ClassUtils.getClassName; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; @@ -16,7 +16,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil; -import io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.JavaInterfaces.Jax; +import io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.annotations.JavaInterfaces.Jax; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; import jakarta.ws.rs.HEAD; diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/AbstractRequestContextInstrumentation.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/common/AbstractRequestContextInstrumentation.java similarity index 95% rename from instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/AbstractRequestContextInstrumentation.java rename to instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/common/AbstractRequestContextInstrumentation.java index 88b40f1016e5..3938176a8a6e 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/AbstractRequestContextInstrumentation.java +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/common/AbstractRequestContextInstrumentation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0; +package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.common; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface; diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/Jaxrs3HandlerData.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/common/Jaxrs3HandlerData.java similarity index 96% rename from instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/Jaxrs3HandlerData.java rename to instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/common/Jaxrs3HandlerData.java index b298a1067f63..6b9714848a8d 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/Jaxrs3HandlerData.java +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/common/Jaxrs3HandlerData.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0; +package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.common; import io.opentelemetry.javaagent.instrumentation.jaxrs.HandlerData; import jakarta.ws.rs.HttpMethod; diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/Jaxrs3RequestContextHelper.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/common/Jaxrs3RequestContextHelper.java similarity index 93% rename from instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/Jaxrs3RequestContextHelper.java rename to instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/common/Jaxrs3RequestContextHelper.java index 6bb511c30cc0..91d0d8a532ca 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/Jaxrs3RequestContextHelper.java +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/common/Jaxrs3RequestContextHelper.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0; +package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.common; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/jersey/v3_0/JerseyRequestContextInstrumentation.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/jersey/v3_0/JerseyRequestContextInstrumentation.java index a0e4cf97a3bf..6e5e35ff2603 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/jersey/v3_0/JerseyRequestContextInstrumentation.java +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/jersey/v3_0/JerseyRequestContextInstrumentation.java @@ -10,9 +10,9 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsConstants; -import io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.AbstractRequestContextInstrumentation; -import io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.Jaxrs3HandlerData; -import io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.Jaxrs3RequestContextHelper; +import io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.common.AbstractRequestContextInstrumentation; +import io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.common.Jaxrs3HandlerData; +import io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.common.Jaxrs3RequestContextHelper; import jakarta.ws.rs.container.ContainerRequestContext; import jakarta.ws.rs.container.ResourceInfo; import jakarta.ws.rs.core.UriInfo; diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/resteasy/v6_0/ResteasyRequestContextInstrumentation.java b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/resteasy/v6_0/ResteasyRequestContextInstrumentation.java index 380a95a9549a..4bacde24ceae 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/resteasy/v6_0/ResteasyRequestContextInstrumentation.java +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/resteasy/v6_0/ResteasyRequestContextInstrumentation.java @@ -10,9 +10,9 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsConstants; -import io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.AbstractRequestContextInstrumentation; -import io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.Jaxrs3HandlerData; -import io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.Jaxrs3RequestContextHelper; +import io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.common.AbstractRequestContextInstrumentation; +import io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.common.Jaxrs3HandlerData; +import io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.common.Jaxrs3RequestContextHelper; import jakarta.ws.rs.container.ContainerRequestContext; import java.lang.reflect.Method; import javax.annotation.Nullable;