rm registerClientOnGlobalHub

Author: Lms24

dev-packages/browser-integration-tests/fixtures/loader.js

@@ -101,9 +101,8 @@
     // carrier. This needs still needs to be added to the actual loader script before we
     // release the loader for v8!
     var v = e && e.version && e[e.version];
-    var c = v && v.stack && v.stack.getClient();
 
-    return !(void 0 === e || !e.hub || !e.hub.getClient()) || !!c;
+    return !(void 0 === e || !e.hub || !e.hub.getClient()) || !!v;
   }
   (n[i] = n[i] || {}),
     (n[i].onLoad = function (n) {

packages/core/src/carrier.ts

@@ -1,6 +1,5 @@
 import type { Client, Integration, MetricsAggregator, Scope, VersionString } from '@sentry/types';
-import { GLOBAL_OBJ } from '@sentry/utils';
-import { SDK_VERSION } from '@sentry/utils';
+import { GLOBAL_OBJ, SDK_VERSION } from '@sentry/utils';
 import type { AsyncContextStack } from './asyncContext/stackStrategy';
 import type { AsyncContextStrategy } from './asyncContext/types';
 

packages/core/src/sdk.ts

@@ -2,7 +2,6 @@ import type { Client, ClientOptions } from '@sentry/types';
 import { consoleSandbox, logger } from '@sentry/utils';
 import { getCurrentScope } from './currentScopes';
 
-import { getMainCarrier, getSentryCarrier } from './carrier';
 import { DEBUG_BUILD } from './debug-build';
 
 /** A class object that can instantiate Client objects. */
@@ -43,21 +42,4 @@ export function initAndBind<F extends Client, O extends ClientOptions>(
  */
 export function setCurrentClient(client: Client): void {
   getCurrentScope().setClient(client);
-  registerClientOnGlobalHub(client);
-}
-
-/**
- * Unfortunately, we still have to manually bind the client to the "stack" property set on the global
- * Sentry carrier object. This is because certain scripts (e.g. our loader script) obtain
- * the client via `window.__SENTRY__[version].stack.getClient()`.
- *
- * @see {@link ./asyncContext/stackStrategy.ts getAsyncContextStack}
- */
-function registerClientOnGlobalHub(client: Client): void {
-  try {
-    // @ts-expect-error - purposefully not guarding the call here but try/catching for bundle size efficiency
-    getSentryCarrier(getMainCarrier()).stack.getStackTop().client = client;
-  } catch {
-    // ignore errors here
-  }
 }

packages/utils/src/worldwide.ts

@@ -103,6 +103,5 @@ export function getGlobalSingleton<T>(name: keyof SentryCarrier, creator: () =>
   const gbl = (obj || GLOBAL_OBJ) as InternalGlobal;
   const __SENTRY__ = (gbl.__SENTRY__ = gbl.__SENTRY__ || {});
   const versionedCarrier = (__SENTRY__[SDK_VERSION] = __SENTRY__[SDK_VERSION] || {});
-  const singleton = versionedCarrier[name] || (versionedCarrier[name] = creator());
-  return singleton;
+  return versionedCarrier[name] || (versionedCarrier[name] = creator());
 }