Commit 3f5f10cb authored by Sean McGivern's avatar Sean McGivern

Make handler metric params more explicit

parent 9f162b91
...@@ -16,6 +16,10 @@ module Gitlab ...@@ -16,6 +16,10 @@ module Gitlab
def execute def execute
raise NotImplementedError raise NotImplementedError
end end
def metrics_params
{ handler: self.class.name }
end
end end
end end
end end
......
require 'gitlab/email/handler/base_handler' require 'gitlab/email/handler/base_handler'
module Gitlab module Gitlab
...@@ -37,6 +36,10 @@ module Gitlab ...@@ -37,6 +36,10 @@ module Gitlab
@project ||= Project.find_by_full_path(project_path) @project ||= Project.find_by_full_path(project_path)
end end
def metrics_params
super.merge(project: project)
end
private private
def create_issue def create_issue
......
...@@ -28,6 +28,10 @@ module Gitlab ...@@ -28,6 +28,10 @@ module Gitlab
record_name: 'comment') record_name: 'comment')
end end
def metrics_params
super.merge(project: project)
end
private private
def author def author
......
...@@ -16,6 +16,10 @@ module Gitlab ...@@ -16,6 +16,10 @@ module Gitlab
send_thank_you_email! if from_address send_thank_you_email! if from_address
end end
def metrics_params
super.merge(project: project)
end
private private
def service_desk_key def service_desk_key
......
...@@ -19,6 +19,10 @@ module Gitlab ...@@ -19,6 +19,10 @@ module Gitlab
noteable.unsubscribe(sent_notification.recipient) noteable.unsubscribe(sent_notification.recipient)
end end
def metrics_params
super.merge(project: project)
end
private private
def sent_notification def sent_notification
......
require_dependency 'gitlab/email/handler' require_dependency 'gitlab/email/handler'
# Inspired in great part by Discourse's Email::Receiver # Inspired in great part by Discourse's Email::Receiver
...@@ -32,9 +31,7 @@ module Gitlab ...@@ -32,9 +31,7 @@ module Gitlab
raise UnknownIncomingEmail unless handler raise UnknownIncomingEmail unless handler
Gitlab::Metrics.add_event(:receive_email, Gitlab::Metrics.add_event(:receive_email, handler.metrics_params)
project: handler.try(:project),
handler: handler.class.name)
handler.execute handler.execute
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment