feat(sveltekit): Switch to Otel-based @sentry/node package

Author: Lms24

dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

@@ -98,7 +98,7 @@ const DEPENDENTS: Dependent[] = [
   },
   {
     package: '@sentry/sveltekit',
-    compareWith: nodeExperimentalExports,
+    compareWith: nodeExports,
     exports: Object.keys(SentrySvelteKit),
   },
 ];

packages/sveltekit/package.json

@@ -39,7 +39,7 @@
   "dependencies": {
     "@sentry-internal/tracing": "8.0.0-alpha.2",
     "@sentry/core": "8.0.0-alpha.2",
-    "@sentry/node-experimental": "8.0.0-alpha.2",
+    "@sentry/node": "8.0.0-alpha.2",
     "@sentry/svelte": "8.0.0-alpha.2",
     "@sentry/types": "8.0.0-alpha.2",
     "@sentry/utils": "8.0.0-alpha.2",

packages/sveltekit/src/index.types.ts

@@ -36,16 +36,18 @@ export declare function handleErrorWithSentry<T extends HandleClientError | Hand
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export declare function wrapLoadWithSentry<T extends (...args: any) => any>(origLoad: T): T;
 
-// We export a merged Integrations object so that users can (at least typing-wise) use all integrations everywhere.
-// eslint-disable-next-line deprecation/deprecation
-export declare const Integrations: typeof clientSdk.Integrations & typeof serverSdk.Integrations;
-
 export declare const linkedErrorsIntegration: typeof clientSdk.linkedErrorsIntegration;
 export declare const contextLinesIntegration: typeof clientSdk.contextLinesIntegration;
 
 export declare const getDefaultIntegrations: (options: Options) => Integration[];
 export declare const defaultStackParser: StackParser;
 
+export declare const getClient: typeof clientSdk.getClient;
+// eslint-disable-next-line deprecation/deprecation
+export declare const getCurrentHub: typeof clientSdk.getCurrentHub;
+// eslint-disable-next-line deprecation/deprecation
+export declare const makeMain: typeof clientSdk.makeMain;
+
 export declare function close(timeout?: number | undefined): PromiseLike<boolean>;
 export declare function flush(timeout?: number | undefined): PromiseLike<boolean>;
 

packages/sveltekit/src/server/handle.ts

@@ -10,7 +10,7 @@ import {
   withIsolationScope,
 } from '@sentry/core';
 import { startSpan } from '@sentry/core';
-import { captureException } from '@sentry/node-experimental';
+import { captureException } from '@sentry/node';
 import type { Span } from '@sentry/types';
 import { dynamicSamplingContextToSentryBaggageHeader, objectify } from '@sentry/utils';
 import type { Handle, ResolveOptions } from '@sveltejs/kit';

packages/sveltekit/src/server/handleError.ts

@@ -1,4 +1,4 @@
-import { captureException } from '@sentry/node-experimental';
+import { captureException } from '@sentry/node';
 import type { HandleServerError } from '@sveltejs/kit';
 
 import { flushIfServerless } from './utils';

packages/sveltekit/src/server/index.ts

@@ -1,11 +1,9 @@
 // Node SDK exports
-// Unfortunately, we cannot `export * from '@sentry/node-experimental'` because in prod builds,
+// Unfortunately, we cannot `export * from '@sentry/node'` because in prod builds,
 // Vite puts these exports into a `default` property (Sentry.default) rather than
 // on the top - level namespace.
 // Hence, we export everything from the Node SDK explicitly:
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  addGlobalEventProcessor,
   addEventProcessor,
   addBreadcrumb,
   addIntegration,
@@ -15,10 +13,6 @@ export {
   captureCheckIn,
   withMonitor,
   createTransport,
-  // eslint-disable-next-line deprecation/deprecation
-  getActiveTransaction,
-  // eslint-disable-next-line deprecation/deprecation
-  getCurrentHub,
   getClient,
   isInitialized,
   getCurrentScope,
@@ -41,7 +35,6 @@ export {
   setHttpStatus,
   withScope,
   withIsolationScope,
-  autoDiscoverNodePerformanceMonitoringIntegrations,
   makeNodeTransport,
   getDefaultIntegrations,
   defaultStackParser,
@@ -51,7 +44,6 @@ export {
   addRequestDataToEvent,
   DEFAULT_USER_INCLUDES,
   extractRequestData,
-  Integrations,
   consoleIntegration,
   onUncaughtExceptionIntegration,
   onUnhandledRejectionIntegration,
@@ -63,7 +55,6 @@ export {
   functionToStringIntegration,
   inboundFiltersIntegration,
   linkedErrorsIntegration,
-  Handlers,
   setMeasurement,
   getActiveSpan,
   getRootSpan,
@@ -75,16 +66,15 @@ export {
   cron,
   parameterize,
   createGetModuleFromFilename,
-  hapiErrorPlugin,
   metrics,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
-} from '@sentry/node-experimental';
+} from '@sentry/node';
 
 // We can still leave this for the carrier init and type exports
-export * from '@sentry/node-experimental';
+export * from '@sentry/node';
 
 // -------------------------
 // SvelteKit SDK exports:

packages/sveltekit/src/server/load.ts

@@ -4,7 +4,7 @@ import {
   continueTrace,
   startSpan,
 } from '@sentry/core';
-import { captureException } from '@sentry/node-experimental';
+import { captureException } from '@sentry/node';
 import { addNonEnumerableProperty, objectify } from '@sentry/utils';
 import type { LoadEvent, ServerLoadEvent } from '@sveltejs/kit';
 

packages/sveltekit/src/server/sdk.ts

@@ -1,7 +1,7 @@
 import { applySdkMetadata, setTag } from '@sentry/core';
-import type { NodeOptions } from '@sentry/node-experimental';
-import { getDefaultIntegrations as getDefaultNodeIntegrations } from '@sentry/node-experimental';
-import { init as initNodeSdk } from '@sentry/node-experimental';
+import type { NodeOptions } from '@sentry/node';
+import { getDefaultIntegrations as getDefaultNodeIntegrations } from '@sentry/node';
+import { init as initNodeSdk } from '@sentry/node';
 
 import { rewriteFramesIntegration } from './rewriteFramesIntegration';
 

packages/sveltekit/src/server/utils.ts

@@ -1,4 +1,4 @@
-import { flush } from '@sentry/node-experimental';
+import { flush } from '@sentry/node';
 import { logger } from '@sentry/utils';
 import type { RequestEvent } from '@sveltejs/kit';
 

packages/sveltekit/src/vite/sourceMaps.ts

@@ -1,7 +1,7 @@
 import * as child_process from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
-import { getSentryRelease } from '@sentry/node-experimental';
+import { getSentryRelease } from '@sentry/node';
 import { escapeStringForRegex, uuid4 } from '@sentry/utils';
 import type { SentryVitePluginOptions } from '@sentry/vite-plugin';
 import { sentryVitePlugin } from '@sentry/vite-plugin';

packages/sveltekit/test/server/handle.test.ts

@@ -6,8 +6,8 @@ import {
   spanIsSampled,
   spanToJSON,
 } from '@sentry/core';
-import { NodeClient, setCurrentClient } from '@sentry/node-experimental';
-import * as SentryNode from '@sentry/node-experimental';
+import { NodeClient, setCurrentClient } from '@sentry/node';
+import * as SentryNode from '@sentry/node';
 import type { Span } from '@sentry/types';
 import type { Handle } from '@sveltejs/kit';
 import { redirect } from '@sveltejs/kit';

packages/sveltekit/test/server/handleError.test.ts

@@ -1,4 +1,4 @@
-import * as SentryNode from '@sentry/node-experimental';
+import * as SentryNode from '@sentry/node';
 import type { HandleServerError, RequestEvent } from '@sveltejs/kit';
 import { vi } from 'vitest';
 

packages/sveltekit/test/server/load.test.ts

@@ -5,8 +5,8 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   addTracingExtensions,
 } from '@sentry/core';
-import { getClient, getCurrentScope, getIsolationScope, init } from '@sentry/node-experimental';
-import * as SentryNode from '@sentry/node-experimental';
+import { getClient, getCurrentScope, getIsolationScope, init } from '@sentry/node';
+import * as SentryNode from '@sentry/node';
 import type { Event } from '@sentry/types';
 import type { Load, ServerLoad } from '@sveltejs/kit';
 import { error, redirect } from '@sveltejs/kit';
@@ -151,7 +151,8 @@ describe.each([
       [504, 1],
     ])('error with status code %s calls captureException %s times', async (code, times) => {
       async function load({ params }) {
-        throw error(code, params.id);
+        // @ts-expect-error - number is not assignable to NumericRange but that's fine here
+        throw error(code, { message: params.id });
       }
 
       const wrappedLoad = wrapLoadWithSentry(load);

packages/sveltekit/test/server/sdk.test.ts

@@ -1,7 +1,8 @@
-import * as SentryNode from '@sentry/node-experimental';
-import type { NodeClient } from '@sentry/node-experimental';
-import { SDK_VERSION, getClient } from '@sentry/node-experimental';
+import * as SentryNode from '@sentry/node';
+import type { NodeClient } from '@sentry/node';
+import { SDK_VERSION, getClient } from '@sentry/node';
 
+import { vi } from 'vitest';
 import { init } from '../../src/server/sdk';
 
 const nodeInit = vi.spyOn(SentryNode, 'init');