From 9565066ba470c9eb1009eb512119bdc91ef5d8e8 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 11 Mar 2025 12:49:01 -0700 Subject: [PATCH 1/2] Rename testing module --- .../jaxws/jaxws-2.0-axis2-1.6-testing/build.gradle.kts | 6 +++--- .../build.gradle.kts | 0 .../javaagent/instrumentation/axis2/Axis2JaxWs2Test.java | 0 .../instrumentation/axis2/CustomJaxWsDeployer.java | 0 .../test/resources/test-app/WEB-INF/classes/placeholder.txt | 0 .../src/test/resources/test-app/WEB-INF/lib/placeholder.txt | 0 .../src/test/resources/test-app/WEB-INF/web.xml | 0 settings.gradle.kts | 2 +- 8 files changed, 4 insertions(+), 4 deletions(-) rename instrumentation/jaxws/{jaxws-3.0-axis2-1.6-testing => jaxws-3.0-axis2-2.0-testing}/build.gradle.kts (100%) rename instrumentation/jaxws/{jaxws-3.0-axis2-1.6-testing => jaxws-3.0-axis2-2.0-testing}/src/test/java/io/opentelemetry/javaagent/instrumentation/axis2/Axis2JaxWs2Test.java (100%) rename instrumentation/jaxws/{jaxws-3.0-axis2-1.6-testing => jaxws-3.0-axis2-2.0-testing}/src/test/java/io/opentelemetry/javaagent/instrumentation/axis2/CustomJaxWsDeployer.java (100%) rename instrumentation/jaxws/{jaxws-3.0-axis2-1.6-testing => jaxws-3.0-axis2-2.0-testing}/src/test/resources/test-app/WEB-INF/classes/placeholder.txt (100%) rename instrumentation/jaxws/{jaxws-3.0-axis2-1.6-testing => jaxws-3.0-axis2-2.0-testing}/src/test/resources/test-app/WEB-INF/lib/placeholder.txt (100%) rename instrumentation/jaxws/{jaxws-3.0-axis2-1.6-testing => jaxws-3.0-axis2-2.0-testing}/src/test/resources/test-app/WEB-INF/web.xml (100%) diff --git a/instrumentation/jaxws/jaxws-2.0-axis2-1.6-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-axis2-1.6-testing/build.gradle.kts index f7b58a856a1d..3137f4a76975 100644 --- a/instrumentation/jaxws/jaxws-2.0-axis2-1.6-testing/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-2.0-axis2-1.6-testing/build.gradle.kts @@ -24,9 +24,9 @@ dependencies { testImplementation("com.sun.xml.ws:jaxws-rt:2.2.8") testImplementation("com.sun.xml.ws:jaxws-tools:2.2.8") - latestDepTestLibrary("org.apache.axis2:axis2-jaxws:1.+") // see jaxws-3.0-axis2-1.6-testing module - latestDepTestLibrary("org.apache.axis2:axis2-transport-http:1.+") // see jaxws-3.0-axis2-1.6-testing module - latestDepTestLibrary("org.apache.axis2:axis2-transport-local:1.+") // see jaxws-3.0-axis2-1.6-testing module + latestDepTestLibrary("org.apache.axis2:axis2-jaxws:1.+") // see jaxws-3.0-axis2-2.0-testing module + latestDepTestLibrary("org.apache.axis2:axis2-transport-http:1.+") // see jaxws-3.0-axis2-2.0-testing module + latestDepTestLibrary("org.apache.axis2:axis2-transport-local:1.+") // see jaxws-3.0-axis2-2.0-testing module } configurations.configureEach { diff --git a/instrumentation/jaxws/jaxws-3.0-axis2-1.6-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-3.0-axis2-2.0-testing/build.gradle.kts similarity index 100% rename from instrumentation/jaxws/jaxws-3.0-axis2-1.6-testing/build.gradle.kts rename to instrumentation/jaxws/jaxws-3.0-axis2-2.0-testing/build.gradle.kts diff --git a/instrumentation/jaxws/jaxws-3.0-axis2-1.6-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/axis2/Axis2JaxWs2Test.java b/instrumentation/jaxws/jaxws-3.0-axis2-2.0-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/axis2/Axis2JaxWs2Test.java similarity index 100% rename from instrumentation/jaxws/jaxws-3.0-axis2-1.6-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/axis2/Axis2JaxWs2Test.java rename to instrumentation/jaxws/jaxws-3.0-axis2-2.0-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/axis2/Axis2JaxWs2Test.java diff --git a/instrumentation/jaxws/jaxws-3.0-axis2-1.6-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/axis2/CustomJaxWsDeployer.java b/instrumentation/jaxws/jaxws-3.0-axis2-2.0-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/axis2/CustomJaxWsDeployer.java similarity index 100% rename from instrumentation/jaxws/jaxws-3.0-axis2-1.6-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/axis2/CustomJaxWsDeployer.java rename to instrumentation/jaxws/jaxws-3.0-axis2-2.0-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/axis2/CustomJaxWsDeployer.java diff --git a/instrumentation/jaxws/jaxws-3.0-axis2-1.6-testing/src/test/resources/test-app/WEB-INF/classes/placeholder.txt b/instrumentation/jaxws/jaxws-3.0-axis2-2.0-testing/src/test/resources/test-app/WEB-INF/classes/placeholder.txt similarity index 100% rename from instrumentation/jaxws/jaxws-3.0-axis2-1.6-testing/src/test/resources/test-app/WEB-INF/classes/placeholder.txt rename to instrumentation/jaxws/jaxws-3.0-axis2-2.0-testing/src/test/resources/test-app/WEB-INF/classes/placeholder.txt diff --git a/instrumentation/jaxws/jaxws-3.0-axis2-1.6-testing/src/test/resources/test-app/WEB-INF/lib/placeholder.txt b/instrumentation/jaxws/jaxws-3.0-axis2-2.0-testing/src/test/resources/test-app/WEB-INF/lib/placeholder.txt similarity index 100% rename from instrumentation/jaxws/jaxws-3.0-axis2-1.6-testing/src/test/resources/test-app/WEB-INF/lib/placeholder.txt rename to instrumentation/jaxws/jaxws-3.0-axis2-2.0-testing/src/test/resources/test-app/WEB-INF/lib/placeholder.txt diff --git a/instrumentation/jaxws/jaxws-3.0-axis2-1.6-testing/src/test/resources/test-app/WEB-INF/web.xml b/instrumentation/jaxws/jaxws-3.0-axis2-2.0-testing/src/test/resources/test-app/WEB-INF/web.xml similarity index 100% rename from instrumentation/jaxws/jaxws-3.0-axis2-1.6-testing/src/test/resources/test-app/WEB-INF/web.xml rename to instrumentation/jaxws/jaxws-3.0-axis2-2.0-testing/src/test/resources/test-app/WEB-INF/web.xml diff --git a/settings.gradle.kts b/settings.gradle.kts index e2f863ecf1cc..77b3f150a84a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -304,7 +304,7 @@ 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-1.6-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-2.2-testing") From 1e4adb1e4446003b6512ec689d5fa3e5cd1dacc4 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 11 Mar 2025 14:15:44 -0700 Subject: [PATCH 2/2] metro too --- .../jaxws/jaxws-2.0-metro-2.2-testing/build.gradle.kts | 4 ++-- .../build.gradle.kts | 0 .../javaagent/instrumentation/metro/MetroJaxWs3Test.java | 0 .../src/test/resources/test-app/WEB-INF/sun-jaxws.xml | 0 .../src/test/resources/test-app/WEB-INF/web.xml | 0 settings.gradle.kts | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) rename instrumentation/jaxws/{jaxws-3.0-metro-2.2-testing => jaxws-3.0-metro-3.0-testing}/build.gradle.kts (100%) rename instrumentation/jaxws/{jaxws-3.0-metro-2.2-testing => jaxws-3.0-metro-3.0-testing}/src/test/java/io/opentelemetry/javaagent/instrumentation/metro/MetroJaxWs3Test.java (100%) rename instrumentation/jaxws/{jaxws-3.0-metro-2.2-testing => jaxws-3.0-metro-3.0-testing}/src/test/resources/test-app/WEB-INF/sun-jaxws.xml (100%) rename instrumentation/jaxws/{jaxws-3.0-metro-2.2-testing => jaxws-3.0-metro-3.0-testing}/src/test/resources/test-app/WEB-INF/web.xml (100%) diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-metro-2.2-testing/build.gradle.kts index 95d3124c6c7c..f8307a77e21a 100644 --- a/instrumentation/jaxws/jaxws-2.0-metro-2.2-testing/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-2.0-metro-2.2-testing/build.gradle.kts @@ -18,8 +18,8 @@ dependencies { 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-2.2-testing module - latestDepTestLibrary("com.sun.xml.stream.buffer:streambuffer:1.+") // see jaxws-3.0-metro-2.2-testing module + 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().configureEach { diff --git a/instrumentation/jaxws/jaxws-3.0-metro-2.2-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-3.0-metro-3.0-testing/build.gradle.kts similarity index 100% rename from instrumentation/jaxws/jaxws-3.0-metro-2.2-testing/build.gradle.kts rename to instrumentation/jaxws/jaxws-3.0-metro-3.0-testing/build.gradle.kts diff --git a/instrumentation/jaxws/jaxws-3.0-metro-2.2-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/metro/MetroJaxWs3Test.java b/instrumentation/jaxws/jaxws-3.0-metro-3.0-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/metro/MetroJaxWs3Test.java similarity index 100% rename from instrumentation/jaxws/jaxws-3.0-metro-2.2-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/metro/MetroJaxWs3Test.java rename to instrumentation/jaxws/jaxws-3.0-metro-3.0-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/metro/MetroJaxWs3Test.java diff --git a/instrumentation/jaxws/jaxws-3.0-metro-2.2-testing/src/test/resources/test-app/WEB-INF/sun-jaxws.xml b/instrumentation/jaxws/jaxws-3.0-metro-3.0-testing/src/test/resources/test-app/WEB-INF/sun-jaxws.xml similarity index 100% rename from instrumentation/jaxws/jaxws-3.0-metro-2.2-testing/src/test/resources/test-app/WEB-INF/sun-jaxws.xml rename to instrumentation/jaxws/jaxws-3.0-metro-3.0-testing/src/test/resources/test-app/WEB-INF/sun-jaxws.xml diff --git a/instrumentation/jaxws/jaxws-3.0-metro-2.2-testing/src/test/resources/test-app/WEB-INF/web.xml b/instrumentation/jaxws/jaxws-3.0-metro-3.0-testing/src/test/resources/test-app/WEB-INF/web.xml similarity index 100% rename from instrumentation/jaxws/jaxws-3.0-metro-2.2-testing/src/test/resources/test-app/WEB-INF/web.xml rename to instrumentation/jaxws/jaxws-3.0-metro-3.0-testing/src/test/resources/test-app/WEB-INF/web.xml diff --git a/settings.gradle.kts b/settings.gradle.kts index 77b3f150a84a..aa8f8d605900 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -307,7 +307,7 @@ 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-2.2-testing") +include(":instrumentation:jaxws:jaxws-3.0-metro-3.0-testing") include(":instrumentation:jaxws:jaxws-common:javaagent") include(":instrumentation:jaxws:jaxws-cxf-3.0:javaagent") include(":instrumentation:jaxws:jaxws-cxf-3.0:javaagent-unit-tests")