gitlab-exporter 9.0.0 → 10.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3fb1c9119047242e695cb956c7a68f7c19f564f7a274c8d503b7d4b984eed03
-  data.tar.gz: fb77e078e08dbc9f8f81a1a82dc070944fbf49af3944c90a8e30eac59ca1c39a
+  metadata.gz: 8e5ca8b32e5bce057dbfd998d16e3bc940440115a7540d44e4ab6a4c616c23b3
+  data.tar.gz: 616a825e49b9a0aee99f0684ec7df670c3ad1d09a2b182e317037ac30bca031a
 SHA512:
-  metadata.gz: 0c75097275454229a38f351618bc7eef530534726fa16d3d06b1c8fb95d5fdacc43a84d4d9781963bf27b8afc7700699bfe32d5f0f8516403edf7d5fa5a6555a
-  data.tar.gz: 1eb96b35d5a80166dc5f587dce7de896d7533cf5822d5a17b220c0d09d858b01e5d02cfc7bbd8710b6002591efd9181cfab063b8fa8bfee698beca672536e83a
+  metadata.gz: a346775749dce1e4e08311d42e7988dc470a46f1b52379b982bc11376b70ebf81fa4a8090447743a5624e16ec3377b638204b2d31bd4e41f2c175d8fdbe51336
+  data.tar.gz: d1fb453077499d6de7ea8fd434e839f390ce3052f4f50fc17c0ee041ed90dcafd83e0e0a9a16ad7a50ce862752701be5a2eecc39b5306458f8feb08b293c3868

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    gitlab-exporter (9.0.0)
+    gitlab-exporter (10.3.0)
       connection_pool (~> 2.2.1)
       pg (~> 1.1)
+      puma (~> 5.3.2)
       quantile (~> 0.2.0)
       redis (~> 4.1.2)
       redis-namespace (~> 1.6.0)
@@ -14,14 +15,17 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.1)
-    connection_pool (2.2.3)
+    connection_pool (2.2.5)
     diff-lcs (1.3)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
+    nio4r (2.5.7)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
     pg (1.2.3)
+    puma (5.3.2)
+      nio4r (~> 2.0)
     quantile (0.2.1)
     rack (2.2.3)
     rack-protection (2.0.8.1)
@@ -57,7 +61,7 @@ GEM
     rubocop-ast (1.4.0)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.2)
+    ruby2_keywords (0.0.4)
     sidekiq (5.2.9)
       connection_pool (~> 2.2, >= 2.2.2)
       rack (~> 2.0)

data/README.md

@@ -33,23 +33,6 @@ metrics.
     * [git pull/push timings](lib/gitlab_exporter/git.rb) --
       `git_pull_time_milliseconds`, `git_push_time_milliseconds`
     * git processes stats (see Process below)
-1. [Process](lib/gitlab_exporter/process.rb)
-    * CPU time -- `process_cpu_seconds_total`
-    * Start time -- `process_start_time_seconds`
-    * Count -- `process_count`
-    * Memory usage
-      * Data from /proc/<pid>/cmdline:
-        * `process_resident_memory_bytes`
-        * `process_virtual_memory_bytes`
-      * Data from /proc/<pid>/smaps -- `probe_smaps` (off by default):
-        * `process_smaps_size_bytes`
-        * `process_smaps_rss_bytes`
-        * `process_smaps_shared_clean_bytes`
-        * `process_smaps_shared_dirty_bytes`
-        * `process_smaps_private_clean_bytes`
-        * `process_smaps_private_dirty_bytes`
-        * `process_smaps_swap_bytes`
-        * `process_smaps_pss_bytes`
 1. [Sidekiq](lib/gitlab_exporter/sidekiq.rb)
 	* Stats
 	  * `sidekiq_jobs_processed_total`

data/bin/gitlab-exporter

@@ -2,6 +2,9 @@
 
 $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 
+require "rubygems"
+require "bundler"
+require "bundler/setup"
 require "optparse"
 require "gitlab_exporter"
 

data/config/gitlab-exporter.yml.example

@@ -46,7 +46,6 @@ probes:
       <<: *db_common
       opts:
         <<: *db_common_opts
-        allowed_repeated_commands_count: 2
         created_builds_counting_disabled: true
         unarchived_traces_offset_minutes: 1440
     tuple_stats:
@@ -95,12 +94,21 @@ probes:
       redis_url: "redis://localhost:6379"
       redis_enable_client: true
 
+  ruby: &ruby
+    class_name: RubyProber
+    methods:
+    - probe_gc
+    opts:
+      quantiles: false
+
   metrics:
     multiple: true
     git_process:
       <<: *git_process
     process:
       <<: *process
+    ruby:
+      <<: *ruby
     sidekiq:
       <<: *sidekiq
     ci_builds:

data/gitlab-exporter.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "connection_pool", "~> 2.2.1"
   s.add_runtime_dependency "pg", "~> 1.1"
+  s.add_runtime_dependency "puma", "~> 5.3.2"
   s.add_runtime_dependency "quantile", "~> 0.2.0"
   s.add_runtime_dependency "redis", "~> 4.1.2"
   s.add_runtime_dependency "redis-namespace", "~> 1.6.0"

data/lib/gitlab_exporter.rb

@@ -14,5 +14,6 @@ module GitLab
     autoload :WebExporter,       "gitlab_exporter/web_exporter"
     autoload :Prober,            "gitlab_exporter/prober"
     autoload :SidekiqProber,     "gitlab_exporter/sidekiq"
+    autoload :RubyProber,        "gitlab_exporter/ruby"
   end
 end

data/lib/gitlab_exporter/database/base.rb

@@ -8,14 +8,39 @@ module GitLab
       #
       # It takes a connection string (e.g. "dbname=test port=5432")
       class Base
+        POOL_SIZE = 3
+
+        # This timeout is configured to higher interval than scrapping
+        # of Prometheus to ensure that connection is kept instead of
+        # needed to be re-initialized
+        POOL_TIMEOUT = 90
+
         def self.connection_pool
-          @connection_pool ||= Hash.new do |h, connection_string|
-            h[connection_string] = ConnectionPool.new(size: 3, timeout: 5) do
-              PG.connect(connection_string)
+          @@connection_pool ||= Hash.new do |h, connection_string| # rubocop:disable Style/ClassVars
+            h[connection_string] = ConnectionPool.new(size: POOL_SIZE, timeout: POOL_TIMEOUT) do
+              PG.connect(connection_string).tap do |conn|
+                configure_type_map_for_results(conn)
+              end
             end
           end
         end
 
+        def self.configure_type_map_for_results(conn)
+          tm = PG::BasicTypeMapForResults.new(conn)
+
+          # Remove warning message:
+          # Warning: no type cast defined for type "name" with oid 19.
+          # Please cast this type explicitly to TEXT to be safe for future changes.
+          # Warning: no type cast defined for type "regproc" with oid 24.
+          # Please cast this type explicitly to TEXT to be safe for future changes.
+          [{ "type": "text", "oid": 19 }, { "type": "int4", "oid": 24 }].each do |value|
+            old_coder = tm.coders.find { |c| c.name == value[:type] }
+            tm.add_coder(old_coder.dup.tap { |c| c.oid = value[:oid] })
+          end
+
+          conn.type_map_for_results = tm
+        end
+
         def initialize(args, logger: nil)
           @connection_string = args[:connection_string]
           @logger = logger

data/lib/gitlab_exporter/database/ci_builds.rb

@@ -147,100 +147,6 @@ module GitLab
             SELECT COUNT(*) FROM licenses
           SQL
 
-        REPEATED_COMMANDS_QUERY_EE =
-          <<~SQL.freeze
-            SELECT
-              subquery.namespace_id,
-              subquery.shared_runners_enabled,
-              subquery.project_id,
-              subquery.status,
-              subquery.has_minutes,
-              MAX(subquery.count) as count
-            FROM (
-              SELECT
-                projects.namespace_id,
-                projects.shared_runners_enabled,
-                ci_builds.project_id,
-                ci_builds.commit_id,
-                ci_builds.status,
-                (COALESCE(namespaces.shared_runners_minutes_limit, application_settings.shared_runners_minutes, 0) = 0 OR
-                   COALESCE(namespace_statistics.shared_runners_seconds, 0) < COALESCE(namespaces.shared_runners_minutes_limit, application_settings.shared_runners_minutes, 0) * 60) as has_minutes,
-                COUNT(*) AS count
-              FROM ci_builds
-              JOIN projects
-                ON projects.id = ci_builds.project_id
-              JOIN namespaces
-                ON namespaces.id = projects.namespace_id
-              LEFT JOIN namespace_statistics
-                ON namespace_statistics.namespace_id = namespaces.id
-              JOIN application_settings ON (TRUE)
-              WHERE ci_builds.type = 'Ci::Build'
-                AND ci_builds.status IN ('running', 'pending')
-                -- The created_at filter has been introduced for performance reasons only
-                AND ci_builds.created_at > NOW() - INTERVAL '7 days'
-              GROUP BY
-                projects.namespace_id,
-                projects.shared_runners_enabled,
-                ci_builds.project_id,
-                ci_builds.commit_id,
-                ci_builds.status,
-                ci_builds.commands,
-                namespaces.shared_runners_minutes_limit,
-                namespace_statistics.shared_runners_seconds,
-                application_settings.shared_runners_minutes
-              HAVING COUNT(*) > %d
-            ) AS subquery
-            GROUP BY
-              subquery.namespace_id,
-              subquery.shared_runners_enabled,
-              subquery.project_id,
-              subquery.commit_id,
-              subquery.status,
-              subquery.has_minutes
-          SQL
-
-        REPEATED_COMMANDS_QUERY_CE =
-          <<~SQL.freeze
-            SELECT
-              subquery.namespace_id,
-              subquery.shared_runners_enabled,
-              subquery.project_id,
-              subquery.status,
-              MAX(subquery.count) as count
-            FROM (
-              SELECT
-                projects.namespace_id,
-                projects.shared_runners_enabled,
-                ci_builds.project_id,
-                ci_builds.commit_id,
-                ci_builds.status,
-                COUNT(*) AS count
-              FROM ci_builds
-              JOIN projects
-                ON projects.id = ci_builds.project_id
-              JOIN namespaces
-                ON namespaces.id = projects.namespace_id
-              WHERE ci_builds.type = 'Ci::Build'
-                AND ci_builds.status IN ('running', 'pending')
-              -- The created_at filter has been introduced for performance reasons only
-              AND ci_builds.created_at > NOW() - INTERVAL '7 days'
-              GROUP BY
-                projects.namespace_id,
-                projects.shared_runners_enabled,
-                ci_builds.project_id,
-                ci_builds.commit_id,
-                ci_builds.status,
-                ci_builds.commands
-              HAVING COUNT(*) > %d
-            ) AS subquery
-            GROUP BY
-              subquery.namespace_id,
-              subquery.shared_runners_enabled,
-              subquery.project_id,
-              subquery.commit_id,
-              subquery.status
-          SQL
-
         UNARCHIVED_TRACES_QUERY =
           <<~SQL.freeze
             SELECT
@@ -265,7 +171,6 @@ module GitLab
         def initialize(opts, logger: nil)
           super(opts, logger: logger)
 
-          @allowed_repeated_commands_count = opts[:allowed_repeated_commands_count]
           @created_builds_counting_disabled = opts[:created_builds_counting_disabled]
           @unarchived_traces_offset_minutes = opts[:unarchived_traces_offset_minutes]
         end
@@ -276,7 +181,6 @@ module GitLab
           results[:pending_builds] = builds(STATUS_PENDING)
           results[:stale_builds] = stale_builds
           results[:per_runner] = per_runner_builds
-          results[:repeated_commands] = repeated_commands
           results[:unarchived_traces] = unarchived_traces
           results
         end
@@ -335,34 +239,6 @@ module GitLab
           include_ee_fields(values, row)
         end
 
-        def repeated_commands
-          results = []
-
-          query = ee? ? REPEATED_COMMANDS_QUERY_EE : REPEATED_COMMANDS_QUERY_CE
-          query = query % [allowed_repeated_commands_count] # rubocop:disable Style/FormatString
-          exec_query_with_custom_random_page_cost(query).each do |row|
-            results << transform_repeated_commands_row_to_values(row)
-          end
-
-          results
-        rescue PG::UndefinedTable, PG::UndefinedColumn
-          []
-        end
-
-        def allowed_repeated_commands_count
-          @allowed_repeated_commands_count ||= 2
-        end
-
-        def transform_repeated_commands_row_to_values(row)
-          values = { namespace: row["namespace_id"].to_s,
-                     project: row["project_id"].to_s,
-                     shared_runners: row["shared_runners_enabled"] == "t" ? "yes" : "no",
-                     status: row["status"].to_s,
-                     value: row["count"].to_i }
-
-          include_has_minutes_field(values, row)
-        end
-
         def unarchived_traces
           time = Time.now - (unarchived_traces_offset_minutes * 60)
           query = UNARCHIVED_TRACES_QUERY % [time.strftime("%F %T")] # rubocop:disable Style/FormatString
@@ -422,7 +298,6 @@ module GitLab
           @metrics = metrics
 
           collector_opts = { connection_string: opts[:connection_string],
-                             allowed_repeated_commands_count: opts[:allowed_repeated_commands_count],
                              created_builds_counting_disabled: opts[:created_builds_counting_disabled],
                              unarchived_traces_offset_minutes: opts[:unarchived_traces_offset_minutes] }
           @collector = CiBuildsCollector.new(collector_opts, logger: logger)
@@ -435,7 +310,6 @@ module GitLab
           ci_builds_metrics(@results[:pending_builds], "ci_pending_builds")
           ci_stale_builds_metrics
           metrics_per_runner
-          repeated_commands_metrics
           unarchived_traces_metrics
 
           self
@@ -520,14 +394,6 @@ module GitLab
           @metrics.add(metric_name, value.to_f, selected_labels)
         end
 
-        def repeated_commands_metrics
-          @results[:repeated_commands].each do |metric|
-            value = metric.delete(:value)
-
-            @metrics.add("ci_repeated_commands_builds", value.to_f, metric)
-          end
-        end
-
         def unarchived_traces_metrics
           @metrics.add("ci_unarchived_traces", @results[:unarchived_traces].to_f)
         end

data/lib/gitlab_exporter/database/row_count.rb

@@ -175,30 +175,12 @@ module GitLab
 
         def execute(query)
           with_connection_pool do |conn|
-            conn.exec(query).map_types!(type_map_for_results(conn))
+            conn.exec(query)
           end
         rescue PG::UndefinedTable, PG::UndefinedColumn
           nil
         end
 
-        def type_map_for_results(conn)
-          @type_map_for_results ||= begin
-            tm = PG::BasicTypeMapForResults.new(conn)
-
-            # Remove warning message:
-            # Warning: no type cast defined for type "name" with oid 19.
-            # Please cast this type explicitly to TEXT to be safe for future changes.
-            # Warning: no type cast defined for type "regproc" with oid 24.
-            # Please cast this type explicitly to TEXT to be safe for future changes.
-            [{ "type": "text", "oid": 19 }, { "type": "int4", "oid": 24 }].each do |value|
-              old_coder = tm.coders.find { |c| c.name == value[:type] }
-              tm.add_coder(old_coder.dup.tap { |c| c.oid = value[:oid] })
-            end
-
-            tm
-          end
-        end
-
         # Not private so I can test it without meta programming tricks
         def construct_query(query)
           query_string = "SELECT COUNT(*)"

data/lib/gitlab_exporter/git.rb

@@ -93,6 +93,10 @@ module GitLab
       end
 
       def probe_git # rubocop:disable Metrics/MethodLength
+        puts "[DEPRECATED] probe_git and GitProcessProber are now considered obsolete"\
+          " and will be removed in future major versions,"\
+          " please use git metrics produced by Gitaly instead"
+
         counts = Hash.new(0)
 
         Utils.pgrep("^git ").each do |pid|

data/lib/gitlab_exporter/process.rb

@@ -71,6 +71,10 @@ module GitLab
       end
 
       def probe_stat
+        puts "[DEPRECATED] probe_stat and ProcessProber are now considered obsolete"\
+          " and will be removed in future major versions,"\
+          " please use metrics produced by application processes instead"
+
         @pids.each do |pid|
           stats = ProcessStats.new(pid)
           next unless stats.valid?
@@ -88,12 +92,20 @@ module GitLab
       end
 
       def probe_count
+        puts "[DEPRECATED] probe_count and ProcessProber are now considered obsolete"\
+          " and will be removed in future major versions,"\
+          " please use metrics produced by application processes instead"
+
         @metrics.add("process_count", @pids.count, name: @name.downcase)
 
         self
       end
 
       def probe_smaps
+        puts "[DEPRECATED] probe_smaps and ProcessProber are now considered obsolete"\
+          " and will be removed in future major versions,"\
+          " please use metrics produced by application processes instead"
+
         @pids.each do |pid|
           stats = ::GitLab::Exporter::MemStats::Aggregator.new(pid)
 

data/lib/gitlab_exporter/ruby.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module GitLab
+  module Exporter
+    # Probes a current process GC for info then writes metrics to a target
+    class RubyProber
+      def initialize(options, metrics: PrometheusMetrics.new, logger: nil) # rubocop:disable Lint/UnusedMethodArgument
+        @metrics = metrics
+        @use_quantiles = options.fetch(:quantiles, false)
+      end
+
+      def probe_gc
+        GC.stat.each do |stat, value|
+          @metrics.add("ruby_gc_stat_#{stat}", value.to_i, @use_quantiles)
+        end
+
+        self
+      end
+    end
+  end
+end

data/lib/gitlab_exporter/sidekiq.rb

@@ -10,100 +10,109 @@ module GitLab
       QUEUE_JOB_STATS_SCRIPT = File.read(File.expand_path("#{__FILE__}/../sidekiq_queue_job_stats.lua")).freeze
       QUEUE_JOB_STATS_SHA    = Digest::SHA1.hexdigest(QUEUE_JOB_STATS_SCRIPT).freeze
 
+      POOL_SIZE = 3
+
+      # This timeout is configured to higher interval than scrapping
+      # of Prometheus to ensure that connection is kept instead of
+      # needed to be re-initialized
+      POOL_TIMEOUT = 90
+
+      def self.connection_pool
+        @@connection_pool ||= Hash.new do |h, connection_hash| # rubocop:disable Style/ClassVars
+          config = connection_hash.merge(pool_timeout: POOL_TIMEOUT, size: POOL_SIZE)
+
+          h[connection_hash] = Sidekiq::RedisConnection.create(config)
+        end
+      end
+
       def initialize(opts, metrics: PrometheusMetrics.new, logger: nil)
         @opts    = opts
         @metrics = metrics
         @logger  = logger
-
-        Sidekiq.configure_client do |config|
-          config.redis = redis_options
-        end
-
-        ensure_queue_job_stats_script_loaded
       end
 
       def probe_stats
-        return self unless connected?
-
-        stats = Sidekiq::Stats.new
-
-        @metrics.add("sidekiq_jobs_processed_total", stats.processed)
-        @metrics.add("sidekiq_jobs_failed_total", stats.failed)
-        @metrics.add("sidekiq_jobs_enqueued_size", stats.enqueued)
-        @metrics.add("sidekiq_jobs_scheduled_size", stats.scheduled_size)
-        @metrics.add("sidekiq_jobs_retry_size", stats.retry_size)
-        @metrics.add("sidekiq_jobs_dead_size", stats.dead_size)
-
-        @metrics.add("sidekiq_default_queue_latency_seconds", stats.default_queue_latency)
-        @metrics.add("sidekiq_processes_size", stats.processes_size)
-        @metrics.add("sidekiq_workers_size", stats.workers_size)
+        with_sidekiq do
+          stats = Sidekiq::Stats.new
+
+          @metrics.add("sidekiq_jobs_processed_total", stats.processed)
+          @metrics.add("sidekiq_jobs_failed_total", stats.failed)
+          @metrics.add("sidekiq_jobs_enqueued_size", stats.enqueued)
+          @metrics.add("sidekiq_jobs_scheduled_size", stats.scheduled_size)
+          @metrics.add("sidekiq_jobs_retry_size", stats.retry_size)
+          @metrics.add("sidekiq_jobs_dead_size", stats.dead_size)
+
+          @metrics.add("sidekiq_default_queue_latency_seconds", stats.default_queue_latency)
+          @metrics.add("sidekiq_processes_size", stats.processes_size)
+          @metrics.add("sidekiq_workers_size", stats.workers_size)
+        end
 
         self
       end
 
       def probe_queues
-        return self unless connected?
-
-        Sidekiq::Queue.all.each do |queue|
-          @metrics.add("sidekiq_queue_size", queue.size, name: queue.name)
-          @metrics.add("sidekiq_queue_latency_seconds", queue.latency, name: queue.name)
-          @metrics.add("sidekiq_queue_paused", queue.paused? ? 1 : 0, name: queue.name)
+        with_sidekiq do
+          Sidekiq::Queue.all.each do |queue|
+            @metrics.add("sidekiq_queue_size", queue.size, name: queue.name)
+            @metrics.add("sidekiq_queue_latency_seconds", queue.latency, name: queue.name)
+            @metrics.add("sidekiq_queue_paused", queue.paused? ? 1 : 0, name: queue.name)
+          end
         end
 
         self
       end
 
       def probe_jobs
-        return self unless connected?
-
-        job_stats = {}
-
-        Sidekiq::Queue.all.each do |queue|
-          Sidekiq.redis do |conn|
-            stats = conn.evalsha(QUEUE_JOB_STATS_SHA, ["queue:#{queue.name}"])
-            job_stats.merge!(stats.to_h)
+        with_sidekiq do
+          job_stats = {}
+
+          Sidekiq::Queue.all.each do |queue|
+            Sidekiq.redis do |conn|
+              stats = conn.evalsha(QUEUE_JOB_STATS_SHA, ["queue:#{queue.name}"])
+              job_stats.merge!(stats.to_h)
+            end
+          rescue Redis::CommandError # Could happen if the script exceeded the maximum run time (5 seconds by default)
+            # FIXME: Should we call SCRIPT KILL?
+            return self
           end
-        rescue Redis::CommandError # Could happen if the script exceeded the maximum run time (5 seconds by default)
-          # FIXME: Should we call SCRIPT KILL?
-          return self
-        end
 
-        job_stats.each do |class_name, count|
-          @metrics.add("sidekiq_enqueued_jobs", count, name: class_name)
+          job_stats.each do |class_name, count|
+            @metrics.add("sidekiq_enqueued_jobs", count, name: class_name)
+          end
         end
 
         self
       end
 
       def probe_workers
-        return self unless connected?
-
-        worker_stats = Hash.new(0)
+        with_sidekiq do
+          worker_stats = Hash.new(0)
 
-        Sidekiq::Workers.new.map do |_pid, _tid, work|
-          job_klass = work["payload"]["class"]
+          Sidekiq::Workers.new.map do |_pid, _tid, work|
+            job_klass = work["payload"]["class"]
 
-          worker_stats[job_klass] += 1
-        end
+            worker_stats[job_klass] += 1
+          end
 
-        worker_stats.each do |class_name, count|
-          @metrics.add("sidekiq_running_jobs", count, name: class_name)
+          worker_stats.each do |class_name, count|
+            @metrics.add("sidekiq_running_jobs", count, name: class_name)
+          end
         end
 
         self
       end
 
       def probe_retries
-        return self unless connected?
+        with_sidekiq do
+          retry_stats = Hash.new(0)
 
-        retry_stats = Hash.new(0)
-
-        Sidekiq::RetrySet.new.map do |job|
-          retry_stats[job.klass] += 1
-        end
+          Sidekiq::RetrySet.new.map do |job|
+            retry_stats[job.klass] += 1
+          end
 
-        retry_stats.each do |class_name, count|
-          @metrics.add("sidekiq_to_be_retried_jobs", count, name: class_name)
+          retry_stats.each do |class_name, count|
+            @metrics.add("sidekiq_to_be_retried_jobs", count, name: class_name)
+          end
         end
 
         self
@@ -113,9 +122,9 @@ module GitLab
         puts "[DEPRECATED] probe_dead is now considered obsolete and will be removed in future major versions,"\
              " please use probe_stats instead"
 
-        return self unless connected?
-
-        @metrics.add("sidekiq_dead_jobs", Sidekiq::Stats.new.dead_size)
+        with_sidekiq do
+          @metrics.add("sidekiq_dead_jobs", Sidekiq::Stats.new.dead_size)
+        end
 
         self
       end
@@ -126,6 +135,19 @@ module GitLab
 
       private
 
+      def with_sidekiq
+        # TODO: this is not concurrent safe as we change global context
+        # It means that we are unable to use many different sidekiq's
+        # which is not a problem as of now
+        Sidekiq.configure_client do |config|
+          config.redis = self.class.connection_pool[redis_options]
+        end
+
+        return unless connected?
+
+        yield
+      end
+
       def redis_options
         options = {
           url: @opts[:redis_url],
@@ -145,26 +167,19 @@ module GitLab
       end
 
       def connected?
-        @connected ||= begin
-                         Sidekiq.redis do |conn|
-                           conn.get("foo")
-                         end
-                         true
-                       end
-      rescue Redis::CannotConnectError, Redis::TimeoutError
-        # Maybe we're trying connecting to a slave
-      end
-
-      def ensure_queue_job_stats_script_loaded
-        return unless connected?
+        return @connected unless @connected.nil?
 
+        # This is also a good "connected check"
         Sidekiq.redis do |conn|
           # Using administrative commands on conn directly (which is a Redis::Namespace)
           # will be removed in redis-namespace 2.0.
-          next if conn.redis.script(:exists, QUEUE_JOB_STATS_SHA)
-
-          conn.redis.script(:load, QUEUE_JOB_STATS_SCRIPT)
+          conn.redis.script(:load, QUEUE_JOB_STATS_SCRIPT) unless conn.redis.script(:exists, QUEUE_JOB_STATS_SHA)
         end
+
+        @connected = true
+      rescue Redis::BaseConnectionError => e
+        @logger&.error "Error connecting to the Redis: #{e}"
+        @connected = false
       end
     end
   end

data/lib/gitlab_exporter/version.rb

@@ -1,5 +1,5 @@
 module GitLab
   module Exporter
-    VERSION = "9.0.0".freeze
+    VERSION = "10.3.0".freeze
   end
 end

data/lib/gitlab_exporter/web_exporter.rb

@@ -35,6 +35,21 @@ module GitLab
         end
       end
 
+      # Performs a major GC after each request. We found that this helps to free up
+      # several MB of memory in conjunction with sricter malloc config.
+      # See https://gitlab.com/gitlab-org/gitlab/-/issues/297241
+      class RunGC
+        def initialize(app)
+          @app = app
+        end
+
+        def call(env)
+          @app.call(env).tap do
+            GC.start
+          end
+        end
+      end
+
       class << self
         DEFAULT_WEB_SERVER = "webrick".freeze
 
@@ -45,6 +60,10 @@ module GitLab
           memory_threshold = (config[:server] && config[:server][:memory_threshold]) || 1024
           use MemoryKillerMiddleware, memory_threshold
           use Rack::Logger
+          use RunGC
+
+          # Defrag heap after everything is loaded into memory.
+          GC.compact
         end
 
         def logger

data/spec/database/ci_builds_spec.rb

@@ -10,12 +10,9 @@ describe GitLab::Exporter::Database do
   let(:per_runner_query_ee) { "SELECT ALL RUNNING PER RUNNER EE" }
   let(:per_runner_query_ce) { "SELECT ALL RUNNING PER RUNNER CE" }
   let(:ee_check_query) { "SELECT COUNT(*) FROM licenses" }
-  let(:repeated_commands_query_ee) { "SELECT EE REPEATED COMNANDS %d" }
-  let(:repeated_commands_query_ce) { "SELECT CE REPEATED COMNANDS %d" }
   let(:unarchived_traces_query) { "SELECT UNARCHIVED TRACES %s LIST" }
   let(:connection_pool) { double("connection pool") }
   let(:connection) { double("connection") }
-  let(:allowed_repeated_commands_count) { 5 }
   let(:created_builds_counting_disabled) { true }
   let(:time_now) { Time.new(2019, 4, 9, 6, 30, 0) }
   let(:unarchived_traces_query_time) { "2019-04-09 05:30:00" }
@@ -63,22 +60,6 @@ describe GitLab::Exporter::Database do
   end
   # rubocop:enable Metrics/ParameterLists
 
-  # rubocop:disable Metrics/ParameterLists
-  def repeated_commands_query_row_ee(namespace_id, shared_runners_enabled, project_id, status, has_minutes, count)
-    row = repeated_commands_query_row_ce(namespace_id, shared_runners_enabled, project_id, status, count)
-    row["has_minutes"] = has_minutes
-    row
-  end
-  # rubocop:enable Metrics/ParameterLists
-
-  def repeated_commands_query_row_ce(namespace_id, shared_runners_enabled, project_id, status, count)
-    { "namespace_id" => namespace_id,
-      "shared_runners_enabled" => shared_runners_enabled,
-      "project_id" => project_id,
-      "status" => status,
-      "count" => count }
-  end
-
   before do
     stub_const("GitLab::Exporter::Database::CiBuildsCollector::SET_RANDOM_PAGE_COST", set_random_page_cost_query)
     stub_const("GitLab::Exporter::Database::CiBuildsCollector::BUILDS_QUERY_EE", builds_query_ee)
@@ -87,8 +68,6 @@ describe GitLab::Exporter::Database do
     stub_const("GitLab::Exporter::Database::CiBuildsCollector::PER_RUNNER_QUERY_EE", per_runner_query_ee)
     stub_const("GitLab::Exporter::Database::CiBuildsCollector::PER_RUNNER_QUERY_CE", per_runner_query_ce)
     stub_const("GitLab::Exporter::Database::CiBuildsCollector::EE_CHECK_QUERY", ee_check_query)
-    stub_const("GitLab::Exporter::Database::CiBuildsCollector::REPEATED_COMMANDS_QUERY_EE", repeated_commands_query_ee)
-    stub_const("GitLab::Exporter::Database::CiBuildsCollector::REPEATED_COMMANDS_QUERY_CE", repeated_commands_query_ce)
     stub_const("GitLab::Exporter::Database::CiBuildsCollector::UNARCHIVED_TRACES_QUERY", unarchived_traces_query)
 
     allow_any_instance_of(GitLab::Exporter::Database::CiBuildsCollector).to receive(:connection_pool).and_return(connection_pool)
@@ -130,24 +109,6 @@ describe GitLab::Exporter::Database do
                                                     per_runner_query_row_ce(2, "project_type", 3, nil, 3, 5),
                                                     per_runner_query_row_ce(3, "project_type", 4, nil, 3, 5)])
 
-    # rubocop:disable Style/FormatString
-    repeated_commands_query_ee_with_limit = repeated_commands_query_ee % [allowed_repeated_commands_count]
-    repeated_commands_query_ce_with_limit = repeated_commands_query_ce % [allowed_repeated_commands_count]
-    # rubocop:enable Style/FormatString
-
-    allow(connection).to receive(:exec)
-      .with(repeated_commands_query_ee_with_limit)
-      .and_return([repeated_commands_query_row_ee(1, "t", 1, "pending", "t", 10),
-                   repeated_commands_query_row_ee(2, "f", 2, "running", "f", 20),
-                   repeated_commands_query_row_ee(1, "f", 3, "pending", "t", 30),
-                   repeated_commands_query_row_ee(2, "t", 4, "running", "f", 40)])
-    allow(connection).to receive(:exec)
-      .with(repeated_commands_query_ce_with_limit)
-      .and_return([repeated_commands_query_row_ce(1, "t", 1, "pending", 10),
-                   repeated_commands_query_row_ce(2, "f", 2, "running", 20),
-                   repeated_commands_query_row_ce(1, "f", 3, "pending", 30),
-                   repeated_commands_query_row_ce(2, "t", 4, "running", 40)])
-
     unarchived_traces_query_with_time = unarchived_traces_query % [unarchived_traces_query_time] # rubocop:disable Style/FormatString
 
     allow(connection).to receive(:exec).with(unarchived_traces_query_with_time).and_return([{ "count" => 10 }])
@@ -156,7 +117,6 @@ describe GitLab::Exporter::Database do
   describe GitLab::Exporter::Database::CiBuildsCollector do
     let(:collector) do
       described_class.new(connection_string: "host=localhost",
-                          allowed_repeated_commands_count: allowed_repeated_commands_count,
                           created_builds_counting_disabled: created_builds_counting_disabled,
                           unarchived_traces_offset_minutes: unarchived_traces_offset_minutes)
     end
@@ -195,10 +155,6 @@ describe GitLab::Exporter::Database do
         expect(subject[:stale_builds]).to eq(expected_stale_builds)
       end
 
-      it "returns raw repeated_commands data" do
-        expect(subject[:repeated_commands]).to include(*expected_repeated_commands)
-      end
-
       it "returns raw unarchived_traces data" do
         expect(subject[:unarchived_traces]).to eq(expected_unarchived_traces)
       end
@@ -222,12 +178,6 @@ describe GitLab::Exporter::Database do
          { runner: "2", runner_type: "project_type", namespace: "3", mirror: "yes", mirror_trigger_builds: "yes", scheduled: "no", triggered: "yes", has_minutes: "yes", value: 5.0 },
          { runner: "3", runner_type: "project_type", namespace: "4", mirror: "yes", mirror_trigger_builds: "yes", scheduled: "no", triggered: "yes", has_minutes: "no", value: 5.0 }]
       end
-      let(:expected_repeated_commands) do
-        [{ namespace: "1", project: "1", shared_runners: "yes", status: "pending", has_minutes: "yes", value: 10.0 },
-         { namespace: "2", project: "2", shared_runners: "no", status: "running", has_minutes: "no", value: 20.0 },
-         { namespace: "1", project: "3", shared_runners: "no", status: "pending", has_minutes: "yes", value: 30.0 },
-         { namespace: "2", project: "4", shared_runners: "yes", status: "running", has_minutes: "no", value: 40.0 }]
-      end
 
       before do
         stub_ee
@@ -254,12 +204,6 @@ describe GitLab::Exporter::Database do
          { runner: "2", runner_type: "project_type", namespace: "3", scheduled: "no", triggered: "yes", value: 5 },
          { runner: "3", runner_type: "project_type", namespace: "4", scheduled: "no", triggered: "yes", value: 5 }]
       end
-      let(:expected_repeated_commands) do
-        [{ namespace: "1", project: "1", shared_runners: "yes", status: "pending", value: 10 },
-         { namespace: "2", project: "2", shared_runners: "no", status: "running", value: 20 },
-         { namespace: "1", project: "3", shared_runners: "no", status: "pending", value: 30 },
-         { namespace: "2", project: "4", shared_runners: "yes", status: "running", value: 40 }]
-      end
 
       before do
         stub_ce
@@ -273,7 +217,6 @@ describe GitLab::Exporter::Database do
     let(:writer) { StringIO.new }
     let(:prober) do
       opts = { connection_string: "host=localhost",
-               allowed_repeated_commands_count: allowed_repeated_commands_count,
                created_builds_counting_disabled: created_builds_counting_disabled,
                unarchived_traces_offset_minutes: unarchived_traces_offset_minutes }
       described_class.new(opts,
@@ -324,12 +267,6 @@ describe GitLab::Exporter::Database do
           end
         end
 
-        it "responds with repeated commands Prometheus metrics" do
-          ci_repeated_commands_builds_lines.each do |expected_line|
-            expect(subject).to match(Regexp.new("^#{expected_line}$", Regexp::MULTILINE))
-          end
-        end
-
         it "responds with stale builds Prometheus metrics" do
           expect(subject).to match(/^ci_stale_builds 2.0$/m)
         end
@@ -372,12 +309,6 @@ describe GitLab::Exporter::Database do
          'ci_running_builds\{has_minutes="yes",mirror="yes",mirror_trigger_builds="yes",namespace="",runner="2",runner_type="project_type",scheduled="no",triggered="yes"\} 5.0',
          'ci_running_builds\{has_minutes="no",mirror="yes",mirror_trigger_builds="yes",namespace="",runner="3",runner_type="project_type",scheduled="no",triggered="yes"\} 5.0']
       end
-      let(:ci_repeated_commands_builds_lines) do
-        ['ci_repeated_commands_builds\{namespace="1",project="1",shared_runners="yes",status="pending",has_minutes="yes"\} 10.0',
-         'ci_repeated_commands_builds\{namespace="2",project="2",shared_runners="no",status="running",has_minutes="no"\} 20.0',
-         'ci_repeated_commands_builds\{namespace="1",project="3",shared_runners="no",status="pending",has_minutes="yes"\} 30.0',
-         'ci_repeated_commands_builds\{namespace="2",project="4",shared_runners="yes",status="running",has_minutes="no"\} 40.0']
-      end
       let(:namespace_out_of_limit) { 2 }
 
       before do
@@ -403,12 +334,6 @@ describe GitLab::Exporter::Database do
          'ci_running_builds\{namespace="",runner="2",runner_type="project_type",scheduled="no",triggered="yes"\} 10.0',
          'ci_running_builds\{namespace="",runner="3",runner_type="project_type",scheduled="no",triggered="yes"\} 5.0']
       end
-      let(:ci_repeated_commands_builds_lines) do
-        ['ci_repeated_commands_builds\{namespace="1",project="1",shared_runners="yes",status="pending"\} 10.0',
-         'ci_repeated_commands_builds\{namespace="2",project="2",shared_runners="no",status="running"\} 20.0',
-         'ci_repeated_commands_builds\{namespace="1",project="3",shared_runners="no",status="pending"\} 30.0',
-         'ci_repeated_commands_builds\{namespace="2",project="4",shared_runners="yes",status="running"\} 40.0']
-      end
       let(:namespace_out_of_limit) { 0 }
 
       before do

data/spec/ruby_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+require "gitlab_exporter/ruby"
+require "gitlab_exporter/prober"
+
+describe GitLab::Exporter::RubyProber do
+  let(:prober) { GitLab::Exporter::Prober.new(options) }
+
+  let(:options) do
+    {
+      ruby: {
+        class_name: described_class.to_s,
+        methods: %w[probe_gc],
+        opts: { quantiles: false }
+      }
+    }
+  end
+
+  it "probes and returns GC stats" do
+    prober.probe_all
+
+    output = StringIO.new
+    prober.write_to(output)
+    expect(output.string).to match(/ruby_gc_stat_count \d+ \d+/)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-exporter
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 10.3.0
 platform: ruby
 authors:
 - Pablo Carranza
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.3.2
 - !ruby/object:Gem::Dependency
   name: quantile
   requirement: !ruby/object:Gem::Requirement
@@ -173,6 +187,7 @@ files:
 - lib/gitlab_exporter/prober.rb
 - lib/gitlab_exporter/process.rb
 - lib/gitlab_exporter/prometheus.rb
+- lib/gitlab_exporter/ruby.rb
 - lib/gitlab_exporter/sidekiq.rb
 - lib/gitlab_exporter/sidekiq_queue_job_stats.lua
 - lib/gitlab_exporter/util.rb
@@ -187,6 +202,7 @@ files:
 - spec/git_spec.rb
 - spec/memstats_spec.rb
 - spec/prometheus_metrics_spec.rb
+- spec/ruby_spec.rb
 - spec/spec_helper.rb
 - spec/util_spec.rb
 homepage: http://gitlab.com
@@ -222,5 +238,6 @@ test_files:
 - spec/git_spec.rb
 - spec/memstats_spec.rb
 - spec/prometheus_metrics_spec.rb
+- spec/ruby_spec.rb
 - spec/spec_helper.rb
 - spec/util_spec.rb