Skip to content

Commit 2389646

Browse files
authored
ref(node): Remove the old node package (#11322)
This is not used anymore except in tests, so this PR actually removes the old node package! A few tests are failing now, we should address them before v8 goes stable. For now I marked these to be skipped and added a comment there.
1 parent 53ea491 commit 2389646

File tree

193 files changed

+457
-18537
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

193 files changed

+457
-18537
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ jobs:
118118
node:
119119
- *shared
120120
- 'packages/node/**'
121-
- 'packages/node-experimental/**'
122121
- 'dev-packages/node-integration-tests/**'
123122
nextjs:
124123
- *shared
@@ -135,7 +134,6 @@ jobs:
135134
profiling_node:
136135
- *shared
137136
- 'packages/node/**'
138-
- 'packages/node-experimental/**'
139137
- 'packages/profiling-node/**'
140138
- 'dev-packages/e2e-tests/test-applications/node-profiling/**'
141139
profiling_node_bindings:

MIGRATION.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ For IE11 support please transpile your code to ES5 using babel or similar and ad
4343

4444
**Next.js**: The Next.js SDK now supports Next.js 13.2.0+
4545

46+
**Express**: Complex router setups are only properly parametrized in Node 16+.
47+
4648
## 2. Package removal
4749

4850
We've removed the following packages:

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"test:assert": "pnpm test"
1313
},
1414
"dependencies": {
15-
"@sentry/node-experimental": "latest || *",
1615
"@sentry/node": "latest || *",
1716
"@sentry/sveltekit": "latest || *",
1817
"@sentry/remix": "latest || *",

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,20 @@ import * as SentryAstro from '@sentry/astro';
22
import * as SentryBun from '@sentry/bun';
33
import * as SentryNextJs from '@sentry/nextjs';
44
import * as SentryNode from '@sentry/node';
5-
import * as SentryNodeExperimental from '@sentry/node-experimental';
65
import * as SentryRemix from '@sentry/remix';
76
import * as SentrySvelteKit from '@sentry/sveltekit';
87

98
// Serverless SDKs are CJS only
109
const SentryAWS = require('@sentry/aws-serverless');
1110
const SentryGoogleCloud = require('@sentry/google-cloud-serverless');
1211

13-
/* List of exports that are safe to ignore / we don't require in any depending package */
14-
const NODE_EXPERIMENTAL_EXPORTS_IGNORE = [
15-
'default',
16-
// Probably generated by transpilation, no need to require it
17-
'__esModule',
18-
// These are not re-exported where not needed
19-
'Http',
20-
'Undici',
21-
];
22-
2312
/* List of exports that are safe to ignore / we don't require in any depending package */
2413
const NODE_EXPORTS_IGNORE = [
2514
'default',
2615
// Probably generated by transpilation, no need to require it
2716
'__esModule',
2817
];
2918

30-
/* Sanitized list of node exports */
31-
const nodeExperimentalExports = Object.keys(SentryNodeExperimental).filter(
32-
e => !NODE_EXPERIMENTAL_EXPORTS_IGNORE.includes(e),
33-
);
3419
const nodeExports = Object.keys(SentryNode).filter(e => !NODE_EXPORTS_IGNORE.includes(e));
3520

3621
type Dependent = {

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,6 @@ packages:
9292
unpublish: $all
9393
# proxy: npmjs # Don't proxy for E2E tests!
9494

95-
'@sentry/node-experimental':
96-
access: $all
97-
publish: $all
98-
unpublish: $all
99-
# proxy: npmjs # Don't proxy for E2E tests!
100-
10195
'@sentry/opentelemetry':
10296
access: $all
10397
publish: $all

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"build:types": "tsc -p tsconfig.types.json",
1717
"clean": "rimraf -g **/node_modules && run-p clean:script",
1818
"clean:script": "node scripts/clean.js",
19-
"prisma:init": "(cd suites/tracing-experimental/prisma-orm && ts-node ./setup.ts)",
19+
"prisma:init": "(cd suites/tracing/prisma-orm && ts-node ./setup.ts)",
2020
"lint": "eslint . --format stylish",
2121
"fix": "eslint . --format stylish --fix",
2222
"type-check": "tsc",

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
2-
import * as Sentry from '@sentry/node-experimental';
3-
import express from 'express';
4-
5-
const app = express();
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
2+
import * as Sentry from '@sentry/node';
63

74
Sentry.init({
85
dsn: 'https://[email protected]/1337',
96
release: '1.0',
107
transport: loggingTransport,
118
});
129

13-
app.use(Sentry.Handlers.requestHandler());
10+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
11+
import express from 'express';
12+
13+
const app = express();
1414

1515
Sentry.setTag('global', 'tag');
1616

@@ -26,6 +26,6 @@ app.get('/test/isolationScope', () => {
2626
throw new Error('isolation_test_error');
2727
});
2828

29-
app.use(Sentry.Handlers.errorHandler());
29+
Sentry.setupExpressErrorHandler(app);
3030

3131
startExpressServerAndSendPortToRunner(app);
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
2-
import * as Sentry from '@sentry/node-experimental';
3-
import express from 'express';
4-
5-
const app = express();
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
2+
import * as Sentry from '@sentry/node';
63

74
Sentry.init({
85
dsn: 'https://[email protected]/1337',
96
release: '1.0',
107
transport: loggingTransport,
118
});
129

13-
app.use(Sentry.Handlers.requestHandler());
10+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
11+
import express from 'express';
12+
13+
const app = express();
1414

1515
app.get('/test/express', () => {
1616
throw new Error('test_error');
1717
});
1818

19-
app.use(Sentry.Handlers.errorHandler());
19+
Sentry.setupExpressErrorHandler(app);
2020

2121
startExpressServerAndSendPortToRunner(app);
Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
2-
import * as Sentry from '@sentry/node-experimental';
3-
import cors from 'cors';
4-
import express from 'express';
5-
6-
const app = express();
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
2+
import * as Sentry from '@sentry/node';
73

84
Sentry.init({
95
dsn: 'https://[email protected]/1337',
106
release: '1.0',
11-
integrations: [Sentry.httpIntegration({ tracing: true }), new Sentry.Integrations.Express({ app })],
7+
integrations: [
8+
// TODO: This used to have the Express integration
9+
],
1210
tracesSampleRate: 1.0,
1311
transport: loggingTransport,
1412
});
1513

16-
app.use(Sentry.Handlers.requestHandler());
17-
app.use(Sentry.Handlers.tracingHandler());
14+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
15+
import cors from 'cors';
16+
import express from 'express';
17+
18+
const app = express();
1819

1920
app.use(cors());
2021

@@ -30,6 +31,6 @@ const root = express.Router();
3031
app.use('/api2/v1', root);
3132
app.use('/api/v1', APIv1);
3233

33-
app.use(Sentry.Handlers.errorHandler());
34+
Sentry.setupExpressErrorHandler(app);
3435

3536
startExpressServerAndSendPortToRunner(app);
Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
2-
import * as Sentry from '@sentry/node-experimental';
3-
import cors from 'cors';
4-
import express from 'express';
5-
6-
const app = express();
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
2+
import * as Sentry from '@sentry/node';
73

84
Sentry.init({
95
dsn: 'https://[email protected]/1337',
106
release: '1.0',
11-
integrations: [Sentry.httpIntegration({ tracing: true }), new Sentry.Integrations.Express({ app })],
7+
integrations: [
8+
// TODO: This used to have the Express integration
9+
],
1210
tracesSampleRate: 1.0,
1311
transport: loggingTransport,
1412
});
1513

16-
app.use(Sentry.Handlers.requestHandler());
17-
app.use(Sentry.Handlers.tracingHandler());
14+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
15+
import cors from 'cors';
16+
import express from 'express';
17+
18+
const app = express();
1819

1920
app.use(cors());
2021

@@ -30,6 +31,6 @@ const root = express.Router();
3031
app.use('/api/v1', root);
3132
app.use('/api2/v1', APIv1);
3233

33-
app.use(Sentry.Handlers.errorHandler());
34+
Sentry.setupExpressErrorHandler(app);
3435

3536
startExpressServerAndSendPortToRunner(app);
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
2-
import * as Sentry from '@sentry/node-experimental';
3-
import cors from 'cors';
4-
import express from 'express';
5-
6-
const app = express();
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
2+
import * as Sentry from '@sentry/node';
73

84
Sentry.init({
95
dsn: 'https://[email protected]/1337',
106
release: '1.0',
11-
integrations: [Sentry.httpIntegration({ tracing: true }), new Sentry.Integrations.Express({ app })],
7+
integrations: [
8+
// TODO: This used to have the Express integration
9+
],
1210
tracesSampleRate: 1.0,
1311
transport: loggingTransport,
1412
});
1513

16-
app.use(Sentry.Handlers.requestHandler());
17-
app.use(Sentry.Handlers.tracingHandler());
14+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
15+
import cors from 'cors';
16+
import express from 'express';
17+
18+
const app = express();
1819

1920
app.use(cors());
2021

@@ -30,6 +31,6 @@ const root = express.Router();
3031
app.use('/api/v1', APIv1);
3132
app.use('/api', root);
3233

33-
app.use(Sentry.Handlers.errorHandler());
34+
Sentry.setupExpressErrorHandler(app);
3435

3536
startExpressServerAndSendPortToRunner(app);
Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
2-
import * as Sentry from '@sentry/node-experimental';
3-
import cors from 'cors';
4-
import express from 'express';
5-
6-
const app = express();
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
2+
import * as Sentry from '@sentry/node';
73

84
Sentry.init({
95
dsn: 'https://[email protected]/1337',
106
release: '1.0',
11-
integrations: [Sentry.httpIntegration({ tracing: true }), new Sentry.Integrations.Express({ app })],
7+
integrations: [
8+
// TODO: This used to use the Express integration
9+
],
1210
tracesSampleRate: 1.0,
1311
transport: loggingTransport,
1412
});
1513

16-
app.use(Sentry.Handlers.requestHandler());
17-
app.use(Sentry.Handlers.tracingHandler());
14+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
15+
import cors from 'cors';
16+
import express from 'express';
17+
18+
const app = express();
1819

1920
app.use(cors());
2021

@@ -30,6 +31,6 @@ const root = express.Router();
3031
app.use('/api', root);
3132
app.use('/api/v1', APIv1);
3233

33-
app.use(Sentry.Handlers.errorHandler());
34+
Sentry.setupExpressErrorHandler(app);
3435

3536
startExpressServerAndSendPortToRunner(app);
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
2-
import * as Sentry from '@sentry/node-experimental';
3-
import cors from 'cors';
4-
import express from 'express';
5-
6-
const app = express();
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
2+
import * as Sentry from '@sentry/node';
73

84
Sentry.init({
95
dsn: 'https://[email protected]/1337',
106
release: '1.0',
11-
integrations: [Sentry.httpIntegration({ tracing: true }), new Sentry.Integrations.Express({ app })],
7+
integrations: [
8+
// TODO: This used to have the Express integration
9+
],
1210
tracesSampleRate: 1.0,
1311
transport: loggingTransport,
1412
});
1513

16-
app.use(Sentry.Handlers.requestHandler());
17-
app.use(Sentry.Handlers.tracingHandler());
14+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
15+
import cors from 'cors';
16+
import express from 'express';
17+
18+
const app = express();
1819

1920
app.use(cors());
2021

@@ -30,6 +31,6 @@ const root = express.Router();
3031
app.use('/api/v1', APIv1);
3132
app.use('/api', root);
3233

33-
app.use(Sentry.Handlers.errorHandler());
34+
Sentry.setupExpressErrorHandler(app);
3435

3536
startExpressServerAndSendPortToRunner(app);
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
2-
import * as Sentry from '@sentry/node-experimental';
3-
import cors from 'cors';
4-
import express from 'express';
5-
6-
const app = express();
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
2+
import * as Sentry from '@sentry/node';
73

84
Sentry.init({
95
dsn: 'https://[email protected]/1337',
106
release: '1.0',
11-
integrations: [Sentry.httpIntegration({ tracing: true }), new Sentry.Integrations.Express({ app })],
7+
integrations: [
8+
// TODO: This used to have the Express integration
9+
],
1210
tracesSampleRate: 1.0,
1311
transport: loggingTransport,
1412
});
1513

16-
app.use(Sentry.Handlers.requestHandler());
17-
app.use(Sentry.Handlers.tracingHandler());
14+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
15+
import cors from 'cors';
16+
import express from 'express';
17+
18+
const app = express();
1819

1920
app.use(cors());
2021

@@ -30,6 +31,6 @@ const root = express.Router();
3031
app.use('/api', root);
3132
app.use('/api/v1', APIv1);
3233

33-
app.use(Sentry.Handlers.errorHandler());
34+
Sentry.setupExpressErrorHandler(app);
3435

3536
startExpressServerAndSendPortToRunner(app);

0 commit comments

Comments
 (0)