Merge branch 'revert-influxdb-milliseconds' into 'master'

See merge request !2326

4 files changed, 6 insertions, 14 deletions

diff --git a/lib/gitlab/metrics/subscribers/action_view.rb b/lib/gitlab/metrics/subscribers/action_view.rb
index 84d9e383625..7c0105d543a 100644
--- a/lib/gitlab/metrics/subscribers/action_view.rb
+++ b/lib/gitlab/metrics/subscribers/action_view.rb
@@ -19,7 +19,7 @@ module Gitlab
           values = values_for(event)
           tags   = tags_for(event)
 
-          current_transaction.increment(:view_duration, duration(event))
+          current_transaction.increment(:view_duration, event.duration)
           current_transaction.add_metric(SERIES, values, tags)
         end
 
@@ -28,7 +28,7 @@ module Gitlab
         end
 
         def values_for(event)
-          { duration: duration(event) }
+          { duration: event.duration }
         end
 
         def tags_for(event)
@@ -48,10 +48,6 @@ module Gitlab
         def current_transaction
           Transaction.current
         end
-
-        def duration(event)
-          event.duration * 1000.0
-        end
       end
     end
   end
diff --git a/lib/gitlab/metrics/subscribers/active_record.rb b/lib/gitlab/metrics/subscribers/active_record.rb
index 6fa73e7a3be..8008b3bc895 100644
--- a/lib/gitlab/metrics/subscribers/active_record.rb
+++ b/lib/gitlab/metrics/subscribers/active_record.rb
@@ -8,7 +8,7 @@ module Gitlab
         def sql(event)
           return unless current_transaction
 
-          current_transaction.increment(:sql_duration, duration(event))
+          current_transaction.increment(:sql_duration, event.duration)
         end
 
         private
@@ -16,10 +16,6 @@ module Gitlab
         def current_transaction
           Transaction.current
         end
-
-        def duration(event)
-          event.duration * 1000.0
-        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 0a4cc5e929b..05e4fbbeb51 100644
--- a/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
+++ b/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
@@ -21,7 +21,7 @@ describe Gitlab::Metrics::Subscribers::ActionView do
 
   describe '#render_template' do
     it 'tracks rendering of a template' do
-      values = { duration: 2100 }
+      values = { duration: 2.1 }
       tags   = {
         view: 'app/views/x.html.haml',
         file: 'app/views/x.html.haml',
@@ -29,7 +29,7 @@ describe Gitlab::Metrics::Subscribers::ActionView do
       }
 
       expect(transaction).to receive(:increment).
-        with(:view_duration, 2100)
+        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
index ca86142a2f4..7bc070a4d09 100644
--- a/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
+++ b/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
@@ -26,7 +26,7 @@ describe Gitlab::Metrics::Subscribers::ActiveRecord do
           and_return(transaction)
 
         expect(transaction).to receive(:increment).
-          with(:sql_duration, 200)
+          with(:sql_duration, 0.2)
 
         subscriber.sql(event)
       end