fix: Call setupOnce in integrations

Author: HazAT

packages/browser/src/integrations/breadcrumbs.ts

@@ -1,5 +1,5 @@
 import { API, getCurrentHub, logger } from '@sentry/core';
-import { Integration, Severity } from '@sentry/types';
+import { Breadcrumb, Integration, SentryBreadcrumbHint, Severity } from '@sentry/types';
 import { isFunction, isString } from '@sentry/utils/is';
 import { getEventDescription, getGlobalObject, parseUrl } from '@sentry/utils/misc';
 import { deserialize, fill } from '@sentry/utils/object';
@@ -27,7 +27,7 @@ function addSentryBreadcrumb(serializedData: string): void {
   try {
     const event: { [key: string]: any } = deserialize(serializedData);
 
-    getCurrentHub().addBreadcrumb(
+    Breadcrumbs.addBreadcrumb(
       {
         category: 'sentry',
         event_id: event.event_id,
@@ -113,7 +113,7 @@ export class Breadcrumbs implements Integration {
           breadcrumbData.level = Severity.Error;
         }
 
-        getCurrentHub().addBreadcrumb(breadcrumbData, {
+        Breadcrumbs.addBreadcrumb(breadcrumbData, {
           input: args,
           result,
         });
@@ -156,7 +156,7 @@ export class Breadcrumbs implements Integration {
             }
           }
 
-          getCurrentHub().addBreadcrumb(breadcrumbData, {
+          Breadcrumbs.addBreadcrumb(breadcrumbData, {
             input: args,
             level,
           });
@@ -230,7 +230,7 @@ export class Breadcrumbs implements Integration {
           .apply(global, args)
           .then((response: Response) => {
             fetchData.status_code = response.status;
-            getCurrentHub().addBreadcrumb(
+            Breadcrumbs.addBreadcrumb(
               {
                 category: 'fetch',
                 data: fetchData,
@@ -244,7 +244,7 @@ export class Breadcrumbs implements Integration {
             return response;
           })
           .catch((error: Error) => {
-            getCurrentHub().addBreadcrumb(
+            Breadcrumbs.addBreadcrumb(
               {
                 category: 'fetch',
                 data: fetchData,
@@ -295,7 +295,7 @@ export class Breadcrumbs implements Integration {
         from = parsedFrom.relative;
       }
 
-      getCurrentHub().addBreadcrumb({
+      Breadcrumbs.addBreadcrumb({
         category: 'navigation',
         data: {
           from,
@@ -404,7 +404,7 @@ export class Breadcrumbs implements Integration {
               } catch (e) {
                 /* do nothing */
               }
-              getCurrentHub().addBreadcrumb(
+              Breadcrumbs.addBreadcrumb(
                 {
                   category: 'xhr',
                   data: xhr.__sentry_xhr__,
@@ -447,6 +447,13 @@ export class Breadcrumbs implements Integration {
         },
     );
   }
+
+  public static addBreadcrumb(breadcrumb: Breadcrumb, hint?: SentryBreadcrumbHint): void {
+    if (getCurrentHub().getIntegration('Breadcrumbs')) {
+      getCurrentHub().addBreadcrumb(breadcrumb, hint);
+    }
+  }
+
   /**
    * Instrument browser built-ins w/ breadcrumb capturing
    *  - Console API

packages/browser/src/integrations/reportingobserver.ts

@@ -1,4 +1,4 @@
-import { captureMessage, withScope } from '@sentry/core';
+import { captureMessage, getCurrentHub, withScope } from '@sentry/core';
 import { Integration } from '@sentry/types';
 import { getGlobalObject } from '@sentry/utils/misc';
 import { supportsReportingObserver } from '@sentry/utils/supports';
@@ -92,6 +92,9 @@ export class ReportingObserver implements Integration {
    * @inheritDoc
    */
   public handler(reports: Report[]): void {
+    if (!getCurrentHub().getIntegration(this.name)) {
+      return;
+    }
     for (const report of reports) {
       withScope(scope => {
         scope.setExtra('url', report.url);

packages/browser/src/integrations/useragent.ts

@@ -15,9 +15,9 @@ export class UserAgent implements Integration {
    * @inheritDoc
    */
   public setupOnce(): void {
-    if (getCurrentHub().getIntegration(this.name)) {
-      configureScope(scope => {
-        scope.addEventProcessor(async (event: SentryEvent) => {
+    configureScope(scope => {
+      scope.addEventProcessor(async (event: SentryEvent) => {
+        if (getCurrentHub().getIntegration(this.name)) {
           if (!global.navigator || !global.location) {
             return event;
           }
@@ -32,8 +32,9 @@ export class UserAgent implements Integration {
             ...event,
             request,
           };
-        });
+        }
+        return event;
       });
-    }
+    });
   }
 }

packages/core/src/integrations/index.ts

@@ -24,9 +24,9 @@ export interface IntegrationIndex {
  */
 export function setupIntegrations<O extends Options>(options: O): IntegrationIndex {
   const integrations: IntegrationIndex = {};
-  let integrationsToInstall = options.defaultIntegrations === false ? [] : [...options.defaultIntegrations];
-  if (Array.isArray(integrationsToInstall)) {
-    const providedIntegrationsNames = integrationsToInstall.map(i => i.name);
+  let integrationsToInstall = (options.defaultIntegrations && [...options.defaultIntegrations]) || [];
+  if (Array.isArray(options.integrations)) {
+    const providedIntegrationsNames = options.integrations.map(i => i.name);
     integrationsToInstall = [
       // Leave only unique integrations, that were not overridden with provided integrations with the same name
       ...integrationsToInstall.filter(integration => providedIntegrationsNames.indexOf(integration.name) === -1),
@@ -39,10 +39,10 @@ export function setupIntegrations<O extends Options>(options: O): IntegrationInd
   // Just in case someone will return non-array from a `itegrations` callback
   if (Array.isArray(integrationsToInstall)) {
     integrationsToInstall.forEach(integration => {
+      integrations[name] = integration;
       if (installedIntegrations.indexOf(integration.name) !== -1) {
         return;
       }
-      integrations[name] = integration;
       try {
         if (integration.setupOnce) {
           // TODO remove

packages/core/src/integrations/pluggable/debug.ts

@@ -33,12 +33,11 @@ export class Debug implements Integration {
    * @inheritDoc
    */
   public install(): void {
-    if (getCurrentHub().getIntegration(this.name)) {
-      configureScope(scope => {
-        scope.addEventProcessor(async (event: SentryEvent, hint?: SentryEventHint) => {
+    configureScope(scope => {
+      scope.addEventProcessor(async (event: SentryEvent, hint?: SentryEventHint) => {
+        if (getCurrentHub().getIntegration(this.name)) {
           // tslint:disable:no-console
           // tslint:disable:no-debugger
-
           if (this.options.debugger) {
             debugger;
           }
@@ -54,9 +53,9 @@ export class Debug implements Integration {
               console.log(hint);
             }
           }
-          return event;
-        });
+        }
+        return event;
       });
-    }
+    });
   }
 }

packages/core/src/integrations/pluggable/rewriteframes.ts

@@ -43,11 +43,14 @@ export class RewriteFrames implements Integration {
    * @inheritDoc
    */
   public install(): void {
-    if (getCurrentHub().getIntegration(this.name)) {
-      getCurrentHub().configureScope((scope: Scope) => {
-        scope.addEventProcessor(async event => this.process(event));
+    getCurrentHub().configureScope((scope: Scope) => {
+      scope.addEventProcessor(async event => {
+        if (getCurrentHub().getIntegration(this.name)) {
+          return this.process(event);
+        }
+        return event;
       });
-    }
+    });
   }
 
   /** JSDoc */