Merge branch 'master' into feat/tracing

Author: HazAT

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,13 +1,18 @@
 ---
-name: 🐛 Bug Report
+name: "\U0001F41B Bug Report"
 about: Report a reproducible bug or regression in Sentry JavaScript SDKs.
+title: ''
+labels: 'Status: Needs Triage'
+assignees: ''
+
 ---
 
 <!-- Requirements: please go through this checklist before opening a new issue -->
 
 - [ ] Review the documentation: https://docs.sentry.io/
 - [ ] Search for existing issues: https://github.com/getsentry/sentry-javascript/issues
 - [ ] Use the latest release: https://github.com/getsentry/sentry-javascript/releases
+- [ ] Provide a link to the affected event from your Sentry account
 
 ## Package + Version
 
@@ -25,4 +30,4 @@ about: Report a reproducible bug or regression in Sentry JavaScript SDKs.
 
 ## Description
 
-Describe your issue in detail, ideally you have a reproducible demo that you can show.
+Describe your issue in detail, ideally, you have a reproducible demo that you can show.

CHANGELOG.md

@@ -8,6 +8,10 @@
 - [hub] feat: Add new function to Scope `setContext`
 - [hub] feat: Add new function to Scope `setTransaction`
 
+## 5.1.3
+
+- [browser] fix: GlobalHandler integration sometimes receives Event objects as message: Fix #1949
+
 ## 5.1.2
 
 - [browser] fix: Fixed a bug if Sentry was initialized multiple times: Fix #2043

packages/browser/src/integrations/globalhandlers.ts

@@ -1,6 +1,6 @@
 import { getCurrentHub } from '@sentry/core';
 import { Event, Integration } from '@sentry/types';
-import { addExceptionTypeValue, logger, normalize, truncate } from '@sentry/utils';
+import { addExceptionTypeValue, isString, logger, normalize, truncate } from '@sentry/utils';
 
 import { eventFromStacktrace } from '../parsers';
 import {
@@ -91,6 +91,14 @@ export class GlobalHandlers implements Integration {
    * @param stacktrace TraceKitStackTrace to be converted to an Event.
    */
   private _eventFromGlobalHandler(stacktrace: TraceKitStackTrace): Event {
+    if (!isString(stacktrace.message) && stacktrace.mechanism !== 'onunhandledrejection') {
+      // There are cases where stacktrace.message is an Event object
+      // https://github.com/getsentry/sentry-javascript/issues/1949
+      // In this specific case we try to extract stacktrace.message.error.message
+      const message = (stacktrace.message as unknown) as any;
+      stacktrace.message =
+        message.error && isString(message.error.message) ? message.error.message : 'No error message';
+    }
     const event = eventFromStacktrace(stacktrace);
 
     const data: { [key: string]: string } = {

packages/integrations/src/ember.ts

@@ -42,7 +42,7 @@ export class Ember implements Integration {
       if (getCurrentHub().getIntegration(Ember)) {
         getCurrentHub().withScope(scope => {
           this._addIntegrationToSdkInfo(scope);
-          getCurrentHub().captureException(error);
+          getCurrentHub().captureException(error, { originalException: error });
         });
       }
 
@@ -61,7 +61,7 @@ export class Ember implements Integration {
             if (reason instanceof Error) {
               scope.setExtra('context', 'Unhandled Promise error detected');
               this._addIntegrationToSdkInfo(scope);
-              getCurrentHub().captureException(reason);
+              getCurrentHub().captureException(reason, { originalException: reason });
             } else {
               scope.setExtra('reason', reason);
               this._addIntegrationToSdkInfo(scope);