Merge branch 'metrics-milliseconds' into 'master'

See merge request !2316

2 files changed, 3 insertions, 3 deletions

diff --git a/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb b/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
index 05e4fbbeb51..0a4cc5e929b 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: 2.1 }
+      values = { duration: 2100 }
       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, 2.1)
+        with(:view_duration, 2100)
 
       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 7bc070a4d09..ca86142a2f4 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, 0.2)
+          with(:sql_duration, 200)
 
         subscriber.sql(event)
       end