feat(nestjs): Change nest sdk setup

.github/workflows/build.yml

@@ -1010,6 +1010,8 @@ jobs:
             'generic-ts3.8',
             'node-fastify',
             'node-hapi',
+            'node-nestjs-basic',
+            'node-nestjs-distributed-tracing',
             'nestjs-basic',
             'nestjs-distributed-tracing',
             'nestjs-with-submodules',

dev-packages/e2e-tests/test-applications/nestjs-basic/src/app.module.ts

@@ -1,10 +1,11 @@
 import { Module } from '@nestjs/common';
 import { ScheduleModule } from '@nestjs/schedule';
+import { SentryIntegrationModule } from '@sentry/nestjs/setup';
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
 
 @Module({
-  imports: [ScheduleModule.forRoot()],
+  imports: [SentryIntegrationModule.forRoot(), ScheduleModule.forRoot()],
   controllers: [AppController],
   providers: [AppService],
 })

dev-packages/e2e-tests/test-applications/nestjs-basic/src/main.ts

@@ -2,18 +2,13 @@
 import './instrument';
 
 // Import other modules
-import { BaseExceptionFilter, HttpAdapterHost, NestFactory } from '@nestjs/core';
-import * as Sentry from '@sentry/nestjs';
+import { NestFactory } from '@nestjs/core';
 import { AppModule } from './app.module';
 
 const PORT = 3030;
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
-
-  const { httpAdapter } = app.get(HttpAdapterHost);
-  Sentry.setupNestErrorHandler(app, new BaseExceptionFilter(httpAdapter));
-
   await app.listen(PORT);
 }
 

dev-packages/e2e-tests/test-applications/nestjs-basic/tsconfig.json

@@ -16,6 +16,7 @@
     "noImplicitAny": false,
     "strictBindCallApply": false,
     "forceConsistentCasingInFileNames": false,
-    "noFallthroughCasesInSwitch": false
+    "noFallthroughCasesInSwitch": false,
+    "moduleResolution": "Node16"
   }
 }

dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/src/main.ts

@@ -2,8 +2,7 @@
 import './instrument';
 
 // Import other modules
-import { BaseExceptionFilter, HttpAdapterHost, NestFactory } from '@nestjs/core';
-import * as Sentry from '@sentry/nestjs';
+import { NestFactory } from '@nestjs/core';
 import { TraceInitiatorModule } from './trace-initiator.module';
 import { TraceReceiverModule } from './trace-receiver.module';
 
@@ -12,10 +11,6 @@ const TRACE_RECEIVER_PORT = 3040;
 
 async function bootstrap() {
   const trace_initiator_app = await NestFactory.create(TraceInitiatorModule);
-
-  const { httpAdapter } = trace_initiator_app.get(HttpAdapterHost);
-  Sentry.setupNestErrorHandler(trace_initiator_app, new BaseExceptionFilter(httpAdapter));
-
   await trace_initiator_app.listen(TRACE_INITIATOR_PORT);
 
   const trace_receiver_app = await NestFactory.create(TraceReceiverModule);

dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/src/trace-initiator.module.ts

@@ -1,9 +1,10 @@
 import { Module } from '@nestjs/common';
+import { SentryIntegrationModule } from '@sentry/nestjs/setup';
 import { TraceInitiatorController } from './trace-initiator.controller';
 import { TraceInitiatorService } from './trace-initiator.service';
 
 @Module({
-  imports: [],
+  imports: [SentryIntegrationModule.forRoot()],
   controllers: [TraceInitiatorController],
   providers: [TraceInitiatorService],
 })

dev-packages/e2e-tests/test-applications/nestjs-with-submodules/src/app.module.ts

@@ -1,10 +1,18 @@
 import { Module } from '@nestjs/common';
+import { SentryIntegrationModule } from '@sentry/nestjs/setup';
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
-import { ExampleModule } from './example-module/example.module';
+import { ExampleModuleGlobalFilterWrongRegistrationOrder } from './example-module-global-filter-wrong-registration-order/example.module';
+import { ExampleModuleGlobalFilter } from './example-module-global-filter/example.module';
+import { ExampleModuleLocalFilter } from './example-module-local-filter/example.module';
 
 @Module({
-  imports: [ExampleModule],
+  imports: [
+    ExampleModuleGlobalFilterWrongRegistrationOrder,
+    SentryIntegrationModule.forRoot(),
+    ExampleModuleGlobalFilter,
+    ExampleModuleLocalFilter,
+  ],
   controllers: [AppController],
   providers: [AppService],
 })

dev-packages/e2e-tests/test-applications/nestjs-with-submodules/src/example-module-global-filter-wrong-registration-order/example.controller.ts

@@ -0,0 +1,17 @@
+import { Controller, Get } from '@nestjs/common';
+import { ExampleExceptionWrongRegistrationOrder } from './example.exception';
+
+@Controller('example-module-wrong-order')
+export class ExampleController {
+  constructor() {}
+
+  @Get('/expected-exception')
+  getCaughtException(): string {
+    throw new ExampleExceptionWrongRegistrationOrder();
+  }
+
+  @Get('/unexpected-exception')
+  getUncaughtException(): string {
+    throw new Error(`This is an uncaught exception!`);
+  }
+}

dev-packages/e2e-tests/test-applications/nestjs-with-submodules/src/example-module-global-filter-wrong-registration-order/example.exception.ts

@@ -0,0 +1,5 @@
+export class ExampleExceptionWrongRegistrationOrder extends Error {
+  constructor() {
+    super('Something went wrong in the example module!');
+  }
+}

dev-packages/e2e-tests/test-applications/nestjs-with-submodules/src/example-module-global-filter-wrong-registration-order/example.filter.ts

@@ -0,0 +1,13 @@
+import { ArgumentsHost, BadRequestException, Catch } from '@nestjs/common';
+import { BaseExceptionFilter } from '@nestjs/core';
+import { ExampleExceptionWrongRegistrationOrder } from './example.exception';
+
+@Catch(ExampleExceptionWrongRegistrationOrder)
+export class ExampleExceptionFilterWrongRegistrationOrder extends BaseExceptionFilter {
+  catch(exception: unknown, host: ArgumentsHost) {
+    if (exception instanceof ExampleExceptionWrongRegistrationOrder) {
+      return super.catch(new BadRequestException(exception.message), host);
+    }
+    return super.catch(exception, host);
+  }
+}

dev-packages/e2e-tests/test-applications/nestjs-with-submodules/src/example-module-global-filter-wrong-registration-order/example.module.ts

@@ -0,0 +1,16 @@
+import { Module } from '@nestjs/common';
+import { APP_FILTER } from '@nestjs/core';
+import { ExampleController } from './example.controller';
+import { ExampleExceptionFilterWrongRegistrationOrder } from './example.filter';
+
+@Module({
+  imports: [],
+  controllers: [ExampleController],
+  providers: [
+    {
+      provide: APP_FILTER,
+      useClass: ExampleExceptionFilterWrongRegistrationOrder,
+    },
+  ],
+})
+export class ExampleModuleGlobalFilterWrongRegistrationOrder {}

dev-packages/e2e-tests/test-applications/nestjs-with-submodules/src/example-module-global-filter/example.controller.ts

@@ -0,0 +1,25 @@
+import { Controller, Get } from '@nestjs/common';
+import * as Sentry from '@sentry/nestjs';
+import { ExampleException } from './example.exception';
+
+@Controller('example-module')
+export class ExampleController {
+  constructor() {}
+
+  @Get('/expected-exception')
+  getCaughtException(): string {
+    throw new ExampleException();
+  }
+
+  @Get('/unexpected-exception')
+  getUncaughtException(): string {
+    throw new Error(`This is an uncaught exception!`);
+  }
+
+  @Get('/transaction')
+  testTransaction() {
+    Sentry.startSpan({ name: 'test-span' }, () => {
+      Sentry.startSpan({ name: 'child-span' }, () => {});
+    });
+  }
+}

dev-packages/e2e-tests/test-applications/nestjs-with-submodules/src/example-module/example.module.ts → dev-packages/e2e-tests/test-applications/nestjs-with-submodules/src/example-module-global-filter/example.module.ts

@@ -13,4 +13,4 @@ import { ExampleExceptionFilter } from './example.filter';
     },
   ],
 })
-export class ExampleModule {}
+export class ExampleModuleGlobalFilter {}

dev-packages/e2e-tests/test-applications/nestjs-with-submodules/src/example-module-local-filter/example.controller.ts

@@ -0,0 +1,14 @@
+import { Controller, Get, UseFilters } from '@nestjs/common';
+import { LocalExampleException } from './example.exception';
+import { LocalExampleExceptionFilter } from './example.filter';
+
+@Controller('example-module-local-filter')
+@UseFilters(LocalExampleExceptionFilter)
+export class ExampleControllerLocalFilter {
+  constructor() {}
+
+  @Get('/expected-exception')
+  getCaughtException() {
+    throw new LocalExampleException();
+  }
+}

dev-packages/e2e-tests/test-applications/nestjs-with-submodules/src/example-module-local-filter/example.exception.ts

@@ -0,0 +1,5 @@
+export class LocalExampleException extends Error {
+  constructor() {
+    super('Something went wrong in the example module with local filter!');
+  }
+}

dev-packages/e2e-tests/test-applications/nestjs-with-submodules/src/example-module-local-filter/example.filter.ts

@@ -0,0 +1,13 @@
+import { ArgumentsHost, BadRequestException, Catch } from '@nestjs/common';
+import { BaseExceptionFilter } from '@nestjs/core';
+import { LocalExampleException } from './example.exception';
+
+@Catch(LocalExampleException)
+export class LocalExampleExceptionFilter extends BaseExceptionFilter {
+  catch(exception: unknown, host: ArgumentsHost) {
+    if (exception instanceof LocalExampleException) {
+      return super.catch(new BadRequestException(exception.message), host);
+    }
+    return super.catch(exception, host);
+  }
+}

dev-packages/e2e-tests/test-applications/nestjs-with-submodules/src/example-module-local-filter/example.module.ts

@@ -0,0 +1,9 @@
+import { Module } from '@nestjs/common';
+import { ExampleControllerLocalFilter } from './example.controller';
+
+@Module({
+  imports: [],
+  controllers: [ExampleControllerLocalFilter],
+  providers: [],
+})
+export class ExampleModuleLocalFilter {}

dev-packages/e2e-tests/test-applications/nestjs-with-submodules/src/main.ts

@@ -2,18 +2,13 @@
 import './instrument';
 
 // Import other modules
-import { BaseExceptionFilter, HttpAdapterHost, NestFactory } from '@nestjs/core';
-import * as Sentry from '@sentry/nestjs';
+import { NestFactory } from '@nestjs/core';
 import { AppModule } from './app.module';
 
 const PORT = 3030;
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
-
-  const { httpAdapter } = app.get(HttpAdapterHost);
-  Sentry.setupNestErrorHandler(app, new BaseExceptionFilter(httpAdapter));
-
   await app.listen(PORT);
 }