enforce http.error to be present even in synchronouse mode in tracing…

… valve
yupiik · May 22, 2023 · 45700f6 · 45700f6
1 parent aff5683
commit 45700f6
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/tracing/src/main/java/io/yupiik/uship/tracing/server/TracingValve.java b/tracing/src/main/java/io/yupiik/uship/tracing/server/TracingValve.java
@@ -30,6 +30,7 @@
 import java.time.Clock;
 import java.time.Instant;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
@@ -105,6 +106,9 @@ public void invoke(final Request request, final Response response) throws IOExce
         request.setAttribute(Span.class.getName(), span);
         try {
             getNext().invoke(request, response);
+        } catch (final RuntimeException | IOException | ServletException re) {
+            addErrorTag(tags, re);
+            throw re;
         } finally {
             if (request.isAsyncStarted()) {
                 request.getAsyncContext().addListener(new AsyncListener() {
@@ -126,9 +130,7 @@ public void onTimeout(final AsyncEvent event) {
 
                     @Override
                     public void onError(final AsyncEvent event) {
-                        tags.putIfAbsent("http.error", event.getThrowable() == null ?
-                                "unknown" :
-                                (event.getThrowable().getMessage() == null ? event.getThrowable().getClass().getName() : event.getThrowable().getMessage()));
+                        addErrorTag(tags, event.getThrowable());
                         status(event);
                     }
 
@@ -144,6 +146,12 @@ public void onStartAsync(final AsyncEvent event) {
         }
     }
 
+    protected void addErrorTag(final Map<String, Object> tags, final Throwable throwable) {
+        tags.putIfAbsent("http.error", throwable == null ?
+                "unknown" :
+                (throwable.getMessage() == null ? throwable.getClass().getName() : throwable.getMessage()));
+    }
+
     protected void finish(final HttpServletResponse response, final Span span, final Instant start) {
         final var end = clock.instant();
         span.getTags().putIfAbsent("http.status", response.getStatus());