move getMainCarrier to @sentry/utils

Author: lobsterkatie

packages/hub/src/hub.ts

@@ -22,7 +22,7 @@ import {
   TransactionContext,
   User,
 } from '@sentry/types';
-import { consoleSandbox, dateTimestampInSeconds, getGlobalObject, isNodeEnv, logger, uuid4 } from '@sentry/utils';
+import { consoleSandbox, dateTimestampInSeconds, getMainCarrier, isNodeEnv, logger, uuid4 } from '@sentry/utils';
 
 import { DomainAsCarrier, Layer } from './interfaces';
 import { Scope } from './scope';
@@ -451,16 +451,6 @@ export class Hub implements HubInterface {
   }
 }
 
-/** Returns the global shim registry. */
-export function getMainCarrier(): Carrier {
-  const carrier = getGlobalObject();
-  carrier.__SENTRY__ = carrier.__SENTRY__ || {
-    extensions: {},
-    hub: undefined,
-  };
-  return carrier;
-}
-
 /**
  * Replaces the current main hub with the passed one on the global object
  *

packages/hub/src/index.ts

@@ -7,11 +7,11 @@ export {
   getActiveDomain,
   getCurrentHub,
   getHubFromCarrier,
-  getMainCarrier,
   Hub,
   makeMain,
   setHubOnCarrier,
 } from './hub';
 
 // For backwards compatibillity
+export { getMainCarrier } from '@sentry/utils';
 export { Carrier } from '@sentry/types';

packages/node/src/index.ts

@@ -44,7 +44,7 @@ export { defaultIntegrations, init, lastEventId, flush, close } from './sdk';
 export { SDK_NAME } from './version';
 
 import { Integrations as CoreIntegrations } from '@sentry/core';
-import { getMainCarrier } from '@sentry/hub';
+import { getMainCarrier } from '@sentry/utils';
 import * as domain from 'domain';
 
 import * as Handlers from './handlers';

packages/node/src/sdk.ts

@@ -1,6 +1,6 @@
 import { getCurrentHub, initAndBind, Integrations as CoreIntegrations } from '@sentry/core';
-import { getMainCarrier, setHubOnCarrier } from '@sentry/hub';
-import { getGlobalObject } from '@sentry/utils';
+import { setHubOnCarrier } from '@sentry/hub';
+import { getGlobalObject, getMainCarrier } from '@sentry/utils';
 import * as domain from 'domain';
 
 import { NodeOptions } from './backend';

packages/tracing/src/hubextensions.ts

@@ -1,12 +1,12 @@
-import { getMainCarrier, Hub } from '@sentry/hub';
+import { Hub } from '@sentry/hub';
 import {
   CustomSamplingContext,
   Options,
   SamplingContext,
   TransactionContext,
   TransactionSamplingMethod,
 } from '@sentry/types';
-import { logger } from '@sentry/utils';
+import { getMainCarrier, logger } from '@sentry/utils';
 
 import { registerErrorInstrumentation } from './errors';
 import { IdleTransaction } from './idletransaction';

packages/utils/src/compat.ts

@@ -42,3 +42,13 @@ export function getGlobalObject<T>(): T & SentryGlobal {
     ? self
     : fallbackGlobalObject) as T & SentryGlobal;
 }
+
+/** Returns the global shim registry. */
+export function getMainCarrier(): Carrier {
+  const carrier = getGlobalObject();
+  carrier.__SENTRY__ = carrier.__SENTRY__ || {
+    extensions: {},
+    hub: undefined,
+  };
+  return carrier;
+}