revert

Author: trask

.fossa.yml

@@ -567,7 +567,7 @@ targets:
       target: ':instrumentation:jaxws:jaxws-2.0-cxf-3.0:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:jaxws:jaxws-2.0-jws-api-1.1:javaagent'
+      target: ':instrumentation:jaxws:jaxws-jws-api-1.1:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:jaxws:jaxws-2.0-metro-2.2:javaagent'

.github/scripts/instrumentations.sh

@@ -141,7 +141,7 @@ readonly INSTRUMENTATIONS=(
   "jaxws:jaxws-2.0:javaagent:test"
   "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-jws-api-1.1:javaagent:test"
   "jaxws:jaxws-2.0-metro-2.2:javaagent:test"
   "jdbc:javaagent:test"
   "jdbc:javaagent:testStableSemconv"

CHANGELOG.md

@@ -3160,7 +3160,7 @@ too disruptive to adopt right away.
   - `io.opentelemetry.resteasy-3.0` → `io.opentelemetry.jaxrs-2.0-resteasy-3.0`
   - `io.opentelemetry.resteasy-3.1` → `io.opentelemetry.jaxrs-2.0-resteasy-3.1`
   - `io.opentelemetry.resteasy-6.0` → `io.opentelemetry.jaxrs-3.0-resteasy-6.0`
-  - `io.opentelemetry.jws-1.1` → `io.opentelemetry.jaxws-2.0-jws-api-1.1`
+  - `io.opentelemetry.jws-1.1` → `io.opentelemetry.jaxws-jws-api-1.1`
   - `io.opentelemetry.vertx-kafka-client-3.5` → `io.opentelemetry.vertx-kafka-client-3.6`
   - `io.opentelemetry.hibernate-4.3` → `io.opentelemetry.hibernate-procedure-call-4.3`
 - All methods in all `*Getter` classes in `instrumentation-api-semconv` have been renamed

docs/instrumentation-list.yaml

@@ -6772,17 +6772,17 @@ libraries:
     spans:
     - span_kind: INTERNAL
       attributes: []
-- name: jaxws-2.0-jws-api-1.1
+- name: jaxws-jws-api-1.1
   display_name: JWS API
   description: |
     This instrumentation enables controller spans for methods annotated with the @WebService annotation from the JWS API (controller spans are disabled by default).
   library_link: https://github.com/jakartaee/jws-api
   disabled_by_default: true
   features:
   - CONTROLLER_SPANS
-  source_path: instrumentation/jaxws/jaxws-2.0-jws-api-1.1
+  source_path: instrumentation/jaxws/jaxws-jws-api-1.1
   scope:
-    name: io.opentelemetry.jaxws-2.0-jws-api-1.1
+    name: io.opentelemetry.jaxws-jws-api-1.1
   has_javaagent: true
   javaagent_target_versions:
   - javax.jws:javax.jws-api:[1.1,]

instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/build.gradle.kts

@@ -28,7 +28,7 @@ dependencies {
   testImplementation(project(":instrumentation:jaxws:jaxws-2.0-common-testing"))
 
   testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent"))
-  testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0-jws-api-1.1:javaagent"))
+  testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent"))
   testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0-axis2-1.6:javaagent"))
 
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))

instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts

@@ -28,7 +28,7 @@ dependencies {
   testImplementation(project(":instrumentation:jaxws:jaxws-2.0-common-testing"))
 
   testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent"))
-  testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0-jws-api-1.1: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"))

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

@@ -26,7 +26,7 @@ dependencies {
   testImplementation(project(":instrumentation:jaxws:jaxws-2.0-common-testing"))
 
   testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent"))
-  testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0-jws-api-1.1: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"))

instrumentation/jaxws/jaxws-2.0-tomee-testing/build.gradle.kts

@@ -13,7 +13,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent"))
   testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0-cxf-3.0:javaagent"))
-  testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0-jws-api-1.1:javaagent"))
+  testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent"))
 }
 
 otelJava {

instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts

@@ -13,7 +13,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent"))
   testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0-cxf-3.0:javaagent"))
-  testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0-jws-api-1.1:javaagent"))
+  testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent"))
 
   // wildfly version used to run tests
   testServer("org.wildfly:wildfly-dist:18.0.0.Final@zip")