Rename jaxws-metro-2.2 module and package to jaxws-2.0-metro-2.2

Copilot · trask · web-flow · commit c7288f00d631 · 2026-04-22T20:04:18.000Z
Agent-Logs-Url: https://github.com/open-telemetry/opentelemetry-java-instrumentation/sessions/0f9bed0c-f5b2-4c2a-b201-f941274be132 Co-authored-by: trask <218610+trask@users.noreply.github.com>
diff --git a/.fossa.yml b/.fossa.yml
@@ -573,7 +573,7 @@ targets:
       target: ':instrumentation:jaxws:jaxws-2.0-jws-api-1.1:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:jaxws:jaxws-metro-2.2:javaagent'
+      target: ':instrumentation:jaxws:jaxws-2.0-metro-2.2:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:jboss-logmanager:jboss-logmanager-appender-1.1:javaagent'
diff --git a/.github/scripts/instrumentations.sh b/.github/scripts/instrumentations.sh
@@ -142,7 +142,7 @@ readonly INSTRUMENTATIONS=(
   "jaxws:jaxws-2.0-axis2-1.6:javaagent:test"
   "jaxws:jaxws-2.0-cxf-3.0:javaagent:test"
   "jaxws:jaxws-2.0-jws-api-1.1:javaagent:test"
-  "jaxws:jaxws-metro-2.2:javaagent:test"
+  "jaxws:jaxws-2.0-metro-2.2:javaagent:test"
   "jdbc:javaagent:test"
   "jdbc:javaagent:testStableSemconv"
   "jedis:jedis-1.4:javaagent:test"
diff --git a/docs/instrumentation-list.yaml b/docs/instrumentation-list.yaml
@@ -6794,17 +6794,17 @@ libraries:
         type: STRING
       - name: code.namespace
         type: STRING
-- name: jaxws-metro-2.2
+- name: jaxws-2.0-metro-2.2
   display_name: Metro JAX-WS
   description: |
     This instrumentation enriches HTTP server spans with route information, and enables controller spans for Metro JAX-WS web services (controller spans are disabled by default).
   library_link: https://javaee.github.io/metro/
   features:
   - HTTP_ROUTE
   - CONTROLLER_SPANS
-  source_path: instrumentation/jaxws/jaxws-metro-2.2
+  source_path: instrumentation/jaxws/jaxws-2.0-metro-2.2
   scope:
-    name: io.opentelemetry.jaxws-metro-2.2
+    name: io.opentelemetry.jaxws-2.0-metro-2.2
   has_javaagent: true
   javaagent_target_versions:
   - com.sun.xml.ws:jaxws-rt:[2.2,)
diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/build.gradle.kts
diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/MetroHelper.java b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/MetroHelper.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.metro;
+package io.opentelemetry.javaagent.instrumentation.jaxws.v2_0.metro.v2_2;
 
-import static io.opentelemetry.javaagent.instrumentation.metro.MetroSingletons.instrumenter;
+import static io.opentelemetry.javaagent.instrumentation.jaxws.v2_0.metro.v2_2.MetroSingletons.instrumenter;
 
 import com.sun.xml.ws.api.message.Packet;
 import com.sun.xml.ws.api.server.WSEndpoint;
diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/MetroInstrumentationModule.java b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/MetroInstrumentationModule.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.metro;
+package io.opentelemetry.javaagent.instrumentation.jaxws.v2_0.metro.v2_2;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static java.util.Arrays.asList;
@@ -17,7 +17,7 @@
 @AutoService(InstrumentationModule.class)
 public class MetroInstrumentationModule extends InstrumentationModule {
   public MetroInstrumentationModule() {
-    super("metro", "metro-2.2", "jaxws");
+    super("metro", "jaxws-2.0-metro-2.2", "jaxws");
   }
 
   @Override
diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/MetroRequest.java b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/MetroRequest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.metro;
+package io.opentelemetry.javaagent.instrumentation.jaxws.v2_0.metro.v2_2;
 
 import com.sun.xml.ws.api.message.Packet;
 import com.sun.xml.ws.api.server.WSEndpoint;
diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/MetroServerSpanNameUpdater.java b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/MetroServerSpanNameUpdater.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.metro;
+package io.opentelemetry.javaagent.instrumentation.jaxws.v2_0.metro.v2_2;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/MetroSingletons.java b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/MetroSingletons.java
@@ -3,14 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.metro;
+package io.opentelemetry.javaagent.instrumentation.jaxws.v2_0.metro.v2_2;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.javaagent.bootstrap.internal.ExperimentalConfig;
 
 public class MetroSingletons {
-  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jaxws-metro-2.2";
+  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jaxws-2.0-metro-2.2";
 
   private static final Instrumenter<MetroRequest, Void> instrumenter;
 
diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/ServerTubeAssemblerContextInstrumentation.java b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/ServerTubeAssemblerContextInstrumentation.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.metro;
+package io.opentelemetry.javaagent.instrumentation.jaxws.v2_0.metro.v2_2;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/SoapFaultBuilderInstrumentation.java b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/SoapFaultBuilderInstrumentation.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.metro;
+package io.opentelemetry.javaagent.instrumentation.jaxws.v2_0.metro.v2_2;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/TracingTube.java b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/TracingTube.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.metro;
+package io.opentelemetry.javaagent.instrumentation.jaxws.v2_0.metro.v2_2;
 
 import com.sun.xml.ws.api.message.Packet;
 import com.sun.xml.ws.api.pipe.Fiber;
diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/MetroJaxWs2Test.java b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/MetroJaxWs2Test.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.metro;
+package io.opentelemetry.javaagent.instrumentation.jaxws.v2_0.metro.v2_2;
 
 import io.opentelemetry.javaagent.instrumentation.jaxws.v2_0.AbstractJaxWs2Test;
 
diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/test/resources/test-app/WEB-INF/sun-jaxws.xml b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/test/resources/test-app/WEB-INF/sun-jaxws.xml
diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/test/resources/test-app/WEB-INF/web.xml b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/test/resources/test-app/WEB-INF/web.xml
diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2/metadata.yaml b/instrumentation/jaxws/jaxws-2.0-metro-2.2/metadata.yaml
diff --git a/instrumentation/jaxws/jaxws-3.0-metro-3.0-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-3.0-metro-3.0-testing/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
   testImplementation("jakarta.servlet:jakarta.servlet-api:5.0.0")
   testImplementation(project(":instrumentation:jaxws:jaxws-3.0-common-testing"))
 
-  testInstrumentation(project(":instrumentation:jaxws:jaxws-metro-2.2:javaagent"))
+  testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0-metro-2.2:javaagent"))
 
   testInstrumentation(project(":instrumentation:servlet:servlet-5.0:javaagent"))
   testInstrumentation(project(":instrumentation:jetty:jetty-11.0:javaagent"))
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -361,14 +361,14 @@ include(":instrumentation:jaxws:jaxws-2.0-common-testing")
 include(":instrumentation:jaxws:jaxws-2.0-cxf-3.0:javaagent")
 include(":instrumentation:jaxws:jaxws-2.0-cxf-3.0:javaagent-unit-tests")
 include(":instrumentation:jaxws:jaxws-2.0-jws-api-1.1:javaagent")
+include(":instrumentation:jaxws:jaxws-2.0-metro-2.2:javaagent")
 include(":instrumentation:jaxws:jaxws-2.0-tomee-testing")
 include(":instrumentation:jaxws:jaxws-2.0-wildfly-testing")
 include(":instrumentation:jaxws:jaxws-3.0-axis2-2.0-testing")
 include(":instrumentation:jaxws:jaxws-3.0-common-testing")
 include(":instrumentation:jaxws:jaxws-3.0-cxf-4.0-testing")
 include(":instrumentation:jaxws:jaxws-3.0-metro-3.0-testing")
 include(":instrumentation:jaxws:jaxws-common:javaagent")
-include(":instrumentation:jaxws:jaxws-metro-2.2:javaagent")
 include(":instrumentation:jboss-logmanager:jboss-logmanager-appender-1.1:javaagent")
 include(":instrumentation:jboss-logmanager:jboss-logmanager-mdc-1.1:javaagent")
 include(":instrumentation:jdbc:bootstrap")
