Merge branch 'metrics-milliseconds' into 'master'

See merge request !2316

2 files changed, 11 insertions, 3 deletions

diff --git a/lib/gitlab/metrics/subscribers/action_view.rb b/lib/gitlab/metrics/subscribers/action_view.rb
index 7c0105d543a..84d9e383625 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, event.duration)
+          current_transaction.increment(:view_duration, duration(event))
           current_transaction.add_metric(SERIES, values, tags)
         end
 
@@ -28,7 +28,7 @@ module Gitlab
         end
 
         def values_for(event)
-          { duration: event.duration }
+          { duration: duration(event) }
         end
 
         def tags_for(event)
@@ -48,6 +48,10 @@ 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 8008b3bc895..6fa73e7a3be 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, event.duration)
+          current_transaction.increment(:sql_duration, duration(event))
         end
 
         private
@@ -16,6 +16,10 @@ module Gitlab
         def current_transaction
           Transaction.current
         end
+
+        def duration(event)
+          event.duration * 1000.0
+        end
       end
     end
   end