Fix recording exceptions on server spans

airlift · May 4, 2024 · 0c765c2 · 0c765c2
1 parent 740a6fc
commit 0c765c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/jaxrs/src/main/java/io/airlift/jaxrs/tracing/TracingFilter.java b/jaxrs/src/main/java/io/airlift/jaxrs/tracing/TracingFilter.java
@@ -115,7 +115,6 @@ public void filter(ContainerRequestContext request, ContainerResponseContext res
                 span.setAttribute(SemanticAttributes.HTTP_RESPONSE_BODY_SIZE, response.getLength());
             }
         }
-        span.end();
     }
 
     private static String normalizePath(String path)

diff --git a/jaxrs/src/main/java/io/airlift/jaxrs/tracing/TracingServletFilter.java b/jaxrs/src/main/java/io/airlift/jaxrs/tracing/TracingServletFilter.java
@@ -36,6 +36,9 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
             if (request.getAttribute(TracingFilter.REQUEST_SCOPE) instanceof Scope scope) {
                 scope.close();
             }
+            if (request.getAttribute(TracingFilter.REQUEST_SPAN) instanceof Span span) {
+                span.end();
+            }
         }
     }
 }