Rename JAX-RS 2.0 RESTEasy shared javaagent module to jaxrs-2.0-resteasy-common-3.0 (#18078)

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: Trask Stalnaker <trask.stalnaker@gmail.com>

Author: Copilot

.fossa.yml

@@ -1092,7 +1092,7 @@ targets:
       target: ':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.1:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-common:javaagent'
+      target: ':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-common-3.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:jaxrs:jaxrs-3.0:jaxrs-3.0-annotations:javaagent'

buildscripts/checkstyle.xml

@@ -132,9 +132,10 @@
     <module name="PackageName">
       <!-- modified from default to support packages like
            io.opentelemetry.javaagent.instrumentation.log4j.appender.v2_17 and
-           io.opentelemetry.javaagent.instrumentation.netty.v4_1.client -->
+           io.opentelemetry.javaagent.instrumentation.netty.v4_1.client and
+           io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.resteasy.common.v3_0 -->
       <property name="format"
-        value="^[a-z]+(\.[a-z][a-z0-9]*)*(\.v[0-9]+_[0-9]+(_[0-9]+)?)?(\.[a-z][a-z0-9]*)*$"/>
+        value="^[a-z]+(\.(?:[a-z][a-z0-9]*|v[0-9]+_[0-9]+(?:_[0-9]+)?))*$"/>
       <message key="name.invalidPattern"
         value="Package name ''{0}'' must match pattern ''{1}''."/>
     </module>

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

@@ -38,7 +38,7 @@ dependencies {
   library("org.jboss.resteasy:resteasy-jaxrs:3.0.0.Final")
 
   implementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent"))
-  implementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-common:javaagent"))
+  implementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-common-3.0:javaagent"))
 
   testInstrumentation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-annotations:javaagent"))
 

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

@@ -11,6 +11,10 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.resteasy.common.v3_0.ResteasyResourceLocatorInvokerInstrumentation;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.resteasy.common.v3_0.ResteasyResourceMethodInvokerInstrumentation;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.resteasy.common.v3_0.ResteasyRootNodeTypeInstrumentation;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.resteasy.common.v3_0.ResteasyServletContainerDispatcherInstrumentation;
 import java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
 

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

@@ -38,7 +38,7 @@ dependencies {
   library("org.jboss.resteasy:resteasy-jaxrs:3.1.0.Final")
 
   implementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent"))
-  implementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-common:javaagent"))
+  implementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-common-3.0:javaagent"))
 
   testInstrumentation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-annotations:javaagent"))
 

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

@@ -11,6 +11,10 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.resteasy.common.v3_0.ResteasyResourceLocatorInvokerInstrumentation;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.resteasy.common.v3_0.ResteasyResourceMethodInvokerInstrumentation;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.resteasy.common.v3_0.ResteasyRootNodeTypeInstrumentation;
+import io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.resteasy.common.v3_0.ResteasyServletContainerDispatcherInstrumentation;
 import java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
 

…steasy-common/javaagent/build.gradle.kts …sy-common-3.0/javaagent/build.gradle.ktsinstrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/build.gradle.kts renamed to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common-3.0/javaagent/build.gradle.kts instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/build.gradle.kts renamed to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common-3.0/javaagent/build.gradle.kts

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
+package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.resteasy.common.v3_0;
 
-import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.ResteasySingletons.LOCATOR_NAME;
+import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.resteasy.common.v3_0.ResteasySingletons.LOCATOR_NAME;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
@@ -21,7 +21,7 @@
 import net.bytebuddy.matcher.ElementMatcher;
 import org.jboss.resteasy.core.ResourceLocatorInvoker;
 
-class ResteasyResourceLocatorInvokerInstrumentation implements TypeInstrumentation {
+public class ResteasyResourceLocatorInvokerInstrumentation implements TypeInstrumentation {
   @Override
   public ElementMatcher<TypeDescription> typeMatcher() {
     return named("org.jboss.resteasy.core.ResourceLocatorInvoker");

…sourceLocatorInvokerInstrumentation.java …sourceLocatorInvokerInstrumentation.javainstrumentation/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-2.0-resteasy-common-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/resteasy/common/v3_0/ResteasyResourceLocatorInvokerInstrumentation.java 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-2.0-resteasy-common-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/resteasy/common/v3_0/ResteasyResourceLocatorInvokerInstrumentation.java

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
+package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.resteasy.common.v3_0;
 
-import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.ResteasySingletons.INVOKER_NAME;
+import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.resteasy.common.v3_0.ResteasySingletons.INVOKER_NAME;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
@@ -17,7 +17,7 @@
 import net.bytebuddy.matcher.ElementMatcher;
 import org.jboss.resteasy.core.ResourceMethodInvoker;
 
-class ResteasyResourceMethodInvokerInstrumentation implements TypeInstrumentation {
+public class ResteasyResourceMethodInvokerInstrumentation implements TypeInstrumentation {
   @Override
   public ElementMatcher<TypeDescription> typeMatcher() {
     return named("org.jboss.resteasy.core.ResourceMethodInvoker");

…esourceMethodInvokerInstrumentation.java …esourceMethodInvokerInstrumentation.javainstrumentation/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-2.0-resteasy-common-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/resteasy/common/v3_0/ResteasyResourceMethodInvokerInstrumentation.java 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-2.0-resteasy-common-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/resteasy/common/v3_0/ResteasyResourceMethodInvokerInstrumentation.java

@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
+package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.resteasy.common.v3_0;
 
-import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.ResteasySingletons.INVOKER_NAME;
-import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.ResteasySingletons.LOCATOR_NAME;
+import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.resteasy.common.v3_0.ResteasySingletons.INVOKER_NAME;
+import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.resteasy.common.v3_0.ResteasySingletons.LOCATOR_NAME;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -21,7 +21,7 @@
 import org.jboss.resteasy.core.ResourceLocatorInvoker;
 import org.jboss.resteasy.core.ResourceMethodInvoker;
 
-class ResteasyRootNodeTypeInstrumentation implements TypeInstrumentation {
+public class ResteasyRootNodeTypeInstrumentation implements TypeInstrumentation {
   @Override
   public ElementMatcher<TypeDescription> typeMatcher() {
     return named("org.jboss.resteasy.core.registry.RootNode");