From a6c60127e3e2966b2f29fa6e6e79503b130c2b02 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 31 Dec 2015 17:14:02 +0100
Subject: Removed tracking of raw SQL queries

This particular setup had 3 problems:

1. Storing SQL queries as tags is very inefficient as InfluxDB ends up
   indexing every query (and they can get pretty large). Storing these
   as values instead means we can't always display the SQL as easily.
2. We already instrument ActiveRecord query methods, thus we already
   have timing information about database queries.
3. SQL obfuscation is difficult to get right and I'd rather not expose
   sensitive data by accident.
---
 config/initializers/metrics.rb                     |  1 -
 lib/gitlab/metrics/obfuscated_sql.rb               | 47 -----------
 lib/gitlab/metrics/subscribers/active_record.rb    | 48 -----------
 spec/lib/gitlab/metrics/obfuscated_sql_spec.rb     | 93 ----------------------
 .../metrics/subscribers/active_record_spec.rb      | 32 --------
 5 files changed, 221 deletions(-)
 delete mode 100644 lib/gitlab/metrics/obfuscated_sql.rb
 delete mode 100644 lib/gitlab/metrics/subscribers/active_record.rb
 delete mode 100644 spec/lib/gitlab/metrics/obfuscated_sql_spec.rb
 delete mode 100644 spec/lib/gitlab/metrics/subscribers/active_record_spec.rb

diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb
index 2e4908192a1..94c535dc562 100644
--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -7,7 +7,6 @@ if Gitlab::Metrics.enabled?
   # These are manually require'd so the classes are registered properly with
   # ActiveSupport.
   require 'gitlab/metrics/subscribers/action_view'
-  require 'gitlab/metrics/subscribers/active_record'
 
   Gitlab::Application.configure do |config|
     config.middleware.use(Gitlab::Metrics::RackMiddleware)
diff --git a/lib/gitlab/metrics/obfuscated_sql.rb b/lib/gitlab/metrics/obfuscated_sql.rb
deleted file mode 100644
index fe97d7a0534..00000000000
--- a/lib/gitlab/metrics/obfuscated_sql.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-module Gitlab
-  module Metrics
-    # Class for producing SQL queries with sensitive data stripped out.
-    class ObfuscatedSQL
-      REPLACEMENT = /
-        \d+(\.\d+)?      # integers, floats
-        | '.+?'          # single quoted strings
-        | \/.+?(?<!\\)\/ # regexps (including escaped slashes)
-      /x
-
-      MYSQL_REPLACEMENTS = /
-        ".+?" # double quoted strings
-      /x
-
-      # Regex to replace consecutive placeholders with a single one indicating
-      # the length. This can be useful when a "IN" statement uses thousands of
-      # IDs (storing this would just be a waste of space).
-      CONSECUTIVE = /(\?(\s*,\s*)?){2,}/
-
-      # sql - The raw SQL query as a String.
-      def initialize(sql)
-        @sql = sql
-      end
-
-      # Returns a new, obfuscated SQL query.
-      def to_s
-        regex = REPLACEMENT
-
-        if Gitlab::Database.mysql?
-          regex = Regexp.union(regex, MYSQL_REPLACEMENTS)
-        end
-
-        sql = @sql.gsub(regex, '?').gsub(CONSECUTIVE) do |match|
-          "#{match.count(',') + 1} values"
-        end
-
-        # InfluxDB escapes double quotes upon output, so lets get rid of them
-        # whenever we can.
-        if Gitlab::Database.postgresql?
-          sql = sql.delete('"')
-        end
-
-        sql.tr("\n", ' ')
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/metrics/subscribers/active_record.rb b/lib/gitlab/metrics/subscribers/active_record.rb
deleted file mode 100644
index d947c128ce2..00000000000
--- a/lib/gitlab/metrics/subscribers/active_record.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-module Gitlab
-  module Metrics
-    module Subscribers
-      # Class for tracking raw SQL queries.
-      #
-      # Queries are obfuscated before being logged to ensure no private data is
-      # exposed via InfluxDB/Grafana.
-      class ActiveRecord < ActiveSupport::Subscriber
-        attach_to :active_record
-
-        SERIES = 'sql_queries'
-
-        def sql(event)
-          return unless current_transaction
-
-          values = values_for(event)
-          tags   = tags_for(event)
-
-          current_transaction.add_metric(SERIES, values, tags)
-        end
-
-        private
-
-        def values_for(event)
-          { duration: event.duration }
-        end
-
-        def tags_for(event)
-          sql  = ObfuscatedSQL.new(event.payload[:sql]).to_s
-          tags = { sql: sql }
-
-          file, line = Metrics.last_relative_application_frame
-
-          if file and line
-            tags[:file] = file
-            tags[:line] = line
-          end
-
-          tags
-        end
-
-        def current_transaction
-          Transaction.current
-        end
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/metrics/obfuscated_sql_spec.rb b/spec/lib/gitlab/metrics/obfuscated_sql_spec.rb
deleted file mode 100644
index 2b681c9fe34..00000000000
--- a/spec/lib/gitlab/metrics/obfuscated_sql_spec.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::Metrics::ObfuscatedSQL do
-  describe '#to_s' do
-    it 'replaces newlines with a space' do
-      sql = described_class.new("SELECT x\nFROM y")
-
-      expect(sql.to_s).to eq('SELECT x FROM y')
-    end
-
-    describe 'using single values' do
-      it 'replaces a single integer' do
-        sql = described_class.new('SELECT x FROM y WHERE a = 10')
-
-        expect(sql.to_s).to eq('SELECT x FROM y WHERE a = ?')
-      end
-
-      it 'replaces a single float' do
-        sql = described_class.new('SELECT x FROM y WHERE a = 10.5')
-
-        expect(sql.to_s).to eq('SELECT x FROM y WHERE a = ?')
-      end
-
-      it 'replaces a single quoted string' do
-        sql = described_class.new("SELECT x FROM y WHERE a = 'foo'")
-
-        expect(sql.to_s).to eq('SELECT x FROM y WHERE a = ?')
-      end
-
-      if Gitlab::Database.mysql?
-        it 'replaces a double quoted string' do
-          sql = described_class.new('SELECT x FROM y WHERE a = "foo"')
-
-          expect(sql.to_s).to eq('SELECT x FROM y WHERE a = ?')
-        end
-      end
-
-      it 'replaces a single regular expression' do
-        sql = described_class.new('SELECT x FROM y WHERE a = /foo/')
-
-        expect(sql.to_s).to eq('SELECT x FROM y WHERE a = ?')
-      end
-
-      it 'replaces regular expressions using escaped slashes' do
-        sql = described_class.new('SELECT x FROM y WHERE a = /foo\/bar/')
-
-        expect(sql.to_s).to eq('SELECT x FROM y WHERE a = ?')
-      end
-    end
-
-    describe 'using consecutive values' do
-      it 'replaces multiple integers' do
-        sql = described_class.new('SELECT x FROM y WHERE z IN (10, 20, 30)')
-
-        expect(sql.to_s).to eq('SELECT x FROM y WHERE z IN (3 values)')
-      end
-
-      it 'replaces multiple floats' do
-        sql = described_class.new('SELECT x FROM y WHERE z IN (1.5, 2.5, 3.5)')
-
-        expect(sql.to_s).to eq('SELECT x FROM y WHERE z IN (3 values)')
-      end
-
-      it 'replaces multiple single quoted strings' do
-        sql = described_class.new("SELECT x FROM y WHERE z IN ('foo', 'bar')")
-
-        expect(sql.to_s).to eq('SELECT x FROM y WHERE z IN (2 values)')
-      end
-
-      if Gitlab::Database.mysql?
-        it 'replaces multiple double quoted strings' do
-          sql = described_class.new('SELECT x FROM y WHERE z IN ("foo", "bar")')
-
-          expect(sql.to_s).to eq('SELECT x FROM y WHERE z IN (2 values)')
-        end
-      end
-
-      it 'replaces multiple regular expressions' do
-        sql = described_class.new('SELECT x FROM y WHERE z IN (/foo/, /bar/)')
-
-        expect(sql.to_s).to eq('SELECT x FROM y WHERE z IN (2 values)')
-      end
-    end
-
-    if Gitlab::Database.postgresql?
-      it 'replaces double quotes' do
-        sql = described_class.new('SELECT "x" FROM "y"')
-
-        expect(sql.to_s).to eq('SELECT x FROM y')
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb b/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
deleted file mode 100644
index 05b6cc14716..00000000000
--- a/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::Metrics::Subscribers::ActiveRecord do
-  let(:transaction) { Gitlab::Metrics::Transaction.new }
-
-  let(:subscriber) { described_class.new }
-
-  let(:event) do
-    double(:event, duration: 0.2,
-                   payload:  { sql: 'SELECT * FROM users WHERE id = 10' })
-  end
-
-  before do
-    allow(subscriber).to receive(:current_transaction).and_return(transaction)
-
-    allow(Gitlab::Metrics).to receive(:last_relative_application_frame).
-      and_return(['app/models/foo.rb', 4])
-  end
-
-  describe '#sql' do
-    it 'tracks the execution of a SQL query' do
-      sql    = 'SELECT * FROM users WHERE id = ?'
-      values = { duration: 0.2 }
-      tags   = { sql: sql, file: 'app/models/foo.rb', line: 4 }
-
-      expect(transaction).to receive(:add_metric).
-        with(described_class::SERIES, values, tags)
-
-      subscriber.sql(event)
-    end
-  end
-end
-- 
cgit v1.2.1


From 55ed6e1c96e4072af81ed51c4377f2c015f237d5 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 31 Dec 2015 17:47:07 +0100
Subject: Cache InfluxDB settings after the first use

This ensures we don't need to load anything from either PostgreSQL or
the Rails cache whenever creating new InfluxDB connections.
---
 lib/gitlab/metrics.rb           | 32 ++++++++++++++++++--------------
 spec/lib/gitlab/metrics_spec.rb | 12 +++---------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/lib/gitlab/metrics.rb b/lib/gitlab/metrics.rb
index 2d266ccfe9e..c5b98a0115e 100644
--- a/lib/gitlab/metrics.rb
+++ b/lib/gitlab/metrics.rb
@@ -6,16 +6,21 @@ module Gitlab
     METRICS_ROOT = Rails.root.join('lib', 'gitlab', 'metrics').to_s
     PATH_REGEX   = /^#{RAILS_ROOT}\/?/
 
-    def self.pool_size
-      current_application_settings[:metrics_pool_size] || 16
-    end
-
-    def self.timeout
-      current_application_settings[:metrics_timeout] || 10
+    def self.settings
+      @settings ||= {
+        enabled:               current_application_settings[:metrics_enabled],
+        pool_size:             current_application_settings[:metrics_pool_size],
+        timeout:               current_application_settings[:metrics_timeout],
+        method_call_threshold: current_application_settings[:metrics_method_call_threshold],
+        host:                  current_application_settings[:metrics_host],
+        username:              current_application_settings[:metrics_username],
+        password:              current_application_settings[:metrics_password],
+        port:                  current_application_settings[:metrics_port]
+      }
     end
 
     def self.enabled?
-      current_application_settings[:metrics_enabled] || false
+      settings[:enabled] || false
     end
 
     def self.mri?
@@ -26,8 +31,7 @@ module Gitlab
       # This is memoized since this method is called for every instrumented
       # method. Loading data from an external cache on every method call slows
       # things down too much.
-      @method_call_threshold ||=
-        (current_application_settings[:metrics_method_call_threshold] || 10)
+      @method_call_threshold ||= settings[:method_call_threshold]
     end
 
     def self.pool
@@ -90,11 +94,11 @@ module Gitlab
     # When enabled this should be set before being used as the usual pattern
     # "@foo ||= bar" is _not_ thread-safe.
     if enabled?
-      @pool = ConnectionPool.new(size: pool_size, timeout: timeout) do
-        host = current_application_settings[:metrics_host]
-        user = current_application_settings[:metrics_username]
-        pw   = current_application_settings[:metrics_password]
-        port = current_application_settings[:metrics_port]
+      @pool = ConnectionPool.new(size: settings[:pool_size], timeout: settings[:timeout]) do
+        host = settings[:host]
+        user = settings[:username]
+        pw   = settings[:password]
+        port = settings[:port]
 
         InfluxDB::Client.
           new(udp: { host: host, port: port }, username: user, password: pw)
diff --git a/spec/lib/gitlab/metrics_spec.rb b/spec/lib/gitlab/metrics_spec.rb
index 6c0682cac4d..c2924708f44 100644
--- a/spec/lib/gitlab/metrics_spec.rb
+++ b/spec/lib/gitlab/metrics_spec.rb
@@ -1,15 +1,9 @@
 require 'spec_helper'
 
 describe Gitlab::Metrics do
-  describe '.pool_size' do
-    it 'returns a Fixnum' do
-      expect(described_class.pool_size).to be_an_instance_of(Fixnum)
-    end
-  end
-
-  describe '.timeout' do
-    it 'returns a Fixnum' do
-      expect(described_class.timeout).to be_an_instance_of(Fixnum)
+  describe '.settings' do
+    it 'returns a Hash' do
+      expect(described_class.settings).to be_an_instance_of(Hash)
     end
   end
 
-- 
cgit v1.2.1


From bd9f86bb8abb4759a0c72f94fb0492b1ff8619b5 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 31 Dec 2015 17:51:12 +0100
Subject: Use separate series for Rails/Sidekiq transactions

This removes the need for tagging all metrics with a "process_type" tag.
---
 lib/gitlab/metrics/metric.rb                            | 3 +--
 lib/gitlab/metrics/rack_middleware.rb                   | 4 +++-
 lib/gitlab/metrics/sidekiq_middleware.rb                | 4 +++-
 lib/gitlab/metrics/transaction.rb                       | 7 +++----
 spec/lib/gitlab/metrics/instrumentation_spec.rb         | 2 +-
 spec/lib/gitlab/metrics/metric_spec.rb                  | 1 -
 spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb      | 2 +-
 spec/lib/gitlab/metrics/subscribers/action_view_spec.rb | 2 +-
 spec/lib/gitlab/metrics/transaction_spec.rb             | 4 ++--
 9 files changed, 15 insertions(+), 14 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
diff --git a/spec/lib/gitlab/metrics/instrumentation_spec.rb b/spec/lib/gitlab/metrics/instrumentation_spec.rb
index a7eab9d11cc..a9003d8796b 100644
--- a/spec/lib/gitlab/metrics/instrumentation_spec.rb
+++ b/spec/lib/gitlab/metrics/instrumentation_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Gitlab::Metrics::Instrumentation do
-  let(:transaction) { Gitlab::Metrics::Transaction.new }
+  let(:transaction) { Gitlab::Metrics::Transaction.new('rspec') }
 
   before do
     @dummy = Class.new do
diff --git a/spec/lib/gitlab/metrics/metric_spec.rb b/spec/lib/gitlab/metrics/metric_spec.rb
index aa76315c79c..9b942855140 100644
--- a/spec/lib/gitlab/metrics/metric_spec.rb
+++ b/spec/lib/gitlab/metrics/metric_spec.rb
@@ -39,7 +39,6 @@ describe Gitlab::Metrics::Metric do
         expect(hash[:tags]).to be_an_instance_of(Hash)
 
         expect(hash[:tags][:hostname]).to be_an_instance_of(String)
-        expect(hash[:tags][:process_type]).to be_an_instance_of(String)
       end
 
       it 'includes the values' do
diff --git a/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb b/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
index 5882e7d81c7..5fda6de52f4 100644
--- a/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
+++ b/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
@@ -15,7 +15,7 @@ describe Gitlab::Metrics::SidekiqMiddleware do
 
   describe '#tag_worker' do
     it 'adds the worker class and action to the transaction' do
-      trans  = Gitlab::Metrics::Transaction.new
+      trans  = Gitlab::Metrics::Transaction.new('rspec')
       worker = double(:worker, class: double(:class, name: 'TestWorker'))
 
       expect(trans).to receive(:add_tag).with(:action, 'TestWorker#perform')
diff --git a/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb b/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
index c6cd584663f..bca76ca5a69 100644
--- a/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
+++ b/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Gitlab::Metrics::Subscribers::ActionView do
-  let(:transaction) { Gitlab::Metrics::Transaction.new }
+  let(:transaction) { Gitlab::Metrics::Transaction.new('rspec') }
 
   let(:subscriber) { described_class.new }
 
diff --git a/spec/lib/gitlab/metrics/transaction_spec.rb b/spec/lib/gitlab/metrics/transaction_spec.rb
index 6862fc9e2d1..345163bfbea 100644
--- a/spec/lib/gitlab/metrics/transaction_spec.rb
+++ b/spec/lib/gitlab/metrics/transaction_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Gitlab::Metrics::Transaction do
-  let(:transaction) { described_class.new }
+  let(:transaction) { described_class.new('rspec') }
 
   describe '#duration' do
     it 'returns the duration of a transaction in seconds' do
@@ -58,7 +58,7 @@ describe Gitlab::Metrics::Transaction do
   describe '#track_self' do
     it 'adds a metric for the transaction itself' do
       expect(transaction).to receive(:add_metric).
-        with(described_class::SERIES, { duration: transaction.duration }, {})
+        with('rspec', { duration: transaction.duration }, {})
 
       transaction.track_self
     end
-- 
cgit v1.2.1


From cafc784ee1d5d0a0279077272af8ee435bb110e4 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 31 Dec 2015 17:55:10 +0100
Subject: Removed tracking of hostnames for metrics

This isn't hugely useful and mostly wastes InfluxDB space. We can re-add
this whenever needed (but only once we really need it).
---
 config/initializers/metrics.rb         | 1 -
 lib/gitlab/metrics.rb                  | 6 ------
 lib/gitlab/metrics/metric.rb           | 6 ++----
 spec/lib/gitlab/metrics/metric_spec.rb | 2 --
 spec/lib/gitlab/metrics_spec.rb        | 6 ------
 5 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb
index 94c535dc562..ebb20be7283 100644
--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -1,6 +1,5 @@
 if Gitlab::Metrics.enabled?
   require 'influxdb'
-  require 'socket'
   require 'connection_pool'
   require 'method_source'
 
diff --git a/lib/gitlab/metrics.rb b/lib/gitlab/metrics.rb
index c5b98a0115e..ee88ab34d6c 100644
--- a/lib/gitlab/metrics.rb
+++ b/lib/gitlab/metrics.rb
@@ -38,10 +38,6 @@ module Gitlab
       @pool
     end
 
-    def self.hostname
-      @hostname
-    end
-
     # Returns a relative path and line number based on the last application call
     # frame.
     def self.last_relative_application_frame
@@ -89,8 +85,6 @@ module Gitlab
       value.to_s.gsub('=', '\\=')
     end
 
-    @hostname = Socket.gethostname
-
     # When enabled this should be set before being used as the usual pattern
     # "@foo ||= bar" is _not_ thread-safe.
     if enabled?
diff --git a/lib/gitlab/metrics/metric.rb b/lib/gitlab/metrics/metric.rb
index 8319e628a40..7ea9555cc8c 100644
--- a/lib/gitlab/metrics/metric.rb
+++ b/lib/gitlab/metrics/metric.rb
@@ -17,10 +17,8 @@ module Gitlab
       # Returns a Hash in a format that can be directly written to InfluxDB.
       def to_hash
         {
-          series: @series,
-          tags:   @tags.merge(
-            hostname: Metrics.hostname
-          ),
+          series:    @series,
+          tags:      @tags,
           values:    @values,
           timestamp: @created_at.to_i * 1_000_000_000
         }
diff --git a/spec/lib/gitlab/metrics/metric_spec.rb b/spec/lib/gitlab/metrics/metric_spec.rb
index 9b942855140..f718d536130 100644
--- a/spec/lib/gitlab/metrics/metric_spec.rb
+++ b/spec/lib/gitlab/metrics/metric_spec.rb
@@ -37,8 +37,6 @@ describe Gitlab::Metrics::Metric do
 
       it 'includes the tags' do
         expect(hash[:tags]).to be_an_instance_of(Hash)
-
-        expect(hash[:tags][:hostname]).to be_an_instance_of(String)
       end
 
       it 'includes the values' do
diff --git a/spec/lib/gitlab/metrics_spec.rb b/spec/lib/gitlab/metrics_spec.rb
index c2924708f44..c2782f95c8e 100644
--- a/spec/lib/gitlab/metrics_spec.rb
+++ b/spec/lib/gitlab/metrics_spec.rb
@@ -13,12 +13,6 @@ describe Gitlab::Metrics do
     end
   end
 
-  describe '.hostname' do
-    it 'returns a String containing the hostname' do
-      expect(described_class.hostname).to eq(Socket.gethostname)
-    end
-  end
-
   describe '.last_relative_application_frame' do
     it 'returns an Array containing a file path and line number' do
       file, line = described_class.last_relative_application_frame
-- 
cgit v1.2.1


From 96075be6f4688a59335130dc796132ad4f232442 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 4 Jan 2016 11:37:46 +0100
Subject: Ability to increment custom transaction values

This will be used to store/increment the total query/view rendering
timings on a per transaction basis. This in turn can greatly reduce the
amount of metrics stored.
---
 lib/gitlab/metrics/transaction.rb           | 15 +++++++++++++--
 spec/lib/gitlab/metrics/transaction_spec.rb | 12 ++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/metrics/transaction.rb b/lib/gitlab/metrics/transaction.rb
index 43a7dab5323..0aaebf262d4 100644
--- a/lib/gitlab/metrics/transaction.rb
+++ b/lib/gitlab/metrics/transaction.rb
@@ -19,7 +19,8 @@ module Gitlab
         @started_at  = nil
         @finished_at = nil
 
-        @tags = {}
+        @values = Hash.new(0)
+        @tags   = {}
       end
 
       def duration
@@ -44,6 +45,10 @@ module Gitlab
         @metrics << Metric.new(series, values, tags)
       end
 
+      def increment(name, value)
+        @values[name] += value
+      end
+
       def add_tag(key, value)
         @tags[key] = value
       end
@@ -54,7 +59,13 @@ module Gitlab
       end
 
       def track_self
-        add_metric(@series, { duration: duration }, @tags)
+        values = { duration: duration }
+
+        @values.each do |name, value|
+          values[name] = value
+        end
+
+        add_metric(@series, values, @tags)
       end
 
       def submit
diff --git a/spec/lib/gitlab/metrics/transaction_spec.rb b/spec/lib/gitlab/metrics/transaction_spec.rb
index 345163bfbea..18d63bdbdb9 100644
--- a/spec/lib/gitlab/metrics/transaction_spec.rb
+++ b/spec/lib/gitlab/metrics/transaction_spec.rb
@@ -38,6 +38,18 @@ describe Gitlab::Metrics::Transaction do
     end
   end
 
+  describe '#increment' do
+    it 'increments a counter' do
+      transaction.increment(:time, 1)
+      transaction.increment(:time, 2)
+
+      expect(transaction).to receive(:add_metric).
+        with('rspec', { duration: 0.0, time: 3 }, {})
+
+      transaction.track_self
+    end
+  end
+
   describe '#add_tag' do
     it 'adds a tag' do
       transaction.add_tag(:foo, 'bar')
-- 
cgit v1.2.1


From 66a997a91403eef62ffd9fb789e899619d021a26 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 4 Jan 2016 12:14:36 +0100
Subject: Track total query/view timings in transactions

---
 config/initializers/metrics.rb                     |  1 +
 lib/gitlab/metrics/subscribers/action_view.rb      |  1 +
 lib/gitlab/metrics/subscribers/active_record.rb    | 22 ++++++++++++++
 .../gitlab/metrics/subscribers/action_view_spec.rb |  3 ++
 .../metrics/subscribers/active_record_spec.rb      | 35 ++++++++++++++++++++++
 5 files changed, 62 insertions(+)
 create mode 100644 lib/gitlab/metrics/subscribers/active_record.rb
 create mode 100644 spec/lib/gitlab/metrics/subscribers/active_record_spec.rb

diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb
index ebb20be7283..52ace27b7ae 100644
--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -6,6 +6,7 @@ if Gitlab::Metrics.enabled?
   # These are manually require'd so the classes are registered properly with
   # ActiveSupport.
   require 'gitlab/metrics/subscribers/action_view'
+  require 'gitlab/metrics/subscribers/active_record'
 
   Gitlab::Application.configure do |config|
     config.middleware.use(Gitlab::Metrics::RackMiddleware)
diff --git a/lib/gitlab/metrics/subscribers/action_view.rb b/lib/gitlab/metrics/subscribers/action_view.rb
index 7e0dcf99d92..7c0105d543a 100644
--- a/lib/gitlab/metrics/subscribers/action_view.rb
+++ b/lib/gitlab/metrics/subscribers/action_view.rb
@@ -19,6 +19,7 @@ module Gitlab
           values = values_for(event)
           tags   = tags_for(event)
 
+          current_transaction.increment(:view_duration, event.duration)
           current_transaction.add_metric(SERIES, values, tags)
         end
 
diff --git a/lib/gitlab/metrics/subscribers/active_record.rb b/lib/gitlab/metrics/subscribers/active_record.rb
new file mode 100644
index 00000000000..8008b3bc895
--- /dev/null
+++ b/lib/gitlab/metrics/subscribers/active_record.rb
@@ -0,0 +1,22 @@
+module Gitlab
+  module Metrics
+    module Subscribers
+      # Class for tracking the total query duration of a transaction.
+      class ActiveRecord < ActiveSupport::Subscriber
+        attach_to :active_record
+
+        def sql(event)
+          return unless current_transaction
+
+          current_transaction.increment(:sql_duration, event.duration)
+        end
+
+        private
+
+        def current_transaction
+          Transaction.current
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb b/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
index bca76ca5a69..699d50f770a 100644
--- a/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
+++ b/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
@@ -28,6 +28,9 @@ describe Gitlab::Metrics::Subscribers::ActionView do
         line: 4
       }
 
+      expect(transaction).to receive(:increment).
+        with(:view_duration, 2.1)
+
       expect(transaction).to receive(:add_metric).
         with(described_class::SERIES, values, tags)
 
diff --git a/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb b/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
new file mode 100644
index 00000000000..9ecedd934c6
--- /dev/null
+++ b/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Gitlab::Metrics::Subscribers::ActiveRecord do
+  let(:transaction) { Gitlab::Metrics::Transaction.new('rspec') }
+  let(:subscriber)  { described_class.new }
+
+  let(:event) do
+    double(:event, duration: 0.2,
+           payload:  { sql: 'SELECT * FROM users WHERE id = 10' })
+  end
+
+  describe '#sql' do
+    describe 'without a current transaction' do
+      it 'simply returns' do
+        expect_any_instance_of(Gitlab::Metrics::Transaction).
+          to_not receive(:increment)
+
+        subscriber.sql(event)
+      end
+    end
+
+    describe 'with a current transaction' do
+      it 'increments the :sql_duration value' do
+        expect(subscriber).to receive(:current_transaction).
+          at_least(:once).
+          and_return(transaction)
+
+        expect(transaction).to receive(:increment).
+          with(:sql_duration, 0.2)
+
+        subscriber.sql(event)
+      end
+    end
+  end
+end
-- 
cgit v1.2.1


From 825b46f8a3eb620f99192217d414b72dffe597d7 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 4 Jan 2016 12:19:45 +0100
Subject: Track total method call times per transaction

This makes it easier to see where time is spent without having to
aggregate all the individual points in the method_calls series.
---
 lib/gitlab/metrics/instrumentation.rb           | 2 ++
 spec/lib/gitlab/metrics/instrumentation_spec.rb | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/lib/gitlab/metrics/instrumentation.rb b/lib/gitlab/metrics/instrumentation.rb
index 06fc2f25948..d9fce2e6758 100644
--- a/lib/gitlab/metrics/instrumentation.rb
+++ b/lib/gitlab/metrics/instrumentation.rb
@@ -123,6 +123,8 @@ module Gitlab
               duration = (Time.now - start) * 1000.0
 
               if duration >= Gitlab::Metrics.method_call_threshold
+                trans.increment(:method_duration, duration)
+
                 trans.add_metric(Gitlab::Metrics::Instrumentation::SERIES,
                                  { duration: duration },
                                  method: #{label.inspect})
diff --git a/spec/lib/gitlab/metrics/instrumentation_spec.rb b/spec/lib/gitlab/metrics/instrumentation_spec.rb
index a9003d8796b..af020f652be 100644
--- a/spec/lib/gitlab/metrics/instrumentation_spec.rb
+++ b/spec/lib/gitlab/metrics/instrumentation_spec.rb
@@ -48,6 +48,9 @@ describe Gitlab::Metrics::Instrumentation do
         allow(described_class).to receive(:transaction).
           and_return(transaction)
 
+        expect(transaction).to receive(:increment).
+          with(:method_duration, a_kind_of(Numeric))
+
         expect(transaction).to receive(:add_metric).
           with(described_class::SERIES, an_instance_of(Hash),
                method: 'Dummy.foo')
@@ -102,6 +105,9 @@ describe Gitlab::Metrics::Instrumentation do
         allow(described_class).to receive(:transaction).
           and_return(transaction)
 
+        expect(transaction).to receive(:increment).
+          with(:method_duration, a_kind_of(Numeric))
+
         expect(transaction).to receive(:add_metric).
           with(described_class::SERIES, an_instance_of(Hash),
                method: 'Dummy#bar')
-- 
cgit v1.2.1


From 2ea464bb272fa52ff34a188a921f0bc90811ca45 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 4 Jan 2016 12:45:31 +0100
Subject: Use separate series for Rails/Sidekiq sample stats

This removes the need for any tags to differentiate between Sidekiq and
Rails statistics while still being able to separate the two.
---
 lib/gitlab/metrics/sampler.rb           | 19 ++++++++++++-----
 spec/lib/gitlab/metrics/sampler_spec.rb | 38 ++++++++++++++++++++++++++-------
 2 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/lib/gitlab/metrics/sampler.rb b/lib/gitlab/metrics/sampler.rb
index 998578e1c0a..1ea425bc904 100644
--- a/lib/gitlab/metrics/sampler.rb
+++ b/lib/gitlab/metrics/sampler.rb
@@ -50,12 +50,11 @@ module Gitlab
       end
 
       def sample_memory_usage
-        @metrics << Metric.new('memory_usage', value: System.memory_usage)
+        add_metric('memory_usage', value: System.memory_usage)
       end
 
       def sample_file_descriptors
-        @metrics << Metric.
-          new('file_descriptors', value: System.file_descriptor_count)
+        add_metric('file_descriptors', value: System.file_descriptor_count)
       end
 
       if Metrics.mri?
@@ -69,7 +68,7 @@ module Gitlab
           counts['Symbol'] = Symbol.all_symbols.length
 
           counts.each do |name, count|
-            @metrics << Metric.new('object_counts', { count: count }, type: name)
+            add_metric('object_counts', { count: count }, type: name)
           end
         end
       else
@@ -91,7 +90,17 @@ module Gitlab
 
         stats[:count] = stats[:minor_gc_count] + stats[:major_gc_count]
 
-        @metrics << Metric.new('gc_statistics', stats)
+        add_metric('gc_statistics', stats)
+      end
+
+      def add_metric(series, values, tags = {})
+        prefix = sidekiq? ? 'sidekiq_' : 'rails_'
+
+        @metrics << Metric.new("#{prefix}#{series}", values, tags)
+      end
+
+      def sidekiq?
+        Sidekiq.server?
       end
     end
   end
diff --git a/spec/lib/gitlab/metrics/sampler_spec.rb b/spec/lib/gitlab/metrics/sampler_spec.rb
index 51a941c48cd..27211350fbe 100644
--- a/spec/lib/gitlab/metrics/sampler_spec.rb
+++ b/spec/lib/gitlab/metrics/sampler_spec.rb
@@ -51,8 +51,8 @@ describe Gitlab::Metrics::Sampler do
       expect(Gitlab::Metrics::System).to receive(:memory_usage).
         and_return(9000)
 
-      expect(Gitlab::Metrics::Metric).to receive(:new).
-        with('memory_usage', value: 9000).
+      expect(sampler).to receive(:add_metric).
+        with(/memory_usage/, value: 9000).
         and_call_original
 
       sampler.sample_memory_usage
@@ -64,8 +64,8 @@ describe Gitlab::Metrics::Sampler do
       expect(Gitlab::Metrics::System).to receive(:file_descriptor_count).
         and_return(4)
 
-      expect(Gitlab::Metrics::Metric).to receive(:new).
-        with('file_descriptors', value: 4).
+      expect(sampler).to receive(:add_metric).
+        with(/file_descriptors/, value: 4).
         and_call_original
 
       sampler.sample_file_descriptors
@@ -74,8 +74,8 @@ describe Gitlab::Metrics::Sampler do
 
   describe '#sample_objects' do
     it 'adds a metric containing the amount of allocated objects' do
-      expect(Gitlab::Metrics::Metric).to receive(:new).
-        with('object_counts', an_instance_of(Hash), an_instance_of(Hash)).
+      expect(sampler).to receive(:add_metric).
+        with(/object_counts/, an_instance_of(Hash), an_instance_of(Hash)).
         at_least(:once).
         and_call_original
 
@@ -87,11 +87,33 @@ describe Gitlab::Metrics::Sampler do
     it 'adds a metric containing garbage collection statistics' do
       expect(GC::Profiler).to receive(:total_time).and_return(0.24)
 
-      expect(Gitlab::Metrics::Metric).to receive(:new).
-        with('gc_statistics', an_instance_of(Hash)).
+      expect(sampler).to receive(:add_metric).
+        with(/gc_statistics/, an_instance_of(Hash)).
         and_call_original
 
       sampler.sample_gc
     end
   end
+
+  describe '#add_metric' do
+    it 'prefixes the series name for a Rails process' do
+      expect(sampler).to receive(:sidekiq?).and_return(false)
+
+      expect(Gitlab::Metrics::Metric).to receive(:new).
+        with('rails_cats', { value: 10 }, {}).
+        and_call_original
+
+      sampler.add_metric('cats', value: 10)
+    end
+
+    it 'prefixes the series name for a Sidekiq process' do
+      expect(sampler).to receive(:sidekiq?).and_return(true)
+
+      expect(Gitlab::Metrics::Metric).to receive(:new).
+        with('sidekiq_cats', { value: 10 }, {}).
+        and_call_original
+
+      sampler.add_metric('cats', value: 10)
+    end
+  end
 end
-- 
cgit v1.2.1


From 2ee8f555996baca6b470d223ffad65419b730398 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 4 Jan 2016 13:17:02 +0100
Subject: Automatically prefix transaction series names

This ensures Rails and Sidekiq transactions are split into the series
"rails_transactions" and "sidekiq_transactions" respectively.
---
 lib/gitlab/metrics/rack_middleware.rb                     |  4 +---
 lib/gitlab/metrics/sidekiq_middleware.rb                  |  4 +---
 lib/gitlab/metrics/transaction.rb                         | 15 +++++++++------
 spec/lib/gitlab/metrics/instrumentation_spec.rb           |  2 +-
 spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb        |  2 +-
 spec/lib/gitlab/metrics/subscribers/action_view_spec.rb   |  2 +-
 spec/lib/gitlab/metrics/subscribers/active_record_spec.rb |  2 +-
 spec/lib/gitlab/metrics/transaction_spec.rb               |  8 ++++----
 8 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/lib/gitlab/metrics/rack_middleware.rb b/lib/gitlab/metrics/rack_middleware.rb
index bb9e4fcb918..5c0587c4c51 100644
--- a/lib/gitlab/metrics/rack_middleware.rb
+++ b/lib/gitlab/metrics/rack_middleware.rb
@@ -4,8 +4,6 @@ module Gitlab
     class RackMiddleware
       CONTROLLER_KEY = 'action_controller.instance'
 
-      SERIES = 'rails_transactions'
-
       def initialize(app)
         @app = app
       end
@@ -32,7 +30,7 @@ module Gitlab
       end
 
       def transaction_from_env(env)
-        trans = Transaction.new(SERIES)
+        trans = Transaction.new
 
         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 6e804dd2562..ad441decfa2 100644
--- a/lib/gitlab/metrics/sidekiq_middleware.rb
+++ b/lib/gitlab/metrics/sidekiq_middleware.rb
@@ -4,10 +4,8 @@ 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(SERIES)
+        trans = Transaction.new
 
         begin
           trans.run { yield }
diff --git a/lib/gitlab/metrics/transaction.rb b/lib/gitlab/metrics/transaction.rb
index 0aaebf262d4..68b86de0655 100644
--- a/lib/gitlab/metrics/transaction.rb
+++ b/lib/gitlab/metrics/transaction.rb
@@ -10,9 +10,7 @@ module Gitlab
         Thread.current[THREAD_KEY]
       end
 
-      # name - The name of this transaction as a String.
-      def initialize(series)
-        @series  = series
+      def initialize
         @metrics = []
         @uuid    = SecureRandom.uuid
 
@@ -40,9 +38,10 @@ module Gitlab
       end
 
       def add_metric(series, values, tags = {})
-        tags = tags.merge(transaction_id: @uuid)
+        tags   = tags.merge(transaction_id: @uuid)
+        prefix = sidekiq? ? 'sidekiq_' : 'rails_'
 
-        @metrics << Metric.new(series, values, tags)
+        @metrics << Metric.new("#{prefix}#{series}", values, tags)
       end
 
       def increment(name, value)
@@ -65,12 +64,16 @@ module Gitlab
           values[name] = value
         end
 
-        add_metric(@series, values, @tags)
+        add_metric('transactions', values, @tags)
       end
 
       def submit
         Metrics.submit_metrics(@metrics.map(&:to_hash))
       end
+
+      def sidekiq?
+        Sidekiq.server?
+      end
     end
   end
 end
diff --git a/spec/lib/gitlab/metrics/instrumentation_spec.rb b/spec/lib/gitlab/metrics/instrumentation_spec.rb
index af020f652be..2a37cd40dde 100644
--- a/spec/lib/gitlab/metrics/instrumentation_spec.rb
+++ b/spec/lib/gitlab/metrics/instrumentation_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Gitlab::Metrics::Instrumentation do
-  let(:transaction) { Gitlab::Metrics::Transaction.new('rspec') }
+  let(:transaction) { Gitlab::Metrics::Transaction.new }
 
   before do
     @dummy = Class.new do
diff --git a/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb b/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
index 5fda6de52f4..5882e7d81c7 100644
--- a/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
+++ b/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
@@ -15,7 +15,7 @@ describe Gitlab::Metrics::SidekiqMiddleware do
 
   describe '#tag_worker' do
     it 'adds the worker class and action to the transaction' do
-      trans  = Gitlab::Metrics::Transaction.new('rspec')
+      trans  = Gitlab::Metrics::Transaction.new
       worker = double(:worker, class: double(:class, name: 'TestWorker'))
 
       expect(trans).to receive(:add_tag).with(:action, 'TestWorker#perform')
diff --git a/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb b/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
index 699d50f770a..05e4fbbeb51 100644
--- a/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
+++ b/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Gitlab::Metrics::Subscribers::ActionView do
-  let(:transaction) { Gitlab::Metrics::Transaction.new('rspec') }
+  let(:transaction) { Gitlab::Metrics::Transaction.new }
 
   let(:subscriber) { described_class.new }
 
diff --git a/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb b/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
index 9ecedd934c6..81f35ba5d40 100644
--- a/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
+++ b/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Gitlab::Metrics::Subscribers::ActiveRecord do
-  let(:transaction) { Gitlab::Metrics::Transaction.new('rspec') }
+  let(:transaction) { Gitlab::Metrics::Transaction.new }
   let(:subscriber)  { described_class.new }
 
   let(:event) do
diff --git a/spec/lib/gitlab/metrics/transaction_spec.rb b/spec/lib/gitlab/metrics/transaction_spec.rb
index 18d63bdbdb9..b9b94947afa 100644
--- a/spec/lib/gitlab/metrics/transaction_spec.rb
+++ b/spec/lib/gitlab/metrics/transaction_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Gitlab::Metrics::Transaction do
-  let(:transaction) { described_class.new('rspec') }
+  let(:transaction) { described_class.new }
 
   describe '#duration' do
     it 'returns the duration of a transaction in seconds' do
@@ -32,7 +32,7 @@ describe Gitlab::Metrics::Transaction do
   describe '#add_metric' do
     it 'adds a metric tagged with the transaction UUID' do
       expect(Gitlab::Metrics::Metric).to receive(:new).
-        with('foo', { number: 10 }, { transaction_id: transaction.uuid })
+        with('rails_foo', { number: 10 }, { transaction_id: transaction.uuid })
 
       transaction.add_metric('foo', number: 10)
     end
@@ -44,7 +44,7 @@ describe Gitlab::Metrics::Transaction do
       transaction.increment(:time, 2)
 
       expect(transaction).to receive(:add_metric).
-        with('rspec', { duration: 0.0, time: 3 }, {})
+        with('transactions', { duration: 0.0, time: 3 }, {})
 
       transaction.track_self
     end
@@ -70,7 +70,7 @@ describe Gitlab::Metrics::Transaction do
   describe '#track_self' do
     it 'adds a metric for the transaction itself' do
       expect(transaction).to receive(:add_metric).
-        with('rspec', { duration: transaction.duration }, {})
+        with('transactions', { duration: transaction.duration }, {})
 
       transaction.track_self
     end
-- 
cgit v1.2.1


From 8de491a68fcb130d436d2c85c0fda900381875cf Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 4 Jan 2016 14:21:39 +0100
Subject: Fix Rubocop styling in AR subscriber specs

---
 spec/lib/gitlab/metrics/subscribers/active_record_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb b/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
index 81f35ba5d40..7bc070a4d09 100644
--- a/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
+++ b/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
@@ -6,7 +6,7 @@ describe Gitlab::Metrics::Subscribers::ActiveRecord do
 
   let(:event) do
     double(:event, duration: 0.2,
-           payload:  { sql: 'SELECT * FROM users WHERE id = 10' })
+                   payload:  { sql: 'SELECT * FROM users WHERE id = 10' })
   end
 
   describe '#sql' do
-- 
cgit v1.2.1