Merge pull request #20017 from mozilla/FXA-13031

fix(sentry): Register SentryGlobalFilter via dependency injection

Author: vpomerleau

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

@@ -27,7 +27,6 @@ import { EventLoggingModule } from './event-logging/event-logging.module';
 import { GqlModule } from './gql/gql.module';
 import { NewslettersModule } from './newsletters/newsletters.module';
 import { SubscriptionModule } from './subscriptions/subscriptions.module';
-import { LOGGER_PROVIDER } from '@fxa/shared/log';
 
 const version = getVersionInfo(__dirname);
 

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

@@ -7,15 +7,16 @@
 import './monitoring';
 
 import { NestApplicationOptions } from '@nestjs/common';
-import { NestFactory } from '@nestjs/core';
+import { HttpAdapterHost, NestFactory } from '@nestjs/core';
 import { NestExpressApplication } from '@nestjs/platform-express';
 import { allowlistGqlQueries } from 'fxa-shared/nestjs/gql/gql-allowlist';
 import helmet from 'helmet';
-import { AppModule } from './app.module';
-import Config, { AppConfig } from './config';
 import cors from 'cors';
-import { SentryGlobalFilter } from '@sentry/nestjs/setup';
 import * as Sentry from '@sentry/nestjs';
+import { SentryGlobalFilter } from '@sentry/nestjs/setup';
+
+import { AppModule } from './app.module';
+import Config, { AppConfig } from './config';
 
 const appConfig = Config.getProperties() as AppConfig;
 
@@ -29,8 +30,9 @@ async function bootstrap() {
     nestConfig
   );
 
-  // As of sentry v9, this should handle both regular requests and graphql requests.
-  app.useGlobalFilters(new SentryGlobalFilter());
+  // Register Sentry exception filter with proper HttpAdapterHost
+  const { httpAdapter } = app.get(HttpAdapterHost);
+  app.useGlobalFilters(new SentryGlobalFilter(httpAdapter));
 
   app.use(
     cors({

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

@@ -2,11 +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 { ConfigModule, ConfigService } from '@nestjs/config';
+import { ConfigModule } from '@nestjs/config';
 import { ScheduleModule } from '@nestjs/schedule';
 import { HealthModule } from 'fxa-shared/nestjs/health/health.module';
 import { LoggerModule } from 'fxa-shared/nestjs/logger/logger.module';
-import { MozLoggerService } from 'fxa-shared/nestjs/logger/logger.service';
 import { MetricsFactory } from 'fxa-shared/nestjs/metrics.service';
 import { getVersionInfo } from 'fxa-shared/nestjs/version';
 

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

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

packages/fxa-graphql-api/src/app.module.ts

@@ -52,7 +52,7 @@ const version = getVersionInfo(__dirname);
         extraHealthData: () => db.dbHealthCheck(),
       }),
     }),
-    CustomsModule
+    CustomsModule,
   ],
   controllers: [],
   providers: [

packages/fxa-graphql-api/src/main.ts

@@ -16,7 +16,7 @@ import { StatsDService } from '@fxa/shared/metrics/statsd';
 import helmet from 'helmet';
 
 import { NestApplicationOptions } from '@nestjs/common';
-import { NestFactory } from '@nestjs/core';
+import { HttpAdapterHost, NestFactory } from '@nestjs/core';
 import { NestExpressApplication } from '@nestjs/platform-express';
 
 import { AppModule } from './app.module';
@@ -34,8 +34,9 @@ async function bootstrap() {
     nestConfig
   );
 
-  // As of sentry v9, this should handle both regular requests and graphql requests.
-  app.useGlobalFilters(new SentryGlobalFilter());
+  // Register Sentry exception filter with proper HttpAdapterHost
+  const { httpAdapter } = app.get(HttpAdapterHost);
+  app.useGlobalFilters(new SentryGlobalFilter(httpAdapter));
 
   // Configure allowlisting of gql queries
   app.use(bodyParser.json());