Add support for cxf 4.0 jaxws (#12077)

Author: laurit

instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cxf/CxfServerSpanNaming.java

@@ -11,7 +11,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-cxf-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent"))
 }
 

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

@@ -12,7 +12,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-cxf-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent"))
 
   // wildfly version used to run tests

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

@@ -0,0 +1,27 @@
+plugins {
+  id("otel.javaagent-testing")
+}
+
+dependencies {
+  testLibrary("org.apache.cxf:cxf-rt-frontend-jaxws:4.0.0")
+  testLibrary("org.apache.cxf:cxf-rt-transports-http:4.0.0")
+
+  testImplementation("jakarta.servlet:jakarta.servlet-api:5.0.0")
+  testImplementation(project(":instrumentation:jaxws:jaxws-3.0-common-testing"))
+
+  testInstrumentation(project(":instrumentation:jaxws:jaxws-cxf-3.0:javaagent"))
+
+  testInstrumentation(project(":instrumentation:servlet:servlet-5.0:javaagent"))
+  testInstrumentation(project(":instrumentation:jetty:jetty-11.0:javaagent"))
+}
+
+otelJava {
+  minJavaVersionSupported.set(JavaVersion.VERSION_17)
+}
+
+tasks.withType<Test>().configureEach {
+  // required on jdk17
+  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
+  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}

instrumentation/jaxws/jaxws-3.0-cxf-4.0-testing/build.gradle.kts

@@ -0,0 +1,37 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import hello.HelloServiceImpl
+import io.opentelemetry.api.trace.Span
+import io.opentelemetry.context.Context
+import io.opentelemetry.instrumentation.api.instrumenter.LocalRootSpan
+import org.apache.cxf.jaxws.EndpointImpl
+import org.apache.cxf.message.Message
+import org.apache.cxf.phase.AbstractPhaseInterceptor
+import org.apache.cxf.phase.Phase
+import org.apache.cxf.transport.servlet.CXFNonSpringServlet
+
+import jakarta.servlet.ServletConfig
+
+class TestWsServlet extends CXFNonSpringServlet {
+  @Override
+  void loadBus(ServletConfig servletConfig) {
+    super.loadBus(servletConfig)
+
+    // publish test webservice
+    Object implementor = new HelloServiceImpl()
+    EndpointImpl endpoint = new EndpointImpl(bus, implementor)
+    endpoint.publish("/HelloService")
+    endpoint.getOutInterceptors().add(new AbstractPhaseInterceptor<Message>(Phase.SETUP) {
+      @Override
+      void handleMessage(Message message) {
+        Context context = Context.current()
+        if (LocalRootSpan.fromContext(context) != Span.fromContext(context)) {
+          throw new IllegalStateException("handler span should be ended before outgoing interceptors")
+        }
+      }
+    })
+  }
+}

instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/src/test/groovy/CxfJaxWsTest.groovy renamed to instrumentation/jaxws/jaxws-3.0-cxf-4.0-testing/src/test/groovy/CxfJaxWsTest.groovy

@@ -6,7 +6,7 @@ dependencies {
   compileOnly("javax.servlet:javax.servlet-api:3.0.1")
   compileOnly("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
 
-  implementation(project(":instrumentation:jaxws:jaxws-2.0-cxf-3.0:javaagent"))
+  implementation(project(":instrumentation:jaxws:jaxws-cxf-3.0:javaagent"))
 
   testImplementation(project(":instrumentation-api"))
   testImplementation("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")

instrumentation/jaxws/jaxws-3.0-cxf-4.0-testing/src/test/groovy/TestWsServlet.groovy

@@ -8,8 +8,9 @@ muzzle {
     module.set("cxf-rt-frontend-jaxws")
     // all earlier versions in maven central also pass muzzle check,
     // but 3.0.0 is already 8 years old and testing earlier versions adds complexity
-    versions.set("[3.0.0,4)")
+    versions.set("[3.0.0,)")
     extraDependency("javax.servlet:javax.servlet-api:3.0.1")
+    extraDependency("jakarta.servlet:jakarta.servlet-api:5.0.0")
   }
 }
 
@@ -18,6 +19,8 @@ dependencies {
 
   library("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
   compileOnly("javax.servlet:javax.servlet-api:3.0.1")
+  compileOnly("jakarta.servlet:jakarta.servlet-api:5.0.0")
+  compileOnly(project(":muzzle"))
 
   testLibrary("org.apache.cxf:cxf-rt-transports-http:3.0.0")