Skip to content

Commit af6a6c7

Browse files
Copilottrasklaurit
authored
Rename shared JAX-RS and Axis2 javaagent packages to module-specific paths (#18185)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: trask <218610+trask@users.noreply.github.com> Co-authored-by: laurit <1997823+laurit@users.noreply.github.com>
1 parent f50f058 commit af6a6c7

73 files changed

Lines changed: 101 additions & 84 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-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/AbstractRequestContextInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import net.bytebuddy.description.type.TypeDescription;
1717
import net.bytebuddy.matcher.ElementMatcher;
1818

19-
abstract class AbstractRequestContextInstrumentation implements TypeInstrumentation {
19+
public abstract class AbstractRequestContextInstrumentation implements TypeInstrumentation {
2020
@Override
2121
public ElementMatcher<ClassLoader> classLoaderOptimization() {
2222
return hasClassesNamed("javax.ws.rs.container.ContainerRequestContext");

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfInstrumentationModule.java renamed to 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/CxfInstrumentationModule.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.cxf.v3_2;
77

88
import static java.util.Arrays.asList;
99

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfJaxRsInvokerInstrumentation.java renamed to 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/CxfJaxRsInvokerInstrumentation.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.cxf.v3_2;
77

88
import static net.bytebuddy.matcher.ElementMatchers.named;
99
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfRequestContextInstrumentation.java renamed to 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: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
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.cxf.v3_2;
77

8-
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.CxfSingletons.instrumenter;
8+
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.cxf.v3_2.CxfSingletons.instrumenter;
99
import static net.bytebuddy.matcher.ElementMatchers.named;
1010
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
1111
import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
@@ -15,6 +15,8 @@
1515
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1616
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
1717
import io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsConstants;
18+
import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.Jaxrs2HandlerData;
19+
import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.Jaxrs2RequestContextHelper;
1820
import java.lang.reflect.Method;
1921
import javax.annotation.Nullable;
2022
import javax.ws.rs.container.ContainerRequestContext;

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfRsHttpListenerInstrumentation.java renamed to 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/CxfRsHttpListenerInstrumentation.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.cxf.v3_2;
77

88
import static net.bytebuddy.matcher.ElementMatchers.named;
99

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfServletControllerInstrumentation.java renamed to 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/CxfServletControllerInstrumentation.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.cxf.v3_2;
77

88
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
99
import static net.bytebuddy.matcher.ElementMatchers.named;

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfSingletons.java renamed to 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: 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.cxf.v3_2;
77

88
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
99
import io.opentelemetry.javaagent.instrumentation.jaxrs.HandlerData;

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfSpanName.java renamed to 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
@@ -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.cxf.v3_2;
77

88
import static io.opentelemetry.javaagent.instrumentation.jaxrs.JaxrsPathUtil.normalizePath;
99

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfFilterTest.java renamed to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/cxf/v3_2/CxfFilterTest.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.cxf.v3_2;
77

88
import static java.util.Arrays.asList;
99

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfHttpServerTest.java renamed to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/cxf/v3_2/CxfHttpServerTest.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.cxf.v3_2;
77

88
import io.opentelemetry.instrumentation.jaxrs.v2_0.JaxRsHttpServerTest;
99
import io.opentelemetry.instrumentation.jaxrs.v2_0.test.JaxRsTestApplication;

0 commit comments

Comments
 (0)
⚡