ref(node): Remove the old node package

.github/workflows/build.yml

@@ -118,7 +118,6 @@ jobs:
             node:
               - *shared
               - 'packages/node/**'
-              - 'packages/node-experimental/**'
               - 'dev-packages/node-integration-tests/**'
             nextjs:
               - *shared
@@ -135,7 +134,6 @@ jobs:
             profiling_node:
               - *shared
               - 'packages/node/**'
-              - 'packages/node-experimental/**'
               - 'packages/profiling-node/**'
               - 'dev-packages/e2e-tests/test-applications/node-profiling/**'
             profiling_node_bindings:

MIGRATION.md

@@ -43,6 +43,8 @@ For IE11 support please transpile your code to ES5 using babel or similar and ad
 
 **Next.js**: The Next.js SDK now supports Next.js 13.2.0+
 
+**Express**: Complex router setups are only properly parametrized in Node 16+.
+
 ## 2. Package removal
 
 We've removed the following packages:

dev-packages/e2e-tests/test-applications/node-exports-test-app/package.json

@@ -12,7 +12,6 @@
     "test:assert": "pnpm test"
   },
   "dependencies": {
-    "@sentry/node-experimental": "latest || *",
     "@sentry/node": "latest || *",
     "@sentry/sveltekit": "latest || *",
     "@sentry/remix": "latest || *",

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

@@ -2,35 +2,20 @@ import * as SentryAstro from '@sentry/astro';
 import * as SentryBun from '@sentry/bun';
 import * as SentryNextJs from '@sentry/nextjs';
 import * as SentryNode from '@sentry/node';
-import * as SentryNodeExperimental from '@sentry/node-experimental';
 import * as SentryRemix from '@sentry/remix';
 import * as SentrySvelteKit from '@sentry/sveltekit';
 
 // Serverless SDKs are CJS only
 const SentryAWS = require('@sentry/aws-serverless');
 const SentryGoogleCloud = require('@sentry/google-cloud-serverless');
 
-/* List of exports that are safe to ignore / we don't require in any depending package */
-const NODE_EXPERIMENTAL_EXPORTS_IGNORE = [
-  'default',
-  // Probably generated by transpilation, no need to require it
-  '__esModule',
-  // These are not re-exported where not needed
-  'Http',
-  'Undici',
-];
-
 /* List of exports that are safe to ignore / we don't require in any depending package */
 const NODE_EXPORTS_IGNORE = [
   'default',
   // Probably generated by transpilation, no need to require it
   '__esModule',
 ];
 
-/* Sanitized list of node exports */
-const nodeExperimentalExports = Object.keys(SentryNodeExperimental).filter(
-  e => !NODE_EXPERIMENTAL_EXPORTS_IGNORE.includes(e),
-);
 const nodeExports = Object.keys(SentryNode).filter(e => !NODE_EXPORTS_IGNORE.includes(e));
 
 type Dependent = {

dev-packages/e2e-tests/verdaccio-config/config.yaml

@@ -92,12 +92,6 @@ packages:
     unpublish: $all
     # proxy: npmjs # Don't proxy for E2E tests!
 
-  '@sentry/node-experimental':
-    access: $all
-    publish: $all
-    unpublish: $all
-    # proxy: npmjs # Don't proxy for E2E tests!
-
   '@sentry/opentelemetry':
     access: $all
     publish: $all

dev-packages/node-integration-tests/package.json

@@ -16,7 +16,7 @@
     "build:types": "tsc -p tsconfig.types.json",
     "clean": "rimraf -g **/node_modules && run-p clean:script",
     "clean:script": "node scripts/clean.js",
-    "prisma:init": "(cd suites/tracing-experimental/prisma-orm && ts-node ./setup.ts)",
+    "prisma:init": "(cd suites/tracing/prisma-orm && ts-node ./setup.ts)",
     "lint": "eslint . --format stylish",
     "fix": "eslint . --format stylish --fix",
     "type-check": "tsc",

dev-packages/node-integration-tests/suites/express/handle-error-scope-data-loss/server.ts

@@ -1,16 +1,16 @@
-import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node-experimental';
-import express from 'express';
-
-const app = express();
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
   release: '1.0',
   transport: loggingTransport,
 });
 
-app.use(Sentry.Handlers.requestHandler());
+import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
+import express from 'express';
+
+const app = express();
 
 Sentry.setTag('global', 'tag');
 
@@ -26,6 +26,6 @@ app.get('/test/isolationScope', () => {
   throw new Error('isolation_test_error');
 });
 
-app.use(Sentry.Handlers.errorHandler());
+Sentry.setupExpressErrorHandler(app);
 
 startExpressServerAndSendPortToRunner(app);

dev-packages/node-integration-tests/suites/express/handle-error/server.ts

@@ -1,21 +1,21 @@
-import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node-experimental';
-import express from 'express';
-
-const app = express();
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
   release: '1.0',
   transport: loggingTransport,
 });
 
-app.use(Sentry.Handlers.requestHandler());
+import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
+import express from 'express';
+
+const app = express();
 
 app.get('/test/express', () => {
   throw new Error('test_error');
 });
 
-app.use(Sentry.Handlers.errorHandler());
+Sentry.setupExpressErrorHandler(app);
 
 startExpressServerAndSendPortToRunner(app);

dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix-parameterized/server.ts

@@ -1,20 +1,21 @@
-import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node-experimental';
-import cors from 'cors';
-import express from 'express';
-
-const app = express();
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
   release: '1.0',
-  integrations: [Sentry.httpIntegration({ tracing: true }), new Sentry.Integrations.Express({ app })],
+  integrations: [
+    // TODO: This used to have the Express integration
+  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });
 
-app.use(Sentry.Handlers.requestHandler());
-app.use(Sentry.Handlers.tracingHandler());
+import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
+import cors from 'cors';
+import express from 'express';
+
+const app = express();
 
 app.use(cors());
 
@@ -30,6 +31,6 @@ const root = express.Router();
 app.use('/api2/v1', root);
 app.use('/api/v1', APIv1);
 
-app.use(Sentry.Handlers.errorHandler());
+Sentry.setupExpressErrorHandler(app);
 
 startExpressServerAndSendPortToRunner(app);

dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix/server.ts

@@ -1,20 +1,21 @@
-import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node-experimental';
-import cors from 'cors';
-import express from 'express';
-
-const app = express();
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
   release: '1.0',
-  integrations: [Sentry.httpIntegration({ tracing: true }), new Sentry.Integrations.Express({ app })],
+  integrations: [
+    // TODO: This used to have the Express integration
+  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });
 
-app.use(Sentry.Handlers.requestHandler());
-app.use(Sentry.Handlers.tracingHandler());
+import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
+import cors from 'cors';
+import express from 'express';
+
+const app = express();
 
 app.use(cors());
 
@@ -30,6 +31,6 @@ const root = express.Router();
 app.use('/api/v1', root);
 app.use('/api2/v1', APIv1);
 
-app.use(Sentry.Handlers.errorHandler());
+Sentry.setupExpressErrorHandler(app);
 
 startExpressServerAndSendPortToRunner(app);

dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized-reverse/server.ts

@@ -1,20 +1,21 @@
-import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node-experimental';
-import cors from 'cors';
-import express from 'express';
-
-const app = express();
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
   release: '1.0',
-  integrations: [Sentry.httpIntegration({ tracing: true }), new Sentry.Integrations.Express({ app })],
+  integrations: [
+    // TODO: This used to have the Express integration
+  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });
 
-app.use(Sentry.Handlers.requestHandler());
-app.use(Sentry.Handlers.tracingHandler());
+import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
+import cors from 'cors';
+import express from 'express';
+
+const app = express();
 
 app.use(cors());
 
@@ -30,6 +31,6 @@ const root = express.Router();
 app.use('/api/v1', APIv1);
 app.use('/api', root);
 
-app.use(Sentry.Handlers.errorHandler());
+Sentry.setupExpressErrorHandler(app);
 
 startExpressServerAndSendPortToRunner(app);

dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized/server.ts

@@ -1,20 +1,21 @@
-import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node-experimental';
-import cors from 'cors';
-import express from 'express';
-
-const app = express();
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
   release: '1.0',
-  integrations: [Sentry.httpIntegration({ tracing: true }), new Sentry.Integrations.Express({ app })],
+  integrations: [
+    // TODO: This used to use the Express integration
+  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });
 
-app.use(Sentry.Handlers.requestHandler());
-app.use(Sentry.Handlers.tracingHandler());
+import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
+import cors from 'cors';
+import express from 'express';
+
+const app = express();
 
 app.use(cors());
 
@@ -30,6 +31,6 @@ const root = express.Router();
 app.use('/api', root);
 app.use('/api/v1', APIv1);
 
-app.use(Sentry.Handlers.errorHandler());
+Sentry.setupExpressErrorHandler(app);
 
 startExpressServerAndSendPortToRunner(app);

dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized copy/server.ts

@@ -1,20 +1,21 @@
-import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node-experimental';
-import cors from 'cors';
-import express from 'express';
-
-const app = express();
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
   release: '1.0',
-  integrations: [Sentry.httpIntegration({ tracing: true }), new Sentry.Integrations.Express({ app })],
+  integrations: [
+    // TODO: This used to have the Express integration
+  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });
 
-app.use(Sentry.Handlers.requestHandler());
-app.use(Sentry.Handlers.tracingHandler());
+import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
+import cors from 'cors';
+import express from 'express';
+
+const app = express();
 
 app.use(cors());
 
@@ -30,6 +31,6 @@ const root = express.Router();
 app.use('/api/v1', APIv1);
 app.use('/api', root);
 
-app.use(Sentry.Handlers.errorHandler());
+Sentry.setupExpressErrorHandler(app);
 
 startExpressServerAndSendPortToRunner(app);

dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized/server.ts

@@ -1,20 +1,21 @@
-import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node-experimental';
-import cors from 'cors';
-import express from 'express';
-
-const app = express();
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
   release: '1.0',
-  integrations: [Sentry.httpIntegration({ tracing: true }), new Sentry.Integrations.Express({ app })],
+  integrations: [
+    // TODO: This used to have the Express integration
+  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });
 
-app.use(Sentry.Handlers.requestHandler());
-app.use(Sentry.Handlers.tracingHandler());
+import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
+import cors from 'cors';
+import express from 'express';
+
+const app = express();
 
 app.use(cors());
 
@@ -30,6 +31,6 @@ const root = express.Router();
 app.use('/api', root);
 app.use('/api/v1', APIv1);
 
-app.use(Sentry.Handlers.errorHandler());
+Sentry.setupExpressErrorHandler(app);
 
 startExpressServerAndSendPortToRunner(app);