fix: Dont capture our own XHR events that somehow bubbled-up to global handler

kamilogorek · kamilogorek · commit b92d32bd218a · 2019-08-29T13:21:58.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-- This slot is waiting for you
+- [browser] fix: Don't capture our own XHR events that somehow bubbled-up to global handler
 
 ## 5.6.2
 
diff --git a/packages/browser/src/integrations/globalhandlers.ts b/packages/browser/src/integrations/globalhandlers.ts
@@ -56,7 +56,8 @@ export class GlobalHandlers implements Integration {
     Error.stackTraceLimit = 50;
 
     _subscribe((stack: TraceKitStackTrace, _: boolean, error: any) => {
-      if (shouldIgnoreOnError()) {
+      const isFailedOwnDelivery = error && error.__sentry_own_request__ === true;
+      if (shouldIgnoreOnError() || isFailedOwnDelivery) {
         return;
       }
       const self = getCurrentHub().getIntegration(GlobalHandlers);
diff --git a/packages/browser/test/integration/suites/builtins.js b/packages/browser/test/integration/suites/builtins.js
@@ -304,6 +304,26 @@ describe("wrapped built-ins", function() {
         }
       });
     });
+
+    it("should skip our own failed requests that somehow bubbled-up to unhandledrejection handler", function() {
+      return runInSandbox(sandbox, function() {
+        if (isChrome()) {
+          Promise.reject({
+            __sentry_own_request__: true,
+          });
+          Promise.reject({
+            __sentry_own_request__: false,
+          });
+          Promise.reject({});
+        } else {
+          window.resolveTest({ window: window });
+        }
+      }).then(function(summary) {
+        if (summary.window.isChrome()) {
+          assert.equal(summary.events.length, 2);
+        }
+      });
+    });
   });
 
   it("should capture exceptions inside setTimeout", function() {

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,8 @@ export class GlobalHandlers implements Integration {`
`56`	`56`	`Error.stackTraceLimit = 50;`
`57`	`57`
`58`	`58`	`_subscribe((stack: TraceKitStackTrace, _: boolean, error: any) => {`
`59`		`- if (shouldIgnoreOnError()) {`
	`59`	`+ const isFailedOwnDelivery = error && error.__sentry_own_request__ === true;`
	`60`	`+ if (shouldIgnoreOnError() \|\| isFailedOwnDelivery) {`
`60`	`61`	`return;`
`61`	`62`	`}`
`62`	`63`	`const self = getCurrentHub().getIntegration(GlobalHandlers);`