Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 0 deletions

diff --git a/lib/gitlab/email/handler/base_handler.rb b/lib/gitlab/email/handler/base_handler.rb
index f89d1d15010..2e487c42cb5 100644
--- a/lib/gitlab/email/handler/base_handler.rb
+++ b/lib/gitlab/email/handler/base_handler.rb
@@ -24,6 +24,14 @@ module Gitlab
         def metrics_params
           { handler: self.class.name }
         end
+
+        # Each handler should use it's own metric event.  Otherwise there
+        # is a possibility that within the same Sidekiq process, that same
+        # event with different metrics_params will cause Prometheus to
+        # throw an error
+        def metrics_event
+          raise NotImplementedError
+        end
       end
     end
   end