1 files changed, 13 insertions, 2 deletions
diff --git a/lib/gitlab/metrics/subscribers/active_record.rb b/lib/gitlab/metrics/subscribers/active_record.rb
index 96cad941d5c..ead1acb8d44 100644
--- a/lib/gitlab/metrics/subscribers/active_record.rb
+++ b/lib/gitlab/metrics/subscribers/active_record.rb
@@ -8,8 +8,10 @@ module Gitlab
         def sql(event)
           return unless current_transaction
 
-          current_transaction.increment(:sql_duration, event.duration)
-          current_transaction.increment(:sql_count, 1)
+          metric_sql_duration_seconds.observe(current_transaction.labels, event.duration / 1000.0)
+
+          current_transaction.increment(:sql_duration, event.duration, false)
+          current_transaction.increment(:sql_count, 1, false)
         end
 
         private
@@ -17,6 +19,15 @@ module Gitlab
         def current_transaction
           Transaction.current
         end
+
+        def metric_sql_duration_seconds
+          @metric_sql_duration_seconds ||= Gitlab::Metrics.histogram(
+            :gitlab_sql_duration_seconds,
+            'SQL time',
+            Transaction::BASE_LABELS,
+            [0.001, 0.002, 0.005, 0.01, 0.02, 0.05, 0.1, 0.500, 2.0, 10.0]
+          )
+        end
       end
     end
   end