Merge branch 'tim/sentry_load' into 'master'

fix: If using the global Sentry, check if it has finished loading See merge request TankerHQ/sdk-js!1008
TankerHQ · Jan 9, 2024 · f90300f · f90300f
2 parents c2e6bf4 + 5bff975
commit f90300f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/packages/core/src/Tanker.ts b/packages/core/src/Tanker.ts
@@ -125,7 +125,10 @@ export class Tanker extends EventEmitter {
     }
 
     if (options.sentryHub === undefined) {
-      this._sentry = globalThis.Sentry?.getCurrentHub() || null;
+      // If Sentry is lazy-loaded, the globalThis.Sentry object can exist but be almost empty
+      // So we have to check if getCurrentHub is defined. Disable integration if it hasn't finished loading.
+      const getHub = globalThis.Sentry?.getCurrentHub;
+      this._sentry = getHub ? getHub() : null;
     } else {
       this._sentry = options.sentryHub;
     }

diff --git a/packages/global-this/src/index.ts b/packages/global-this/src/index.ts
@@ -2,7 +2,9 @@ import { getGlobalThis } from './global-this';
 import type { Hub } from '@sentry/types';
 
 const myGlobalThis: typeof globalThis & {
-  Sentry?: { getCurrentHub: () => Hub };
+  Sentry?: {
+    getCurrentHub?: () => Hub,
+  };
 } = getGlobalThis();
 
 export { myGlobalThis as globalThis };