Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 6 insertions, 2 deletions

diff --git a/app/mailers/emails/service_desk.rb b/app/mailers/emails/service_desk.rb
index 66eb2c646a9..e8034ef9b57 100644
--- a/app/mailers/emails/service_desk.rb
+++ b/app/mailers/emails/service_desk.rb
@@ -20,7 +20,9 @@ module Emails
       options = service_desk_options(email_sender, 'thank_you', @issue.external_author)
                   .merge(subject: "Re: #{subject_base}")
 
-      mail_new_thread(@issue, options)
+      mail_new_thread(@issue, options).tap do
+        Gitlab::Metrics::BackgroundTransaction.current&.add_event(:service_desk_thank_you_email)
+      end
     end
 
     def service_desk_new_note_email(issue_id, note_id, recipient)
@@ -31,7 +33,9 @@ module Emails
       options = service_desk_options(email_sender, 'new_note', recipient)
                   .merge(subject: subject_base)
 
-      mail_answer_thread(@issue, options)
+      mail_answer_thread(@issue, options).tap do
+        Gitlab::Metrics::BackgroundTransaction.current&.add_event(:service_desk_new_note_email)
+      end
     end
 
     private