Merge branch 'email-handler-metrics-ee' into 'master'

Make handler metric params more explicit

See merge request !1696

changelogs/unreleased/add-email-receiver-metrics.yml

+---
+title: Add metrics events for incoming emails
+merge_request:
+author:

lib/gitlab/email/handler/base_handler.rb

@@ -16,6 +16,10 @@ module Gitlab
         def execute
           raise NotImplementedError
         end
+
+        def metrics_params
+          { handler: self.class.name }
+        end
       end
     end
   end

lib/gitlab/email/handler/create_issue_handler.rb

-
 require 'gitlab/email/handler/base_handler'
 
 module Gitlab
@@ -37,6 +36,10 @@ module Gitlab
           @project ||= Project.find_by_full_path(project_path)
         end
 
+        def metrics_params
+          super.merge(project: project)
+        end
+
         private
 
         def create_issue

lib/gitlab/email/handler/create_note_handler.rb

@@ -7,6 +7,8 @@ module Gitlab
       class CreateNoteHandler < BaseHandler
         include ReplyProcessing
 
+        delegate :project, to: :sent_notification, allow_nil: true
+
         def can_handle?
           mail_key =~ /\A\w+\z/
         end
@@ -26,16 +28,16 @@ module Gitlab
             record_name: 'comment')
         end
 
+        def metrics_params
+          super.merge(project: project)
+        end
+
         private
 
         def author
           sent_notification.recipient
         end
 
-        def project
-          sent_notification.project
-        end
-
         def sent_notification
           @sent_notification ||= SentNotification.for(mail_key)
         end

lib/gitlab/email/handler/ee/service_desk_handler.rb

@@ -16,6 +16,10 @@ module Gitlab
             send_thank_you_email! if from_address
           end
 
+          def metrics_params
+            super.merge(project: project)
+          end
+
           private
 
           def service_desk_key

lib/gitlab/email/handler/unsubscribe_handler.rb

@@ -4,6 +4,8 @@ module Gitlab
   module Email
     module Handler
       class UnsubscribeHandler < BaseHandler
+        delegate :project, to: :sent_notification, allow_nil: true
+
         def can_handle?
           mail_key =~ /\A\w+#{Regexp.escape(Gitlab::IncomingEmail::UNSUBSCRIBE_SUFFIX)}\z/
         end
@@ -17,6 +19,10 @@ module Gitlab
           noteable.unsubscribe(sent_notification.recipient)
         end
 
+        def metrics_params
+          super.merge(project: project)
+        end
+
         private
 
         def sent_notification

lib/gitlab/email/receiver.rb

-
 require_dependency 'gitlab/email/handler'
 
 # Inspired in great part by Discourse's Email::Receiver
@@ -32,6 +31,8 @@ module Gitlab
 
         raise UnknownIncomingEmail unless handler
 
+        Gitlab::Metrics.add_event(:receive_email, handler.metrics_params)
+
         handler.execute
       end