Merge pull request #20099 from mozilla/worktree-FXA-13051

task(many): Use SentryModule.forRoot() instead of useGlobalFilters

Author: dschom

packages/fxa-admin-server/src/app.module.ts

@@ -15,8 +15,9 @@ import {
 import { ApolloDriver, ApolloDriverConfig } from '@nestjs/apollo';
 import { Module } from '@nestjs/common';
 import { ConfigModule, ConfigService } from '@nestjs/config';
-import { APP_GUARD } from '@nestjs/core';
+import { APP_FILTER, APP_GUARD } from '@nestjs/core';
 import { GraphQLModule } from '@nestjs/graphql';
+import { SentryGlobalFilter, SentryModule } from '@sentry/nestjs/setup';
 
 import { UserGroupGuard } from './auth/user-group-header.guard';
 import { BackendModule } from './backend/backend.module';
@@ -32,6 +33,7 @@ const version = getVersionInfo(__dirname);
 
 @Module({
   imports: [
+    SentryModule.forRoot(),
     ConfigModule.forRoot({
       load: [(): AppConfig => Config.getProperties()],
       isGlobal: true,
@@ -70,6 +72,10 @@ const version = getVersionInfo(__dirname);
   ],
   controllers: [],
   providers: [
+    {
+      provide: APP_FILTER,
+      useClass: SentryGlobalFilter,
+    },
     MetricsFactory,
     {
       provide: APP_GUARD,

packages/fxa-admin-server/src/main.ts

@@ -7,13 +7,12 @@
 import './monitoring';
 
 import { NestApplicationOptions } from '@nestjs/common';
-import { HttpAdapterHost, NestFactory } from '@nestjs/core';
+import { NestFactory } from '@nestjs/core';
 import { NestExpressApplication } from '@nestjs/platform-express';
 import { allowlistGqlQueries } from 'fxa-shared/nestjs/gql/gql-allowlist';
 import helmet from 'helmet';
 import cors from 'cors';
 import * as Sentry from '@sentry/nestjs';
-import { SentryGlobalFilter } from '@sentry/nestjs/setup';
 
 import { AppModule } from './app.module';
 import Config, { AppConfig } from './config';
@@ -30,10 +29,6 @@ async function bootstrap() {
     nestConfig
   );
 
-  // Register Sentry exception filter with proper HttpAdapterHost
-  const { httpAdapter } = app.get(HttpAdapterHost);
-  app.useGlobalFilters(new SentryGlobalFilter(httpAdapter));
-
   app.use(
     cors({
       origin: appConfig.cors.origin,

packages/fxa-event-broker/src/app.module.ts

@@ -2,8 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 import { Module } from '@nestjs/common';
+import { APP_FILTER } from '@nestjs/core';
 import { ConfigModule } from '@nestjs/config';
 import { ScheduleModule } from '@nestjs/schedule';
+import { SentryGlobalFilter, SentryModule } from '@sentry/nestjs/setup';
 import { HealthModule } from 'fxa-shared/nestjs/health/health.module';
 import { LoggerModule } from 'fxa-shared/nestjs/logger/logger.module';
 import { MetricsFactory } from 'fxa-shared/nestjs/metrics.service';
@@ -22,6 +24,7 @@ const version = getVersionInfo(__dirname);
 
 @Module({
   imports: [
+    SentryModule.forRoot(),
     AuthModule,
     ClientCapabilityModule,
     ClientWebhooksModule,
@@ -38,6 +41,12 @@ const version = getVersionInfo(__dirname);
     PubsubProxyModule,
   ],
   controllers: [],
-  providers: [MetricsFactory],
+  providers: [
+    {
+      provide: APP_FILTER,
+      useClass: SentryGlobalFilter,
+    },
+    MetricsFactory,
+  ],
 })
 export class AppModule {}

packages/fxa-event-broker/src/main.ts

@@ -7,11 +7,10 @@
 import './monitoring';
 
 import * as Sentry from '@sentry/nestjs';
-import { SentryGlobalFilter } from '@sentry/nestjs/setup';
 
 import { NestApplicationOptions } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-import { HttpAdapterHost, NestFactory } from '@nestjs/core';
+import { NestFactory } from '@nestjs/core';
 import mozLog from 'mozlog';
 
 import { initTracing } from 'fxa-shared/tracing/node-tracing';
@@ -34,10 +33,6 @@ async function bootstrap() {
   const config: ConfigService<AppConfig> = app.get(ConfigService);
   const proxyConfig = config.get('proxy') as AppConfig['proxy'];
 
-  // Register Sentry exception filter with proper HttpAdapterHost
-  const { httpAdapter } = app.get(HttpAdapterHost);
-  app.useGlobalFilters(new SentryGlobalFilter(httpAdapter));
-
   // Starts listening for shutdown hooks
   app.enableShutdownHooks();