PR review

Author: timfish

packages/node-native/src/event-loop-block-integration.ts

@@ -73,7 +73,7 @@ type ThreadBlockedReturn = (options?: Partial<ThreadBlockedIntegrationOptions>)
  * Monitors the Node.js event loop for blocking behavior and reports blocked events to Sentry.
  *
  * Uses a background worker thread to detect when the main thread is blocked for longer than
- * the configured threshold (default: 5 seconds).
+ * the configured threshold (default: 1 second).
  *
  * When instrumenting via the `--import` flag, this integration will
  * automatically monitor all worker threads as well.
@@ -213,6 +213,9 @@ export function disableBlockedDetectionForCallback<T>(callback: () => T | Promis
     return result.finally(() => integration.start());
   }
 
-  integration.start();
-  return result;
+  try {
+    return result;
+  } finally {
+    integration.start();
+  }
 }

packages/node-native/src/event-loop-block-watchdog.ts

@@ -217,7 +217,7 @@ function getExceptionAndThreads(
   };
 }
 
-async function sendAnrEvent(crashedThreadId: string): Promise<void> {
+async function sendBlockEvent(crashedThreadId: string): Promise<void> {
   if (isRateLimited()) {
     return;
   }
@@ -230,7 +230,11 @@ async function sendAnrEvent(crashedThreadId: string): Promise<void> {
     return;
   }
 
-  await sendAbnormalSession(crashedThread.state?.session);
+  try {
+    await sendAbnormalSession(crashedThread.state?.session);
+  } catch (error) {
+    log(`Failed to send abnormal session for thread '${crashedThreadId}':`, error);
+  }
 
   log('Sending event');
 
@@ -267,10 +271,14 @@ setInterval(async () => {
         continue;
       }
 
-      log(`Detected ANR for thread '${threadId}' with last seen time ${time} ms`);
+      log(`Blocked thread detected '${threadId}' last polled ${time} ms ago.`);
       triggeredThreads.add(threadId);
 
-      await sendAnrEvent(threadId);
+      try {
+        await sendBlockEvent(threadId);
+      } catch (error) {
+        log(`Failed to send event for thread '${threadId}':`, error);
+      }
     } else {
       triggeredThreads.delete(threadId);
     }