1 files changed, 3 insertions, 53 deletions

diff --git a/lib/gitlab/metrics/transaction.rb b/lib/gitlab/metrics/transaction.rb
index 552eae639e6..b126efd2dd5 100644
--- a/lib/gitlab/metrics/transaction.rb
+++ b/lib/gitlab/metrics/transaction.rb
@@ -16,20 +16,18 @@ module Gitlab
       # The series to store events (e.g. Git pushes) in.
       EVENT_SERIES = 'events'
 
-      attr_reader :tags, :values, :method, :metrics
+      attr_reader :tags, :method
 
       def self.current
         Thread.current[THREAD_KEY]
       end
 
       def initialize
-        @metrics = []
         @methods = {}
 
         @started_at = nil
         @finished_at = nil
 
-        @values = Hash.new(0)
         @tags = {}
 
         @memory_before = 0
@@ -40,10 +38,6 @@ module Gitlab
         @finished_at ? (@finished_at - @started_at) : 0.0
       end
 
-      def duration_milliseconds
-        duration.in_milliseconds.to_i
-      end
-
       def thread_cpu_duration
         System.thread_cpu_duration(@thread_cputime_start)
       end
@@ -55,13 +49,13 @@ module Gitlab
       def run
         Thread.current[THREAD_KEY] = self
 
-        @memory_before = System.memory_usage
+        @memory_before = System.memory_usage_rss
         @started_at = System.monotonic_time
         @thread_cputime_start = System.thread_cpu_time
 
         yield
       ensure
-        @memory_after = System.memory_usage
+        @memory_after = System.memory_usage_rss
         @finished_at = System.monotonic_time
 
         self.class.gitlab_transaction_cputime_seconds.observe(labels, thread_cpu_duration)
@@ -71,10 +65,6 @@ module Gitlab
         Thread.current[THREAD_KEY] = nil
       end
 
-      def add_metric(series, values, tags = {})
-        @metrics << Metric.new("#{::Gitlab::Metrics.series_prefix}#{series}", values, filter_tags(tags))
-      end
-
       # Tracks a business level event
       #
       # Business level events including events such as Git pushes, Emails being
@@ -85,7 +75,6 @@ module Gitlab
       def add_event(event_name, tags = {})
         filtered_tags = filter_tags(tags)
         self.class.transaction_metric(event_name, :counter, prefix: 'event_', tags: filtered_tags).increment(filtered_tags.merge(labels))
-        @metrics << Metric.new(EVENT_SERIES, { count: 1 }, filtered_tags.merge(event: event_name), :event)
       end
 
       # Returns a MethodCall object for the given name.
@@ -99,55 +88,16 @@ module Gitlab
 
       def increment(name, value, use_prometheus = true)
         self.class.transaction_metric(name, :counter).increment(labels, value) if use_prometheus
-        @values[name] += value
       end
 
       def set(name, value, use_prometheus = true)
         self.class.transaction_metric(name, :gauge).set(labels, value) if use_prometheus
-        @values[name] = value
-      end
-
-      def finish
-        track_self
-        submit
-      end
-
-      def track_self
-        values = { duration: duration_milliseconds, allocated_memory: allocated_memory }
-
-        @values.each do |name, value|
-          values[name] = value
-        end
-
-        add_metric('transactions', values, @tags)
-      end
-
-      def submit
-        submit = @metrics.dup
-
-        @methods.each do |name, method|
-          submit << method.to_metric if method.above_threshold?
-        end
-
-        submit_hashes = submit.map do |metric|
-          hash = metric.to_hash
-          hash[:tags][:action] ||= action if action && !metric.event?
-
-          hash
-        end
-
-        ::Gitlab::Metrics.submit_metrics(submit_hashes)
       end
 
       def labels
         BASE_LABELS
       end
 
-      # returns string describing the action performed, usually the class plus method name.
-      def action
-        "#{labels[:controller]}##{labels[:action]}" if labels && !labels.empty?
-      end
-
       define_histogram :gitlab_transaction_cputime_seconds do
         docstring 'Transaction thread cputime'
         base_labels BASE_LABELS