JAXWS Metro metadata (#15187)

Author: jaydeluca

docs/instrumentation-list.yaml

@@ -5755,12 +5755,29 @@ libraries:
         - name: code.namespace
           type: STRING
   - name: jaxws-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
     scope:
       name: io.opentelemetry.jaxws-metro-2.2
     target_versions:
       javaagent:
       - com.sun.xml.ws:jaxws-rt:[2.2.0.1,)
+    configurations:
+    - name: otel.instrumentation.common.experimental.controller-telemetry.enabled
+      description: Enables the creation of experimental controller spans.
+      type: boolean
+      default: false
+    telemetry:
+    - when: otel.instrumentation.common.experimental.controller-telemetry.enabled=true
+      spans:
+      - span_kind: INTERNAL
+        attributes: []
   jboss:
   - name: jboss-logmanager-appender-1.1
     source_path: instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1

instrumentation-docs/instrumentations.sh

@@ -127,6 +127,7 @@ readonly INSTRUMENTATIONS=(
   "jaxws:jaxws-2.0-axis2-1.6:javaagent:test"
   "jaxws:jaxws-cxf-3.0:javaagent:test"
   "jaxws:jaxws-jws-api-1.1:javaagent:test"
+  "jaxws:jaxws-metro-2.2:javaagent:test"
   "jetty-httpclient:jetty-httpclient-12.0:javaagent:test"
   "jetty-httpclient:jetty-httpclient-9.2:javaagent:test"
   "jodd-http-4.2:javaagent:test"

instrumentation/jaxws/jaxws-2.0-metro-2.2-testing/build.gradle.kts

@@ -23,4 +23,27 @@ dependencies {
 
   compileOnly("javax.xml.ws:jaxws-api:2.0")
   compileOnly("jakarta.xml.ws:jakarta.xml.ws-api:3.0.0")
+
+  testImplementation("javax.servlet:javax.servlet-api:3.0.1")
+  testImplementation(project(":instrumentation:jaxws:jaxws-2.0-common-testing"))
+
+  testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent"))
+  testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent"))
+
+  testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
+  testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))
+
+  latestDepTestLibrary("com.sun.xml.ws:jaxws-rt:2.+") // see jaxws-3.0-metro-3.0-testing module
+  latestDepTestLibrary("com.sun.xml.stream.buffer:streambuffer:1.+") // see jaxws-3.0-metro-3.0-testing module
+}
+
+tasks.withType<Test>().configureEach {
+  // required on jdk17
+  jvmArgs("--add-exports=java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED")
+  jvmArgs("--add-exports=java.xml/com.sun.org.apache.xerces.internal.jaxp=ALL-UNNAMED")
+  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
+  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+  systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
+  systemProperty("metadataConfig", "otel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 }

instrumentation/jaxws/jaxws-metro-2.2/javaagent/build.gradle.kts

@@ -0,0 +1,13 @@
+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
+configurations:
+  - name: otel.instrumentation.common.experimental.controller-telemetry.enabled
+    description: Enables the creation of experimental controller spans.
+    type: boolean
+    default: false

instrumentation/jaxws/jaxws-2.0-metro-2.2-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/metro/MetroJaxWs2Test.java renamed to instrumentation/jaxws/jaxws-metro-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/metro/MetroJaxWs2Test.java

@@ -351,7 +351,6 @@ include(":instrumentation:jaxws:jaxws-2.0:javaagent")
 include(":instrumentation:jaxws:jaxws-2.0-arquillian-testing")
 include(":instrumentation:jaxws:jaxws-2.0-axis2-1.6:javaagent")
 include(":instrumentation:jaxws:jaxws-2.0-common-testing")
-include(":instrumentation:jaxws:jaxws-2.0-metro-2.2-testing")
 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")