Merge pull request #20223 from mozilla/FXA-12835.3

task(many): Record start up messages to valid sentry config

Author: dschom

packages/fxa-admin-panel/server/lib/server.ts

@@ -155,5 +155,12 @@ export async function createServer() {
   logger.info('server.starting', { port });
   app.listen(port, host, () => {
     logger.info('server.started', { port });
+    Sentry.captureMessage('Admin panel server started', {
+      level: 'info',
+      tags: {
+        service: 'fxa-admin-panel',
+        env: config.get('env'),
+      },
+    });
   });
 }

packages/fxa-admin-server/src/scripts/audit-tokens.ts

@@ -5,6 +5,7 @@
 import program from 'commander';
 import { StatsD } from 'hot-shots';
 import * as Sentry from '@sentry/node';
+import { initSentry } from 'fxa-shared/sentry/node';
 import {
   setupAuthDatabase,
   setupDatabase,
@@ -42,11 +43,11 @@ function getKnex(table: string) {
   }
 }
 
-Sentry.init({});
-
 const logFactory = mozlog(config.log);
 let log: ILogger = logFactory('default');
 
+initSentry({ ...config, release: packageJson.version }, log);
+
 //#region Table Definitions
 /** Defines table and key column */
 type TargetTable = { name: string; keyCol: string };
@@ -243,8 +244,8 @@ export async function auditRowCounts(table: string) {
     table_rows AS table_size
   FROM INFORMATION_SCHEMA.TABLES
   WHERE table_schema = '${table.split('.')[0]}' and table_name = '${
-      table.split('.')[1]
-    }'
+    table.split('.')[1]
+  }'
   `;
   }
 
@@ -310,11 +311,11 @@ export async function auditOrphanedRows(
       COUNT(IF(parent.${parent.keyCol} is NULL, 1, NULL)) AS total_missing
     FROM
       (SELECT ${child.keyCol} FROM ${child.name} ${buildLimit(
-      child.name
-    )}) as child
+        child.name
+      )}) as child
         LEFT JOIN ${parent.name} parent ON child.${child.keyCol} = parent.${
-      parent.keyCol
-    }
+          parent.keyCol
+        }
     ${buildLimit(child.name)}
   ) AS missing;
   `;
@@ -481,6 +482,14 @@ export async function run() {
 if (require.main === module) {
   process.on('exit', (code) => log.info('exit', { code }));
 
+  Sentry.captureMessage('Audit tokens started', {
+    level: 'info',
+    tags: {
+      service: 'fxa-admin-server',
+      env: config.env,
+    },
+  });
+
   const checkInId = Sentry.captureCheckIn({
     monitorSlug: 'audit-tokens',
     status: 'in_progress',

packages/fxa-auth-server/scripts/cleanup-old-carts.ts

@@ -2,6 +2,8 @@
  * 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 program from 'commander';
+import * as Sentry from '@sentry/node';
+import { initSentry } from 'fxa-shared/sentry/node';
 
 import { setupProcessingTaskObjects } from '../lib/payments/processing-tasks-setup';
 import { CartCleanup } from './cleanup-old-carts/cleanup-old-carts';
@@ -27,7 +29,10 @@ const parseDeleteBeforeDays = (deleteBeforeDays: string | number) => {
     return null;
   }
   const date = new Date();
-  const days = typeof deleteBeforeDays === "string" ? parseInt(deleteBeforeDays) : deleteBeforeDays;
+  const days =
+    typeof deleteBeforeDays === 'string'
+      ? parseInt(deleteBeforeDays)
+      : deleteBeforeDays;
 
   date.setDate(date.getDate() - days);
   if (!date.getTime()) {
@@ -52,7 +57,10 @@ const parseAnonymizeBeforeDays = (anonymizeBeforeDays: string | number) => {
     return null;
   }
   const date = new Date();
-  const days = typeof anonymizeBeforeDays === "string" ? parseInt(anonymizeBeforeDays) : anonymizeBeforeDays;
+  const days =
+    typeof anonymizeBeforeDays === 'string'
+      ? parseInt(anonymizeBeforeDays)
+      : anonymizeBeforeDays;
 
   date.setDate(date.getDate() - days);
   if (!date.getTime()) {
@@ -103,18 +111,29 @@ async function init() {
     )
     .parse(process.argv);
 
-  const { config } = await setupProcessingTaskObjects('cleanup-old-carts');
+  const { config, log } = await setupProcessingTaskObjects('cleanup-old-carts');
+
+  initSentry({ ...config, release: pckg.version }, log);
+  Sentry.captureMessage('Cleanup old carts started', {
+    level: 'info',
+    tags: {
+      service: 'fxa-auth-server',
+      env: config.env,
+    },
+  });
 
   const database = await setupAccountDatabase(config.database.mysql.auth);
 
-  const deleteBefore = parseDeleteBefore(program.deleteBefore) || parseDeleteBeforeDays(program.deleteBeforeDays);
-  const anonymizeBefore = parseAnonymizeBefore(program.anonymizeBefore) || parseAnonymizeBeforeDays(program.anonymizeBeforeDays);
+  const deleteBefore =
+    parseDeleteBefore(program.deleteBefore) ||
+    parseDeleteBeforeDays(program.deleteBeforeDays);
+  const anonymizeBefore =
+    parseAnonymizeBefore(program.anonymizeBefore) ||
+    parseAnonymizeBeforeDays(program.anonymizeBeforeDays);
   const anonymizeFields = parseAnonymizeFields(program.anonymizeFields);
 
   if (!deleteBefore) {
-    throw new Error(
-      '--delete-before or --delete-before-days is required'
-    );
+    throw new Error('--delete-before or --delete-before-days is required');
   }
 
   if (anonymizeBefore && !anonymizeFields) {

packages/fxa-auth-server/scripts/delete-inactive-accounts/enqueue-inactive-account-deletions.ts

@@ -32,6 +32,8 @@ import os from 'os';
 import path from 'path';
 import { promisify } from 'util';
 
+import * as Sentry from '@sentry/node';
+import { initSentry } from 'fxa-shared/sentry/node';
 import { Command } from 'commander';
 import { StatsD } from 'hot-shots';
 import { Container } from 'typedi';
@@ -266,6 +268,17 @@ const init = async () => {
   const log = initLog({
     ...config.log,
   });
+
+  const pckg = require('../../package.json');
+  initSentry({ ...config, release: pckg.version }, log);
+  Sentry.captureMessage('Enqueue inactive account deletions started', {
+    level: 'info',
+    tags: {
+      service: 'fxa-auth-server',
+      env: config.env,
+    },
+  });
+
   const glean = gleanMetrics(config);
 
   const redis = initRedis(

packages/fxa-auth-server/scripts/paypal-processor.ts

@@ -62,9 +62,8 @@ export async function init() {
   const lockDuration =
     parseInt(`${program.lockDuration}`) || DEFAULT_LOCK_DURATION_MS;
 
-  const { log, database, senders } = await setupProcessingTaskObjects(
-    'paypal-processor'
-  );
+  const { log, database, senders } =
+    await setupProcessingTaskObjects('paypal-processor');
 
   initSentry(
     {
@@ -74,6 +73,14 @@ export async function init() {
     log
   );
 
+  Sentry.captureMessage('PayPal processor started', {
+    level: 'info',
+    tags: {
+      service: 'fxa-auth-server',
+      env: config.env,
+    },
+  });
+
   const statsd = Container.get(StatsD);
   const paypalClient = new PayPalClient(
     config.subscriptions.paypalNvpSigCredentials,

packages/fxa-auth-server/scripts/prune-tokens.ts

@@ -7,6 +7,7 @@ import { setupDatabase } from 'fxa-shared/db';
 import { BaseAuthModel } from 'fxa-shared/db/models/auth';
 import { StatsD } from 'hot-shots';
 import * as Sentry from '@sentry/node';
+import { initSentry } from 'fxa-shared/sentry/node';
 import moment from 'moment';
 import { SessionToken } from 'fxa-shared/db/models/auth/session-token';
 const { PruneTokens } = require('fxa-shared/db/models/auth');
@@ -27,7 +28,7 @@ function parseDuration(duration: string | number) {
 const config = require('../config').default.getProperties();
 const statsd = new StatsD(config.statsd);
 const log = require('../lib/log')(config.log.level, 'prune-tokens', statsd);
-Sentry.init({});
+initSentry({ ...config, release: pckg.version }, log);
 
 export async function init() {
   // Setup utilities
@@ -270,9 +271,8 @@ Exit Codes:
         // don't exist in the sql database anymore.
         const orphanedTokens = new Array<string>();
         for (const redisSessionTokenId of redisSessionTokenIds) {
-          const dbSessionTokens = await SessionToken.findByTokenId(
-            redisSessionTokenId
-          );
+          const dbSessionTokens =
+            await SessionToken.findByTokenId(redisSessionTokenId);
           if (dbSessionTokens === null) {
             orphanedTokens.push(redisSessionTokenId);
           }
@@ -300,6 +300,14 @@ if (require.main === module) {
     log.info('exit', { code });
   });
 
+  Sentry.captureMessage('Prune tokens started', {
+    level: 'info',
+    tags: {
+      service: 'fxa-auth-server',
+      env: config.env,
+    },
+  });
+
   const checkInId = Sentry.captureCheckIn({
     monitorSlug: 'prune-tokens',
     status: 'in_progress',

packages/fxa-auth-server/scripts/recorded-future/check-and-reset.ts

@@ -24,6 +24,8 @@
 import crypto from 'crypto';
 import { promisify } from 'util';
 
+import * as Sentry from '@sentry/node';
+import { initSentry } from 'fxa-shared/sentry/node';
 import { Command } from 'commander';
 import { Container } from 'typedi';
 import { StatsD } from 'hot-shots';
@@ -81,6 +83,9 @@ const client = createClient<paths>({
 Container.set(AppConfig, config);
 Container.set(StatsD, statsd);
 
+const pckg = require('../../package.json');
+initSentry({ ...config, release: pckg.version }, log);
+
 let authDb: Awaited<ReturnType<typeof DB.connect>> | null;
 
 const checkAndReset = async () => {
@@ -419,6 +424,14 @@ async function getHasTotp2faFn() {
 }
 
 if (require.main === module) {
+  Sentry.captureMessage('Recorded Future check-and-reset started', {
+    level: 'info',
+    tags: {
+      service: 'fxa-auth-server',
+      env: config.env,
+    },
+  });
+
   checkAndReset()
     .then(
       (exitCode) => {

packages/fxa-auth-server/scripts/subscription-reminders.ts

@@ -6,6 +6,7 @@ import { StatsD } from 'hot-shots';
 import Container from 'typedi';
 import { promisify } from 'util';
 import * as Sentry from '@sentry/node';
+import { initSentry } from 'fxa-shared/sentry/node';
 
 import { setupProcessingTaskObjects } from '../lib/payments/processing-tasks-setup';
 import { SubscriptionReminders } from '../lib/payments/subscription-reminders';
@@ -25,8 +26,6 @@ const DEFAULT_ENDING_REMINDER_DAILY_LENGTH = 0;
 const DEFAULT_ENDING_REMINDER_MONTHLY_LENGTH = 7;
 const DEFAULT_ENDING_REMINDER_YEARLY_LENGTH = 14;
 
-Sentry.init({});
-
 async function init() {
   program
     .version(pckg.version)
@@ -70,6 +69,16 @@ async function init() {
 
   const { log, database, senders, stripeHelper, config } =
     await setupProcessingTaskObjects('subscription-reminders');
+
+  initSentry({ ...config, release: pckg.version }, log);
+  Sentry.captureMessage('Subscription reminders started', {
+    level: 'info',
+    tags: {
+      service: 'fxa-auth-server',
+      env: config.env,
+    },
+  });
+
   await initSubplat({
     loggerName: 'subscription-reminders',
     legacyLog: log,

packages/fxa-auth-server/scripts/verification-reminders.js

@@ -25,6 +25,8 @@ const verificationReminders = require('../lib/verification-reminders')(
   config
 );
 const Sentry = require('@sentry/node');
+const { initSentry } = require('fxa-shared/sentry/node');
+const pckg = require('../package.json');
 const cadReminders = require('../lib/cad-reminders')(config, log);
 const subscriptionAccountReminders =
   require('../lib/subscription-account-reminders')(log, config);
@@ -37,8 +39,14 @@ const { FxaMailer } = require('../lib/senders/fxa-mailer');
 const { FxaMailerFormat } = require('../lib/senders/fxa-mailer-format');
 const { StatsD } = require('hot-shots');
 
-
-Sentry.init({});
+initSentry({ ...config, release: pckg.version }, log);
+Sentry.captureMessage('Verification reminders started', {
+  level: 'info',
+  tags: {
+    service: 'fxa-auth-server',
+    env: config.env,
+  },
+});
 const checkInId = Sentry.captureCheckIn({
   monitorSlug: 'verification-reminders',
   status: 'in_progress',

packages/fxa-content-server/server/bin/fxa-content-server.js

@@ -8,6 +8,7 @@
 
 // Initializes sentry
 require('../lib/sentry');
+const Sentry = require('@sentry/node');
 
 // setup version first for the rest of the modules
 const loggerFactory = require('../lib/logging/log');
@@ -296,6 +297,13 @@ function listen(theApp) {
         config.get('scopedKeys.validation')
       )}`
     );
+    Sentry.captureMessage('Content server started', {
+      level: 'info',
+      tags: {
+        service: 'fxa-content-server',
+        env: config.get('env'),
+      },
+    });
   }
   return true;
 }