Feedback

Author: trask

instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/internal/TracingInterceptor.java

@@ -44,7 +44,7 @@ public Response intercept(Chain chain) throws IOException {
     Response response;
     try (Scope ignored = context.makeCurrent()) {
       response = chain.proceed(request);
-    } catch (Exception t) {
+    } catch (Throwable t) {
       instrumenter.end(context, chain, null, t);
       throw t;
     }

instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/WebMvcTelemetryProducingFilter.java

@@ -60,20 +60,21 @@ public void doFilterInternal(
     }
 
     Context context = instrumenter.start(parentContext, request);
-    if (httpRouteSupport.hasMappings()) {
-      HttpServerRoute.update(context, CONTROLLER, httpRouteSupport::getHttpRoute, request);
-    }
     AsyncAwareHttpServletRequest asyncAwareRequest =
         new AsyncAwareHttpServletRequest(request, response, context);
-
+    Throwable error = null;
     try (Scope ignored = context.makeCurrent()) {
       filterChain.doFilter(asyncAwareRequest, response);
     } catch (Throwable t) {
-      instrumenter.end(context, request, response, t);
+      error = t;
       throw t;
-    }
-    if (asyncAwareRequest.isNotAsync()) {
-      instrumenter.end(context, request, response, null);
+    } finally {
+      if (httpRouteSupport.hasMappings()) {
+        HttpServerRoute.update(context, CONTROLLER, httpRouteSupport::getHttpRoute, request);
+      }
+      if (error != null || asyncAwareRequest.isNotAsync()) {
+        instrumenter.end(context, request, response, error);
+      }
     }
   }
 

instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/WebMvcTelemetryProducingFilter.java

@@ -60,20 +60,21 @@ public void doFilterInternal(
     }
 
     Context context = instrumenter.start(parentContext, request);
-    if (httpRouteSupport.hasMappings()) {
-      HttpServerRoute.update(context, CONTROLLER, httpRouteSupport::getHttpRoute, request);
-    }
     AsyncAwareHttpServletRequest asyncAwareRequest =
         new AsyncAwareHttpServletRequest(request, response, context);
-
+    Throwable error = null;
     try (Scope ignored = context.makeCurrent()) {
       filterChain.doFilter(asyncAwareRequest, response);
     } catch (Throwable t) {
-      instrumenter.end(context, request, response, t);
+      error = t;
       throw t;
-    }
-    if (asyncAwareRequest.isNotAsync()) {
-      instrumenter.end(context, request, response, null);
+    } finally {
+      if (httpRouteSupport.hasMappings()) {
+        HttpServerRoute.update(context, CONTROLLER, httpRouteSupport::getHttpRoute, request);
+      }
+      if (error != null || asyncAwareRequest.isNotAsync()) {
+        instrumenter.end(context, request, response, error);
+      }
     }
   }