From 7ef65eda9d7be4ee223145907b66da868f092aed Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Wed, 31 Jan 2024 10:10:06 +0000 Subject: [PATCH] Merge pull request #16833 from overleaf/bg-google-spam-add-email-metrics Include email type and rate-limit status in metrics GitOrigin-RevId: eb5645e68d9ee3571d04b87b2c0fc09f9caa126a --- services/web/app/src/Features/Email/EmailHandler.js | 2 +- services/web/app/src/Features/Email/EmailSender.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/services/web/app/src/Features/Email/EmailHandler.js b/services/web/app/src/Features/Email/EmailHandler.js index 8d90dfacc3..8e0b52e098 100644 --- a/services/web/app/src/Features/Email/EmailHandler.js +++ b/services/web/app/src/Features/Email/EmailHandler.js @@ -22,7 +22,7 @@ async function sendEmail(emailType, opts) { opts.html = email.html opts.text = email.text opts.subject = email.subject - await EmailSender.promises.sendEmail(opts) + await EmailSender.promises.sendEmail(opts, emailType) } function sendDeferredEmail(emailType, opts, delay) { diff --git a/services/web/app/src/Features/Email/EmailSender.js b/services/web/app/src/Features/Email/EmailSender.js index dee3be40d8..fd62810bb3 100644 --- a/services/web/app/src/Features/Email/EmailSender.js +++ b/services/web/app/src/Features/Email/EmailSender.js @@ -66,9 +66,13 @@ function getClient() { return client } -async function sendEmail(options) { +async function sendEmail(options, emailType) { try { const canContinue = await checkCanSendEmail(options) + metrics.inc('email_status', { + status: canContinue ? 'sent' : 'rate_limited', + path: emailType, + }) if (!canContinue) { logger.debug( {