Merge pull request #19877 from mozilla/FXA-12742

task(many): Upgrade Sentry and reduce filtering

Author: dschom

libs/payments/webhooks/src/lib/stripe-webhooks.service.spec.ts

@@ -52,9 +52,13 @@ import {
   NimbusManager,
 } from '@fxa/payments/experiments';
 
-jest.mock('@sentry/node', () => ({
-  captureException: jest.fn(),
-}));
+jest.mock('@sentry/node', () => {
+  const actual = jest.requireActual('@sentry/node');
+  return {
+    ...actual,
+    captureException: jest.fn(),
+  };
+});
 
 describe('StripeWebhookService', () => {
   let stripeEventManager: StripeEventManager;

libs/shared/sentry-browser/src/lib/browser.spec.ts

@@ -6,6 +6,15 @@ import * as Sentry from '@sentry/browser';
 import { enableSentry, SentryConfigOpts } from '@fxa/shared/sentry-utils';
 import { captureException, initSentry } from './browser';
 
+jest.mock('@sentry/browser', () => {
+  const actual = jest.requireActual('@sentry/browser');
+  return {
+    ...actual,
+    init: jest.fn(),
+    captureException: jest.fn(),
+  };
+});
+
 const config: SentryConfigOpts = {
   release: 'v0.0.0',
   sentry: {

libs/shared/sentry-nest/src/lib/nest.ts

@@ -25,6 +25,7 @@ export function initSentry(config: InitSentryOpts, log: Logger) {
 
   const integrations = [
     Sentry.extraErrorDataIntegration({ depth: 5 }),
+    Sentry.requestDataIntegration(),
 
     // Custom Integrations
     ...(config.integrations || []),

libs/shared/sentry-nest/src/lib/reporting.ts

@@ -118,7 +118,9 @@ export function reportRequestException(
   Sentry.withScope((scope: Sentry.Scope) => {
     scope.addEventProcessor((event) => {
       if (request) {
-        event.request = Sentry.extractRequestData(request);
+        // As of sentry v9, this should automatically happen by adding, Sentry.requestDataIntegration()
+        // Leaving note here for historical context.
+        // event.request = Sentry.extractRequestData(request);
         event.level = 'error';
         return event;
       }

libs/shared/sentry-next/src/lib/server.ts

@@ -28,6 +28,7 @@ export function initSentryForNextjsServer(config: InitSentryOpts, log: Logger) {
   const integrations = [
     // Default
     Sentry.extraErrorDataIntegration({ depth: 5 }),
+    Sentry.requestDataIntegration(),
 
     // Custom Integrations
     ...(config.integrations || []),

libs/shared/sentry-node/src/lib/node.ts

@@ -25,6 +25,7 @@ export function initSentry(config: InitSentryOpts, log: Logger) {
 
   const integrations = [
     Sentry.extraErrorDataIntegration({ depth: 5 }),
+    Sentry.requestDataIntegration(),
 
     // Custom Integrations
     ...(config.integrations || []),

libs/shared/sentry-utils/src/lib/before-send.browser.spec.ts

@@ -78,7 +78,9 @@ describe('before send', () => {
     const url = 'https://accounts.firefox.com/complete_reset_password';
     const badQuery =
       '?token=foo&code=bar&email=some%40restmail.net&service=sync';
-    const goodQuery = '?token=VALUE&code=VALUE&email=VALUE&service=sync';
+    // We now allow these parameters to pass through. Leaving test for historical context.
+    const goodQuery =
+      '?token=foo&code=bar&email=some%40restmail.net&service=sync';
     const badData = {
       type: undefined,
       request: {
@@ -100,7 +102,9 @@ describe('before send', () => {
     const url = 'https://accounts.firefox.com/complete_reset_password';
     const badQuery =
       '?token=foo&code=bar&email=some%40restmail.net&service=sync';
-    const goodQuery = '?token=VALUE&code=VALUE&email=VALUE&service=sync';
+    // We now allow these parameters to pass through. Leaving test for historical context.
+    const goodQuery =
+      '?token=foo&code=bar&email=some%40restmail.net&service=sync';
     const badData = {
       type: undefined,
       request: {
@@ -129,8 +133,9 @@ describe('before send', () => {
     const badCulprit = 'https://accounts.firefox.com/scripts/57f6d4e4.main.js';
     const badAbsPath =
       'https://accounts.firefox.com/complete_reset_password?token=foo&code=bar&[email protected]&service=sync&resume=barbar';
+    // We now allow these parameters to pass through. Leaving test for historical context.
     const goodAbsPath =
-      'https://accounts.firefox.com/complete_reset_password?token=VALUE&code=VALUE&email=VALUE&service=sync&resume=VALUE';
+      'https://accounts.firefox.com/complete_reset_password?token=foo&code=bar&email=[email protected]&service=sync&resume=barbar';
     const data = {
       type: undefined,
       culprit: badCulprit,

libs/shared/sentry-utils/src/lib/before-send.browser.ts

@@ -1,9 +1,5 @@
-import { ErrorEvent, EventHint, Exception } from '@sentry/core';
-import {
-  SentryConfigOpts,
-  tagFxaName,
-  cleanUpQueryParam,
-} from '@fxa/shared/sentry-utils';
+import { ErrorEvent, EventHint } from '@sentry/core';
+import { SentryConfigOpts, tagFxaName } from '@fxa/shared/sentry-utils';
 
 // Internal flag to keep track of whether or not sentry is initialized
 let sentryEnabled = false;
@@ -36,10 +32,6 @@ export function beforeSendBrowser(
   }
 
   if (event.request) {
-    if (event.request.url) {
-      event.request.url = cleanUpQueryParam(event.request.url);
-    }
-
     if (event.tags) {
       // if this is a known errno, then use grouping with fingerprints
       // Docs: https://docs.sentry.io/hosted/learn/rollups/#fallback-grouping
@@ -49,24 +41,6 @@ export function beforeSendBrowser(
         event.level = 'info';
       }
     }
-
-    if (event.exception?.values) {
-      event.exception.values.forEach((value: Exception) => {
-        if (value.stacktrace && value.stacktrace.frames) {
-          value.stacktrace.frames.forEach((frame: { abs_path?: string }) => {
-            if (frame.abs_path) {
-              frame.abs_path = cleanUpQueryParam(frame.abs_path); // eslint-disable-line camelcase
-            }
-          });
-        }
-      });
-    }
-
-    if (event.request.headers?.['Referer']) {
-      event.request.headers['Referer'] = cleanUpQueryParam(
-        event.request.headers['Referer']
-      );
-    }
   }
 
   event = tagFxaName(event, opts.sentry?.clientName || opts.sentry?.serverName);

libs/shared/sentry-utils/src/lib/before-send.server.spec.ts

@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import { beforeSendServer } from './before-send.server';
-import { filterSentryEvent } from './utils';
 
 describe('beforeSendServer', () => {
   const config = {
@@ -14,7 +13,7 @@ describe('beforeSendServer', () => {
       clientName: 'fxa-shared-testing',
       sampleRate: 0,
     },
-    eventFilters: [filterSentryEvent],
+    eventFilters: [],
   };
 
   it('adjust event before send', () => {
@@ -28,6 +27,6 @@ describe('beforeSendServer', () => {
     const hint = {};
     const modified = beforeSendServer(config, data, hint);
     expect(modified?.tags?.['fxa.name']).toEqual('unknown');
-    expect(modified?.extra?.['uid']).toEqual('[Filtered]');
+    expect(modified?.extra?.['uid']).toEqual('123');
   });
 });