feat: Move mechanism to exception

Author: HazAT

CHANGELOG.md

@@ -37,6 +37,7 @@ since we removed some methods from the public API and removed some classes from
 - **breaking** [all] ref: Expose `module` in `package.json` as entry point for esm builds.
 - [hub] feat: Introduce `setExtra`, `setTags`, `clearBreadcrumbs` additionally some `set` on the Scope now accept no
   argument which makes it possible to unset the value.
+- [browser/node] feat: Add `synthetic` to `mechanism` in exception.
 
 ## 4.6.4
 

packages/browser/src/backend.ts

@@ -1,9 +1,10 @@
 import { BaseBackend } from '@sentry/core';
 import { Event, EventHint, Options, Severity, Transport } from '@sentry/types';
 import { isDOMError, isDOMException, isError, isErrorEvent, isPlainObject } from '@sentry/utils/is';
+import { addExceptionTypeValue } from '@sentry/utils/misc';
 import { supportsBeacon, supportsFetch } from '@sentry/utils/supports';
 import { SyncPromise } from '@sentry/utils/syncpromise';
-import { addExceptionTypeValue, eventFromPlainObject, eventFromStacktrace, prepareFramesForEvent } from './parsers';
+import { eventFromPlainObject, eventFromStacktrace, prepareFramesForEvent } from './parsers';
 import { computeStackTrace } from './tracekit';
 import { BeaconTransport, FetchTransport, XHRTransport } from './transports';
 
@@ -88,8 +89,12 @@ export class BrowserBackend extends BaseBackend<BrowserOptions> {
       // which is much better than creating new group when any key/value change
       const objectException = exception as {};
       event = eventFromPlainObject(objectException, hint.syntheticException);
-      addExceptionTypeValue(event, 'Custom Object');
-      return SyncPromise.resolve(this.buildEvent(event, hint, true));
+      addExceptionTypeValue(event, 'Custom Object', undefined, {
+        handled: true,
+        synthetic: true,
+        type: 'generic',
+      });
+      return SyncPromise.resolve(this.buildEvent(event, hint));
     }
 
     // If none of previous checks were valid, then it means that
@@ -100,26 +105,22 @@ export class BrowserBackend extends BaseBackend<BrowserOptions> {
     // So bail out and capture it as a simple message:
     const stringException = exception as string;
     return this.eventFromMessage(stringException, undefined, hint).then(messageEvent => {
-      addExceptionTypeValue(messageEvent, `${stringException}`);
-      return SyncPromise.resolve(this.buildEvent(messageEvent, hint, true));
+      addExceptionTypeValue(messageEvent, `${stringException}`, undefined, {
+        handled: true,
+        synthetic: true,
+        type: 'generic',
+      });
+      return SyncPromise.resolve(this.buildEvent(messageEvent, hint));
     });
   }
 
   /**
    * This is an internal helper function that creates an event.
    */
-  private buildEvent(event: Event, hint?: EventHint, isSynthetic?: boolean): Event {
+  private buildEvent(event: Event, hint?: EventHint): Event {
     return {
       ...event,
       event_id: hint && hint.event_id,
-      exception: {
-        ...event.exception,
-        mechanism: {
-          handled: true,
-          synthetic: isSynthetic,
-          type: 'generic',
-        },
-      },
     };
   }
 

packages/browser/src/integrations/globalhandlers.ts

@@ -1,9 +1,10 @@
 import { getCurrentHub } from '@sentry/core';
 import { Event, Integration } from '@sentry/types';
 import { logger } from '@sentry/utils/logger';
+import { addExceptionTypeValue } from '@sentry/utils/misc';
 import { normalize } from '@sentry/utils/object';
 import { truncate } from '@sentry/utils/string';
-import { addExceptionTypeValue, eventFromStacktrace } from '../parsers';
+import { eventFromStacktrace } from '../parsers';
 import {
   installGlobalHandler,
   installGlobalUnhandledRejectionHandler,
@@ -104,14 +105,6 @@ export class GlobalHandlers implements Integration {
 
     const newEvent: Event = {
       ...event,
-      exception: {
-        ...event.exception,
-        mechanism: {
-          data,
-          handled: false,
-          type: stacktrace.mechanism,
-        },
-      },
     };
 
     const client = getCurrentHub().getClient();
@@ -123,7 +116,11 @@ export class GlobalHandlers implements Integration {
     const fallbackType = stacktrace.mechanism === 'onunhandledrejection' ? 'UnhandledRejection' : 'Error';
 
     // This makes sure we have type/value in every exception
-    addExceptionTypeValue(newEvent, fallbackValue, fallbackType);
+    addExceptionTypeValue(newEvent, fallbackValue, fallbackType, {
+      data,
+      handled: false,
+      type: stacktrace.mechanism,
+    });
 
     return newEvent;
   }

packages/browser/src/integrations/helpers.ts

@@ -92,7 +92,10 @@ export function wrap(
 
           if (options.mechanism) {
             processedEvent.exception = processedEvent.exception || {};
-            processedEvent.exception.mechanism = options.mechanism;
+            processedEvent.exception.values = processedEvent.exception.values || [];
+            processedEvent.exception.values[0] = processedEvent.exception.values[0] || {};
+            processedEvent.exception.values[0].mechanism =
+              processedEvent.exception.values[0].mechanism || options.mechanism;
           }
 
           processedEvent.extra = {