use stack to set AsyncStackStrategy; use hub via getCurrentHub

Author: Lms24

dev-packages/browser-integration-tests/suites/old-sdk-interop/hub/subject.js

@@ -1,3 +1,4 @@
+console.log(window.__SENTRY__);
 /**
  * Simulate an old pre v8 SDK obtaining the hub from the global sentry carrier
  * and checking for the hub version.

packages/core/src/asyncContext/stackStrategy.ts

@@ -1,9 +1,10 @@
-import type { Client, Scope as ScopeInterface } from '@sentry/types';
-import { isThenable } from '@sentry/utils';
+import type { Client, Hub, Scope as ScopeInterface } from '@sentry/types';
+import { GLOBAL_OBJ, getGlobalSingleton, isThenable, logger } from '@sentry/utils';
 import { getDefaultCurrentScope, getDefaultIsolationScope } from '../currentScopes';
 import { Scope } from '../scope';
 
-import { getMainCarrier, getSentryCarrier } from './../carrier';
+import { Carrier, getMainCarrier, getSentryCarrier } from '../carrier';
+import { getCurrentHubShim } from '../getCurrentHubShim';
 import type { AsyncContextStrategy } from './types';
 
 interface Layer {
@@ -104,16 +105,6 @@ export class AsyncContextStack {
     return this._stack[this._stack.length - 1];
   }
 
-  /**
-   * Only here for compatibility with <v8 versions
-   * @deprecated DO NOT use this function
-   * @hidden
-   * @internal
-   */
-  public isOlderThan(_version: number): boolean {
-    return false;
-  }
-
   /**
    * Push a scope to the stack.
    */
@@ -141,20 +132,17 @@ export class AsyncContextStack {
  * This will be removed during the v8 cycle and is only here to make migration easier.
  */
 function getAsyncContextStack(): AsyncContextStack {
-  const registry = getMainCarrier();
-
-  // For now we continue to keep this as `hub` on the ACS,
-  // as e.g. the Loader Script relies on this.
-  // Eventually we may change this if/when we update the loader to not require this field anymore
-  // Related, we also write to `hub` in {@link ./../sdk.ts registerClientOnGlobalHub}
-  const sentry = getSentryCarrier(registry) as { hub?: AsyncContextStack };
-
-  if (sentry.hub) {
-    return sentry.hub;
+  // eslint-disable-next-line deprecation/deprecation
+  const sentry = getSentryCarrier(getMainCarrier()) as { hub?: AsyncContextStack };
+  if (!sentry.hub) {
+    // For now, we still set the `hub` object to gracefully handle pre v8 SDKs and certain scripts
+    // (e.g. our loader script) accessing properties on `window.__SENTRY__.hub`.
+    // This will just call the `getCurrentHubShim` function, as if users would interact with `getCurrentHub`.
+    // eslint-disable-next-line deprecation/deprecation
+    Object.defineProperty(sentry, 'hub', { get: () => getCurrentHubShim(), enumerable: true });
   }
 
-  sentry.hub = new AsyncContextStack(getDefaultCurrentScope(), getDefaultIsolationScope());
-  return sentry.hub;
+  return getGlobalSingleton('stack', () => new AsyncContextStack(getDefaultCurrentScope(), getDefaultIsolationScope()));
 }
 
 function withScope<T>(callback: (scope: ScopeInterface) => T): T {

packages/core/src/getCurrentHubShim.ts

@@ -1,4 +1,4 @@
-import type { Client, EventHint, Hub, Integration, IntegrationClass, SeverityLevel } from '@sentry/types';
+import type { Client, EventHint, Hub, Integration, IntegrationClass, Scope, SeverityLevel } from '@sentry/types';
 import { addBreadcrumb } from './breadcrumbs';
 import { getClient, getCurrentScope, getIsolationScope, withScope } from './currentScopes';
 import {
@@ -22,7 +22,10 @@ import {
  * usage
  */
 // eslint-disable-next-line deprecation/deprecation
-export function getCurrentHubShim(): Hub {
+export function getCurrentHubShim(): Hub & {
+  getStackTop: () => { client: Client | undefined; scope: Scope };
+  isOlderThan: () => boolean;
+} {
   return {
     bindClient(client: Client): void {
       const scope = getCurrentScope();
@@ -64,6 +67,13 @@ export function getCurrentHubShim(): Hub {
       // only send the update
       _sendSessionUpdate();
     },
+    getStackTop: () => ({
+      client: getClient(),
+      scope: getCurrentScope(),
+    }),
+    isOlderThan() {
+      return false;
+    },
   };
 }
 

packages/utils/src/worldwide.ts

@@ -45,6 +45,7 @@ export interface InternalGlobal {
   _sentryDebugIds?: Record<string, string>;
   __SENTRY__: {
     hub: any;
+    stack: any;
     logger: any;
     extensions?: {
       /** Extension methods for the hub, which are bound to the current Hub instance */