Add support for async dispatch requests

Keeps the transaction open until the response is committed.
getsentry · Dec 12, 2024 · 768f9ac · 768f9ac
1 parent e227906
commit 768f9ac
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 28 deletions.
diff --git a/...ry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/tracing/SentryTracingFilter.java b/...ry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/tracing/SentryTracingFilter.java
@@ -52,6 +52,11 @@ public SentryTracingFilter() {
     this(HubAdapter.getInstance());
   }
 
+  @Override
+  protected boolean shouldNotFilterAsyncDispatch() {
+    return false;
+  }
+
   /**
    * Creates filter that resolves transaction name using transaction name provider given by
    * parameter.
@@ -110,21 +115,23 @@ private void doFilterWithTransaction(
       transaction.setStatus(SpanStatus.INTERNAL_ERROR);
       throw e;
     } finally {
-      // after all filters run, templated path pattern is available in request attribute
-      final String transactionName = transactionNameProvider.provideTransactionName(httpRequest);
-      final TransactionNameSource transactionNameSource =
-          transactionNameProvider.provideTransactionSource();
-      // if transaction name is not resolved, the request has not been processed by a controller
-      // and we should not report it to Sentry
-      if (transactionName != null) {
-        transaction.setName(transactionName, transactionNameSource);
-        transaction.setOperation(TRANSACTION_OP);
-        // if exception has been thrown, transaction status is already set to INTERNAL_ERROR, and
-        // httpResponse.getStatus() returns 200.
-        if (transaction.getStatus() == null) {
-          transaction.setStatus(SpanStatus.fromHttpStatusCode(httpResponse.getStatus()));
+      if (!isAsyncStarted(httpRequest)) {
+        // after all filters run, templated path pattern is available in request attribute
+        final String transactionName = transactionNameProvider.provideTransactionName(httpRequest);
+        final TransactionNameSource transactionNameSource =
+            transactionNameProvider.provideTransactionSource();
+        // if transaction name is not resolved, the request has not been processed by a controller
+        // and we should not report it to Sentry
+        if (transactionName != null) {
+          transaction.setName(transactionName, transactionNameSource);
+          transaction.setOperation(TRANSACTION_OP);
+          // if exception has been thrown, transaction status is already set to INTERNAL_ERROR, and
+          // httpResponse.getStatus() returns 200.
+          if (transaction.getStatus() == null) {
+            transaction.setStatus(SpanStatus.fromHttpStatusCode(httpResponse.getStatus()));
+          }
+          transaction.finish();
         }
-        transaction.finish();
       }
     }
   }

diff --git a/sentry-spring/src/main/java/io/sentry/spring/tracing/SentryTracingFilter.java b/sentry-spring/src/main/java/io/sentry/spring/tracing/SentryTracingFilter.java
@@ -67,6 +67,11 @@ public SentryTracingFilter(final @NotNull IHub hub) {
     this(hub, new SpringMvcTransactionNameProvider());
   }
 
+  @Override
+  protected boolean shouldNotFilterAsyncDispatch() {
+    return false;
+  }
+
   @Override
   protected void doFilterInternal(
       final @NotNull HttpServletRequest httpRequest,
@@ -109,21 +114,23 @@ private void doFilterWithTransaction(
       transaction.setStatus(SpanStatus.INTERNAL_ERROR);
       throw e;
     } finally {
-      // after all filters run, templated path pattern is available in request attribute
-      final String transactionName = transactionNameProvider.provideTransactionName(httpRequest);
-      final TransactionNameSource transactionNameSource =
-          transactionNameProvider.provideTransactionSource();
-      // if transaction name is not resolved, the request has not been processed by a controller
-      // and we should not report it to Sentry
-      if (transactionName != null) {
-        transaction.setName(transactionName, transactionNameSource);
-        transaction.setOperation(TRANSACTION_OP);
-        // if exception has been thrown, transaction status is already set to INTERNAL_ERROR, and
-        // httpResponse.getStatus() returns 200.
-        if (transaction.getStatus() == null) {
-          transaction.setStatus(SpanStatus.fromHttpStatusCode(httpResponse.getStatus()));
+      if (!isAsyncStarted(httpRequest)) {
+        // after all filters run, templated path pattern is available in request attribute
+        final String transactionName = transactionNameProvider.provideTransactionName(httpRequest);
+        final TransactionNameSource transactionNameSource =
+            transactionNameProvider.provideTransactionSource();
+        // if transaction name is not resolved, the request has not been processed by a controller
+        // and we should not report it to Sentry
+        if (transactionName != null) {
+          transaction.setName(transactionName, transactionNameSource);
+          transaction.setOperation(TRANSACTION_OP);
+          // if exception has been thrown, transaction status is already set to INTERNAL_ERROR, and
+          // httpResponse.getStatus() returns 200.
+          if (transaction.getStatus() == null) {
+            transaction.setStatus(SpanStatus.fromHttpStatusCode(httpResponse.getStatus()));
+          }
+          transaction.finish();
         }
-        transaction.finish();
       }
     }
   }