Use separate series for Rails/Sidekiq transactions

This removes the need for tagging all metrics with a "process_type" tag.

4 files changed, 10 insertions, 8 deletions

diff --git a/lib/gitlab/metrics/metric.rb b/lib/gitlab/metrics/metric.rb
index 753008df99a..8319e628a40 100644
--- a/lib/gitlab/metrics/metric.rb
+++ b/lib/gitlab/metrics/metric.rb
@@ -19,8 +19,7 @@ module Gitlab
         {
           series: @series,
           tags:   @tags.merge(
-            hostname:     Metrics.hostname,
-            process_type: Sidekiq.server? ? 'sidekiq' : 'rails'
+            hostname: Metrics.hostname
           ),
           values:    @values,
           timestamp: @created_at.to_i * 1_000_000_000
diff --git a/lib/gitlab/metrics/rack_middleware.rb b/lib/gitlab/metrics/rack_middleware.rb
index 5c0587c4c51..bb9e4fcb918 100644
--- a/lib/gitlab/metrics/rack_middleware.rb
+++ b/lib/gitlab/metrics/rack_middleware.rb
@@ -4,6 +4,8 @@ module Gitlab
     class RackMiddleware
       CONTROLLER_KEY = 'action_controller.instance'
 
+      SERIES = 'rails_transactions'
+
       def initialize(app)
         @app = app
       end
@@ -30,7 +32,7 @@ module Gitlab
       end
 
       def transaction_from_env(env)
-        trans = Transaction.new
+        trans = Transaction.new(SERIES)
 
         trans.add_tag(:request_method, env['REQUEST_METHOD'])
         trans.add_tag(:request_uri, env['REQUEST_URI'])
diff --git a/lib/gitlab/metrics/sidekiq_middleware.rb b/lib/gitlab/metrics/sidekiq_middleware.rb
index ad441decfa2..6e804dd2562 100644
--- a/lib/gitlab/metrics/sidekiq_middleware.rb
+++ b/lib/gitlab/metrics/sidekiq_middleware.rb
@@ -4,8 +4,10 @@ module Gitlab
     #
     # This middleware is intended to be used as a server-side middleware.
     class SidekiqMiddleware
+      SERIES = 'sidekiq_transactions'
+
       def call(worker, message, queue)
-        trans = Transaction.new
+        trans = Transaction.new(SERIES)
 
         begin
           trans.run { yield }
diff --git a/lib/gitlab/metrics/transaction.rb b/lib/gitlab/metrics/transaction.rb
index a61dbd989e7..43a7dab5323 100644
--- a/lib/gitlab/metrics/transaction.rb
+++ b/lib/gitlab/metrics/transaction.rb
@@ -4,8 +4,6 @@ module Gitlab
     class Transaction
       THREAD_KEY = :_gitlab_metrics_transaction
 
-      SERIES = 'transactions'
-
       attr_reader :uuid, :tags
 
       def self.current
@@ -13,7 +11,8 @@ module Gitlab
       end
 
       # name - The name of this transaction as a String.
-      def initialize
+      def initialize(series)
+        @series  = series
         @metrics = []
         @uuid    = SecureRandom.uuid
 
@@ -55,7 +54,7 @@ module Gitlab
       end
 
       def track_self
-        add_metric(SERIES, { duration: duration }, @tags)
+        add_metric(@series, { duration: duration }, @tags)
       end
 
       def submit