diff --git a/packages/nextjs/test/integration/package.json b/packages/nextjs/test/integration/package.json index 4ff461b86f04..5c55363fe714 100644 --- a/packages/nextjs/test/integration/package.json +++ b/packages/nextjs/test/integration/package.json @@ -32,6 +32,7 @@ "@sentry/react": "file:../../../react", "@sentry/replay": "file:../../../replay", "@sentry/tracing": "file:../../../tracing", + "@sentry-internal/tracing": "file:../../../tracing-internal", "@sentry/types": "file:../../../types", "@sentry/utils": "file:../../../utils" } diff --git a/packages/remix/test/integration/package.json b/packages/remix/test/integration/package.json index 102a7844b1f9..3899f1acddad 100644 --- a/packages/remix/test/integration/package.json +++ b/packages/remix/test/integration/package.json @@ -30,6 +30,7 @@ "@sentry/react": "file:../../../react", "@sentry/replay": "file:../../../replay", "@sentry/tracing": "file:../../../tracing", + "@sentry-internal/tracing": "file:../../../tracing-internal", "@sentry/types": "file:../../../types", "@sentry/utils": "file:../../../utils" }, diff --git a/packages/tracing/src/browser/backgroundtab.ts b/packages/tracing-internal/src/browser/backgroundtab.ts similarity index 100% rename from packages/tracing/src/browser/backgroundtab.ts rename to packages/tracing-internal/src/browser/backgroundtab.ts diff --git a/packages/tracing/src/browser/browsertracing.ts b/packages/tracing-internal/src/browser/browsertracing.ts similarity index 100% rename from packages/tracing/src/browser/browsertracing.ts rename to packages/tracing-internal/src/browser/browsertracing.ts diff --git a/packages/tracing/src/browser/index.ts b/packages/tracing-internal/src/browser/index.ts similarity index 100% rename from packages/tracing/src/browser/index.ts rename to packages/tracing-internal/src/browser/index.ts diff --git a/packages/tracing/src/browser/metrics/index.ts b/packages/tracing-internal/src/browser/metrics/index.ts similarity index 100% rename from packages/tracing/src/browser/metrics/index.ts rename to packages/tracing-internal/src/browser/metrics/index.ts diff --git a/packages/tracing/src/browser/metrics/utils.ts b/packages/tracing-internal/src/browser/metrics/utils.ts similarity index 100% rename from packages/tracing/src/browser/metrics/utils.ts rename to packages/tracing-internal/src/browser/metrics/utils.ts diff --git a/packages/tracing/src/browser/request.ts b/packages/tracing-internal/src/browser/request.ts similarity index 100% rename from packages/tracing/src/browser/request.ts rename to packages/tracing-internal/src/browser/request.ts diff --git a/packages/tracing/src/browser/router.ts b/packages/tracing-internal/src/browser/router.ts similarity index 100% rename from packages/tracing/src/browser/router.ts rename to packages/tracing-internal/src/browser/router.ts diff --git a/packages/tracing/src/browser/types.ts b/packages/tracing-internal/src/browser/types.ts similarity index 100% rename from packages/tracing/src/browser/types.ts rename to packages/tracing-internal/src/browser/types.ts diff --git a/packages/tracing/src/browser/web-vitals/README.md b/packages/tracing-internal/src/browser/web-vitals/README.md similarity index 100% rename from packages/tracing/src/browser/web-vitals/README.md rename to packages/tracing-internal/src/browser/web-vitals/README.md diff --git a/packages/tracing/src/browser/web-vitals/getCLS.ts b/packages/tracing-internal/src/browser/web-vitals/getCLS.ts similarity index 100% rename from packages/tracing/src/browser/web-vitals/getCLS.ts rename to packages/tracing-internal/src/browser/web-vitals/getCLS.ts diff --git a/packages/tracing/src/browser/web-vitals/getFID.ts b/packages/tracing-internal/src/browser/web-vitals/getFID.ts similarity index 100% rename from packages/tracing/src/browser/web-vitals/getFID.ts rename to packages/tracing-internal/src/browser/web-vitals/getFID.ts diff --git a/packages/tracing/src/browser/web-vitals/getLCP.ts b/packages/tracing-internal/src/browser/web-vitals/getLCP.ts similarity index 100% rename from packages/tracing/src/browser/web-vitals/getLCP.ts rename to packages/tracing-internal/src/browser/web-vitals/getLCP.ts diff --git a/packages/tracing/src/browser/web-vitals/lib/bindReporter.ts b/packages/tracing-internal/src/browser/web-vitals/lib/bindReporter.ts similarity index 100% rename from packages/tracing/src/browser/web-vitals/lib/bindReporter.ts rename to packages/tracing-internal/src/browser/web-vitals/lib/bindReporter.ts diff --git a/packages/tracing/src/browser/web-vitals/lib/generateUniqueID.ts b/packages/tracing-internal/src/browser/web-vitals/lib/generateUniqueID.ts similarity index 100% rename from packages/tracing/src/browser/web-vitals/lib/generateUniqueID.ts rename to packages/tracing-internal/src/browser/web-vitals/lib/generateUniqueID.ts diff --git a/packages/tracing/src/browser/web-vitals/lib/getActivationStart.ts b/packages/tracing-internal/src/browser/web-vitals/lib/getActivationStart.ts similarity index 100% rename from packages/tracing/src/browser/web-vitals/lib/getActivationStart.ts rename to packages/tracing-internal/src/browser/web-vitals/lib/getActivationStart.ts diff --git a/packages/tracing/src/browser/web-vitals/lib/getNavigationEntry.ts b/packages/tracing-internal/src/browser/web-vitals/lib/getNavigationEntry.ts similarity index 100% rename from packages/tracing/src/browser/web-vitals/lib/getNavigationEntry.ts rename to packages/tracing-internal/src/browser/web-vitals/lib/getNavigationEntry.ts diff --git a/packages/tracing/src/browser/web-vitals/lib/getVisibilityWatcher.ts b/packages/tracing-internal/src/browser/web-vitals/lib/getVisibilityWatcher.ts similarity index 100% rename from packages/tracing/src/browser/web-vitals/lib/getVisibilityWatcher.ts rename to packages/tracing-internal/src/browser/web-vitals/lib/getVisibilityWatcher.ts diff --git a/packages/tracing/src/browser/web-vitals/lib/initMetric.ts b/packages/tracing-internal/src/browser/web-vitals/lib/initMetric.ts similarity index 100% rename from packages/tracing/src/browser/web-vitals/lib/initMetric.ts rename to packages/tracing-internal/src/browser/web-vitals/lib/initMetric.ts diff --git a/packages/tracing/src/browser/web-vitals/lib/observe.ts b/packages/tracing-internal/src/browser/web-vitals/lib/observe.ts similarity index 100% rename from packages/tracing/src/browser/web-vitals/lib/observe.ts rename to packages/tracing-internal/src/browser/web-vitals/lib/observe.ts diff --git a/packages/tracing/src/browser/web-vitals/lib/onHidden.ts b/packages/tracing-internal/src/browser/web-vitals/lib/onHidden.ts similarity index 100% rename from packages/tracing/src/browser/web-vitals/lib/onHidden.ts rename to packages/tracing-internal/src/browser/web-vitals/lib/onHidden.ts diff --git a/packages/tracing/src/browser/web-vitals/types.ts b/packages/tracing-internal/src/browser/web-vitals/types.ts similarity index 100% rename from packages/tracing/src/browser/web-vitals/types.ts rename to packages/tracing-internal/src/browser/web-vitals/types.ts diff --git a/packages/tracing/src/browser/web-vitals/types/base.ts b/packages/tracing-internal/src/browser/web-vitals/types/base.ts similarity index 100% rename from packages/tracing/src/browser/web-vitals/types/base.ts rename to packages/tracing-internal/src/browser/web-vitals/types/base.ts diff --git a/packages/tracing/src/browser/web-vitals/types/cls.ts b/packages/tracing-internal/src/browser/web-vitals/types/cls.ts similarity index 100% rename from packages/tracing/src/browser/web-vitals/types/cls.ts rename to packages/tracing-internal/src/browser/web-vitals/types/cls.ts diff --git a/packages/tracing/src/browser/web-vitals/types/fid.ts b/packages/tracing-internal/src/browser/web-vitals/types/fid.ts similarity index 100% rename from packages/tracing/src/browser/web-vitals/types/fid.ts rename to packages/tracing-internal/src/browser/web-vitals/types/fid.ts diff --git a/packages/tracing/src/browser/web-vitals/types/lcp.ts b/packages/tracing-internal/src/browser/web-vitals/types/lcp.ts similarity index 100% rename from packages/tracing/src/browser/web-vitals/types/lcp.ts rename to packages/tracing-internal/src/browser/web-vitals/types/lcp.ts diff --git a/packages/tracing/src/browser/web-vitals/types/polyfills.ts b/packages/tracing-internal/src/browser/web-vitals/types/polyfills.ts similarity index 100% rename from packages/tracing/src/browser/web-vitals/types/polyfills.ts rename to packages/tracing-internal/src/browser/web-vitals/types/polyfills.ts diff --git a/packages/tracing/src/errors.ts b/packages/tracing-internal/src/errors.ts similarity index 100% rename from packages/tracing/src/errors.ts rename to packages/tracing-internal/src/errors.ts diff --git a/packages/tracing/src/exports/index.ts b/packages/tracing-internal/src/exports/index.ts similarity index 100% rename from packages/tracing/src/exports/index.ts rename to packages/tracing-internal/src/exports/index.ts diff --git a/packages/tracing/src/extensions.ts b/packages/tracing-internal/src/extensions.ts similarity index 100% rename from packages/tracing/src/extensions.ts rename to packages/tracing-internal/src/extensions.ts diff --git a/packages/tracing-internal/src/index.ts b/packages/tracing-internal/src/index.ts index cb0ff5c3b541..1f0143253d55 100644 --- a/packages/tracing-internal/src/index.ts +++ b/packages/tracing-internal/src/index.ts @@ -1 +1,34 @@ -export {}; +export * from './exports'; + +import { addExtensionMethods } from './extensions'; +import * as Integrations from './node/integrations'; + +export { Integrations }; + +// BrowserTracing is already exported as part of `Integrations` above (and for the moment will remain so for +// backwards compatibility), but that interferes with treeshaking, so we also export it separately +// here. +// +// Previously we expected users to import tracing integrations like +// +// import { Integrations } from '@sentry/tracing'; +// const instance = new Integrations.BrowserTracing(); +// +// This makes the integrations unable to be treeshaken though. To address this, we now have +// this individual export. We now expect users to consume BrowserTracing like so: +// +// import { BrowserTracing } from '@sentry/tracing'; +// const instance = new BrowserTracing(); +// +// For an example of of the new usage of BrowserTracing, see @sentry/nextjs index.client.ts +export { BrowserTracing } from './browser'; + +export { + BROWSER_TRACING_INTEGRATION_ID, + instrumentOutgoingRequests, + defaultRequestInstrumentationOptions, +} from './browser'; + +export type { RequestInstrumentationOptions } from './browser'; + +export { addExtensionMethods }; diff --git a/packages/tracing/src/node/index.ts b/packages/tracing-internal/src/node/index.ts similarity index 100% rename from packages/tracing/src/node/index.ts rename to packages/tracing-internal/src/node/index.ts diff --git a/packages/tracing/src/node/integrations/apollo.ts b/packages/tracing-internal/src/node/integrations/apollo.ts similarity index 100% rename from packages/tracing/src/node/integrations/apollo.ts rename to packages/tracing-internal/src/node/integrations/apollo.ts diff --git a/packages/tracing/src/node/integrations/express.ts b/packages/tracing-internal/src/node/integrations/express.ts similarity index 100% rename from packages/tracing/src/node/integrations/express.ts rename to packages/tracing-internal/src/node/integrations/express.ts diff --git a/packages/tracing/src/node/integrations/graphql.ts b/packages/tracing-internal/src/node/integrations/graphql.ts similarity index 100% rename from packages/tracing/src/node/integrations/graphql.ts rename to packages/tracing-internal/src/node/integrations/graphql.ts diff --git a/packages/tracing/src/node/integrations/index.ts b/packages/tracing-internal/src/node/integrations/index.ts similarity index 100% rename from packages/tracing/src/node/integrations/index.ts rename to packages/tracing-internal/src/node/integrations/index.ts diff --git a/packages/tracing/src/node/integrations/mongo.ts b/packages/tracing-internal/src/node/integrations/mongo.ts similarity index 100% rename from packages/tracing/src/node/integrations/mongo.ts rename to packages/tracing-internal/src/node/integrations/mongo.ts diff --git a/packages/tracing/src/node/integrations/mysql.ts b/packages/tracing-internal/src/node/integrations/mysql.ts similarity index 100% rename from packages/tracing/src/node/integrations/mysql.ts rename to packages/tracing-internal/src/node/integrations/mysql.ts diff --git a/packages/tracing/src/node/integrations/postgres.ts b/packages/tracing-internal/src/node/integrations/postgres.ts similarity index 100% rename from packages/tracing/src/node/integrations/postgres.ts rename to packages/tracing-internal/src/node/integrations/postgres.ts diff --git a/packages/tracing/src/node/integrations/prisma.ts b/packages/tracing-internal/src/node/integrations/prisma.ts similarity index 100% rename from packages/tracing/src/node/integrations/prisma.ts rename to packages/tracing-internal/src/node/integrations/prisma.ts diff --git a/packages/tracing/src/node/integrations/utils/node-utils.ts b/packages/tracing-internal/src/node/integrations/utils/node-utils.ts similarity index 100% rename from packages/tracing/src/node/integrations/utils/node-utils.ts rename to packages/tracing-internal/src/node/integrations/utils/node-utils.ts diff --git a/packages/tracing/test/browser/backgroundtab.test.ts b/packages/tracing-internal/test/browser/backgroundtab.test.ts similarity index 93% rename from packages/tracing/test/browser/backgroundtab.test.ts rename to packages/tracing-internal/test/browser/backgroundtab.test.ts index ddbf76baa6c6..2c4ca381df3b 100644 --- a/packages/tracing/test/browser/backgroundtab.test.ts +++ b/packages/tracing-internal/test/browser/backgroundtab.test.ts @@ -2,9 +2,9 @@ import { BrowserClient } from '@sentry/browser'; import { Hub, makeMain } from '@sentry/core'; import { JSDOM } from 'jsdom'; -import { addExtensionMethods } from '../../src'; +import { addExtensionMethods } from '../../../tracing/src'; +import { getDefaultBrowserClientOptions } from '../../../tracing/test/testutils'; import { registerBackgroundTabDetection } from '../../src/browser/backgroundtab'; -import { getDefaultBrowserClientOptions } from '../testutils'; describe('registerBackgroundTabDetection', () => { let events: Record = {}; diff --git a/packages/tracing/test/browser/browsertracing.test.ts b/packages/tracing-internal/test/browser/browsertracing.test.ts similarity index 99% rename from packages/tracing/test/browser/browsertracing.test.ts rename to packages/tracing-internal/test/browser/browsertracing.test.ts index e2bee71db0a8..94abe88e6cbb 100644 --- a/packages/tracing/test/browser/browsertracing.test.ts +++ b/packages/tracing-internal/test/browser/browsertracing.test.ts @@ -5,13 +5,13 @@ import type { BaseTransportOptions, ClientOptions, DsnComponents } from '@sentry import type { InstrumentHandlerCallback, InstrumentHandlerType } from '@sentry/utils'; import { JSDOM } from 'jsdom'; -import type { IdleTransaction } from '../../src'; -import { getActiveTransaction } from '../../src'; +import type { IdleTransaction } from '../../../tracing/src'; +import { getActiveTransaction } from '../../../tracing/src'; +import { getDefaultBrowserClientOptions } from '../../../tracing/test/testutils'; import type { BrowserTracingOptions } from '../../src/browser/browsertracing'; import { BrowserTracing, getMetaContent } from '../../src/browser/browsertracing'; import { defaultRequestInstrumentationOptions } from '../../src/browser/request'; import { instrumentRoutingWithDefaults } from '../../src/browser/router'; -import { getDefaultBrowserClientOptions } from '../testutils'; let mockChangeHistory: ({ to, from }: { to: string; from?: string }) => void = () => undefined; diff --git a/packages/tracing/test/browser/metrics/index.test.ts b/packages/tracing-internal/test/browser/metrics/index.test.ts similarity index 100% rename from packages/tracing/test/browser/metrics/index.test.ts rename to packages/tracing-internal/test/browser/metrics/index.test.ts diff --git a/packages/tracing/test/browser/metrics/utils.test.ts b/packages/tracing-internal/test/browser/metrics/utils.test.ts similarity index 100% rename from packages/tracing/test/browser/metrics/utils.test.ts rename to packages/tracing-internal/test/browser/metrics/utils.test.ts diff --git a/packages/tracing/test/browser/request.test.ts b/packages/tracing-internal/test/browser/request.test.ts similarity index 98% rename from packages/tracing/test/browser/request.test.ts rename to packages/tracing-internal/test/browser/request.test.ts index 952362107878..4ca971a4947c 100644 --- a/packages/tracing/test/browser/request.test.ts +++ b/packages/tracing-internal/test/browser/request.test.ts @@ -2,11 +2,11 @@ import { BrowserClient } from '@sentry/browser'; import * as sentryCore from '@sentry/core'; import * as utils from '@sentry/utils'; -import type { Transaction } from '../../src'; -import { addExtensionMethods, Span, spanStatusfromHttpCode } from '../../src'; +import type { Transaction } from '../../../tracing/src'; +import { addExtensionMethods, Span, spanStatusfromHttpCode } from '../../../tracing/src'; +import { getDefaultBrowserClientOptions } from '../../../tracing/test/testutils'; import type { FetchData, XHRData } from '../../src/browser/request'; import { fetchCallback, instrumentOutgoingRequests, shouldAttachHeaders, xhrCallback } from '../../src/browser/request'; -import { getDefaultBrowserClientOptions } from '../testutils'; beforeAll(() => { addExtensionMethods(); diff --git a/packages/tracing/test/browser/router.test.ts b/packages/tracing-internal/test/browser/router.test.ts similarity index 100% rename from packages/tracing/test/browser/router.test.ts rename to packages/tracing-internal/test/browser/router.test.ts diff --git a/packages/tracing/test/errors.test.ts b/packages/tracing-internal/test/errors.test.ts similarity index 97% rename from packages/tracing/test/errors.test.ts rename to packages/tracing-internal/test/errors.test.ts index 70a2e4561671..1dba00b825b1 100644 --- a/packages/tracing/test/errors.test.ts +++ b/packages/tracing-internal/test/errors.test.ts @@ -2,8 +2,8 @@ import { BrowserClient } from '@sentry/browser'; import { addTracingExtensions, Hub, makeMain } from '@sentry/core'; import type { InstrumentHandlerCallback, InstrumentHandlerType } from '@sentry/utils'; +import { getDefaultBrowserClientOptions } from '../../tracing/test/testutils'; import { registerErrorInstrumentation } from '../src/errors'; -import { getDefaultBrowserClientOptions } from './testutils'; const mockAddInstrumentationHandler = jest.fn(); let mockErrorCallback: InstrumentHandlerCallback = () => undefined; diff --git a/packages/tracing/package.json b/packages/tracing/package.json index 5ac7ac899983..7bae1b2c2e3b 100644 --- a/packages/tracing/package.json +++ b/packages/tracing/package.json @@ -16,14 +16,14 @@ "access": "public" }, "dependencies": { - "@sentry/core": "7.43.0", - "@sentry/types": "7.43.0", - "@sentry/utils": "7.43.0", - "tslib": "^1.9.3" + "@sentry-internal/tracing": "7.43.0" }, "devDependencies": { - "@sentry/browser": "7.43.0", "@sentry-internal/integration-shims": "7.43.0", + "@sentry/browser": "7.43.0", + "@sentry/core": "7.43.0", + "@sentry/types": "7.43.0", + "@sentry/utils": "7.43.0", "@types/express": "^4.17.14" }, "scripts": { diff --git a/packages/tracing/src/index.bundle.base.ts b/packages/tracing/src/index.bundle.base.ts index a753bab932d4..42e2c67fa4a8 100644 --- a/packages/tracing/src/index.bundle.base.ts +++ b/packages/tracing/src/index.bundle.base.ts @@ -53,13 +53,11 @@ export { } from '@sentry/browser'; export { SDK_VERSION } from '@sentry/browser'; +import { addExtensionMethods, BrowserTracing } from '@sentry-internal/tracing'; import { Integrations as BrowserIntegrations } from '@sentry/browser'; import type { Integration } from '@sentry/types'; import { GLOBAL_OBJ } from '@sentry/utils'; -import { BrowserTracing } from './browser'; -import { addExtensionMethods } from './extensions'; - export { Span } from '@sentry/core'; let windowIntegrations = {}; diff --git a/packages/tracing/src/index.ts b/packages/tracing/src/index.ts index b8456bc6b017..3f98af8cecd2 100644 --- a/packages/tracing/src/index.ts +++ b/packages/tracing/src/index.ts @@ -1,34 +1,6 @@ -export * from './exports'; +export * from '@sentry-internal/tracing'; -import { addExtensionMethods } from './extensions'; -import * as Integrations from './node/integrations'; - -export { Integrations }; - -// This is already exported as part of `Integrations` above (and for the moment will remain so for -// backwards compatibility), but that interferes with treeshaking, so we also export it separately -// here. -// -// Previously we expected users to import tracing integrations like -// -// import { Integrations } from '@sentry/tracing'; -// const instance = new Integrations.BrowserTracing(); -// -// This makes the integrations unable to be treeshaken though. To address this, we now have -// this individual export. We now expect users to consume BrowserTracing like so: -// -// import { BrowserTracing } from '@sentry/tracing'; -// const instance = new BrowserTracing(); -// -// For an example of of the new usage of BrowserTracing, see @sentry/nextjs index.client.ts -export { - BrowserTracing, - BROWSER_TRACING_INTEGRATION_ID, - instrumentOutgoingRequests, - defaultRequestInstrumentationOptions, -} from './browser'; - -export type { RequestInstrumentationOptions } from './browser'; +import { addExtensionMethods } from '@sentry-internal/tracing'; // Treeshakable guard to remove all code related to tracing declare const __SENTRY_TRACING__: boolean; diff --git a/packages/tracing/test/hub.test.ts b/packages/tracing/test/hub.test.ts index 85c0b7791374..789ffc8e939f 100644 --- a/packages/tracing/test/hub.test.ts +++ b/packages/tracing/test/hub.test.ts @@ -4,8 +4,7 @@ import { Hub, makeMain } from '@sentry/core'; import * as utilsModule from '@sentry/utils'; // for mocking import { logger } from '@sentry/utils'; -import { addExtensionMethods, extractTraceparentData, TRACEPARENT_REGEXP, Transaction } from '../src'; -import { BrowserTracing } from '../src/browser/browsertracing'; +import { addExtensionMethods, BrowserTracing, extractTraceparentData, TRACEPARENT_REGEXP, Transaction } from '../src'; import { addDOMPropertiesToGlobal, getDefaultBrowserClientOptions, diff --git a/packages/tracing/test/integrations/apollo-nestjs.test.ts b/packages/tracing/test/integrations/apollo-nestjs.test.ts index 981693875d7a..0a5116277cb1 100644 --- a/packages/tracing/test/integrations/apollo-nestjs.test.ts +++ b/packages/tracing/test/integrations/apollo-nestjs.test.ts @@ -2,8 +2,7 @@ import { Hub, Scope } from '@sentry/core'; import { logger } from '@sentry/utils'; -import { Span } from '../../src'; -import { Apollo } from '../../src/node/integrations/apollo'; +import { Integrations, Span } from '../../src'; import { getTestClient } from '../testutils'; type ApolloResolverGroup = { @@ -67,7 +66,7 @@ describe('setupOnce', () => { let GraphQLFactoryInstance: GraphQLFactory; beforeAll(() => { - new Apollo({ + new Integrations.Apollo({ useNestjs: true, }).setupOnce( () => undefined, @@ -113,7 +112,7 @@ describe('setupOnce', () => { const client = getTestClient({ instrumenter: 'otel' }); const hub = new Hub(client); - const integration = new Apollo({ useNestjs: true }); + const integration = new Integrations.Apollo({ useNestjs: true }); integration.setupOnce( () => {}, () => hub, diff --git a/packages/tracing/test/integrations/apollo.test.ts b/packages/tracing/test/integrations/apollo.test.ts index 910c866505e8..456c824f23ce 100644 --- a/packages/tracing/test/integrations/apollo.test.ts +++ b/packages/tracing/test/integrations/apollo.test.ts @@ -2,8 +2,7 @@ import { Hub, Scope } from '@sentry/core'; import { logger } from '@sentry/utils'; -import { Span } from '../../src'; -import { Apollo } from '../../src/node/integrations/apollo'; +import { Integrations, Span } from '../../src'; import { getTestClient } from '../testutils'; type ApolloResolverGroup = { @@ -69,7 +68,7 @@ describe('setupOnce', () => { let ApolloServer: ApolloServerBase; beforeAll(() => { - new Apollo().setupOnce( + new Integrations.Apollo().setupOnce( () => undefined, () => new Hub(undefined, scope), ); @@ -113,7 +112,7 @@ describe('setupOnce', () => { const client = getTestClient({ instrumenter: 'otel' }); const hub = new Hub(client); - const integration = new Apollo(); + const integration = new Integrations.Apollo(); integration.setupOnce( () => {}, () => hub, diff --git a/packages/tracing/test/integrations/graphql.test.ts b/packages/tracing/test/integrations/graphql.test.ts index 5d61a4acd5cb..ccd4348784bd 100644 --- a/packages/tracing/test/integrations/graphql.test.ts +++ b/packages/tracing/test/integrations/graphql.test.ts @@ -2,8 +2,7 @@ import { Hub, Scope } from '@sentry/core'; import { logger } from '@sentry/utils'; -import { Span } from '../../src'; -import { GraphQL } from '../../src/node/integrations/graphql'; +import { Integrations, Span } from '../../src'; import { getTestClient } from '../testutils'; const GQLExecute = { @@ -33,7 +32,7 @@ describe('setupOnce', () => { let childSpan: Span; beforeAll(() => { - new GraphQL().setupOnce( + new Integrations.GraphQL().setupOnce( () => undefined, () => new Hub(undefined, scope), ); @@ -66,7 +65,7 @@ describe('setupOnce', () => { const client = getTestClient({ instrumenter: 'otel' }); const hub = new Hub(client); - const integration = new GraphQL(); + const integration = new Integrations.GraphQL(); integration.setupOnce( () => {}, () => hub, diff --git a/packages/tracing/test/integrations/node/mongo.test.ts b/packages/tracing/test/integrations/node/mongo.test.ts index 5c3dd11255c4..70ac88e13109 100644 --- a/packages/tracing/test/integrations/node/mongo.test.ts +++ b/packages/tracing/test/integrations/node/mongo.test.ts @@ -2,8 +2,7 @@ import { Hub, Scope } from '@sentry/core'; import { logger } from '@sentry/utils'; -import { Span } from '../../../src'; -import { Mongo } from '../../../src/node/integrations/mongo'; +import { Integrations, Span } from '../../../src'; import { getTestClient } from '../../testutils'; class Collection { @@ -52,7 +51,7 @@ describe('patchOperation()', () => { let childSpan: Span; beforeAll(() => { - new Mongo({ + new Integrations.Mongo({ operations: ['insertOne', 'initializeOrderedBulkOp'], }).setupOnce( () => undefined, @@ -124,7 +123,7 @@ describe('patchOperation()', () => { const client = getTestClient({ instrumenter: 'otel' }); const hub = new Hub(client); - const integration = new Mongo(); + const integration = new Integrations.Mongo(); integration.setupOnce( () => {}, () => hub, diff --git a/packages/tracing/test/integrations/node/postgres.test.ts b/packages/tracing/test/integrations/node/postgres.test.ts index 08aa64cf368d..c2d5868596a1 100644 --- a/packages/tracing/test/integrations/node/postgres.test.ts +++ b/packages/tracing/test/integrations/node/postgres.test.ts @@ -2,8 +2,7 @@ import { Hub, Scope } from '@sentry/core'; import { logger } from '@sentry/utils'; -import { Span } from '../../../src'; -import { Postgres } from '../../../src/node/integrations/postgres'; +import { Integrations, Span } from '../../../src'; import { getTestClient } from '../../testutils'; class PgClient { @@ -51,7 +50,7 @@ describe('setupOnce', () => { let childSpan: Span; beforeAll(() => { - (pgApi === 'pg' ? new Postgres() : new Postgres({ usePgNative: true })).setupOnce( + (pgApi === 'pg' ? new Integrations.Postgres() : new Integrations.Postgres({ usePgNative: true })).setupOnce( () => undefined, () => new Hub(undefined, scope), ); @@ -107,7 +106,7 @@ describe('setupOnce', () => { const client = getTestClient({ instrumenter: 'otel' }); const hub = new Hub(client); - const integration = new Postgres(); + const integration = new Integrations.Postgres(); integration.setupOnce( () => {}, () => hub, diff --git a/packages/tracing/test/integrations/node/prisma.test.ts b/packages/tracing/test/integrations/node/prisma.test.ts index 95892f9c1686..735167161402 100644 --- a/packages/tracing/test/integrations/node/prisma.test.ts +++ b/packages/tracing/test/integrations/node/prisma.test.ts @@ -2,8 +2,7 @@ import { Hub, Scope } from '@sentry/core'; import { logger } from '@sentry/utils'; -import { Span } from '../../../src'; -import { Prisma } from '../../../src/node/integrations/prisma'; +import { Integrations, Span } from '../../../src'; import { getTestClient } from '../../testutils'; type PrismaMiddleware = (params: unknown, next: (params?: unknown) => Promise) => Promise; @@ -32,7 +31,7 @@ describe('setupOnce', function () { let childSpan: Span; beforeAll(() => { - new Prisma({ client: Client }).setupOnce( + new Integrations.Prisma({ client: Client }).setupOnce( () => undefined, () => new Hub(undefined, scope), ); @@ -66,7 +65,7 @@ describe('setupOnce', function () { const client = getTestClient({ instrumenter: 'otel' }); const hub = new Hub(client); - const integration = new Prisma({ client: Client }); + const integration = new Integrations.Prisma({ client: Client }); integration.setupOnce( () => {}, () => hub,