Move @sentry/hub code to @sentry/core

getsentry · Sep 26, 2022 · 472f616 · 472f616
1 parent a5bfa80
commit 472f616
Show file tree

Hide file tree

Showing 69 changed files with 105 additions and 110 deletions.
diff --git a/packages/browser/test/unit/sdk.test.ts b/packages/browser/test/unit/sdk.test.ts
@@ -21,8 +21,8 @@ function getDefaultBrowserOptions(options: Partial<BrowserOptions> = {}): Browse
   };
 }
 
-jest.mock('@sentry/hub', () => {
-  const original = jest.requireActual('@sentry/hub');
+jest.mock('@sentry/core', () => {
+  const original = jest.requireActual('@sentry/core');
   return {
     ...original,
     getCurrentHub(): {

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -16,7 +16,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/hub": "7.13.0",
     "@sentry/types": "7.13.0",
     "@sentry/utils": "7.13.0",
     "tslib": "^1.9.3"

diff --git a/packages/core/src/baseclient.ts b/packages/core/src/baseclient.ts
@@ -1,5 +1,4 @@
 /* eslint-disable max-lines */
-import { Scope, updateSession } from '@sentry/hub';
 import {
   Client,
   ClientOptions,
@@ -40,6 +39,8 @@ import {
 import { getEnvelopeEndpointWithUrlEncodedAuth } from './api';
 import { createEventEnvelope, createSessionEnvelope } from './envelope';
 import { IntegrationIndex, setupIntegrations } from './integration';
+import { Scope } from './scope';
+import { updateSession } from './session';
 
 const ALREADY_SEEN_ERROR = "Not capturing exception because it's already been captured.";
 

diff --git a/packages/hub/src/exports.ts → packages/core/src/exports.ts b/packages/hub/src/exports.ts → packages/core/src/exports.ts
diff --git a/packages/hub/src/hub.ts → packages/core/src/hub.ts b/packages/hub/src/hub.ts → packages/core/src/hub.ts
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -1,4 +1,5 @@
 export type { ClientClass } from './sdk';
+export type { Carrier, Layer } from './hub';
 
 export {
   addBreadcrumb,
@@ -14,13 +15,11 @@ export {
   setTags,
   setUser,
   withScope,
-  addGlobalEventProcessor,
-  getCurrentHub,
-  getHubFromCarrier,
-  Hub,
-  makeMain,
-  Scope,
-} from '@sentry/hub';
+} from './exports';
+export { getCurrentHub, getHubFromCarrier, Hub, makeMain, getMainCarrier, setHubOnCarrier } from './hub';
+export { makeSession, closeSession, updateSession } from './session';
+export { SessionFlusher } from './sessionflusher';
+export { addGlobalEventProcessor, Scope } from './scope';
 export { getEnvelopeEndpointWithUrlEncodedAuth, getReportDialogEndpoint } from './api';
 export { BaseClient } from './baseclient';
 export { initAndBind } from './sdk';

diff --git a/packages/core/src/integration.ts b/packages/core/src/integration.ts
@@ -1,7 +1,9 @@
-import { addGlobalEventProcessor, getCurrentHub } from '@sentry/hub';
 import { Integration, Options } from '@sentry/types';
 import { arrayify, logger } from '@sentry/utils';
 
+import { getCurrentHub } from './hub';
+import { addGlobalEventProcessor } from './scope';
+
 declare module '@sentry/types' {
   interface Integration {
     isDefaultInstance?: boolean;

diff --git a/packages/hub/src/scope.ts → packages/core/src/scope.ts b/packages/hub/src/scope.ts → packages/core/src/scope.ts
diff --git a/packages/core/src/sdk.ts b/packages/core/src/sdk.ts
@@ -1,7 +1,8 @@
-import { getCurrentHub } from '@sentry/hub';
 import { Client, ClientOptions } from '@sentry/types';
 import { logger } from '@sentry/utils';
 
+import { getCurrentHub } from './hub';
+
 /** A class object that can instantiate Client objects. */
 export type ClientClass<F extends Client, O extends ClientOptions> = new (options: O) => F;
 

diff --git a/packages/hub/src/session.ts → packages/core/src/session.ts b/packages/hub/src/session.ts → packages/core/src/session.ts
diff --git a/packages/hub/src/sessionflusher.ts → packages/core/src/sessionflusher.ts b/packages/hub/src/sessionflusher.ts → packages/core/src/sessionflusher.ts
diff --git a/packages/core/test/lib/base.test.ts b/packages/core/test/lib/base.test.ts
@@ -1,7 +1,7 @@
-import { Hub, makeSession, Scope } from '@sentry/hub';
 import { Event, Span } from '@sentry/types';
 import { dsnToString, logger, SentryError, SyncPromise } from '@sentry/utils';
 
+import { Hub, makeSession, Scope } from '../../src';
 import * as integrationModule from '../../src/integration';
 import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
 import { TestIntegration } from '../mocks/integration';

diff --git a/packages/core/test/lib/hint.test.ts b/packages/core/test/lib/hint.test.ts
@@ -1,4 +1,4 @@
-import { captureEvent, configureScope } from '@sentry/hub';
+import { captureEvent, configureScope } from '@sentry/core';
 import { getGlobalObject } from '@sentry/utils';
 
 import { initAndBind } from '../../src/sdk';

diff --git a/packages/core/test/lib/sdk.test.ts b/packages/core/test/lib/sdk.test.ts
@@ -1,4 +1,4 @@
-import { Scope } from '@sentry/hub';
+import { Scope } from '@sentry/core';
 import { Client, Integration } from '@sentry/types';
 
 import { installedIntegrations } from '../../src/integration';
@@ -10,8 +10,8 @@ declare var global: any;
 
 const PUBLIC_DSN = 'https://username@domain/123';
 
-jest.mock('@sentry/hub', () => {
-  const original = jest.requireActual('@sentry/hub');
+jest.mock('@sentry/core', () => {
+  const original = jest.requireActual('@sentry/core');
   return {
     ...original,
     getCurrentHub(): {

diff --git a/packages/core/test/mocks/integration.ts b/packages/core/test/mocks/integration.ts
@@ -1,6 +1,7 @@
-import { configureScope, getCurrentHub } from '@sentry/hub';
 import { Event, EventProcessor, Integration } from '@sentry/types';
 
+import { configureScope, getCurrentHub } from '../../src';
+
 export class TestIntegration implements Integration {
   public static id: string = 'TestIntegration';
 

diff --git a/packages/hub/package.json b/packages/hub/package.json
@@ -16,8 +16,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/types": "7.13.0",
-    "@sentry/utils": "7.13.0",
+    "@sentry/core": "7.13.0",
     "tslib": "^1.9.3"
   },
   "scripts": {

diff --git a/packages/hub/src/index.ts b/packages/hub/src/index.ts
@@ -1,10 +1,18 @@
-export type { Carrier, Layer } from './hub';
+export type { Carrier, Layer } from '@sentry/core';
 
-export { addGlobalEventProcessor, Scope } from './scope';
-export { closeSession, makeSession, updateSession } from './session';
-export { SessionFlusher } from './sessionflusher';
-export { getCurrentHub, getHubFromCarrier, getMainCarrier, Hub, makeMain, setHubOnCarrier } from './hub';
 export {
+  getCurrentHub,
+  addGlobalEventProcessor,
+  Scope,
+  getHubFromCarrier,
+  getMainCarrier,
+  Hub,
+  makeMain,
+  setHubOnCarrier,
+  SessionFlusher,
+  closeSession,
+  makeSession,
+  updateSession,
   addBreadcrumb,
   captureException,
   captureEvent,
@@ -18,4 +26,4 @@ export {
   setTags,
   setUser,
   withScope,
-} from './exports';
+} from '@sentry/core';
diff --git a/packages/hub/test/exports.test.ts b/packages/hub/test/exports.test.ts
@@ -1,17 +1,19 @@
-import { getCurrentHub, getHubFromCarrier, Scope } from '../src';
 import {
   captureEvent,
   captureException,
   captureMessage,
   configureScope,
+  getCurrentHub,
+  getHubFromCarrier,
+  Scope,
   setContext,
   setExtra,
   setExtras,
   setTag,
   setTags,
   setUser,
   withScope,
-} from '../src/exports';
+} from '../src';
 
 export class TestClient {
   public static instance?: TestClient;

diff --git a/packages/hub/test/session.test.ts b/packages/hub/test/session.test.ts
@@ -1,7 +1,7 @@
 import { SessionContext } from '@sentry/types';
 import { timestampInSeconds } from '@sentry/utils';
 
-import { closeSession, makeSession, updateSession } from '../src/session';
+import { closeSession, makeSession, updateSession } from '../src';
 
 describe('Session', () => {
   it('initializes with the proper defaults', () => {

diff --git a/packages/hub/test/sessionflusher.test.ts b/packages/hub/test/sessionflusher.test.ts
@@ -1,6 +1,6 @@
 import { Client } from '@sentry/types';
 
-import { SessionFlusher } from '../src/sessionflusher';
+import { SessionFlusher } from '../src';
 
 describe('Session Flusher', () => {
   let sendSession: jest.Mock;

diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
@@ -19,7 +19,6 @@
   "dependencies": {
     "@rollup/plugin-sucrase": "4.0.4",
     "@sentry/core": "7.13.0",
-    "@sentry/hub": "7.13.0",
     "@sentry/integrations": "7.13.0",
     "@sentry/node": "7.13.0",
     "@sentry/react": "7.13.0",

diff --git a/packages/nextjs/src/index.server.ts b/packages/nextjs/src/index.server.ts
@@ -1,4 +1,4 @@
-import { Carrier, getHubFromCarrier, getMainCarrier } from '@sentry/hub';
+import { Carrier, getHubFromCarrier, getMainCarrier } from '@sentry/core';
 import { RewriteFrames } from '@sentry/integrations';
 import { configureScope, getCurrentHub, init as nodeInit, Integrations } from '@sentry/node';
 import { hasTracingEnabled } from '@sentry/tracing';

diff --git a/packages/nextjs/src/performance/client.ts b/packages/nextjs/src/performance/client.ts
@@ -1,4 +1,4 @@
-import { getCurrentHub } from '@sentry/hub';
+import { getCurrentHub } from '@sentry/core';
 import { Primitive, TraceparentData, Transaction, TransactionContext, TransactionSource } from '@sentry/types';
 import {
   baggageHeaderToDynamicSamplingContext,

diff --git a/packages/nextjs/src/utils/_error.ts b/packages/nextjs/src/utils/_error.ts
@@ -1,5 +1,4 @@
-import { captureException, withScope } from '@sentry/core';
-import { getCurrentHub } from '@sentry/hub';
+import { captureException, getCurrentHub, withScope } from '@sentry/core';
 import { addExceptionMechanism } from '@sentry/utils';
 import { NextPageContext } from 'next';
 

diff --git a/packages/nextjs/test/config/withSentry.test.ts b/packages/nextjs/test/config/withSentry.test.ts
@@ -1,4 +1,4 @@
-import * as hub from '@sentry/hub';
+import * as hub from '@sentry/core';
 import * as Sentry from '@sentry/node';
 import { Client, ClientOptions } from '@sentry/types';
 import * as utils from '@sentry/utils';

diff --git a/packages/nextjs/test/index.client.test.ts b/packages/nextjs/test/index.client.test.ts
@@ -1,5 +1,4 @@
-import { BaseClient } from '@sentry/core';
-import { getCurrentHub } from '@sentry/hub';
+import { BaseClient, getCurrentHub } from '@sentry/core';
 import * as SentryReact from '@sentry/react';
 import { Integrations as TracingIntegrations } from '@sentry/tracing';
 import { Integration } from '@sentry/types';

diff --git a/packages/nextjs/test/integration/package.json b/packages/nextjs/test/integration/package.json
@@ -26,7 +26,6 @@
   "resolutions": {
     "@sentry/browser": "file:../../../browser",
     "@sentry/core": "file:../../../core",
-    "@sentry/hub": "file:../../../hub",
     "@sentry/integrations": "file:../../../integrations",
     "@sentry/node": "file:../../../node",
     "@sentry/react": "file:../../../react",

diff --git a/packages/node/package.json b/packages/node/package.json
@@ -17,7 +17,6 @@
   },
   "dependencies": {
     "@sentry/core": "7.13.0",
-    "@sentry/hub": "7.13.0",
     "@sentry/types": "7.13.0",
     "@sentry/utils": "7.13.0",
     "cookie": "^0.4.1",

diff --git a/packages/node/src/client.ts b/packages/node/src/client.ts
@@ -1,5 +1,4 @@
-import { BaseClient, Scope, SDK_VERSION } from '@sentry/core';
-import { SessionFlusher } from '@sentry/hub';
+import { BaseClient, Scope, SDK_VERSION, SessionFlusher } from '@sentry/core';
 import { Event, EventHint, Severity, SeverityLevel } from '@sentry/types';
 import { logger, resolvedSyncPromise } from '@sentry/utils';
 import * as os from 'os';

diff --git a/packages/node/src/eventbuilder.ts b/packages/node/src/eventbuilder.ts
@@ -1,4 +1,4 @@
-import { getCurrentHub } from '@sentry/hub';
+import { getCurrentHub } from '@sentry/core';
 import {
   Event,
   EventHint,

diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts
@@ -51,8 +51,7 @@ export { defaultIntegrations, init, defaultStackParser, lastEventId, flush, clos
 export { addRequestDataToEvent, DEFAULT_USER_INCLUDES, extractRequestData } from './requestdata';
 export { deepReadDirSync } from './utils';
 
-import { Integrations as CoreIntegrations } from '@sentry/core';
-import { getMainCarrier } from '@sentry/hub';
+import { getMainCarrier, Integrations as CoreIntegrations } from '@sentry/core';
 import * as domain from 'domain';
 
 import * as Handlers from './handlers';
@@ -66,7 +65,7 @@ const INTEGRATIONS = {
 export { INTEGRATIONS as Integrations, Handlers };
 
 // We need to patch domain on the global __SENTRY__ object to make it work for node in cross-platform packages like
-// @sentry/hub. If we don't do this, browser bundlers will have troubles resolving `require('domain')`.
+// @sentry/core. If we don't do this, browser bundlers will have troubles resolving `require('domain')`.
 const carrier = getMainCarrier();
 if (carrier.__SENTRY__) {
   carrier.__SENTRY__.extensions = carrier.__SENTRY__.extensions || {};

diff --git a/packages/node/src/sdk.ts b/packages/node/src/sdk.ts
@@ -1,6 +1,12 @@
 /* eslint-disable max-lines */
-import { getCurrentHub, getIntegrationsToSetup, initAndBind, Integrations as CoreIntegrations } from '@sentry/core';
-import { getMainCarrier, setHubOnCarrier } from '@sentry/hub';
+import {
+  getCurrentHub,
+  getIntegrationsToSetup,
+  getMainCarrier,
+  initAndBind,
+  Integrations as CoreIntegrations,
+  setHubOnCarrier,
+} from '@sentry/core';
 import { SessionStatus, StackParser } from '@sentry/types';
 import {
   createStackParser,

diff --git a/packages/node/test/client.test.ts b/packages/node/test/client.test.ts
@@ -1,4 +1,4 @@
-import { Scope, SessionFlusher } from '@sentry/hub';
+import { Scope, SessionFlusher } from '@sentry/core';
 import { Event, EventHint } from '@sentry/types';
 import * as os from 'os';
 

diff --git a/packages/node/test/eventbuilders.test.ts b/packages/node/test/eventbuilders.test.ts
@@ -5,8 +5,8 @@ import { eventFromUnknownInput } from '../src/eventbuilder';
 
 const testScope = new Scope();
 
-jest.mock('@sentry/hub', () => {
-  const original = jest.requireActual('@sentry/hub');
+jest.mock('@sentry/core', () => {
+  const original = jest.requireActual('@sentry/core');
   return {
     ...original,
     getCurrentHub(): {

diff --git a/packages/node/test/handlers.test.ts b/packages/node/test/handlers.test.ts
@@ -1,6 +1,5 @@
 import * as sentryCore from '@sentry/core';
-import * as sentryHub from '@sentry/hub';
-import { Hub } from '@sentry/hub';
+import { Hub, Scope } from '@sentry/core';
 import { Transaction } from '@sentry/tracing';
 import { Event } from '@sentry/types';
 import { SentryError } from '@sentry/utils';
@@ -277,10 +276,8 @@ describe('tracingHandler', () => {
   it('puts its transaction on the scope', () => {
     const options = getDefaultNodeClientOptions({ tracesSampleRate: 1.0 });
     const hub = new Hub(new NodeClient(options));
-    // we need to mock both of these because the tracing handler relies on `@sentry/core` while the sampler relies on
-    // `@sentry/hub`, and mocking breaks the link between the two
+
     jest.spyOn(sentryCore, 'getCurrentHub').mockReturnValue(hub);
-    jest.spyOn(sentryHub, 'getCurrentHub').mockReturnValue(hub);
 
     sentryTracingMiddleware(req, res, next);
 
@@ -443,7 +440,6 @@ describe('errorHandler()', () => {
 
     jest.spyOn<any, any>(client, '_captureRequestSession');
     jest.spyOn(sentryCore, 'getCurrentHub').mockReturnValue(hub);
-    jest.spyOn(sentryHub, 'getCurrentHub').mockReturnValue(hub);
 
     scope?.setRequestSession({ status: 'ok' });
     sentryErrorMiddleware({ name: 'error', message: 'this is an error' }, req, res, next);
@@ -460,7 +456,6 @@ describe('errorHandler()', () => {
 
     jest.spyOn<any, any>(client, '_captureRequestSession');
     jest.spyOn(sentryCore, 'getCurrentHub').mockReturnValue(hub);
-    jest.spyOn(sentryHub, 'getCurrentHub').mockReturnValue(hub);
 
     scope?.setRequestSession({ status: 'ok' });
     sentryErrorMiddleware({ name: 'error', message: 'this is an error' }, req, res, next);
@@ -474,7 +469,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 sentryHub.Scope();
+    const scope = new Scope();
     const hub = new Hub(client, scope);
 
     jest.spyOn<any, any>(client, '_captureRequestSession');
@@ -493,12 +488,11 @@ describe('errorHandler()', () => {
     // It is required to initialise SessionFlusher to capture Session Aggregates (it is usually initialised
     // by the`requestHandler`)
     client.initSessionFlusher();
-    const scope = new sentryHub.Scope();
+    const scope = new Scope();
     const hub = new Hub(client, scope);
 
     jest.spyOn<any, any>(client, '_captureRequestSession');
     jest.spyOn(sentryCore, 'getCurrentHub').mockReturnValue(hub);
-    jest.spyOn(sentryHub, 'getCurrentHub').mockReturnValue(hub);
 
     sentryErrorMiddleware({ name: 'error', message: 'this is an error' }, req, res, next);
     const requestSession = scope?.getRequestSession();

diff --git a/packages/node/test/index.test.ts b/packages/node/test/index.test.ts
@@ -1,5 +1,4 @@
-import { initAndBind, SDK_VERSION } from '@sentry/core';
-import { getMainCarrier } from '@sentry/hub';
+import { getMainCarrier, initAndBind, SDK_VERSION } from '@sentry/core';
 import { EventHint, Integration } from '@sentry/types';
 import * as domain from 'domain';