1 files changed, 45 insertions, 9 deletions

diff --git a/lib/gitlab/metrics/method_call.rb b/lib/gitlab/metrics/method_call.rb
index d3465e5ec19..90235095306 100644
--- a/lib/gitlab/metrics/method_call.rb
+++ b/lib/gitlab/metrics/method_call.rb
@@ -2,15 +2,45 @@ module Gitlab
   module Metrics
     # Class for tracking timing information about method calls
     class MethodCall
-      attr_reader :real_time, :cpu_time, :call_count
+      MUTEX = Mutex.new
+      BASE_LABELS = { module: nil, method: nil }.freeze
+      attr_reader :real_time, :cpu_time, :call_count, :labels
+
+      def self.call_real_duration_histogram
+        return @call_real_duration_histogram if @call_real_duration_histogram
+
+        MUTEX.synchronize do
+          @call_real_duration_histogram ||= Gitlab::Metrics.histogram(
+            :gitlab_method_call_real_duration_seconds,
+            'Method calls real duration',
+            Transaction::BASE_LABELS.merge(BASE_LABELS),
+            [0.1, 0.2, 0.5, 1, 2, 5, 10]
+          )
+        end
+      end
+
+      def self.call_cpu_duration_histogram
+        return @call_cpu_duration_histogram if @call_cpu_duration_histogram
+
+        MUTEX.synchronize do
+          @call_duration_histogram ||= Gitlab::Metrics.histogram(
+            :gitlab_method_call_cpu_duration_seconds,
+            'Method calls cpu duration',
+            Transaction::BASE_LABELS.merge(BASE_LABELS),
+            [0.1, 0.2, 0.5, 1, 2, 5, 10]
+          )
+        end
+      end
 
       # name - The full name of the method (including namespace) such as
       #        `User#sign_in`.
       #
-      # series - The series to use for storing the data.
-      def initialize(name, series)
+      def initialize(name, module_name, method_name, transaction)
+        @module_name = module_name
+        @method_name = method_name
+        @transaction = transaction
         @name = name
-        @series = series
+        @labels = { module: @module_name, method: @method_name }
         @real_time = 0
         @cpu_time = 0
         @call_count = 0
@@ -22,21 +52,27 @@ module Gitlab
         start_cpu = System.cpu_time
         retval = yield
 
-        @real_time += System.monotonic_time - start_real
-        @cpu_time += System.cpu_time - start_cpu
+        real_time = System.monotonic_time - start_real
+        cpu_time = System.cpu_time - start_cpu
+
+        @real_time += real_time
+        @cpu_time += cpu_time
         @call_count += 1
 
+        self.class.call_real_duration_histogram.observe(@transaction.labels.merge(labels), real_time / 1000.0)
+        self.class.call_cpu_duration_histogram.observe(@transaction.labels.merge(labels), cpu_time / 1000.0)
+
         retval
       end
 
       # Returns a Metric instance of the current method call.
       def to_metric
         Metric.new(
-          @series,
+          Instrumentation.series,
           {
-            duration:     real_time,
+            duration: real_time,
             cpu_duration: cpu_time,
-            call_count:   call_count
+            call_count: call_count
           },
           method: @name
         )