browser: Fixed mechanism for wrapped functions and eventFromObject thingy

Author: kamilogorek

packages/browser/src/integrations/helpers.ts

@@ -30,9 +30,9 @@ export function ignoreNextOnError(): void {
  */
 export function wrap(
   fn: SentryWrappedFunction,
-  options?: {
-    mechanism?: object;
-  },
+  options: {
+    mechanism?: Mechanism;
+  } = {},
   before?: SentryWrappedFunction,
 ): any {
   try {
@@ -66,10 +66,16 @@ export function wrap(
       ignoreNextOnError();
 
       getCurrentHub().withScope(async () => {
-        getCurrentHub().addEventProcessor(async (event: SentryEvent) => ({
-          ...event,
-          ...(options && options.mechanism),
-        }));
+        getCurrentHub().addEventProcessor(async (event: SentryEvent) => {
+          const processedEvent = { ...event };
+
+          if (options.mechanism) {
+            processedEvent.exception = processedEvent.exception || {};
+            processedEvent.exception.mechanism = options.mechanism;
+          }
+
+          return processedEvent;
+        });
 
         getCurrentHub().captureException(ex);
       });

packages/browser/src/integrations/trycatch.ts

@@ -20,6 +20,7 @@ export class TryCatch implements Integration {
       args[0] = wrap(originalCallback, {
         mechanism: {
           data: { function: original.name || '<anonymous>' },
+          handled: true,
           type: 'instrument',
         },
       });
@@ -37,6 +38,7 @@ export class TryCatch implements Integration {
               function: 'requestAnimationFrame',
               handler: (original && original.name) || '<anonymous>',
             },
+            handled: true,
             type: 'instrument',
           },
         }),
@@ -70,6 +72,7 @@ export class TryCatch implements Integration {
                 handler: ((fn as any) as SentryWrappedFunction).name || '<anonymous>',
                 target,
               },
+              handled: true,
               type: 'instrument',
             },
           });
@@ -124,6 +127,7 @@ export class TryCatch implements Integration {
                   handler: ((fn as any) as SentryWrappedFunction).name || '<anonymous>',
                   target,
                 },
+                handled: true,
                 type: 'instrument',
               },
             },

packages/browser/src/parsers.ts

@@ -1,7 +1,7 @@
 import { SentryEvent, StackFrame } from '@sentry/types';
 import { limitObjectDepthToSize, serializeKeysToEventMessage } from '@sentry/utils/object';
 import * as md5proxy from 'md5';
-import { StackFrame as TraceKitStackFrame, StackTrace as TraceKitStackTrace } from './tracekit';
+import { computeStackTrace, StackFrame as TraceKitStackFrame, StackTrace as TraceKitStackTrace } from './tracekit';
 
 // Workaround for Rollup issue with overloading namespaces
 // https://github.com/rollup/rollup/issues/1267#issuecomment-296395734
@@ -10,21 +10,25 @@ const md5 = ((md5proxy as any).default || md5proxy) as (input: string) => string
 const STACKTRACE_LIMIT = 50;
 
 /** JSDoc */
-export function getEventOptionsFromPlainObject(exception: {}): {
-  extra: {
-    __serialized__: object;
-  };
-  fingerprint: [string];
-  message: string;
-} {
+export function eventFromPlainObject(exception: {}, syntheticException: Error | null): SentryEvent {
   const exceptionKeys = Object.keys(exception).sort();
-  return {
+  const event: SentryEvent = {
     extra: {
       __serialized__: limitObjectDepthToSize(exception),
     },
     fingerprint: [md5(exceptionKeys.join(''))],
     message: `Non-Error exception captured with keys: ${serializeKeysToEventMessage(exceptionKeys)}`,
   };
+
+  if (syntheticException) {
+    const stacktrace = computeStackTrace(syntheticException);
+    const frames = prepareFramesForEvent(stacktrace.stack);
+    event.stacktrace = {
+      frames,
+    };
+  }
+
+  return event;
 }
 
 /** JSDoc */