Add latest changes from gitlab-org/gitlab@13-0-stable-ee

4 files changed, 74 insertions, 61 deletions

diff --git a/lib/gitlab/metrics/samplers/database_sampler.rb b/lib/gitlab/metrics/samplers/database_sampler.rb
new file mode 100644
index 00000000000..9ee4b0960c5
--- /dev/null
+++ b/lib/gitlab/metrics/samplers/database_sampler.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Metrics
+    module Samplers
+      class DatabaseSampler < BaseSampler
+        SAMPLING_INTERVAL_SECONDS = 5
+
+        METRIC_PREFIX = 'gitlab_database_connection_pool_'
+
+        METRIC_DESCRIPTIONS = {
+          size: 'Total connection pool capacity',
+          connections: 'Current connections in the pool',
+          busy: 'Connections in use where the owner is still alive',
+          dead: 'Connections in use where the owner is not alive',
+          idle: 'Connections not in use',
+          waiting: 'Threads currently waiting on this queue'
+        }.freeze
+
+        def metrics
+          @metrics ||= init_metrics
+        end
+
+        def sample
+          host_stats.each do |host_stat|
+            METRIC_DESCRIPTIONS.each_key do |metric|
+              metrics[metric].set(host_stat[:labels], host_stat[:stats][metric])
+            end
+          end
+        end
+
+        private
+
+        def init_metrics
+          METRIC_DESCRIPTIONS.map do |name, description|
+            [name, ::Gitlab::Metrics.gauge(:"#{METRIC_PREFIX}#{name}", description)]
+          end.to_h
+        end
+
+        def host_stats
+          return [] unless ActiveRecord::Base.connected?
+
+          [{ labels: labels_for_class(ActiveRecord::Base), stats: ActiveRecord::Base.connection_pool.stat }]
+        end
+
+        def labels_for_class(klass)
+          {
+            host: klass.connection_config[:host],
+            port: klass.connection_config[:port],
+            class: klass.to_s
+          }
+        end
+      end
+    end
+  end
+end
+
+Gitlab::Metrics::Samplers::DatabaseSampler.prepend_if_ee('EE::Gitlab::Metrics::Samplers::DatabaseSampler')
diff --git a/lib/gitlab/metrics/samplers/influx_sampler.rb b/lib/gitlab/metrics/samplers/influx_sampler.rb
deleted file mode 100644
index 4e16e335bee..00000000000
--- a/lib/gitlab/metrics/samplers/influx_sampler.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Metrics
-    module Samplers
-      # Class that sends certain metrics to InfluxDB at a specific interval.
-      #
-      # This class is used to gather statistics that can't be directly associated
-      # with a transaction such as system memory usage, garbage collection
-      # statistics, etc.
-      class InfluxSampler < BaseSampler
-        # interval - The sampling interval in seconds.
-        def initialize(interval = ::Gitlab::Metrics.settings[:sample_interval])
-          super(interval)
-          @last_step = nil
-
-          @metrics = []
-        end
-
-        def sample
-          sample_memory_usage
-          sample_file_descriptors
-
-          flush
-        ensure
-          @metrics.clear
-        end
-
-        def flush
-          ::Gitlab::Metrics.submit_metrics(@metrics.map(&:to_hash))
-        end
-
-        def sample_memory_usage
-          add_metric('memory_usage', value: System.memory_usage)
-        end
-
-        def sample_file_descriptors
-          add_metric('file_descriptors', value: System.file_descriptor_count)
-        end
-
-        def add_metric(series, values, tags = {})
-          prefix = Gitlab::Runtime.sidekiq? ? 'sidekiq_' : 'rails_'
-
-          @metrics << Metric.new("#{prefix}#{series}", values, tags)
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/metrics/samplers/puma_sampler.rb b/lib/gitlab/metrics/samplers/puma_sampler.rb
index f788f51b1ce..98dd517ee3b 100644
--- a/lib/gitlab/metrics/samplers/puma_sampler.rb
+++ b/lib/gitlab/metrics/samplers/puma_sampler.rb
@@ -26,7 +26,7 @@ module Gitlab
           json_stats = puma_stats
           return unless json_stats
 
-          stats = JSON.parse(json_stats)
+          stats = Gitlab::Json.parse(json_stats)
 
           if cluster?(stats)
             sample_cluster(stats)
diff --git a/lib/gitlab/metrics/samplers/ruby_sampler.rb b/lib/gitlab/metrics/samplers/ruby_sampler.rb
index c38769f39a9..df59c06911b 100644
--- a/lib/gitlab/metrics/samplers/ruby_sampler.rb
+++ b/lib/gitlab/metrics/samplers/ruby_sampler.rb
@@ -34,14 +34,15 @@ module Gitlab
 
         def init_metrics
           metrics = {
-            file_descriptors:               ::Gitlab::Metrics.gauge(with_prefix(:file, :descriptors), 'File descriptors used', labels),
-            memory_bytes:                   ::Gitlab::Metrics.gauge(with_prefix(:memory, :bytes), 'Memory used', labels),
-            process_cpu_seconds_total:      ::Gitlab::Metrics.gauge(with_prefix(:process, :cpu_seconds_total), 'Process CPU seconds total'),
-            process_max_fds:                ::Gitlab::Metrics.gauge(with_prefix(:process, :max_fds), 'Process max fds'),
-            process_resident_memory_bytes:  ::Gitlab::Metrics.gauge(with_prefix(:process, :resident_memory_bytes), 'Memory used', labels),
-            process_start_time_seconds:     ::Gitlab::Metrics.gauge(with_prefix(:process, :start_time_seconds), 'Process start time seconds'),
-            sampler_duration:               ::Gitlab::Metrics.counter(with_prefix(:sampler, :duration_seconds_total), 'Sampler time', labels),
-            gc_duration_seconds:            ::Gitlab::Metrics.histogram(with_prefix(:gc, :duration_seconds), 'GC time', labels, GC_REPORT_BUCKETS)
+            file_descriptors:                  ::Gitlab::Metrics.gauge(with_prefix(:file, :descriptors), 'File descriptors used', labels),
+            process_cpu_seconds_total:         ::Gitlab::Metrics.gauge(with_prefix(:process, :cpu_seconds_total), 'Process CPU seconds total'),
+            process_max_fds:                   ::Gitlab::Metrics.gauge(with_prefix(:process, :max_fds), 'Process max fds'),
+            process_resident_memory_bytes:     ::Gitlab::Metrics.gauge(with_prefix(:process, :resident_memory_bytes), 'Memory used (RSS)', labels),
+            process_unique_memory_bytes:       ::Gitlab::Metrics.gauge(with_prefix(:process, :unique_memory_bytes), 'Memory used (USS)', labels),
+            process_proportional_memory_bytes: ::Gitlab::Metrics.gauge(with_prefix(:process, :proportional_memory_bytes), 'Memory used (PSS)', labels),
+            process_start_time_seconds:        ::Gitlab::Metrics.gauge(with_prefix(:process, :start_time_seconds), 'Process start time seconds'),
+            sampler_duration:                  ::Gitlab::Metrics.counter(with_prefix(:sampler, :duration_seconds_total), 'Sampler time', labels),
+            gc_duration_seconds:               ::Gitlab::Metrics.histogram(with_prefix(:gc, :duration_seconds), 'GC time', labels, GC_REPORT_BUCKETS)
           }
 
           GC.stat.keys.each do |key|
@@ -85,10 +86,13 @@ module Gitlab
         end
 
         def set_memory_usage_metrics
-          memory_usage = System.memory_usage
+          metrics[:process_resident_memory_bytes].set(labels, System.memory_usage_rss)
 
-          metrics[:memory_bytes].set(labels, memory_usage)
-          metrics[:process_resident_memory_bytes].set(labels, memory_usage)
+          if Gitlab::Utils.to_boolean(ENV['enable_memory_uss_pss'] || '1')
+            memory_uss_pss = System.memory_usage_uss_pss
+            metrics[:process_unique_memory_bytes].set(labels, memory_uss_pss[:uss])
+            metrics[:process_proportional_memory_bytes].set(labels, memory_uss_pss[:pss])
+          end
         end
       end
     end