ensure everything is properly closed

Author: mydea

dev-packages/node-integration-tests/README.md

@@ -38,14 +38,6 @@ requests, and assertions. Test server, interceptors and assertions are all run o
 
 `utils/` contains helpers and Sentry-specific assertions that can be used in (`test.ts`).
 
-`TestEnv` class contains methods to create and execute requests on a test server instance. `TestEnv.init()` which starts
-a test server and returns a `TestEnv` instance must be called by each test. The test server is automatically shut down
-after each test, if a data collection helper method such as `getEnvelopeRequest` and `getAPIResponse` is used. Tests
-that do not use those helper methods will need to end the server manually.
-
-`TestEnv` instance has two public properties: `url` and `server`. The `url` property is the base URL for the server. The
-`http.Server` instance is used to finish the server eventually.
-
 Nock interceptors are internally used to capture envelope requests by `getEnvelopeRequest` and
 `getMultipleEnvelopeRequest` helpers. After capturing required requests, the interceptors are removed. Nock can manually
 be used inside the test cases to intercept requests but should be removed before the test ends, as not to cause

dev-packages/node-integration-tests/suites/tracing/connect/scenario.js

@@ -13,7 +13,7 @@ Sentry.init({
 const connect = require('connect');
 const http = require('http');
 
-const init = async () => {
+const run = async () => {
   const app = connect();
 
   app.use('/', function (req, res, next) {
@@ -34,4 +34,4 @@ const init = async () => {
   sendPortToRunner(port);
 };
 
-init();
+run();

dev-packages/node-integration-tests/suites/tracing/hapi/scenario.js

@@ -13,7 +13,7 @@ const Boom = require('@hapi/boom');
 
 const port = 5999;
 
-const init = async () => {
+const run = async () => {
   const server = Hapi.server({
     host: 'localhost',
     port,
@@ -65,4 +65,4 @@ const init = async () => {
   sendPortToRunner(port);
 };
 
-init();
+run();

dev-packages/node-integration-tests/suites/tracing/nestjs-errors-no-express/scenario.ts

@@ -47,7 +47,7 @@ class AppController {
 })
 class AppModule {}
 
-async function init(): Promise<void> {
+async function run(): Promise<void> {
   const app = await NestFactory.create(AppModule);
   const { httpAdapter } = app.get(HttpAdapterHost);
   Sentry.setupNestErrorHandler(app, new BaseExceptionFilter(httpAdapter));
@@ -56,4 +56,4 @@ async function init(): Promise<void> {
 }
 
 // eslint-disable-next-line @typescript-eslint/no-floating-promises
-init();
+run();

dev-packages/node-integration-tests/suites/tracing/nestjs-errors/scenario.ts

@@ -45,7 +45,7 @@ class AppController {
 })
 class AppModule {}
 
-async function init(): Promise<void> {
+async function run(): Promise<void> {
   const app = await NestFactory.create(AppModule);
   const { httpAdapter } = app.get(HttpAdapterHost);
   Sentry.setupNestErrorHandler(app, new BaseExceptionFilter(httpAdapter));
@@ -54,4 +54,4 @@ async function init(): Promise<void> {
 }
 
 // eslint-disable-next-line @typescript-eslint/no-floating-promises
-init();
+run();

dev-packages/node-integration-tests/suites/tracing/nestjs-no-express/scenario.ts

@@ -47,7 +47,7 @@ class AppController {
 })
 class AppModule {}
 
-async function init(): Promise<void> {
+async function run(): Promise<void> {
   const app = await NestFactory.create(AppModule);
   const { httpAdapter } = app.get(HttpAdapterHost);
   Sentry.setupNestErrorHandler(app, new BaseExceptionFilter(httpAdapter));
@@ -56,4 +56,4 @@ async function init(): Promise<void> {
 }
 
 // eslint-disable-next-line @typescript-eslint/no-floating-promises
-init();
+run();

dev-packages/node-integration-tests/suites/tracing/nestjs/scenario.ts

@@ -45,11 +45,11 @@ class AppController {
 })
 class AppModule {}
 
-async function init(): Promise<void> {
+async function run(): Promise<void> {
   const app = await NestFactory.create(AppModule);
   await app.listen(port);
   sendPortToRunner(port);
 }
 
 // eslint-disable-next-line @typescript-eslint/no-floating-promises
-init();
+run();

dev-packages/node-integration-tests/suites/tracing/requests/fetch-breadcrumbs/test.ts

@@ -6,7 +6,7 @@ conditionalTest({ min: 18 })('outgoing fetch', () => {
   test('outgoing fetch requests create breadcrumbs', done => {
     createTestServer(done)
       .start()
-      .then(SERVER_URL => {
+      .then(([SERVER_URL, closeTestServer]) => {
         createRunner(__dirname, 'scenario.ts')
           .withEnv({ SERVER_URL })
           .ensureNoErrorOutput()
@@ -72,7 +72,7 @@ conditionalTest({ min: 18 })('outgoing fetch', () => {
               },
             },
           })
-          .start(done);
+          .start(closeTestServer);
       });
   });
 });

dev-packages/node-integration-tests/suites/tracing/requests/fetch-no-tracing/test.ts

@@ -26,7 +26,7 @@ conditionalTest({ min: 18 })('outgoing fetch', () => {
         expect(headers['sentry-trace']).toBeUndefined();
       })
       .start()
-      .then(SERVER_URL => {
+      .then(([SERVER_URL, closeTestServer]) => {
         createRunner(__dirname, 'scenario.ts')
           .withEnv({ SERVER_URL })
           .ensureNoErrorOutput()
@@ -42,7 +42,7 @@ conditionalTest({ min: 18 })('outgoing fetch', () => {
               },
             },
           })
-          .start(done);
+          .start(closeTestServer);
       });
   });
 });

dev-packages/node-integration-tests/suites/tracing/requests/fetch-sampled-no-active-span/test.ts

@@ -26,7 +26,7 @@ conditionalTest({ min: 18 })('outgoing fetch', () => {
         expect(headers['sentry-trace']).toBeUndefined();
       })
       .start()
-      .then(SERVER_URL => {
+      .then(([SERVER_URL, closeTestServer]) => {
         createRunner(__dirname, 'scenario.ts')
           .withEnv({ SERVER_URL })
           .expect({
@@ -41,7 +41,7 @@ conditionalTest({ min: 18 })('outgoing fetch', () => {
               },
             },
           })
-          .start(done);
+          .start(closeTestServer);
       });
   });
 });