Skip to content

Commit 49f1227

Browse files
Copilottrask
Copilot
and
trask
authored
Rename jaxrs resteasy common 2.0 module
Agent-Logs-Url: https://github.com/open-telemetry/opentelemetry-java-instrumentation/sessions/13dd4879-c15b-4db4-8faf-c0899db9c25e Co-authored-by: trask <218610+trask@users.noreply.github.com>
1 parent 71bbdc6 commit 49f1227

13 files changed

Lines changed: 26 additions & 18 deletions

File tree

‎.fossa.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1092,7 +1092,7 @@ targets:
10921092
target: ':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.1:javaagent'
10931093
- type: gradle
10941094
path: ./
1095-
target: ':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-common:javaagent'
1095+
target: ':instrumentation:jaxrs:jaxrs-2.0:jaxrs-resteasy-common-2.0:javaagent'
10961096
- type: gradle
10971097
path: ./
10981098
target: ':instrumentation:jaxrs:jaxrs-3.0:jaxrs-3.0-annotations:javaagent'

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies {
3838
library("org.jboss.resteasy:resteasy-jaxrs:3.0.0.Final")
3939

4040
implementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent"))
41-
implementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-common:javaagent"))
41+
implementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-resteasy-common-2.0:javaagent"))
4242

4343
testInstrumentation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-annotations:javaagent"))
4444

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy30InstrumentationModule.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
import com.google.auto.service.AutoService;
1212
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1313
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
14+
import io.opentelemetry.javaagent.instrumentation.jaxrs.resteasy.common.v2_0.ResteasyResourceLocatorInvokerInstrumentation;
15+
import io.opentelemetry.javaagent.instrumentation.jaxrs.resteasy.common.v2_0.ResteasyResourceMethodInvokerInstrumentation;
16+
import io.opentelemetry.javaagent.instrumentation.jaxrs.resteasy.common.v2_0.ResteasyRootNodeTypeInstrumentation;
17+
import io.opentelemetry.javaagent.instrumentation.jaxrs.resteasy.common.v2_0.ResteasyServletContainerDispatcherInstrumentation;
1418
import java.util.List;
1519
import net.bytebuddy.matcher.ElementMatcher;
1620

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies {
3838
library("org.jboss.resteasy:resteasy-jaxrs:3.1.0.Final")
3939

4040
implementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent"))
41-
implementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-common:javaagent"))
41+
implementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-resteasy-common-2.0:javaagent"))
4242

4343
testInstrumentation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-annotations:javaagent"))
4444

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy31InstrumentationModule.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
import com.google.auto.service.AutoService;
1212
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1313
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
14+
import io.opentelemetry.javaagent.instrumentation.jaxrs.resteasy.common.v2_0.ResteasyResourceLocatorInvokerInstrumentation;
15+
import io.opentelemetry.javaagent.instrumentation.jaxrs.resteasy.common.v2_0.ResteasyResourceMethodInvokerInstrumentation;
16+
import io.opentelemetry.javaagent.instrumentation.jaxrs.resteasy.common.v2_0.ResteasyRootNodeTypeInstrumentation;
17+
import io.opentelemetry.javaagent.instrumentation.jaxrs.resteasy.common.v2_0.ResteasyServletContainerDispatcherInstrumentation;
1418
import java.util.List;
1519
import net.bytebuddy.matcher.ElementMatcher;
1620

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/build.gradle.kts renamed to instrumentation/jaxrs/jaxrs-2.0/jaxrs-resteasy-common-2.0/javaagent/build.gradle.kts

File renamed without changes.

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

Lines changed: 3 additions & 3 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.resteasy.common.v2_0;
77

8-
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.ResteasySingletons.LOCATOR_NAME;
8+
import static io.opentelemetry.javaagent.instrumentation.jaxrs.resteasy.common.v2_0.ResteasySingletons.LOCATOR_NAME;
99
import static net.bytebuddy.matcher.ElementMatchers.named;
1010
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
1111

@@ -21,7 +21,7 @@
2121
import net.bytebuddy.matcher.ElementMatcher;
2222
import org.jboss.resteasy.core.ResourceLocatorInvoker;
2323

24-
class ResteasyResourceLocatorInvokerInstrumentation implements TypeInstrumentation {
24+
public class ResteasyResourceLocatorInvokerInstrumentation implements TypeInstrumentation {
2525
@Override
2626
public ElementMatcher<TypeDescription> typeMatcher() {
2727
return named("org.jboss.resteasy.core.ResourceLocatorInvoker");

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

Lines changed: 3 additions & 3 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.resteasy.common.v2_0;
77

8-
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.ResteasySingletons.INVOKER_NAME;
8+
import static io.opentelemetry.javaagent.instrumentation.jaxrs.resteasy.common.v2_0.ResteasySingletons.INVOKER_NAME;
99
import static net.bytebuddy.matcher.ElementMatchers.named;
1010
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
1111

@@ -17,7 +17,7 @@
1717
import net.bytebuddy.matcher.ElementMatcher;
1818
import org.jboss.resteasy.core.ResourceMethodInvoker;
1919

20-
class ResteasyResourceMethodInvokerInstrumentation implements TypeInstrumentation {
20+
public class ResteasyResourceMethodInvokerInstrumentation implements TypeInstrumentation {
2121
@Override
2222
public ElementMatcher<TypeDescription> typeMatcher() {
2323
return named("org.jboss.resteasy.core.ResourceMethodInvoker");

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
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.resteasy.common.v2_0;
77

8-
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.ResteasySingletons.INVOKER_NAME;
9-
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.ResteasySingletons.LOCATOR_NAME;
8+
import static io.opentelemetry.javaagent.instrumentation.jaxrs.resteasy.common.v2_0.ResteasySingletons.INVOKER_NAME;
9+
import static io.opentelemetry.javaagent.instrumentation.jaxrs.resteasy.common.v2_0.ResteasySingletons.LOCATOR_NAME;
1010
import static net.bytebuddy.matcher.ElementMatchers.named;
1111
import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
1212
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -21,7 +21,7 @@
2121
import org.jboss.resteasy.core.ResourceLocatorInvoker;
2222
import org.jboss.resteasy.core.ResourceMethodInvoker;
2323

24-
class ResteasyRootNodeTypeInstrumentation implements TypeInstrumentation {
24+
public class ResteasyRootNodeTypeInstrumentation implements TypeInstrumentation {
2525
@Override
2626
public ElementMatcher<TypeDescription> typeMatcher() {
2727
return named("org.jboss.resteasy.core.registry.RootNode");

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/ResteasyServletContainerDispatcherInstrumentation.java renamed to instrumentation/jaxrs/jaxrs-2.0/jaxrs-resteasy-common-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/resteasy/common/v2_0/ResteasyServletContainerDispatcherInstrumentation.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.resteasy.common.v2_0;
77

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

@@ -18,7 +18,7 @@
1818
import net.bytebuddy.description.type.TypeDescription;
1919
import net.bytebuddy.matcher.ElementMatcher;
2020

21-
class ResteasyServletContainerDispatcherInstrumentation implements TypeInstrumentation {
21+
public class ResteasyServletContainerDispatcherInstrumentation implements TypeInstrumentation {
2222

2323
@Override
2424
public ElementMatcher<TypeDescription> typeMatcher() {

0 commit comments

Comments
 (0)