Skip to content

Commit d79e25c

Browse files
trasktrask
authored
Normalize JAX-RS 2.0 annotation and common javaagent packages (#18748)
1 parent 095908a commit d79e25c

15 files changed

Lines changed: 31 additions & 28 deletions

File tree

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/ContainerRequestFilterInstrumentation.java renamed to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/annotations/ContainerRequestFilterInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
6+
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.annotations;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/DefaultRequestContextInstrumentation.java renamed to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/annotations/DefaultRequestContextInstrumentation.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
6+
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.annotations;
77

88
import static io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsServerSpanNaming.serverSpanName;
9-
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.JaxrsAnnotationsSingletons.instrumenter;
9+
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.annotations.JaxrsAnnotationsSingletons.instrumenter;
1010

1111
import io.opentelemetry.context.Context;
1212
import io.opentelemetry.context.Scope;
1313
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute;
1414
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteSource;
1515
import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsConstants;
16+
import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.common.AbstractRequestContextInstrumentation;
17+
import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.common.Jaxrs2HandlerData;
1618
import java.lang.reflect.Method;
1719
import javax.annotation.Nullable;
1820
import javax.ws.rs.container.ContainerRequestContext;

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxrsAnnotationsInstrumentation.java renamed to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/annotations/JaxrsAnnotationsInstrumentation.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
6+
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.annotations;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperMethod;
99
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType;
1010
import static io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsServerSpanNaming.serverSpanName;
11-
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.JaxrsAnnotationsSingletons.ASYNC_RESPONSE_DATA;
12-
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.JaxrsAnnotationsSingletons.instrumenter;
11+
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.annotations.JaxrsAnnotationsSingletons.ASYNC_RESPONSE_DATA;
12+
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.annotations.JaxrsAnnotationsSingletons.instrumenter;
1313
import static net.bytebuddy.matcher.ElementMatchers.declaresMethod;
1414
import static net.bytebuddy.matcher.ElementMatchers.isAnnotatedWith;
1515
import static net.bytebuddy.matcher.ElementMatchers.isStatic;
@@ -27,6 +27,7 @@
2727
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
2828
import io.opentelemetry.javaagent.instrumentation.jaxrs.AsyncResponseData;
2929
import io.opentelemetry.javaagent.instrumentation.jaxrs.CompletionStageFinishCallback;
30+
import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.common.Jaxrs2HandlerData;
3031
import java.lang.reflect.Method;
3132
import java.util.concurrent.CompletionStage;
3233
import javax.annotation.Nullable;

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxrsAnnotationsInstrumentationModule.java renamed to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/annotations/JaxrsAnnotationsInstrumentationModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
6+
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.annotations;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static java.util.Arrays.asList;

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxrsAnnotationsSingletons.java renamed to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/annotations/JaxrsAnnotationsSingletons.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
6+
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.annotations;
77

88
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
99
import io.opentelemetry.instrumentation.api.util.VirtualField;

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxrsAsyncResponseInstrumentation.java renamed to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/annotations/JaxrsAsyncResponseInstrumentation.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
6+
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.annotations;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
10-
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.JaxrsAnnotationsSingletons.ASYNC_RESPONSE_DATA;
11-
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.JaxrsAnnotationsSingletons.instrumenter;
10+
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.annotations.JaxrsAnnotationsSingletons.ASYNC_RESPONSE_DATA;
11+
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.annotations.JaxrsAnnotationsSingletons.instrumenter;
1212
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
1313
import static net.bytebuddy.matcher.ElementMatchers.named;
1414
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JavaInterfaces.java renamed to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/annotations/JavaInterfaces.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
6+
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.annotations;
77

88
import javax.ws.rs.GET;
99
import javax.ws.rs.Path;

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxRs2AnnotationsInstrumentationTest.java renamed to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/annotations/JaxRs2AnnotationsInstrumentationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
6+
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.annotations;
77

88
import static io.opentelemetry.instrumentation.test.utils.ClassUtils.getClassName;
99
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
@@ -16,7 +16,7 @@
1616
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
1717
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1818
import io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil;
19-
import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.JavaInterfaces.Jax;
19+
import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.annotations.JavaInterfaces.Jax;
2020
import java.util.stream.Stream;
2121
import javax.ws.rs.DELETE;
2222
import javax.ws.rs.GET;

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/AbstractRequestContextInstrumentation.java renamed to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/common/AbstractRequestContextInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
6+
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.common;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Jaxrs2HandlerData.java renamed to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/common/Jaxrs2HandlerData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
6+
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.common;
77

88
import io.opentelemetry.javaagent.instrumentation.jaxrs.HandlerData;
99
import java.lang.annotation.Annotation;

0 commit comments

Comments
 (0)