Attach response to request on Jetty

open-telemetry · May 20, 2021 · 622f291 · 622f291
1 parent ead08ad
commit 622f291
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/...ain/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11HandlerAdvice.java b/...ain/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11HandlerAdvice.java
@@ -19,7 +19,8 @@ public class Jetty11HandlerAdvice {
   @Advice.OnMethodEnter(suppress = Throwable.class)
   public static void onEnter(
       @Advice.This Object source,
-      @Advice.Argument(value = 2, readOnly = false) HttpServletRequest request,
+      @Advice.Argument(2) HttpServletRequest request,
+      @Advice.Argument(3) HttpServletResponse response,
       @Advice.Local("otelContext") Context context,
       @Advice.Local("otelScope") Scope scope) {
 
@@ -31,6 +32,8 @@ public static void onEnter(
 
     context = tracer().startServerSpan(request);
     scope = context.makeCurrent();
+
+    tracer().setAsyncListenerResponse(request, response);
   }
 
   @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

diff --git a/.../main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8HandlerAdvice.java b/.../main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8HandlerAdvice.java
@@ -19,7 +19,8 @@ public class Jetty8HandlerAdvice {
   @Advice.OnMethodEnter(suppress = Throwable.class)
   public static void onEnter(
       @Advice.This Object source,
-      @Advice.Argument(value = 2, readOnly = false) HttpServletRequest request,
+      @Advice.Argument(2) HttpServletRequest request,
+      @Advice.Argument(3) HttpServletResponse response,
       @Advice.Local("otelContext") Context context,
       @Advice.Local("otelScope") Scope scope) {
 
@@ -31,6 +32,8 @@ public static void onEnter(
 
     context = tracer().startServerSpan(request);
     scope = context.makeCurrent();
+
+    tracer().setAsyncListenerResponse(request, response);
   }
 
   @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)