chore: Introduce internal getHubAndIntegration

packages/browser/package.json

@@ -18,6 +18,7 @@
   "dependencies": {
     "@sentry/core": "6.16.1",
     "@sentry/types": "6.16.1",
+    "@sentry/hub": "6.16.1",
     "@sentry/utils": "6.16.1",
     "tslib": "^1.9.3"
   },

packages/browser/src/integrations/dedupe.ts

@@ -1,4 +1,5 @@
-import { Event, EventProcessor, Exception, Hub, Integration, StackFrame } from '@sentry/types';
+import { addGlobalEventProcessor, getHubAndIntegration } from '@sentry/hub';
+import { Event, Exception, Integration, StackFrame } from '@sentry/types';
 import { logger } from '@sentry/utils';
 
 /** Deduplication filter */
@@ -21,21 +22,21 @@ export class Dedupe implements Integration {
   /**
    * @inheritDoc
    */
-  public setupOnce(addGlobalEventProcessor: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void {
+  public setupOnce(): void {
     addGlobalEventProcessor((currentEvent: Event) => {
-      const self = getCurrentHub().getIntegration(Dedupe);
-      if (self) {
+      const [hub, integration] = getHubAndIntegration(Dedupe);
+      if (hub && integration) {
         // Juuust in case something goes wrong
         try {
-          if (self._shouldDropEvent(currentEvent, self._previousEvent)) {
+          if (integration._shouldDropEvent(currentEvent, integration._previousEvent)) {
             logger.warn(`Event dropped due to being a duplicate of previously captured event.`);
             return null;
           }
         } catch (_oO) {
-          return (self._previousEvent = currentEvent);
+          return (integration._previousEvent = currentEvent);
         }
 
-        return (self._previousEvent = currentEvent);
+        return (integration._previousEvent = currentEvent);
       }
       return currentEvent;
     });

packages/browser/src/integrations/globalhandlers.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import { getCurrentHub } from '@sentry/core';
-import { Event, EventHint, Hub, Integration, Primitive, Severity } from '@sentry/types';
+import { getHubAndIntegration } from '@sentry/hub';
+import { Hub, Event, EventHint, Integration, Primitive, Severity } from '@sentry/types';
 import {
   addExceptionMechanism,
   addInstrumentationHandler,
@@ -78,9 +78,10 @@ function _installGlobalOnErrorHandler(): void {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     callback: (data: { msg: any; url: any; line: any; column: any; error: any }) => {
       const [hub, attachStacktrace] = getHubAndAttachStacktrace();
-      if (!hub.getIntegration(GlobalHandlers)) {
+      if (!hub) {
         return;
       }
+
       const { msg, url, line, column, error } = data;
       if (shouldIgnoreOnError() || (error && error.__sentry_own_request__)) {
         return;
@@ -111,7 +112,7 @@ function _installGlobalOnUnhandledRejectionHandler(): void {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     callback: (e: any) => {
       const [hub, attachStacktrace] = getHubAndAttachStacktrace();
-      if (!hub.getIntegration(GlobalHandlers)) {
+      if (!hub) {
         return;
       }
       let error = e;
@@ -252,9 +253,12 @@ function addMechanismAndCapture(hub: Hub, error: EventHint['originalException'],
   });
 }
 
-function getHubAndAttachStacktrace(): [Hub, boolean | undefined] {
-  const hub = getCurrentHub();
-  const client = hub.getClient();
-  const attachStacktrace = client && client.getOptions().attachStacktrace;
-  return [hub, attachStacktrace];
+function getHubAndAttachStacktrace(): [Hub | undefined, boolean | undefined] {
+  const [hub, integration] = getHubAndIntegration(GlobalHandlers);
+  if (hub && integration) {
+    const client = hub.getClient();
+    const attachStacktrace = client && client.getOptions().attachStacktrace;
+    return [hub, attachStacktrace];
+  }
+  return [undefined, undefined];
 }

packages/browser/src/integrations/linkederrors.ts

@@ -1,4 +1,4 @@
-import { addGlobalEventProcessor, getCurrentHub } from '@sentry/core';
+import { addGlobalEventProcessor, getHubAndIntegration } from '@sentry/hub';
 import { Event, EventHint, Exception, ExtendedError, Integration } from '@sentry/types';
 import { isInstanceOf } from '@sentry/utils';
 
@@ -43,8 +43,8 @@ export class LinkedErrors implements Integration {
    */
   public setupOnce(): void {
     addGlobalEventProcessor((event: Event, hint?: EventHint) => {
-      const self = getCurrentHub().getIntegration(LinkedErrors);
-      if (self) {
+      const [hub, self] = getHubAndIntegration(LinkedErrors);
+      if (hub && self) {
         const handler = self._handler && self._handler.bind(self);
         return typeof handler === 'function' ? handler(event, hint) : event;
       }

packages/browser/src/integrations/useragent.ts

@@ -1,4 +1,4 @@
-import { addGlobalEventProcessor, getCurrentHub } from '@sentry/core';
+import { addGlobalEventProcessor, getHubAndIntegration } from '@sentry/hub';
 import { Event, Integration } from '@sentry/types';
 import { getGlobalObject } from '@sentry/utils';
 
@@ -21,7 +21,8 @@ export class UserAgent implements Integration {
    */
   public setupOnce(): void {
     addGlobalEventProcessor((event: Event) => {
-      if (getCurrentHub().getIntegration(UserAgent)) {
+      const [hub, integration] = getHubAndIntegration(UserAgent);
+      if (hub && integration) {
         // if none of the information we want exists, don't bother
         if (!global.navigator && !global.location && !global.document) {
           return event;

packages/hub/src/hub.ts

@@ -26,6 +26,16 @@ import { consoleSandbox, dateTimestampInSeconds, getGlobalObject, isNodeEnv, log
 import { Scope } from './scope';
 import { Session } from './session';
 
+/**
+ * Utility to return the hub an integration at once.
+ */
+export function getHubAndIntegration<T extends Integration>(
+  integration: IntegrationClass<T>,
+): [HubInterface | null, T | null] {
+  const hub = getCurrentHub();
+  return hub ? [hub, hub.getIntegration(integration)] : [null, null];
+}
+
 /**
  * API compatibility version of this hub.
  *

packages/hub/src/index.ts

@@ -7,6 +7,7 @@ export {
   getCurrentHub,
   getHubFromCarrier,
   getMainCarrier,
+  getHubAndIntegration,
   Hub,
   makeMain,
   setHubOnCarrier,

packages/integrations/package.json

@@ -18,6 +18,7 @@
   "dependencies": {
     "@sentry/types": "6.16.1",
     "@sentry/utils": "6.16.1",
+    "@sentry/hub": "6.16.1",
     "localforage": "^1.8.1",
     "tslib": "^1.9.3"
   },

packages/integrations/src/angular.ts

@@ -1,4 +1,5 @@
-import { Event, EventProcessor, Hub, Integration } from '@sentry/types';
+import { getHubAndIntegration } from '@sentry/hub';
+import { Event, Integration } from '@sentry/types';
 import { getGlobalObject, logger } from '@sentry/utils';
 
 // See https://github.com/angular/angular.js/blob/v1.4.7/src/minErr.js
@@ -37,11 +38,6 @@ export class Angular implements Integration {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private readonly _module: any;
 
-  /**
-   * Returns current hub.
-   */
-  private _getCurrentHub?: () => Hub;
-
   /**
    * @inheritDoc
    */
@@ -64,13 +60,11 @@ export class Angular implements Integration {
   /**
    * @inheritDoc
    */
-  public setupOnce(_: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void {
+  public setupOnce(): void {
     if (!this._module) {
       return;
     }
 
-    this._getCurrentHub = getCurrentHub;
-
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     this._module.config([
       '$provide',
@@ -88,9 +82,9 @@ export class Angular implements Integration {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private _$exceptionHandlerDecorator($delegate: any): any {
     return (exception: Error, cause?: string): void => {
-      const hub = this._getCurrentHub && this._getCurrentHub();
+      const [hub, integration] = getHubAndIntegration(Angular);
 
-      if (hub && hub.getIntegration(Angular)) {
+      if (hub && integration) {
         hub.withScope(scope => {
           if (cause) {
             scope.setExtra('cause', cause);

packages/integrations/src/captureconsole.ts

@@ -1,4 +1,5 @@
-import { EventProcessor, Hub, Integration, Severity } from '@sentry/types';
+import { getHubAndIntegration } from '@sentry/hub';
+import { Integration, Severity } from '@sentry/types';
 import { fill, getGlobalObject, safeJoin } from '@sentry/utils';
 
 const global = getGlobalObject<Window | NodeJS.Global>();
@@ -32,7 +33,7 @@ export class CaptureConsole implements Integration {
   /**
    * @inheritDoc
    */
-  public setupOnce(_: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void {
+  public setupOnce(): void {
     if (!('console' in global)) {
       return;
     }
@@ -44,9 +45,9 @@ export class CaptureConsole implements Integration {
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       fill(global.console, level, (originalConsoleLevel: () => any) => (...args: any[]): void => {
-        const hub = getCurrentHub();
+        const [hub, integration] = getHubAndIntegration(CaptureConsole);
 
-        if (hub.getIntegration(CaptureConsole)) {
+        if (hub && integration) {
           hub.withScope(scope => {
             scope.setLevel(Severity.fromString(level));
             scope.setExtra('arguments', args);

packages/integrations/src/debug.ts

@@ -1,4 +1,5 @@
-import { Event, EventHint, EventProcessor, Hub, Integration } from '@sentry/types';
+import { addGlobalEventProcessor, getHubAndIntegration } from '@sentry/hub';
+import { Event, EventHint, Integration } from '@sentry/types';
 import { consoleSandbox } from '@sentry/utils';
 
 /** JSDoc */
@@ -36,10 +37,10 @@ export class Debug implements Integration {
   /**
    * @inheritDoc
    */
-  public setupOnce(addGlobalEventProcessor: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void {
+  public setupOnce(): void {
     addGlobalEventProcessor((event: Event, hint?: EventHint) => {
-      const self = getCurrentHub().getIntegration(Debug);
-      if (self) {
+      const [hub, self] = getHubAndIntegration(Debug);
+      if (hub && self) {
         if (self._options.debugger) {
           // eslint-disable-next-line no-debugger
           debugger;

packages/integrations/src/dedupe.ts

@@ -1,4 +1,5 @@
-import { Event, EventProcessor, Exception, Hub, Integration, StackFrame } from '@sentry/types';
+import { addGlobalEventProcessor, getHubAndIntegration } from '@sentry/hub';
+import { Event, Exception, Integration, StackFrame } from '@sentry/types';
 import { logger } from '@sentry/utils';
 
 /** Deduplication filter */
@@ -21,10 +22,10 @@ export class Dedupe implements Integration {
   /**
    * @inheritDoc
    */
-  public setupOnce(addGlobalEventProcessor: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void {
+  public setupOnce(): void {
     addGlobalEventProcessor((currentEvent: Event) => {
-      const self = getCurrentHub().getIntegration(Dedupe);
-      if (self) {
+      const [hub, self] = getHubAndIntegration(Dedupe);
+      if (hub && self) {
         // Juuust in case something goes wrong
         try {
           if (self._shouldDropEvent(currentEvent, self._previousEvent)) {

packages/integrations/src/ember.ts

@@ -1,4 +1,5 @@
-import { EventProcessor, Hub, Integration } from '@sentry/types';
+import { getHubAndIntegration } from '@sentry/hub';
+import { Integration } from '@sentry/types';
 import { getGlobalObject, isInstanceOf, logger } from '@sentry/utils';
 
 /** JSDoc */
@@ -31,7 +32,7 @@ export class Ember implements Integration {
   /**
    * @inheritDoc
    */
-  public setupOnce(_: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void {
+  public setupOnce(): void {
     if (!this._Ember) {
       logger.error('EmberIntegration is missing an Ember instance');
       return;
@@ -41,8 +42,9 @@ export class Ember implements Integration {
     const oldOnError = this._Ember.onerror;
 
     this._Ember.onerror = (error: Error): void => {
-      if (getCurrentHub().getIntegration(Ember)) {
-        getCurrentHub().captureException(error, { originalException: error });
+      const [hub, integration] = getHubAndIntegration(Ember);
+      if (hub && integration) {
+        hub.captureException(error, { originalException: error });
       }
 
       if (typeof oldOnError === 'function') {
@@ -54,14 +56,15 @@ export class Ember implements Integration {
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     this._Ember.RSVP.on('error', (reason: unknown): void => {
-      if (getCurrentHub().getIntegration(Ember)) {
-        getCurrentHub().withScope(scope => {
+      const [hub, integration] = getHubAndIntegration(Ember);
+      if (hub && integration) {
+        hub.withScope(scope => {
           if (isInstanceOf(reason, Error)) {
             scope.setExtra('context', 'Unhandled Promise error detected');
-            getCurrentHub().captureException(reason, { originalException: reason as Error });
+            hub.captureException(reason, { originalException: reason as Error });
           } else {
             scope.setExtra('reason', reason);
-            getCurrentHub().captureMessage('Unhandled Promise error detected');
+            hub.captureMessage('Unhandled Promise error detected');
           }
         });
       }

packages/integrations/src/extraerrordata.ts

@@ -1,4 +1,5 @@
-import { Event, EventHint, EventProcessor, ExtendedError, Hub, Integration } from '@sentry/types';
+import { addGlobalEventProcessor, getHubAndIntegration } from '@sentry/hub';
+import { Event, EventHint, ExtendedError, Integration } from '@sentry/types';
 import { isError, isPlainObject, logger, normalize } from '@sentry/utils';
 
 /** JSDoc */
@@ -26,13 +27,14 @@ export class ExtraErrorData implements Integration {
   /**
    * @inheritDoc
    */
-  public setupOnce(addGlobalEventProcessor: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void {
+  public setupOnce(): void {
     addGlobalEventProcessor((event: Event, hint?: EventHint) => {
-      const self = getCurrentHub().getIntegration(ExtraErrorData);
-      if (!self) {
+      const [hub, self] = getHubAndIntegration(ExtraErrorData);
+      if (!hub || !self) {
         return event;
+      } else {
+        return self.enhanceEventWithErrorData(event, hint);
       }
-      return self.enhanceEventWithErrorData(event, hint);
     });
   }