ref(tracing): Re-organize exports for node/browser

packages/tracing/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentry/tracing",
   "version": "7.41.0",
-  "description": "Extensions for Sentry AM",
+  "description": "Sentry Performance Monitoring Package",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tracing",
   "author": "Sentry",

packages/tracing/src/browser/index.ts

@@ -1,3 +1,5 @@
+export * from '../exports';
+
 export type { RequestInstrumentationOptions } from './request';
 
 export { BrowserTracing, BROWSER_TRACING_INTEGRATION_ID } from './browsertracing';

packages/tracing/src/exports/index.ts

@@ -0,0 +1,15 @@
+export {
+  extractTraceparentData,
+  getActiveTransaction,
+  hasTracingEnabled,
+  IdleTransaction,
+  Span,
+  // eslint-disable-next-line deprecation/deprecation
+  SpanStatus,
+  spanStatusfromHttpCode,
+  startIdleTransaction,
+  stripUrlQueryAndFragment,
+  TRACEPARENT_REGEXP,
+  Transaction,
+} from '@sentry/core';
+export type { SpanStatusType } from '@sentry/core';

packages/tracing/src/extensions.ts

@@ -15,25 +15,25 @@ function _autoloadDatabaseIntegrations(): void {
 
   const packageToIntegrationMapping: Record<string, () => Integration> = {
     mongodb() {
-      const integration = dynamicRequire(module, './integrations/node/mongo') as {
+      const integration = dynamicRequire(module, './node/integrations/mongo') as {
         Mongo: IntegrationClass<Integration>;
       };
       return new integration.Mongo();
     },
     mongoose() {
-      const integration = dynamicRequire(module, './integrations/node/mongo') as {
+      const integration = dynamicRequire(module, './node/integrations/mongo') as {
         Mongo: IntegrationClass<Integration>;
       };
       return new integration.Mongo({ mongoose: true });
     },
     mysql() {
-      const integration = dynamicRequire(module, './integrations/node/mysql') as {
+      const integration = dynamicRequire(module, './node/integrations/mysql') as {
         Mysql: IntegrationClass<Integration>;
       };
       return new integration.Mysql();
     },
     pg() {
-      const integration = dynamicRequire(module, './integrations/node/postgres') as {
+      const integration = dynamicRequire(module, './node/integrations/postgres') as {
         Postgres: IntegrationClass<Integration>;
       };
       return new integration.Postgres();

packages/tracing/src/index.ts

@@ -1,23 +1,7 @@
-export {
-  extractTraceparentData,
-  getActiveTransaction,
-  hasTracingEnabled,
-  IdleTransaction,
-  Span,
-  // eslint-disable-next-line deprecation/deprecation
-  SpanStatus,
-  spanStatusfromHttpCode,
-  startIdleTransaction,
-  stripUrlQueryAndFragment,
-  TRACEPARENT_REGEXP,
-  Transaction,
-} from '@sentry/core';
-export type { SpanStatusType } from '@sentry/core';
+export * from './exports';
 
 import { addExtensionMethods } from './extensions';
-import * as Integrations from './integrations';
-
-export type { RequestInstrumentationOptions } from './browser';
+import * as Integrations from './node';
 
 export { Integrations };
 
@@ -37,9 +21,14 @@ export { Integrations };
 // 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 } from './browser';
+export {
+  BrowserTracing,
+  BROWSER_TRACING_INTEGRATION_ID,
+  instrumentOutgoingRequests,
+  defaultRequestInstrumentationOptions,
+} from './browser';
 
-export { instrumentOutgoingRequests, defaultRequestInstrumentationOptions } from './browser';
+export type { RequestInstrumentationOptions } from './browser';
 
 // Treeshakable guard to remove all code related to tracing
 declare const __SENTRY_TRACING__: boolean;

packages/tracing/src/node/index.ts

@@ -0,0 +1,13 @@
+export * from '../exports';
+
+export { Express } from './integrations/express';
+export { Postgres } from './integrations/postgres';
+export { Mysql } from './integrations/mysql';
+export { Mongo } from './integrations/mongo';
+export { Prisma } from './integrations/prisma';
+export { GraphQL } from './integrations/graphql';
+export { Apollo } from './integrations/apollo';
+
+// TODO(v7): Remove this export
+// Please see `src/index.ts` for more details.
+export { BrowserTracing } from '../browser';

packages/tracing/src/integrations/node/apollo.ts → packages/tracing/src/node/integrations/apollo.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @sentry-internal/sdk/no-optional-chaining */
+
 import type { Hub } from '@sentry/core';
 import type { EventProcessor, Integration } from '@sentry/types';
 import { arrayify, fill, isThenable, loadModule, logger } from '@sentry/utils';

packages/tracing/src/integrations/node/utils/node-utils.ts → packages/tracing/src/node/integrations/utils/node-utils.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @sentry-internal/sdk/no-optional-chaining */
 import type { Hub } from '@sentry/types';
 
 /**