Skip to content

Commit 203807a

Browse files
mydeamydea
committed
revert node-integration-test changes
1 parent ff55f27 commit 203807a

File tree

134 files changed

+335
-236
lines changed

Some content is hidden

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

134 files changed

+335
-236
lines changed

‎dev-packages/node-integration-tests/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import type { AddressInfo } from 'net';
12
import type { BaseTransportOptions, Envelope, Transport, TransportMakeRequestResponse } from '@sentry/core';
23
import type { Express } from 'express';
3-
import type { AddressInfo } from 'net';
44

55
/**
66
* Debug logging transport

‎dev-packages/node-integration-tests/suites/client-reports/drop-reasons/before-send/scenario.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import * as Sentry from '@sentry/node';
21
import { loggingTransport } from '@sentry-internal/node-integration-tests';
2+
import * as Sentry from '@sentry/node';
33

44
// eslint-disable-next-line @typescript-eslint/no-floating-promises
55
(async () => {

‎dev-packages/node-integration-tests/suites/client-reports/drop-reasons/event-processors/scenario.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import * as Sentry from '@sentry/node';
21
import { loggingTransport } from '@sentry-internal/node-integration-tests';
2+
import * as Sentry from '@sentry/node';
33

44
// eslint-disable-next-line @typescript-eslint/no-floating-promises
55
(async () => {

‎dev-packages/node-integration-tests/suites/client-reports/periodic-send/scenario.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import * as Sentry from '@sentry/node';
21
import { loggingTransport } from '@sentry-internal/node-integration-tests';
2+
import * as Sentry from '@sentry/node';
33

44
Sentry.init({
55
dsn: 'https://public@dsn.ingest.sentry.io/1337',

‎dev-packages/node-integration-tests/suites/contextLines/memory-leak/scenario.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
import { execSync } from 'node:child_process';
22
import * as path from 'node:path';
3-
import * as Sentry from '@sentry/node';
3+
44
import { loggingTransport } from '@sentry-internal/node-integration-tests';
5-
import { runSentry } from './other-file';
5+
import * as Sentry from '@sentry/node';
66

77
Sentry.init({
88
dsn: 'https://public@dsn.ingest.sentry.io/1337',
99
release: '1.0',
1010
transport: loggingTransport,
1111
});
1212

13+
import { runSentry } from './other-file';
14+
1315
runSentry();
1416

1517
const lsofOutput = execSync(`lsof -p ${process.pid}`, { encoding: 'utf8' });

‎dev-packages/node-integration-tests/suites/contextLines/memory-leak/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { afterAll, describe, test } from 'vitest';
21
import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
2+
import { describe, afterAll, test } from 'vitest';
33

44
describe('ContextLines integration in CJS', () => {
55
afterAll(() => {

‎dev-packages/node-integration-tests/suites/cron/cron/scenario.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import * as Sentry from '@sentry/node';
21
import { loggingTransport } from '@sentry-internal/node-integration-tests';
2+
import * as Sentry from '@sentry/node';
33
import { CronJob } from 'cron';
44

55
Sentry.init({

‎dev-packages/node-integration-tests/suites/cron/node-cron/scenario.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import * as Sentry from '@sentry/node';
21
import { loggingTransport } from '@sentry-internal/node-integration-tests';
2+
import * as Sentry from '@sentry/node';
33
import * as cron from 'node-cron';
44

55
Sentry.init({

‎dev-packages/node-integration-tests/suites/cron/node-schedule/scenario.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import * as Sentry from '@sentry/node';
21
import { loggingTransport } from '@sentry-internal/node-integration-tests';
2+
import * as Sentry from '@sentry/node';
33
import * as schedule from 'node-schedule';
44

55
Sentry.init({

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
12
import * as Sentry from '@sentry/node';
2-
import { loggingTransport , startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
3-
import express from 'express';
43

54
Sentry.init({
65
dsn: 'https://public@dsn.ingest.sentry.io/1337',
76
release: '1.0',
87
transport: loggingTransport,
98
});
109

10+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
11+
import express from 'express';
12+
1113
const app = express();
1214

1315
Sentry.setTag('global', 'tag');

‎dev-packages/node-integration-tests/suites/express-v5/handle-error-tracesSampleRate-0/server.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
12
import * as Sentry from '@sentry/node';
2-
import { loggingTransport , startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
3-
import express from 'express';
43

54
Sentry.init({
65
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -9,6 +8,9 @@ Sentry.init({
98
tracesSampleRate: 1,
109
});
1110

11+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
12+
import express from 'express';
13+
1214
const app = express();
1315

1416
app.get('/test/express/:id', req => {

‎dev-packages/node-integration-tests/suites/express-v5/handle-error-tracesSampleRate-unset/server.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
12
import * as Sentry from '@sentry/node';
2-
import { loggingTransport , startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
3-
import express from 'express';
43

54
Sentry.init({
65
dsn: 'https://public@dsn.ingest.sentry.io/1337',
76
release: '1.0',
87
transport: loggingTransport,
98
});
109

10+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
11+
import express from 'express';
12+
1113
const app = express();
1214

1315
app.get('/test/express/:id', req => {

‎dev-packages/node-integration-tests/suites/express-v5/multiple-init/server.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
12
import * as Sentry from '@sentry/node';
2-
import { loggingTransport , startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
3-
import express from 'express';
43

54
Sentry.init({
65
// No dsn, means client is disabled
@@ -16,6 +15,9 @@ initialClient?.addIntegration(Sentry.httpIntegration());
1615
// Store this so we can update the client later
1716
const initialCurrentScope = Sentry.getCurrentScope();
1817

18+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
19+
import express from 'express';
20+
1921
const app = express();
2022

2123
Sentry.setTag('global', 'tag');

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
12
import * as Sentry from '@sentry/node';
2-
import { loggingTransport , startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
3-
import cors from 'cors';
4-
import express from 'express';
53

64
Sentry.init({
75
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -10,6 +8,10 @@ Sentry.init({
108
transport: loggingTransport,
119
});
1210

11+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
12+
import cors from 'cors';
13+
import express from 'express';
14+
1315
const app = express();
1416

1517
app.use(cors());

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
12
import * as Sentry from '@sentry/node';
2-
import { loggingTransport , startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
3-
import cors from 'cors';
4-
import express from 'express';
53

64
Sentry.init({
75
debug: true,
@@ -11,6 +9,10 @@ Sentry.init({
119
transport: loggingTransport,
1210
});
1311

12+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
13+
import cors from 'cors';
14+
import express from 'express';
15+
1416
const app = express();
1517

1618
app.use(cors());

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
12
import * as Sentry from '@sentry/node';
2-
import { loggingTransport , startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
3-
import cors from 'cors';
4-
import express from 'express';
53

64
Sentry.init({
75
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -10,6 +8,10 @@ Sentry.init({
108
transport: loggingTransport,
119
});
1210

11+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
12+
import cors from 'cors';
13+
import express from 'express';
14+
1315
const app = express();
1416

1517
app.use(cors());

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
12
import * as Sentry from '@sentry/node';
2-
import { loggingTransport , startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
3-
import cors from 'cors';
4-
import express from 'express';
53

64
Sentry.init({
75
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -10,6 +8,10 @@ Sentry.init({
108
transport: loggingTransport,
119
});
1210

11+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
12+
import cors from 'cors';
13+
import express from 'express';
14+
1315
const app = express();
1416

1517
app.use(cors());

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
12
import * as Sentry from '@sentry/node';
2-
import { loggingTransport , startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
3-
import cors from 'cors';
4-
import express from 'express';
53

64
Sentry.init({
75
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -10,6 +8,10 @@ Sentry.init({
108
transport: loggingTransport,
119
});
1210

11+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
12+
import cors from 'cors';
13+
import express from 'express';
14+
1315
const app = express();
1416

1517
app.use(cors());

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
12
import * as Sentry from '@sentry/node';
2-
import { loggingTransport , startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
3-
import cors from 'cors';
4-
import express from 'express';
53

64
Sentry.init({
75
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -10,6 +8,10 @@ Sentry.init({
108
transport: loggingTransport,
119
});
1210

11+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
12+
import cors from 'cors';
13+
import express from 'express';
14+
1315
const app = express();
1416

1517
app.use(cors());

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
12
import * as Sentry from '@sentry/node';
2-
import { loggingTransport , startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
3-
import cors from 'cors';
4-
import express from 'express';
53

64
Sentry.init({
75
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -10,6 +8,10 @@ Sentry.init({
108
transport: loggingTransport,
119
});
1210

11+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
12+
import cors from 'cors';
13+
import express from 'express';
14+
1315
const app = express();
1416

1517
app.use(cors());

‎dev-packages/node-integration-tests/suites/express-v5/multiple-routers/complex-router/server.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
12
import * as Sentry from '@sentry/node';
2-
import { loggingTransport , startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
3-
import express from 'express';
43

54
Sentry.init({
65
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -9,6 +8,9 @@ Sentry.init({
98
transport: loggingTransport,
109
});
1110

11+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
12+
import express from 'express';
13+
1214
const app = express();
1315

1416
const APIv1 = express.Router();

‎dev-packages/node-integration-tests/suites/express-v5/multiple-routers/complex-router/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { afterAll, describe,test } from 'vitest';
1+
import { afterAll, test, describe } from 'vitest';
22
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';
33

44
afterAll(() => {

‎dev-packages/node-integration-tests/suites/express-v5/multiple-routers/middle-layer-parameterized/server.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
12
import * as Sentry from '@sentry/node';
2-
import { loggingTransport , startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
3-
import express from 'express';
43

54
Sentry.init({
65
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -9,6 +8,9 @@ Sentry.init({
98
transport: loggingTransport,
109
});
1110

11+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
12+
import express from 'express';
13+
1214
const app = express();
1315

1416
const APIv1 = express.Router();

‎dev-packages/node-integration-tests/suites/express-v5/sentry-trace/baggage-header-out/server.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
import * as Sentry from '@sentry/node';
21
import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
3-
import cors from 'cors';
4-
import express from 'express';
5-
import http from 'http';
2+
import * as Sentry from '@sentry/node';
63

74
export type TestAPIResponse = { test_data: { host: string; 'sentry-trace': string; baggage: string } };
85

@@ -15,6 +12,10 @@ Sentry.init({
1512
transport: loggingTransport,
1613
});
1714

15+
import http from 'http';
16+
import cors from 'cors';
17+
import express from 'express';
18+
1819
const app = express();
1920

2021
Sentry.setUser({ id: 'user123' });

‎dev-packages/node-integration-tests/suites/express-v5/sentry-trace/baggage-other-vendors-with-sentry-entries/server.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
12
import * as Sentry from '@sentry/node';
2-
import { loggingTransport , startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
3-
import cors from 'cors';
4-
import express from 'express';
5-
import * as http from 'http';
63

74
export type TestAPIResponse = { test_data: { host: string; 'sentry-trace': string; baggage: string } };
85

@@ -16,6 +13,11 @@ Sentry.init({
1613
transport: loggingTransport,
1714
});
1815

16+
import * as http from 'http';
17+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
18+
import cors from 'cors';
19+
import express from 'express';
20+
1921
const app = express();
2022

2123
app.use(cors());

‎dev-packages/node-integration-tests/suites/express-v5/sentry-trace/baggage-other-vendors/server.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
12
import * as Sentry from '@sentry/node';
2-
import { loggingTransport , startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
3-
import cors from 'cors';
4-
import express from 'express';
5-
import http from 'http';
63

74
export type TestAPIResponse = { test_data: { host: string; 'sentry-trace': string; baggage: string } };
85

@@ -16,6 +13,11 @@ Sentry.init({
1613
transport: loggingTransport,
1714
});
1815

16+
import http from 'http';
17+
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
18+
import cors from 'cors';
19+
import express from 'express';
20+
1921
const app = express();
2022

2123
app.use(cors());

0 commit comments

Comments
 (0)