Fix cxf-2.1 tests after jetty update from 12.0 to 12.1

Author: ygree

dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile

@@ -59,10 +59,10 @@ io.sqreen:libsqreen:17.3.0=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntim
 jakarta.activation:jakarta.activation-api:1.2.2=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
 jakarta.activation:jakarta.activation-api:2.1.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 jakarta.annotation:jakarta.annotation-api:1.3.5=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
-jakarta.annotation:jakarta.annotation-api:2.1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
-jakarta.servlet:jakarta.servlet-api:6.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+jakarta.annotation:jakarta.annotation-api:3.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:2.1.6=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
-jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 javax.activation:javax.activation-api:1.2.0=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
@@ -89,19 +89,19 @@ org.apache.cxf:cxf-api:2.1=compileClasspath
 org.apache.cxf:cxf-common-schemas:2.1=compileClasspath
 org.apache.cxf:cxf-common-utilities:2.1=compileClasspath
 org.apache.cxf:cxf-core:3.0.0=testCompileClasspath,testRuntimeClasspath
-org.apache.cxf:cxf-core:3.6.9=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
-org.apache.cxf:cxf-core:4.1.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+org.apache.cxf:cxf-core:3.6.10=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
+org.apache.cxf:cxf-core:4.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 org.apache.cxf:cxf-rt-frontend-jaxrs:3.0.0=testCompileClasspath,testRuntimeClasspath
-org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.9=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
-org.apache.cxf:cxf-rt-frontend-jaxrs:4.1.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
-org.apache.cxf:cxf-rt-security:3.6.9=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
-org.apache.cxf:cxf-rt-security:4.1.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.10=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
+org.apache.cxf:cxf-rt-frontend-jaxrs:4.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+org.apache.cxf:cxf-rt-security:3.6.10=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
+org.apache.cxf:cxf-rt-security:4.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 org.apache.cxf:cxf-rt-transports-http-jetty:3.0.0=testCompileClasspath,testRuntimeClasspath
-org.apache.cxf:cxf-rt-transports-http-jetty:3.6.9=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
-org.apache.cxf:cxf-rt-transports-http-jetty:4.1.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+org.apache.cxf:cxf-rt-transports-http-jetty:3.6.10=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
+org.apache.cxf:cxf-rt-transports-http-jetty:4.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 org.apache.cxf:cxf-rt-transports-http:3.0.0=testCompileClasspath,testRuntimeClasspath
-org.apache.cxf:cxf-rt-transports-http:3.6.9=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
-org.apache.cxf:cxf-rt-transports-http:4.1.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+org.apache.cxf:cxf-rt-transports-http:3.6.10=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
+org.apache.cxf:cxf-rt-transports-http:4.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 org.apache.geronimo.specs:geronimo-activation_1.1_spec:1.0.2=compileClasspath
 org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.1.1=compileClasspath
 org.apache.geronimo.specs:geronimo-servlet_3.0_spec:1.0=testCompileClasspath,testRuntimeClasspath
@@ -130,25 +130,25 @@ org.codehaus.woodstox:wstx-asl:3.2.4=compileClasspath
 org.codenarc:CodeNarc:3.7.0=codenarc
 org.dom4j:dom4j:2.2.0=spotbugs
 org.eclipse.angus:angus-activation:2.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+org.eclipse.jetty.ee11:jetty-ee11-servlet:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016=testCompileClasspath,testRuntimeClasspath
 org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
 org.eclipse.jetty:jetty-continuation:8.1.15.v20140411=testCompileClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-http:10.0.26=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
-org.eclipse.jetty:jetty-http:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 org.eclipse.jetty:jetty-http:8.1.15.v20140411=testCompileClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-io:10.0.26=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
-org.eclipse.jetty:jetty-io:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 org.eclipse.jetty:jetty-io:8.1.15.v20140411=testCompileClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-security:10.0.26=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
-org.eclipse.jetty:jetty-security:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 org.eclipse.jetty:jetty-security:8.1.15.v20140411=testCompileClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-server:10.0.26=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
-org.eclipse.jetty:jetty-server:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 org.eclipse.jetty:jetty-server:8.1.15.v20140411=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-session:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 org.eclipse.jetty:jetty-util:10.0.26=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
-org.eclipse.jetty:jetty-util:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 org.eclipse.jetty:jetty-util:8.1.15.v20140411=testCompileClasspath,testRuntimeClasspath
 org.glassfish.jaxb:jaxb-core:4.0.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 org.glassfish.jaxb:jaxb-runtime:2.3.5=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
@@ -159,6 +159,7 @@ org.gmetrics:GMetrics:2.1.0=codenarc
 org.hamcrest:hamcrest-core:1.3=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jctools:jctools-core:3.3.0=buildTimeInstrumentationPlugin,cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.14.1=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.14.1=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-params:5.14.1=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/JettyResponseInstrumentation.java

@@ -0,0 +1,50 @@
+package datadog.trace.instrumentation.jetty12;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+import static net.bytebuddy.matcher.ElementMatchers.takesNoArguments;
+
+import datadog.trace.agent.tooling.Instrumenter;
+import net.bytebuddy.asm.Advice;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
+import org.eclipse.jetty.server.internal.HttpChannelState.ChannelResponse;
+
+final class JettyResponseInstrumentation
+    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+  @Override
+  public String instrumentedType() {
+    return "org.eclipse.jetty.server.internal.HttpChannelState$ChannelResponse";
+  }
+
+  @Override
+  public void methodAdvice(MethodTransformer transformer) {
+    transformer.applyAdvice(
+        named("succeeded").and(takesNoArguments()),
+        JettyResponseInstrumentation.class.getName() + "$ResponseSuccessAdvice");
+    transformer.applyAdvice(
+        named("failed").and(takesArguments(1)),
+        JettyResponseInstrumentation.class.getName() + "$ResponseFailureAdvice");
+  }
+
+  public static class ResponseSuccessAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void stopSpan(@Advice.This final Response response) {
+      if (response instanceof ChannelResponse) {
+        Request req = ((ChannelResponse) response).getRequest();
+        JettyServerAdvice.finishSpan(req, response, null);
+      }
+    }
+  }
+
+  public static class ResponseFailureAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void stopSpan(
+        @Advice.This final Response response, @Advice.Argument(0) final Throwable failure) {
+      if (response instanceof ChannelResponse) {
+        Request req = ((ChannelResponse) response).getRequest();
+        JettyServerAdvice.finishSpan(req, response, failure);
+      }
+    }
+  }
+}

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java

@@ -1,66 +1,87 @@
 package datadog.trace.instrumentation.jetty12;
 
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
-import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter.ExcludeType.RUNNABLE;
+import static datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator.DD_CONTEXT_ATTRIBUTE;
+import static datadog.trace.instrumentation.jetty12.JettyDecorator.DECORATE;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 import static net.bytebuddy.matcher.ElementMatchers.takesNoArguments;
 
-import com.google.auto.service.AutoService;
-import datadog.trace.agent.tooling.ExcludeFilterProvider;
+import datadog.context.Context;
+import datadog.context.ContextScope;
 import datadog.trace.agent.tooling.Instrumenter;
-import datadog.trace.agent.tooling.InstrumenterModule;
-import datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-
-@AutoService(InstrumenterModule.class)
-public final class JettyServerInstrumentation extends InstrumenterModule.Tracing
-    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
-
-  public JettyServerInstrumentation() {
-    super("jetty");
-  }
+import datadog.trace.api.CorrelationIdentifier;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import net.bytebuddy.asm.Advice;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.internal.HttpChannelState;
 
+final class JettyServerInstrumentation
+    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
   @Override
   public String instrumentedType() {
     return "org.eclipse.jetty.server.internal.HttpChannelState";
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ExtractAdapter",
-      packageName + ".ExtractAdapter$Request",
-      packageName + ".ExtractAdapter$Response",
-      packageName + ".JettyDecorator",
-      packageName + ".RequestURIDataAdapter",
-      packageName + ".JettyServerAdvice",
-      packageName + ".JettyServerAdvice$HandleAdvice",
-      packageName + ".JettyServerAdvice$ResetAdvice",
-      packageName + ".JettyRunnableWrapper"
-    };
-  }
-
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(
-        named("onRequest").and(takesArguments(1)), packageName + ".JettyServerAdvice$HandleAdvice");
+        named("onRequest").and(takesArguments(1)),
+        JettyServerInstrumentation.class.getName() + "$HandleAdvice");
     transformer.applyAdvice(
-        named("recycle").and(takesNoArguments()), packageName + ".JettyServerAdvice$ResetAdvice");
+        named("recycle").and(takesNoArguments()),
+        JettyServerInstrumentation.class.getName() + "$ResetAdvice");
   }
 
-  @Override
-  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
-    return Collections.singletonMap(
-        RUNNABLE,
-        Arrays.asList(
-            "org.eclipse.jetty.util.thread.strategy.ProduceConsume",
-            "org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume",
-            "org.eclipse.jetty.io.ManagedSelector",
-            "org.eclipse.jetty.util.thread.TimerScheduler",
-            "org.eclipse.jetty.util.thread.TimerScheduler$SimpleTask",
-            "org.eclipse.jetty.util.thread.SerializedInvoker$NamedRunnable"));
+  public static class HandleAdvice {
+
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(
+        @Advice.This final HttpChannelState channel,
+        @Advice.Return(readOnly = false) Runnable ret) {
+      Request req = channel.getRequest();
+      Object existingContext = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+      if (existingContext instanceof Context) {
+        try (final ContextScope scope = ((Context) existingContext).attach()) {
+          ret = JettyRunnableWrapper.wrapIfNeeded(ret);
+          return;
+        }
+      }
+
+      final Context parentContext = DECORATE.extract(req);
+      final Context context = DECORATE.startSpan(req, parentContext);
+      try (final ContextScope ignored = context.attach()) {
+        final AgentSpan span = AgentSpan.fromContext(context);
+        span.setMeasured(true);
+        DECORATE.afterStart(span);
+        DECORATE.onRequest(span, req, req, parentContext);
+
+        req.setAttribute(DD_CONTEXT_ATTRIBUTE, context);
+        req.setAttribute(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
+        req.setAttribute(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
+        ret = JettyRunnableWrapper.wrapIfNeeded(ret);
+      }
+    }
+  }
+
+  /**
+   * Jetty ensures that connections are reset immediately after the response is sent. This provides
+   * a reliable point to finish the server span at the last possible moment.
+   */
+  public static class ResetAdvice {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void stopSpan(@Advice.This final HttpChannelState channel) {
+      Request req = channel.getRequest();
+      Object contextObj = req.getAttribute(DD_CONTEXT_ATTRIBUTE);
+      if (contextObj instanceof Context) {
+        final Context context = (Context) contextObj;
+        final AgentSpan span = AgentSpan.fromContext(context);
+        if (span != null) {
+          DECORATE.onResponse(span, channel);
+          DECORATE.beforeFinish(context);
+          span.finish();
+        }
+        req.removeAttribute(DD_CONTEXT_ATTRIBUTE);
+      }
+    }
   }
 }

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerModule.java

@@ -0,0 +1,54 @@
+package datadog.trace.instrumentation.jetty12;
+
+import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter.ExcludeType.RUNNABLE;
+import static java.util.Arrays.asList;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.ExcludeFilterProvider;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.InstrumenterModule;
+import datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+@AutoService(InstrumenterModule.class)
+public final class JettyServerModule extends InstrumenterModule.Tracing
+    implements ExcludeFilterProvider {
+
+  public JettyServerModule() {
+    super("jetty");
+  }
+
+  @Override
+  public List<Instrumenter> typeInstrumentations() {
+    return asList(new JettyServerInstrumentation(), new JettyResponseInstrumentation());
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".ExtractAdapter",
+      packageName + ".ExtractAdapter$Request",
+      packageName + ".ExtractAdapter$Response",
+      packageName + ".JettyDecorator",
+      packageName + ".RequestURIDataAdapter",
+      packageName + ".JettyServerAdvice",
+      packageName + ".JettyRunnableWrapper"
+    };
+  }
+
+  @Override
+  public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
+    return Collections.singletonMap(
+        RUNNABLE,
+        asList(
+            "org.eclipse.jetty.util.thread.strategy.ProduceConsume",
+            "org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume",
+            "org.eclipse.jetty.io.ManagedSelector",
+            "org.eclipse.jetty.util.thread.TimerScheduler",
+            "org.eclipse.jetty.util.thread.TimerScheduler$SimpleTask",
+            "org.eclipse.jetty.util.thread.SerializedInvoker$NamedRunnable"));
+  }
+}

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyDecorator.java

@@ -91,6 +91,10 @@ protected String getRequestHeader(final Request request, String key) {
   public AgentSpan onResponse(AgentSpan span, HttpChannelState channel) {
     Request request = channel.getRequest();
     Response response = channel.getResponse();
+    return onResponse(span, request, response);
+  }
+
+  public AgentSpan onResponse(AgentSpan span, Request request, Response response) {
     if (Config.get().isServletPrincipalEnabled()) {
       final Request.AuthenticationState authenticationState =
           Request.getAuthenticationState(request);