ref(core): Remove getGlobalObject() usage from @sentry/core (#5914)

This also includes a couple of changes to the hub tests which will eventually get moved to core

Author: timfish

packages/core/src/hub.ts

@@ -23,8 +23,8 @@ import {
 import {
   consoleSandbox,
   dateTimestampInSeconds,
-  getGlobalObject,
   getGlobalSingleton,
+  GLOBAL_OBJ,
   isNodeEnv,
   logger,
   uuid4,
@@ -413,8 +413,7 @@ export class Hub implements HubInterface {
     const { release, environment } = (client && client.getOptions()) || {};
 
     // Will fetch userAgent if called from browser sdk
-    const global = getGlobalObject<{ navigator?: { userAgent?: string } }>();
-    const { userAgent } = global.navigator || {};
+    const { userAgent } = GLOBAL_OBJ.navigator || {};
 
     const session = makeSession({
       release,
@@ -500,12 +499,11 @@ export class Hub implements HubInterface {
  * at the call-site. We always access the carrier through this function, so we can guarantee that `__SENTRY__` is there.
  **/
 export function getMainCarrier(): Carrier {
-  const carrier = getGlobalObject();
-  carrier.__SENTRY__ = carrier.__SENTRY__ || {
+  GLOBAL_OBJ.__SENTRY__ = GLOBAL_OBJ.__SENTRY__ || {
     extensions: {},
     hub: undefined,
   };
-  return carrier;
+  return GLOBAL_OBJ;
 }
 
 /**

packages/core/test/lib/base.test.ts

@@ -22,20 +22,18 @@ jest.mock('@sentry/utils', () => {
     uuid4(): string {
       return '42';
     },
-    getGlobalObject(): any {
-      return {
-        console: {
-          log(): void {
-            // no-empty
-          },
-          warn(): void {
-            // no-empty
-          },
-          error(): void {
-            // no-empty
-          },
+    GLOBAL_OBJ: {
+      console: {
+        log(): void {
+          // no-empty
         },
-      };
+        warn(): void {
+          // no-empty
+        },
+        error(): void {
+          // no-empty
+        },
+      },
     },
     consoleSandbox(cb: () => any): any {
       return cb();

packages/core/test/lib/hint.test.ts

@@ -1,5 +1,5 @@
 import { captureEvent, configureScope } from '@sentry/core';
-import { getGlobalObject } from '@sentry/utils';
+import { GLOBAL_OBJ } from '@sentry/utils';
 
 import { initAndBind } from '../../src/sdk';
 import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
@@ -16,7 +16,7 @@ describe('Hint', () => {
 
   afterEach(() => {
     jest.clearAllMocks();
-    delete getGlobalObject().__SENTRY__;
+    delete GLOBAL_OBJ.__SENTRY__;
   });
 
   describe('attachments', () => {

packages/hub/test/global.test.ts

@@ -1,15 +1,13 @@
 /* eslint-disable deprecation/deprecation */
 
-import { getGlobalObject } from '@sentry/utils';
+import { GLOBAL_OBJ } from '@sentry/utils';
 
 import { getCurrentHub, getHubFromCarrier, Hub } from '../src';
 
-const global = getGlobalObject();
-
 describe('global', () => {
   test('getGlobalHub', () => {
     expect(getCurrentHub()).toBeTruthy();
-    expect((global as any).__SENTRY__.hub).toBeTruthy();
+    expect(GLOBAL_OBJ.__SENTRY__.hub).toBeTruthy();
   });
 
   test('getHubFromCarrier', () => {
@@ -22,22 +20,21 @@ describe('global', () => {
 
   test('getGlobalHub', () => {
     const newestHub = new Hub(undefined, undefined, 999999);
-    (global as any).__SENTRY__.hub = newestHub;
+    GLOBAL_OBJ.__SENTRY__.hub = newestHub;
     expect(getCurrentHub()).toBe(newestHub);
   });
 
   test('hub extension methods receive correct hub instance', () => {
     const newestHub = new Hub(undefined, undefined, 999999);
-    (global as any).__SENTRY__.hub = newestHub;
+    GLOBAL_OBJ.__SENTRY__.hub = newestHub;
     const fn = jest.fn().mockImplementation(function (...args: []) {
       // @ts-ignore typescript complains that this can be `any`
       expect(this).toBe(newestHub);
       expect(args).toEqual([1, 2, 3]);
     });
-    (global as any).__SENTRY__.extensions = {};
-    (global as any).__SENTRY__.extensions.testy = fn;
+    GLOBAL_OBJ.__SENTRY__.extensions = {};
+    GLOBAL_OBJ.__SENTRY__.extensions.testy = fn;
     (getCurrentHub() as any)._callExtensionMethod('testy', 1, 2, 3);
     expect(fn).toBeCalled();
   });
-  // (global as any).__SENTRY__
 });

packages/hub/test/scope.test.ts

@@ -1,15 +1,15 @@
 /* eslint-disable deprecation/deprecation */
 
 import { Event, EventHint, RequestSessionStatus } from '@sentry/types';
-import { getGlobalObject } from '@sentry/utils';
+import { GLOBAL_OBJ } from '@sentry/utils';
 
 import { addGlobalEventProcessor, Scope } from '../src';
 
 describe('Scope', () => {
   afterEach(() => {
     jest.resetAllMocks();
     jest.useRealTimers();
-    getGlobalObject<any>().__SENTRY__.globalEventProcessors = undefined;
+    GLOBAL_OBJ.__SENTRY__.globalEventProcessors = undefined;
   });
 
   describe('attributes modification', () => {