Skip to content

Commit af2eba4

Browse files
trasktrask
authored
Rename JAX-RS common package (#18776)
1 parent 7ac7fa6 commit af2eba4

42 files changed

Lines changed: 65 additions & 65 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎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
@@ -13,7 +13,7 @@
1313

1414
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1515
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
16-
import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsConstants;
16+
import io.opentelemetry.javaagent.instrumentation.jaxrs.common.JaxrsConstants;
1717
import javax.ws.rs.container.ContainerRequestContext;
1818
import javax.ws.rs.container.ContainerRequestFilter;
1919
import net.bytebuddy.asm.Advice;

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.annotations;
77

8-
import static io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsServerSpanNaming.serverSpanName;
8+
import static io.opentelemetry.javaagent.instrumentation.jaxrs.common.JaxrsServerSpanNaming.serverSpanName;
99
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;
15-
import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsConstants;
15+
import io.opentelemetry.javaagent.instrumentation.jaxrs.common.JaxrsConstants;
1616
import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.common.AbstractRequestContextInstrumentation;
1717
import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.common.Jaxrs2HandlerData;
1818
import java.lang.reflect.Method;

‎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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperMethod;
99
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType;
10-
import static io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsServerSpanNaming.serverSpanName;
10+
import static io.opentelemetry.javaagent.instrumentation.jaxrs.common.JaxrsServerSpanNaming.serverSpanName;
1111
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.annotations.JaxrsAnnotationsSingletons.ASYNC_RESPONSE_DATA;
1212
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.annotations.JaxrsAnnotationsSingletons.instrumenter;
1313
import static net.bytebuddy.matcher.ElementMatchers.declaresMethod;
@@ -25,8 +25,8 @@
2525
import io.opentelemetry.javaagent.bootstrap.CallDepth;
2626
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
2727
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
28-
import io.opentelemetry.javaagent.instrumentation.jaxrs.AsyncResponseData;
29-
import io.opentelemetry.javaagent.instrumentation.jaxrs.CompletionStageFinishCallback;
28+
import io.opentelemetry.javaagent.instrumentation.jaxrs.common.AsyncResponseData;
29+
import io.opentelemetry.javaagent.instrumentation.jaxrs.common.CompletionStageFinishCallback;
3030
import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.common.Jaxrs2HandlerData;
3131
import java.lang.reflect.Method;
3232
import java.util.concurrent.CompletionStage;

‎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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
99
import io.opentelemetry.instrumentation.api.util.VirtualField;
10-
import io.opentelemetry.javaagent.instrumentation.jaxrs.AsyncResponseData;
11-
import io.opentelemetry.javaagent.instrumentation.jaxrs.HandlerData;
12-
import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsInstrumenterFactory;
10+
import io.opentelemetry.javaagent.instrumentation.jaxrs.common.AsyncResponseData;
11+
import io.opentelemetry.javaagent.instrumentation.jaxrs.common.HandlerData;
12+
import io.opentelemetry.javaagent.instrumentation.jaxrs.common.JaxrsInstrumenterFactory;
1313
import javax.ws.rs.container.AsyncResponse;
1414

1515
public class JaxrsAnnotationsSingletons {

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
1818
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1919
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
20-
import io.opentelemetry.javaagent.instrumentation.jaxrs.AsyncResponseData;
21-
import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsConfig;
20+
import io.opentelemetry.javaagent.instrumentation.jaxrs.common.AsyncResponseData;
21+
import io.opentelemetry.javaagent.instrumentation.jaxrs.common.JaxrsConfig;
2222
import javax.ws.rs.container.AsyncResponse;
2323
import net.bytebuddy.asm.Advice;
2424
import net.bytebuddy.description.type.TypeDescription;

‎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
@@ -5,7 +5,7 @@
55

66
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.common;
77

8-
import io.opentelemetry.javaagent.instrumentation.jaxrs.HandlerData;
8+
import io.opentelemetry.javaagent.instrumentation.jaxrs.common.HandlerData;
99
import java.lang.annotation.Annotation;
1010
import java.lang.reflect.AnnotatedElement;
1111
import java.lang.reflect.Method;

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/common/Jaxrs2RequestContextHelper.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
import io.opentelemetry.context.Context;
99
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
10-
import io.opentelemetry.javaagent.instrumentation.jaxrs.HandlerData;
11-
import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsConstants;
12-
import io.opentelemetry.javaagent.instrumentation.jaxrs.RequestContextHelper;
10+
import io.opentelemetry.javaagent.instrumentation.jaxrs.common.HandlerData;
11+
import io.opentelemetry.javaagent.instrumentation.jaxrs.common.JaxrsConstants;
12+
import io.opentelemetry.javaagent.instrumentation.jaxrs.common.RequestContextHelper;
1313
import javax.annotation.Nullable;
1414
import javax.ws.rs.container.ContainerRequestContext;
1515

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/cxf/v3_2/CxfRequestContextInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import io.opentelemetry.context.Scope;
1515
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1616
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
17-
import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsConstants;
17+
import io.opentelemetry.javaagent.instrumentation.jaxrs.common.JaxrsConstants;
1818
import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.common.Jaxrs2HandlerData;
1919
import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.common.Jaxrs2RequestContextHelper;
2020
import java.lang.reflect.Method;

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/cxf/v3_2/CxfSingletons.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.cxf.v3_2;
77

88
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
9-
import io.opentelemetry.javaagent.instrumentation.jaxrs.HandlerData;
10-
import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsInstrumenterFactory;
9+
import io.opentelemetry.javaagent.instrumentation.jaxrs.common.HandlerData;
10+
import io.opentelemetry.javaagent.instrumentation.jaxrs.common.JaxrsInstrumenterFactory;
1111

1212
class CxfSingletons {
1313

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/cxf/v3_2/CxfSpanName.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.cxf.v3_2;
77

8-
import static io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsPathUtil.normalizePath;
8+
import static io.opentelemetry.javaagent.instrumentation.jaxrs.common.JaxrsPathUtil.normalizePath;
99

1010
import io.opentelemetry.context.Context;
1111
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute;

0 commit comments

Comments
 (0)