ref: Remove remaining usage of makeMain

Author: mydea

packages/gatsby/gatsby-browser.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import { init } from '@sentry/gatsby';
+import { getClient, init } from '@sentry/gatsby';
 
 export function onClientEntry(_, pluginParams) {
   const isIntialized = isSentryInitialized();
@@ -32,10 +32,7 @@ export function onClientEntry(_, pluginParams) {
 }
 
 function isSentryInitialized() {
-  // Although `window` should exist because we're in the browser (where this script
-  // is run), and `__SENTRY__.hub` is created when importing the Gatsby SDK, double
-  // check that in case something weird happens.
-  return !!(window && window.__SENTRY__ && window.__SENTRY__.hub && window.__SENTRY__.hub.getClient());
+  return !!getClient();
 }
 
 function areSentryOptionsDefined(params) {

packages/gatsby/test/gatsby-browser.test.ts

@@ -1,8 +1,6 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
+import type { Client } from '@sentry/types';
 import { onClientEntry } from '../gatsby-browser';
-import { browserTracingIntegration } from '../src/index';
+import { browserTracingIntegration, getCurrentScope, getIsolationScope, setCurrentClient } from '../src/index';
 
 (global as any).__SENTRY_RELEASE__ = '683f3a6ab819d47d23abfca9a914c81f0524d35b';
 (global as any).__SENTRY_DSN__ = 'https://[email protected]/0';
@@ -50,24 +48,21 @@ describe('onClientEntry', () => {
   });
 
   describe('inits Sentry once', () => {
+    beforeEach(() => {
+      getCurrentScope().clear();
+      getIsolationScope().clear();
+      getCurrentScope().setClient(undefined);
+    });
+
     afterEach(() => {
-      delete (window as any).__SENTRY__;
       (global.console.warn as jest.Mock).mockClear();
       (global.console.error as jest.Mock).mockClear();
     });
 
-    function setMockedSentryInWindow() {
-      (window as any).__SENTRY__ = {
-        hub: {
-          getClient: () => ({
-            // Empty object mocking the client
-          }),
-        },
-      };
-    }
-
     it('initialized in injected config, without pluginParams', () => {
-      setMockedSentryInWindow();
+      const client = {} as Client;
+      setCurrentClient(client);
+
       onClientEntry(undefined, { plugins: [] });
       // eslint-disable-next-line no-console
       expect(console.warn).not.toHaveBeenCalled();
@@ -77,7 +72,9 @@ describe('onClientEntry', () => {
     });
 
     it('initialized in injected config, with pluginParams', () => {
-      setMockedSentryInWindow();
+      const client = {} as Client;
+      setCurrentClient(client);
+
       onClientEntry(undefined, { plugins: [], dsn: 'dsn', release: 'release' });
       // eslint-disable-next-line no-console
       expect((console.warn as jest.Mock).mock.calls[0]).toMatchInlineSnapshot(`

packages/node/test/async/domain.test.ts

@@ -1,15 +1,15 @@
 /* eslint-disable deprecation/deprecation */
-import { Hub, getCurrentHub, getCurrentScope, makeMain, setAsyncContextStrategy, withScope } from '@sentry/core';
+import type { Hub } from '@sentry/core';
+import { getCurrentHub, getCurrentScope, setAsyncContextStrategy, withScope } from '@sentry/core';
 import { getIsolationScope, withIsolationScope } from '@sentry/core';
 import type { Scope } from '@sentry/types';
 
 import { setDomainAsyncContextStrategy } from '../../src/async/domain';
 
 describe('setDomainAsyncContextStrategy()', () => {
   beforeEach(() => {
-    const hub = new Hub();
-
-    makeMain(hub);
+    getCurrentScope().clear();
+    getIsolationScope().clear();
   });
 
   afterEach(() => {

packages/node/test/async/hooks.test.ts

@@ -1,10 +1,9 @@
 /* eslint-disable deprecation/deprecation */
+import type { Hub } from '@sentry/core';
 import {
-  Hub,
   getCurrentHub,
   getCurrentScope,
   getIsolationScope,
-  makeMain,
   setAsyncContextStrategy,
   withIsolationScope,
   withScope,
@@ -15,9 +14,8 @@ import { setHooksAsyncContextStrategy } from '../../src/async/hooks';
 
 describe('setHooksAsyncContextStrategy()', () => {
   beforeEach(() => {
-    const hub = new Hub();
-
-    makeMain(hub);
+    getCurrentScope().clear();
+    getIsolationScope().clear();
   });
 
   afterEach(() => {

packages/node/test/handlers.test.ts

@@ -2,15 +2,15 @@ import * as http from 'http';
 import * as sentryCore from '@sentry/core';
 import {
   Hub,
-  Scope as ScopeClass,
   Transaction,
   getClient,
   getCurrentScope,
   getIsolationScope,
   getMainCarrier,
-  makeMain,
   mergeScopeData,
+  setCurrentClient,
   spanToJSON,
+  withScope,
 } from '@sentry/core';
 import type { Event, PropagationContext, Scope } from '@sentry/types';
 import { SentryError } from '@sentry/utils';
@@ -21,10 +21,14 @@ import { getDefaultNodeClientOptions } from './helper/node-client-options';
 
 describe('requestHandler', () => {
   beforeEach(() => {
+    getCurrentScope().clear();
+    getIsolationScope().clear();
+
     // Ensure we reset a potentially set acs to use the default
     const sentry = getMainCarrier().__SENTRY__;
     if (sentry) {
       sentry.acs = undefined;
+      sentry.hub = undefined;
     }
   });
 
@@ -38,7 +42,6 @@ describe('requestHandler', () => {
   const sentryRequestMiddleware = requestHandler();
 
   let req: http.IncomingMessage, res: http.ServerResponse, next: () => undefined;
-  let client: NodeClient;
 
   function createNoOpSpy() {
     const noop = { noop: () => undefined }; // this is wrapped in an object so jest can spy on it
@@ -63,11 +66,8 @@ describe('requestHandler', () => {
 
   it('autoSessionTracking is enabled, sets requestSession status to ok, when handling a request', done => {
     const options = getDefaultNodeClientOptions({ autoSessionTracking: true, release: '1.2' });
-    client = new NodeClient(options);
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = new Hub(client);
-    // eslint-disable-next-line deprecation/deprecation
-    makeMain(hub);
+    const client = new NodeClient(options);
+    setCurrentClient(client);
 
     let isolationScope: Scope;
     sentryRequestMiddleware(req, res, () => {
@@ -83,11 +83,8 @@ describe('requestHandler', () => {
 
   it('autoSessionTracking is disabled, does not set requestSession, when handling a request', done => {
     const options = getDefaultNodeClientOptions({ autoSessionTracking: false, release: '1.2' });
-    client = new NodeClient(options);
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = new Hub(client);
-    // eslint-disable-next-line deprecation/deprecation
-    makeMain(hub);
+    const client = new NodeClient(options);
+    setCurrentClient(client);
 
     let isolationScope: Scope;
     sentryRequestMiddleware(req, res, () => {
@@ -103,11 +100,8 @@ describe('requestHandler', () => {
 
   it('autoSessionTracking is enabled, calls _captureRequestSession, on response finish', done => {
     const options = getDefaultNodeClientOptions({ autoSessionTracking: true, release: '1.2' });
-    client = new NodeClient(options);
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = new Hub(client);
-    // eslint-disable-next-line deprecation/deprecation
-    makeMain(hub);
+    const client = new NodeClient(options);
+    setCurrentClient(client);
 
     const captureRequestSession = jest.spyOn<any, any>(client, '_captureRequestSession');
 
@@ -128,11 +122,8 @@ describe('requestHandler', () => {
 
   it('autoSessionTracking is disabled, does not call _captureRequestSession, on response finish', done => {
     const options = getDefaultNodeClientOptions({ autoSessionTracking: false, release: '1.2' });
-    client = new NodeClient(options);
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = new Hub(client);
-    // eslint-disable-next-line deprecation/deprecation
-    makeMain(hub);
+    const client = new NodeClient(options);
+    setCurrentClient(client);
 
     const captureRequestSession = jest.spyOn<any, any>(client, '_captureRequestSession');
 
@@ -179,10 +170,8 @@ describe('requestHandler', () => {
   });
 
   it('stores request and request data options in `sdkProcessingMetadata`', done => {
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = new Hub(new NodeClient(getDefaultNodeClientOptions()));
-    // eslint-disable-next-line deprecation/deprecation
-    makeMain(hub);
+    const client = new NodeClient(getDefaultNodeClientOptions());
+    setCurrentClient(client);
 
     const requestHandlerOptions = { include: { ip: false } };
     const sentryRequestMiddleware = requestHandler(requestHandlerOptions);
@@ -208,6 +197,18 @@ describe('requestHandler', () => {
 });
 
 describe('tracingHandler', () => {
+  beforeEach(() => {
+    getCurrentScope().clear();
+    getIsolationScope().clear();
+
+    // Ensure we reset a potentially set acs to use the default
+    const sentry = getMainCarrier().__SENTRY__;
+    if (sentry) {
+      sentry.acs = undefined;
+      sentry.hub = undefined;
+    }
+  });
+
   const headers = { ears: 'furry', nose: 'wet', tongue: 'spotted', cookie: 'favorite=zukes' };
   const method = 'wagging';
   const protocol = 'mutualsniffing';
@@ -218,18 +219,16 @@ describe('tracingHandler', () => {
 
   const sentryTracingMiddleware = tracingHandler();
 
-  let hub: Hub, req: http.IncomingMessage, res: http.ServerResponse, next: () => undefined;
+  let req: http.IncomingMessage, res: http.ServerResponse, next: () => undefined;
 
   function createNoOpSpy() {
     const noop = { noop: () => undefined }; // this is wrapped in an object so jest can spy on it
     return jest.spyOn(noop, 'noop') as any;
   }
 
   beforeEach(() => {
-    // eslint-disable-next-line deprecation/deprecation
-    hub = new Hub(new NodeClient(getDefaultNodeClientOptions({ tracesSampleRate: 1.0 })));
-    // eslint-disable-next-line deprecation/deprecation
-    makeMain(hub);
+    const client = new NodeClient(getDefaultNodeClientOptions({ tracesSampleRate: 1.0 }));
+    setCurrentClient(client);
 
     req = {
       headers,
@@ -349,12 +348,10 @@ describe('tracingHandler', () => {
   it('extracts request data for sampling context', () => {
     const tracesSampler = jest.fn();
     const options = getDefaultNodeClientOptions({ tracesSampler });
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = new Hub(new NodeClient(options));
-    // eslint-disable-next-line deprecation/deprecation
-    makeMain(hub);
+    const client = new NodeClient(options);
+    setCurrentClient(client);
 
-    hub.run(() => {
+    withScope(() => {
       sentryTracingMiddleware(req, res, next);
 
       expect(tracesSampler).toHaveBeenCalledWith(
@@ -373,10 +370,8 @@ describe('tracingHandler', () => {
 
   it('puts its transaction on the scope', () => {
     const options = getDefaultNodeClientOptions({ tracesSampleRate: 1.0 });
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = new Hub(new NodeClient(options));
-    // eslint-disable-next-line deprecation/deprecation
-    makeMain(hub);
+    const client = new NodeClient(options);
+    setCurrentClient(client);
 
     sentryTracingMiddleware(req, res, next);
 
@@ -521,6 +516,18 @@ describe('tracingHandler', () => {
 });
 
 describe('errorHandler()', () => {
+  beforeEach(() => {
+    getCurrentScope().clear();
+    getIsolationScope().clear();
+
+    // Ensure we reset a potentially set acs to use the default
+    const sentry = getMainCarrier().__SENTRY__;
+    if (sentry) {
+      sentry.acs = undefined;
+      sentry.hub = undefined;
+    }
+  });
+
   const headers = { ears: 'furry', nose: 'wet', tongue: 'spotted', cookie: 'favorite=zukes' };
   const method = 'wagging';
   const protocol = 'mutualsniffing';
@@ -561,10 +568,7 @@ describe('errorHandler()', () => {
     // by the`requestHandler`)
     client.initSessionFlusher();
 
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = new Hub(client);
-    // eslint-disable-next-line deprecation/deprecation
-    makeMain(hub);
+    setCurrentClient(client);
 
     jest.spyOn<any, any>(client, '_captureRequestSession');
 
@@ -585,11 +589,9 @@ describe('errorHandler()', () => {
   it('autoSessionTracking is enabled + requestHandler is not used -> does not set requestSession status on Crash', done => {
     const options = getDefaultNodeClientOptions({ autoSessionTracking: false, release: '3.3' });
     client = new NodeClient(options);
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = new Hub(client);
+    setCurrentClient(client);
 
     jest.spyOn<any, any>(client, '_captureRequestSession');
-    jest.spyOn(sentryCore, 'getCurrentHub').mockReturnValue(hub);
 
     getIsolationScope().setRequestSession({ status: 'ok' });
 
@@ -611,15 +613,12 @@ describe('errorHandler()', () => {
     // It is required to initialise SessionFlusher to capture Session Aggregates (it is usually initialised
     // by the`requestHandler`)
     client.initSessionFlusher();
-    const scope = new ScopeClass();
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = new Hub(client, scope);
-    // eslint-disable-next-line deprecation/deprecation
-    makeMain(hub);
+
+    setCurrentClient(client);
 
     jest.spyOn<any, any>(client, '_captureRequestSession');
 
-    hub.run(() => {
+    withScope(() => {
       getIsolationScope().setRequestSession({ status: 'ok' });
       sentryErrorMiddleware({ name: 'error', message: 'this is an error' }, req, res, () => {
         expect(getIsolationScope().getRequestSession()).toEqual({ status: 'crashed' });
@@ -633,11 +632,7 @@ describe('errorHandler()', () => {
     // It is required to initialise SessionFlusher to capture Session Aggregates (it is usually initialised
     // by the`requestHandler`)
     client.initSessionFlusher();
-    const scope = new ScopeClass();
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = new Hub(client, scope);
-    // eslint-disable-next-line deprecation/deprecation
-    makeMain(hub);
+    setCurrentClient(client);
 
     jest.spyOn<any, any>(client, '_captureRequestSession');
 
@@ -656,11 +651,7 @@ describe('errorHandler()', () => {
   it('stores request in `sdkProcessingMetadata`', done => {
     const options = getDefaultNodeClientOptions({});
     client = new NodeClient(options);
-
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = new Hub(client);
-    // eslint-disable-next-line deprecation/deprecation
-    makeMain(hub);
+    setCurrentClient(client);
 
     let isolationScope: Scope;
     sentryErrorMiddleware({ name: 'error', message: 'this is an error' }, req, res, () => {