s/onunhandledpromiserejection/onunhandledrejection/g and minor handler fixes

kamilogorek · kamilogorek · commit 673b65c8e658 · 2018-08-02T13:34:06.000+02:00
diff --git a/packages/browser/src/backend.ts b/packages/browser/src/backend.ts
@@ -105,8 +105,6 @@ export class BrowserBackend implements Backend {
       },
     };
 
-    console.log(event);
-
     return event;
   }
 
@@ -127,8 +125,6 @@ export class BrowserBackend implements Backend {
       };
     }
 
-    console.log(event);
-
     return event;
   }
 
diff --git a/packages/browser/src/integrations/globalhandlers.ts b/packages/browser/src/integrations/globalhandlers.ts
@@ -18,10 +18,10 @@ export class GlobalHandlers implements Integration {
   public constructor(
     private options: {
       onerror: boolean;
-      onunhandledpromiserejection: boolean;
+      onunhandledrejection: boolean;
     } = {
       onerror: true,
-      onunhandledpromiserejection: true,
+      onunhandledrejection: true,
     },
   ) {}
   /**
@@ -51,24 +51,22 @@ export class GlobalHandlers implements Integration {
       installGlobalHandler();
     }
 
-    if (this.options.onunhandledpromiserejection) {
-      logger.log('Global Handler attached: onunhandledpromiserejection');
+    if (this.options.onunhandledrejection) {
+      logger.log('Global Handler attached: onunhandledrejection');
       installGlobalUnhandledRejectionHandler();
     }
   }
 
   /** TODO */
   private eventFromGlobalHandler(stacktrace: TraceKitStackTrace): SentryEvent {
     const event = eventFromStacktrace(stacktrace);
-    console.log(event);
-    // TODO: Make a distinction between 'onunhandledrejection' and 'onerror'
     return {
       ...event,
       exception: {
         ...event.exception,
         mechanism: {
           handled: false,
-          type: 'onerror',
+          type: stacktrace.mode === 'onerror' ? 'onerror' : 'onunhandledrejection',
         },
       },
     };
diff --git a/packages/browser/src/parsers.ts b/packages/browser/src/parsers.ts
@@ -57,15 +57,18 @@ export function prepareFramesForEvent(stack: TraceKitStackFrame[]): StackFrame[]
     return [];
   }
 
-  return stack
-    .filter(
-      // TODO: This could be smarter
-      frame => !frame.func.includes('captureMessage') && !frame.func.includes('captureException'),
-    )
+  let localStack = stack;
+
+  // TODO: This could be smarter
+  if (localStack[0].func.includes('captureMessage') || localStack[0].func.includes('captureException')) {
+    localStack = localStack.slice(1);
+  }
+
+  return localStack
     .map(
       (frame: TraceKitStackFrame): StackFrame => ({
         colno: frame.column,
-        filename: frame.url || stack[0].url,
+        filename: frame.url || localStack[0].url,
         function: frame.func || '?',
         in_app: true,
         lineno: frame.line,

Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,6 @@ export class BrowserBackend implements Backend {`
`105`	`105`	`},`
`106`	`106`	`};`
`107`	`107`
`108`		`- console.log(event);`
`109`		`-`
`110`	`108`	`return event;`
`111`	`109`	`}`
`112`	`110`
`@@ -127,8 +125,6 @@ export class BrowserBackend implements Backend {`
`127`	`125`	`};`
`128`	`126`	`}`
`129`	`127`
`130`		`- console.log(event);`
`131`		`-`
`132`	`128`	`return event;`
`133`	`129`	`}`
`134`	`130`