Merge pull request #14006 from mozilla/FXA-5726-remove-sentry-tracing…

…-references Fxa 5726 remove sentry tracing references
mozilla · Aug 30, 2022 · 2ade9a5 · 2ade9a5
2 parents bd715fa + 20736c4
commit 2ade9a5
Show file tree

Hide file tree

Showing 43 changed files with 0 additions and 213 deletions.
diff --git a/packages/browserid-verifier/lib/config.js b/packages/browserid-verifier/lib/config.js
@@ -102,12 +102,6 @@ function loadConf() {
         format: 'Number',
         env: 'SENTRY_SAMPLE_RATE',
       },
-      tracesSampleRate: {
-        doc: 'Rate at which sentry traces are captured.',
-        default: 0.0,
-        format: 'Number',
-        env: 'SENTRY_TRACES_SAMPLE_RATE',
-      },
       serverName: {
         doc: 'Name used by sentry to identify the server.',
         default: 'browserid-verifier',

diff --git a/packages/browserid-verifier/lib/server.js b/packages/browserid-verifier/lib/server.js
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const Sentry = require('@sentry/node');
-const Tracing = require('@sentry/tracing');
 
 const express = require('express'),
   bodyParser = require('body-parser'),
@@ -47,13 +46,8 @@ if (sentryConfig.dsn) {
       event = tagFxaName(event, opts.serverName);
       return event;
     },
-    integrations: [
-      new Sentry.Integrations.Http({ tracing: true }),
-      new Tracing.Integrations.Express({ app }),
-    ],
   });
   app.use(Sentry.Handlers.requestHandler());
-  app.use(Sentry.Handlers.tracingHandler());
 }
 
 var verifier = new CCVerifier({

diff --git a/packages/browserid-verifier/package.json b/packages/browserid-verifier/package.json
@@ -14,7 +14,6 @@
   "dependencies": {
     "@sentry/integrations": "6.19.7",
     "@sentry/node": "6.19.7",
-    "@sentry/tracing": "6.19.7",
     "async": "3.2.4",
     "body-parser": "^1.19.1",
     "browserid-local-verify": "0.5.2",

diff --git a/packages/fxa-admin-panel/package.json b/packages/fxa-admin-panel/package.json
@@ -33,7 +33,6 @@
   "dependencies": {
     "@apollo/client": "^3.4.5",
     "@sentry/node": "^7.3.1",
-    "@sentry/tracing": "^7.3.1",
     "body-parser": "^1.19.1",
     "convict": "^6.2.3",
     "convict-format-with-moment": "^6.2.0",

diff --git a/packages/fxa-admin-panel/server/config/index.ts b/packages/fxa-admin-panel/server/config/index.ts
@@ -76,12 +76,6 @@ const conf = convict({
       format: 'Number',
       env: 'SENTRY_SAMPLE_RATE',
     },
-    tracesSampleRate: {
-      doc: 'Rate at which sentry traces are captured.',
-      default: 0.0,
-      format: 'Number',
-      env: 'SENTRY_TRACES_SAMPLE_RATE',
-    },
     serverName: {
       doc: 'Name used by sentry to identify the server.',
       default: 'fxa-admin-panel',

diff --git a/packages/fxa-admin-panel/server/lib/server.ts b/packages/fxa-admin-panel/server/lib/server.ts
@@ -4,7 +4,6 @@
 
 // TO DO: CORS, other security-related tasks (#4312)
 import * as Sentry from '@sentry/node';
-import * as Tracing from '@sentry/tracing';
 
 import express, { Request, Response } from 'express';
 import bodyParser from 'body-parser';
@@ -61,13 +60,8 @@ if (sentryConfig.dsn) {
       event = tagFxaName(event, opts.serverName);
       return event;
     },
-    integrations: [
-      new Sentry.Integrations.Http({ tracing: true }),
-      new Tracing.Integrations.Express({ app }),
-    ],
   });
   app.use(Sentry.Handlers.requestHandler());
-  app.use(Sentry.Handlers.tracingHandler());
 }
 
 app.use(

diff --git a/packages/fxa-admin-server/src/config/index.ts b/packages/fxa-admin-server/src/config/index.ts
@@ -80,12 +80,6 @@ const conf = convict({
       format: 'Number',
       env: 'SENTRY_SAMPLE_RATE',
     },
-    tracesSampleRate: {
-      doc: 'Rate at which sentry traces are captured.',
-      default: 0.0,
-      format: 'Number',
-      env: 'SENTRY_TRACES_SAMPLE_RATE',
-    },
     serverName: {
       doc: 'Name used by sentry to identify the server.',
       default: 'fxa-admin-server',

diff --git a/packages/fxa-auth-server/config/index.ts b/packages/fxa-auth-server/config/index.ts
@@ -1646,12 +1646,6 @@ const conf = convict({
       format: 'Number',
       env: 'SENTRY_SAMPLE_RATE',
     },
-    tracesSampleRate: {
-      doc: 'Rate at which sentry traces are captured.',
-      default: 0.0,
-      format: 'Number',
-      env: 'SENTRY_TRACES_SAMPLE_RATE',
-    },
     serverName: {
       doc: 'Name used by sentry to identify the server.',
       default: 'fxa-auth-server',

diff --git a/packages/fxa-auth-server/lib/sentry.js b/packages/fxa-auth-server/lib/sentry.js
@@ -7,7 +7,6 @@
 const config = require('../config').getProperties();
 const Hoek = require('@hapi/hoek');
 const Sentry = require('@sentry/node');
-require('@sentry/tracing');
 const { ExtraErrorData } = require('@sentry/integrations');
 const verror = require('verror');
 const { ERRNO } = require('./error');
@@ -194,7 +193,6 @@ async function configureSentry(server, config, processName = 'key_server') {
       integrations: [
         new Sentry.Integrations.LinkedErrors({ key: 'jse_cause' }),
         new ExtraErrorData({ depth: 5 }),
-        new Sentry.Integrations.Http({ tracing: true }),
       ],
       // https://docs.sentry.io/platforms/node/configuration/options/#max-value-length
       maxValueLength: 500,

diff --git a/packages/fxa-content-server/app/scripts/lib/sentry.js b/packages/fxa-content-server/app/scripts/lib/sentry.js
@@ -2,7 +2,6 @@
  * 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 * as Sentry from '@sentry/browser';
-import { BrowserTracing } from '@sentry/tracing';
 
 import {
   buildSentryConfig,
@@ -140,11 +139,6 @@ function SentryMetrics(config) {
         event = beforeSend(event);
         return event;
       },
-      integrations: [
-        new BrowserTracing({
-          tracingOrigins: opts.tracingOrigins,
-        }),
-      ],
     });
   } catch (e) {
     this._logger.error(e);

diff --git a/packages/fxa-content-server/app/tests/spec/lib/sentry.js b/packages/fxa-content-server/app/tests/spec/lib/sentry.js
@@ -26,7 +26,6 @@ describe('lib/sentry', function () {
             dsn,
             env: 'test',
             sampleRate: 1.0,
-            tracesSampleRate: 1.0,
             clientName: 'fxa-content-server-test',
           },
         });

diff --git a/packages/fxa-content-server/package.json b/packages/fxa-content-server/package.json
@@ -43,7 +43,6 @@
     "@sentry/browser": "^6.19.7",
     "@sentry/integrations": "^6.19.1",
     "@sentry/node": "^6.19.1",
-    "@sentry/tracing": "^6.19.1",
     "asmcrypto.js": "^0.22.0",
     "autoprefixer": "^10.4.7",
     "babel-loader": "^8.2.2",

diff --git a/packages/fxa-content-server/server/lib/beta-settings.js b/packages/fxa-content-server/server/lib/beta-settings.js
@@ -38,7 +38,6 @@ const settingsConfig = {
     dsn: config.get('sentry.dsn'),
     env: config.get('sentry.env'),
     sampleRate: config.get('sentry.sampleRate'),
-    tracesSampleRate: config.get('sentry.tracesSampleRate'),
     clientName: config.get('sentry.clientName'),
     serverName: config.get('sentry.serverName'),
   },

diff --git a/packages/fxa-content-server/server/lib/configuration.js b/packages/fxa-content-server/server/lib/configuration.js
@@ -639,12 +639,6 @@ const conf = (module.exports = convict({
       env: 'SENTRY_SAMPLE_RATE',
       format: Number,
     },
-    tracesSampleRate: {
-      default: 0.0,
-      doc: 'Sentry config for client side errors. If not set, then no errors reported.',
-      env: 'SENTRY_TRACES_SAMPLE_RATE',
-      format: Number,
-    },
   },
   sourceMapType: {
     default: 'source-map',

diff --git a/packages/fxa-content-server/server/lib/routes/get-index.js b/packages/fxa-content-server/server/lib/routes/get-index.js
@@ -34,7 +34,6 @@ module.exports = function (config) {
   const SENTRY_CLIENT_DSN = config.get('sentry.dsn');
   const SENTRY_CLIENT_ENV = config.get('sentry.env');
   const SENTRY_SAMPLE_RATE = config.get('sentry.sampleRate');
-  const SENTRY_TRACES_SAMPLE_RATE = config.get('sentry.tracesSampleRate');
   const SENTRY_CLIENT_NAME = config.get('sentry.clientName');
   const OAUTH_SERVER_URL = config.get('oauth_url');
   const PAIRING_CHANNEL_URI = config.get('pairing.server_base_uri');
@@ -83,7 +82,6 @@ module.exports = function (config) {
       dsn: SENTRY_CLIENT_DSN,
       env: SENTRY_CLIENT_ENV,
       sampleRate: SENTRY_SAMPLE_RATE,
-      tracesSampleRate: SENTRY_TRACES_SAMPLE_RATE,
       clientName: SENTRY_CLIENT_NAME,
     },
     staticResourceUrl: STATIC_RESOURCE_URL,

diff --git a/packages/fxa-content-server/server/lib/sentry.js b/packages/fxa-content-server/server/lib/sentry.js
@@ -15,7 +15,6 @@ const {
 const logger = require('./logging/log')('sentry');
 
 const Sentry = require('@sentry/node');
-require('@sentry/tracing');
 
 function removeQuery(url) {
   if (!url) {
@@ -60,7 +59,6 @@ if (config.get('sentry.dsn')) {
         dsn: config.get('sentry.dsn'),
         env: config.get('sentry.env'),
         sampleRate: config.get('sentry.sampleRate'),
-        tracesSampleRate: config.get('sentry.tracesSampleRate'),
         serverName: config.get('sentry.serverName'),
       },
     },
@@ -76,7 +74,6 @@ if (config.get('sentry.dsn')) {
     },
     integrations: [
       new Sentry.Integrations.LinkedErrors({ key: 'jse_cause' }),
-      new Sentry.Integrations.Http({ tracing: true }),
     ],
   });
 }

diff --git a/packages/fxa-customs-server/lib/config/config.js b/packages/fxa-customs-server/lib/config/config.js
@@ -318,12 +318,6 @@ module.exports = function (fs, path, url, convict) {
         format: 'Number',
         env: 'SENTRY_SAMPLE_RATE',
       },
-      tracesSampleRate: {
-        doc: 'Rate at which sentry traces are captured.',
-        default: 0.0,
-        format: 'Number',
-        env: 'SENTRY_TRACES_SAMPLE_RATE',
-      },
       serverName: {
         doc: 'Name used by sentry to identify the server.',
         default: 'fxa-customs-server',

diff --git a/packages/fxa-customs-server/lib/sentry.js b/packages/fxa-customs-server/lib/sentry.js
@@ -6,7 +6,6 @@
 
 const Hoek = require('@hapi/hoek');
 const Sentry = require('@sentry/node');
-require('@sentry/tracing');
 const {
   buildSentryConfig,
   tagCriticalEvent,
@@ -28,7 +27,6 @@ async function configureSentry(server, config, log) {
     ...opts,
     integrations: [
       new Sentry.Integrations.LinkedErrors({ key: 'jse_cause' }),
-      new Sentry.Integrations.Http({ tracing: true }),
     ],
     beforeSend(event, _hint) {
       event = tagCriticalEvent(event);

diff --git a/packages/fxa-event-broker/src/config.ts b/packages/fxa-event-broker/src/config.ts
@@ -209,12 +209,6 @@ const conf = convict({
       env: 'SENTRY_SAMPLE_RATE',
       format: 'Number',
     },
-    tracesSampleRate: {
-      default: 0.0,
-      doc: 'Rate at which traces are sampled.',
-      env: 'SENTRY_TRACES_SAMPLE_RATE',
-      format: 'Number',
-    },
     serverName: {
       doc: 'Name used by sentry to identify the server.',
       default: 'fxa-event-broker',

diff --git a/packages/fxa-graphql-api/src/config.ts b/packages/fxa-graphql-api/src/config.ts
@@ -206,12 +206,6 @@ const conf = convict({
       env: 'SENTRY_SAMPLE_RATE',
       format: 'Number',
     },
-    tracesSampleRate: {
-      default: 0.0,
-      doc: 'Rate at which traces are sampled.',
-      env: 'SENTRY_TRACES_SAMPLE_RATE',
-      format: 'Number',
-    },
     serverName: {
       doc: 'Name used by sentry to identify the server.',
       default: 'fxa-graphql-api',

diff --git a/packages/fxa-payments-server/package.json b/packages/fxa-payments-server/package.json
@@ -107,7 +107,6 @@
   "dependencies": {
     "@sentry/browser": "^6.19.7",
     "@sentry/node": "^6.19.1",
-    "@sentry/tracing": "^6.19.1",
     "@stripe/react-stripe-js": "^1.10.0",
     "@stripe/stripe-js": "^1.31.0",
     "accept-language-parser": "^1.5.0",

diff --git a/packages/fxa-payments-server/server/config/index.js b/packages/fxa-payments-server/server/config/index.js
@@ -236,12 +236,6 @@ const conf = convict({
       env: 'SENTRY_SAMPLE_RATE',
       format: 'Number',
     },
-    tracesSampleRate: {
-      default: 0.0,
-      doc: 'Rate at which traces are sampled.',
-      env: 'SENTRY_TRACES_SAMPLE_RATE',
-      format: 'Number',
-    },
     serverName: {
       doc: 'Name used by sentry to identify the server.',
       default: 'fxa-payments-broker',

diff --git a/packages/fxa-payments-server/server/lib/server.js b/packages/fxa-payments-server/server/lib/server.js
@@ -21,7 +21,6 @@ module.exports = () => {
   const helmet = require('helmet');
   const noCache = require('nocache');
   const Sentry = require('@sentry/node');
-  const Tracing = require('@sentry/tracing');
   const serveStatic = require('serve-static');
 
   const bodyParser = require('body-parser');
@@ -75,7 +74,6 @@ module.exports = () => {
       dsn: config.get('sentry.dsn'),
       env: config.get('sentry.env'),
       sampleRate: config.get('sentry.sampleRate'),
-      tracesSampleRate: config.get('sentry.tracesSampleRate'),
       serverName: config.get('sentry.serverName'),
       clientName: config.get('sentry.clientName'),
     },
@@ -131,13 +129,8 @@ module.exports = () => {
         event = tagFxaName(event, opts.serverName);
         return event;
       },
-      integrations: [
-        new Sentry.Integrations.Http({ tracing: true }),
-        new Tracing.Integrations.Express({ app }),
-      ],
     });
     app.use(Sentry.Handlers.requestHandler());
-    app.use(Sentry.Handlers.tracingHandler());
   }
 
   const hstsEnabled = config.get('hstsEnabled');

diff --git a/packages/fxa-payments-server/src/lib/config.test.ts b/packages/fxa-payments-server/src/lib/config.test.ts
@@ -104,7 +104,6 @@ const mockConfig = {
     env: 'test',
     sampleRate: 1.0,
     serverName: 'fxa-payments-server',
-    tracesSampleRate: 0.0,
   },
   version: '1.0.0',
 };
@@ -138,7 +137,6 @@ const expectedMergedConfig = {
     env: 'test',
     sampleRate: 1.0,
     serverName: 'fxa-payments-server',
-    tracesSampleRate: 0.0,
   },
   servers: {
     auth: {

diff --git a/packages/fxa-payments-server/src/lib/config.ts b/packages/fxa-payments-server/src/lib/config.ts
@@ -16,7 +16,6 @@ export interface Config {
     dsn: string;
     env: string;
     sampleRate: number;
-    tracesSampleRate: number;
     clientName?: string;
     serverName?: string;
   };
@@ -63,7 +62,6 @@ export function defaultConfig(): Config {
       dsn: '',
       env: 'test',
       sampleRate: 1.0,
-      tracesSampleRate: 0.0,
       serverName: 'fxa-payments-server',
       clientName: 'fxa-payments-client',
     },

diff --git a/packages/fxa-payments-server/src/lib/sentry.js b/packages/fxa-payments-server/src/lib/sentry.js
@@ -4,7 +4,6 @@
 
 import Logger from './logger';
 import * as Sentry from '@sentry/browser';
-import { BrowserTracing } from '@sentry/tracing';
 
 import {
   tagFxaName,
@@ -145,11 +144,6 @@ SentryMetrics.prototype = {
           event = tagFxaName(event, opts.clientName);
           return event;
         },
-        integrations: [
-          new BrowserTracing({
-            tracingOrigins: opts.tracingOrigins,
-          }),
-        ],
       });
     } catch (e) {
       this._logger.error(e);

diff --git a/packages/fxa-payments-server/src/lib/sentry.test.js b/packages/fxa-payments-server/src/lib/sentry.test.js
@@ -31,7 +31,6 @@ describe('lib/sentry', function () {
             env,
             serverName,
             sampleRate: 1.0,
-            tracesSampleRate: 0.0,
           },
         });
       } catch (e) {
@@ -51,7 +50,6 @@ describe('lib/sentry', function () {
         env,
         serverName,
         sampleRate: 1.0,
-        tracesSampleRate: 0.0,
       },
     });