gitlab-exporter 10.5.0 → 11.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c392268186f090b025d290c818f821120f5160a9a59f2e3ba228f26da0b8505
-  data.tar.gz: 3771d5912cb2a310183a1f78a8e24d191eb502d20c2beab3c327994243ae7077
+  metadata.gz: 2d94bb457b87a9b44d9147c8bb0f504d43ca4d6516d0995b5f02fca2f2f19f71
+  data.tar.gz: 00bf2b35ff8759f55485026ff21c72adc472ad750001450084bbfee5f4e5f59d
 SHA512:
-  metadata.gz: c9ee25b554e51484e4cba96070677c90e3cbad17da49eef2e2f649ad4d4ff125e8e2982cfb6e952444436d7ead6f603f6173ba1270b7112b3de75126cb57b318
-  data.tar.gz: e6038eff74531eb7c0561437cb676336853d9a597b588d07a9561a4561ef165a3ad2f528711b3a2f5d61ebfc8df341ef93ec4d15274fb7efcc88859abc1bc6c3
+  metadata.gz: 19769e5db26bf3be5a5dfe4109d4e7e36830d7e2bcc9a471398936cf5a83eb99a7b63082cacf826219f6e1d6ab229e6b97504670b402d74326e7e984ed9034c3
+  data.tar.gz: c65749449b07cc73b777c79d93091e6720392663574b627b48f0dc56ac44975903402cddaa9c081e2b064fe17252e0ecb35260b354e8dad18c5f9fbd76b96ffb

data/.gitlab-ci.yml

@@ -6,12 +6,15 @@ include:
   - template: Security/SAST.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml
   - template: Security/Secret-Detection.gitlab-ci.yml # https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/lib/gitlab/ci/templates/Security/Secret-Detection.gitlab-ci.yml
 
+variables:
+  RUBY_VERSION: "2.7"
+
 stages:
   - test
   - dast
 
 default:
-  image: ruby:2.7
+  image: ruby:${RUBY_VERSION}
   cache:
     paths:
       - vendor
@@ -36,6 +39,10 @@ rspec:
   script:
     - bundle exec rspec spec -f d -c
   before_script: *before_scripts
+  parallel:
+    matrix:
+      - RUBY_VERSION: "2.7"
+      - RUBY_VERSION: "3.0"
 
 rubocop:
   script:

data/Gemfile

@@ -2,6 +2,8 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "webrick", "~> 1.7"
+
 group :test do
   gem "rspec", "~>3.5"
   gem "rubocop", "~>0.42"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-exporter (10.5.0)
+    gitlab-exporter (11.2.0)
       connection_pool (= 2.2.5)
       pg (= 1.2.3)
       puma (= 5.3.2)
@@ -9,7 +9,7 @@ PATH
       redis (= 4.1.4)
       redis-namespace (= 1.6.0)
       sidekiq (= 5.2.9)
-      sinatra (= 2.0.8.1)
+      sinatra (~> 2.1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -28,7 +28,7 @@ GEM
       nio4r (~> 2.0)
     quantile (0.2.1)
     rack (2.2.3)
-    rack-protection (2.0.8.1)
+    rack-protection (2.1.0)
       rack
     rainbow (3.0.0)
     redis (4.1.4)
@@ -67,13 +67,14 @@ GEM
       rack (~> 2.0)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 4.2)
-    sinatra (2.0.8.1)
+    sinatra (2.1.0)
       mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
       tilt (~> 2.0)
     tilt (2.0.10)
     unicode-display_width (1.7.0)
+    webrick (1.7.0)
 
 PLATFORMS
   ruby
@@ -83,6 +84,7 @@ DEPENDENCIES
   rspec (~> 3.5)
   rspec-expectations (~> 3.7.0)
   rubocop (~> 0.42)
+  webrick (~> 1.7)
 
 BUNDLED WITH
-   2.1.4
+   2.2.22

data/README.md

@@ -34,7 +34,7 @@ metrics.
       `git_pull_time_milliseconds`, `git_push_time_milliseconds`
     * git processes stats (see Process below)
 1. [Sidekiq](lib/gitlab_exporter/sidekiq.rb)
-	* Stats
+	* Stats (probe_stats)
 	  * `sidekiq_jobs_processed_total`
 	  * `sidekiq_jobs_failed_total`
 	  * `sidekiq_jobs_enqueued_size`
@@ -44,14 +44,21 @@ metrics.
 	  * `sidekiq_default_queue_latency_seconds`
 	  * `sidekiq_processes_size`
 	  * `sidekiq_workers_size`
-	* Queues
+	* Queues (probe_queues)
 	  * `sidekiq_queue_size`
 	  * `sidekiq_queue_paused`
 	  * `sidekiq_queue_latency_seconds`
-	* Jobs
+	* Jobs (probe_jobs_limit)
 	  * `sidekiq_enqueued_jobs`
+  * Workers (probe_workers)
 	  * `sidekiq_running_jobs`
+  * Retries (probe_retries)
 	  * `sidekiq_to_be_retried_jobs`
+  * Future Sets (probe_future_sets)
+    * `sidekiq_schedule_set_processing_delay_seconds`
+    * `sidekiq_schedule_set_backlog_count`
+    * `sidekiq_retry_set_processing_delay_seconds`
+    * `sidekiq_retry_set_backlog_count`
 
 ### Setup with GitLab Development Kit
 

data/gitlab-exporter.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "redis", "4.1.4"
   s.add_runtime_dependency "redis-namespace", "1.6.0"
   s.add_runtime_dependency "sidekiq", "5.2.9"
-  s.add_runtime_dependency "sinatra", "2.0.8.1"
+  s.add_runtime_dependency "sinatra", "~> 2.1.0"
 
   s.add_development_dependency "rspec", "~> 3.7.0"
   s.add_development_dependency "rspec-expectations", "~> 3.7.0"

data/lib/gitlab_exporter/cli.rb

@@ -275,7 +275,7 @@ module GitLab
           ::GitLab::Exporter::SidekiqProber.new(redis_url: @redis_url)
                                            .probe_stats
                                            .probe_queues
-                                           .probe_jobs
+                                           .probe_jobs_limit
                                            .probe_workers
                                            .probe_retries
                                            .write_to(@target)

data/lib/gitlab_exporter/database/base.rb

@@ -41,8 +41,8 @@ module GitLab
           conn.type_map_for_results = tm
         end
 
-        def initialize(args, logger: nil)
-          @connection_string = args[:connection_string]
+        def initialize(connection_string:, logger: nil, **opts) # rubocop:disable Lint/UnusedMethodArgument
+          @connection_string = connection_string
           @logger = logger
         end
 

data/lib/gitlab_exporter/database/bloat.rb

@@ -39,12 +39,11 @@ module GitLab
 
         attr_reader :metrics, :collector, :bloat_types
 
-        def initialize(opts,
-                       metrics: PrometheusMetrics.new,
-                       collector: BloatCollector.new(connection_string: opts[:connection_string]),
-                       logger: nil)
+        def initialize(metrics: PrometheusMetrics.new,
+                       logger: nil,
+                       **opts)
           @metrics = metrics
-          @collector = collector
+          @collector = opts[:collector] || BloatCollector.new(**opts)
           @collector.logger = logger
           @bloat_types = opts[:bloat_types] || %i[btree table]
         end

data/lib/gitlab_exporter/database/ci_builds.rb

@@ -168,8 +168,8 @@ module GitLab
 
         DEFAULT_UNARCHIVED_TRACES_OFFSET_MINUTES = 1440
 
-        def initialize(opts, logger: nil)
-          super(opts, logger: logger)
+        def initialize(**opts)
+          super
 
           @created_builds_counting_disabled = opts[:created_builds_counting_disabled]
           @unarchived_traces_offset_minutes = opts[:unarchived_traces_offset_minutes]
@@ -294,13 +294,9 @@ module GitLab
 
       # The prober which is called when gathering metrics
       class CiBuildsProber
-        def initialize(opts, metrics: PrometheusMetrics.new, logger: nil)
+        def initialize(metrics: PrometheusMetrics.new, **opts)
           @metrics = metrics
-
-          collector_opts = { connection_string: opts[:connection_string],
-                             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)
+          @collector = CiBuildsCollector.new(**opts)
         end
 
         def probe_db
@@ -391,7 +387,7 @@ module GitLab
           labels[:namespace] = "" unless labels[:namespace]
 
           selected_labels = labels.select { |k, _| allowed_labels.include?(k) }.sort.to_h
-          @metrics.add(metric_name, value.to_f, selected_labels)
+          @metrics.add(metric_name, value.to_f, **selected_labels)
         end
 
         def unarchived_traces_metrics

data/lib/gitlab_exporter/database/remote_mirrors.rb

@@ -10,8 +10,8 @@ module GitLab
           FROM remote_mirrors WHERE project_id IN (%s) AND enabled = 't'
         SQL
 
-        def initialize(args)
-          super(args)
+        def initialize(**args)
+          super(**args)
 
           @project_ids = args[:project_ids]
         end
@@ -35,7 +35,7 @@ module GitLab
 
       # The prober which is called when gathering metrics
       class RemoteMirrorsProber
-        def initialize(opts, metrics: PrometheusMetrics.new, logger: nil) # rubocop:disable Lint/UnusedMethodArgument
+        def initialize(metrics: PrometheusMetrics.new, **opts)
           @metrics = metrics
           @collector = RemoteMirrorsCollector.new(
             connection_string: opts[:connection_string],

data/lib/gitlab_exporter/database/row_count.rb

@@ -134,10 +134,10 @@ module GitLab
           }
         }.freeze
 
-        def initialize(args)
-          super(args)
+        def initialize(selected_queries: nil, **args)
+          super(**args)
 
-          @selected_queries = Set.new(args[:selected_queries].map(&:to_sym)) unless args[:selected_queries].nil?
+          @selected_queries = Set.new(selected_queries.map(&:to_sym)) unless selected_queries.nil?
         end
 
         def run
@@ -200,12 +200,9 @@ module GitLab
 
       # The prober which is called when gathering metrics
       class RowCountProber
-        def initialize(opts, metrics: PrometheusMetrics.new, logger: nil) # rubocop:disable Lint/UnusedMethodArgument
+        def initialize(metrics: PrometheusMetrics.new, **opts)
           @metrics = metrics
-          @collector = RowCountCollector.new(
-            connection_string: opts[:connection_string],
-            selected_queries: opts[:selected_queries]
-          )
+          @collector = RowCountCollector.new(**opts)
         end
 
         def probe_db

data/lib/gitlab_exporter/database/tuple_stats.rb

@@ -25,9 +25,9 @@ module GitLab
 
       # Probes the DB specified by opts[:connection_string] for tuple stats, then converts them to metrics
       class TuplesProber
-        def initialize(opts, metrics: PrometheusMetrics.new, logger: nil)
+        def initialize(metrics: PrometheusMetrics.new, **opts)
           @metrics   = metrics
-          @collector = TupleStatsCollector.new(connection_string: opts[:connection_string], logger: logger)
+          @collector = TupleStatsCollector.new(**opts)
         end
 
         def probe_db

data/lib/gitlab_exporter/git.rb

@@ -64,10 +64,10 @@ module GitLab
     # Optionally takes a metrics object which by default is a PrometheusMetrics, useful to change the
     # metrics writer to something else.
     class GitProber
-      def initialize(opts, metrics: PrometheusMetrics.new, logger: nil) # rubocop:disable Lint/UnusedMethodArgument
+      def initialize(source:, metrics: PrometheusMetrics.new, labels: {}, **opts) # rubocop:disable Lint/UnusedMethodArgument
         @metrics = metrics
-        @labels = opts[:labels] || {}
-        @git = Git.new(opts[:source])
+        @labels = labels
+        @git = Git.new(source)
       end
 
       def probe_pull
@@ -87,9 +87,9 @@ module GitLab
 
     # A special prober for git processes
     class GitProcessProber
-      def initialize(opts, metrics: PrometheusMetrics.new, logger: nil) # rubocop:disable Lint/UnusedMethodArgument
-        @opts    = opts
+      def initialize(metrics: PrometheusMetrics.new, quantiles: nil, **opts) # rubocop:disable Lint/UnusedMethodArgument
         @metrics = metrics
+        @quantiles = quantiles
       end
 
       def probe_git # rubocop:disable Metrics/MethodLength
@@ -115,7 +115,7 @@ module GitLab
             {
               name: name,
               pid_or_pattern: pid,
-              quantiles: @opts[:quantiles]
+              quantiles: @quantiles
             },
             metrics: @metrics
           )

data/lib/gitlab_exporter/prober.rb

@@ -2,7 +2,7 @@ module GitLab
   module Exporter
     # A class to combine multiple probers into one
     class Prober
-      def initialize(prober_opts, metrics: PrometheusMetrics.new, logger: nil)
+      def initialize(metrics: PrometheusMetrics.new, logger: nil, **prober_opts)
         @prober_opts = prober_opts
         @metrics     = metrics
         @logger      = logger
@@ -13,7 +13,7 @@ module GitLab
       def probe_all
         @prober_opts.each do |_probe_name, params|
           Utils.wrap_in_array(params[:opts]).each do |opts|
-            prober = params[:class].new(opts, metrics: @metrics, logger: @logger)
+            prober = params[:class].new(metrics: @metrics, logger: @logger, **opts)
             params[:methods].each do |meth|
               prober.send(meth)
             end

data/lib/gitlab_exporter/process.rb

@@ -59,15 +59,15 @@ module GitLab
 
     # Probes a process for info then writes metrics to a target
     class ProcessProber
-      def initialize(options, metrics: PrometheusMetrics.new, logger: nil) # rubocop:disable Lint/UnusedMethodArgument
+      def initialize(name:, metrics: PrometheusMetrics.new, quantiles: false, **options)
         @metrics = metrics
-        @name    = options[:name]
+        @name    = name
         @pids    = if options[:pid_or_pattern] =~ /^\d+$/
                      [options[:pid_or_pattern]]
                    else
                      Utils.pgrep(options[:pid_or_pattern])
                    end
-        @use_quantiles = options.fetch(:quantiles, false)
+        @use_quantiles = quantiles
       end
 
       def probe_stat

data/lib/gitlab_exporter/ruby.rb

@@ -4,9 +4,9 @@ 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
+      def initialize(metrics: PrometheusMetrics.new, quantiles: false, **opts) # rubocop:disable Lint/UnusedMethodArgument
         @metrics = metrics
-        @use_quantiles = options.fetch(:quantiles, false)
+        @use_quantiles = quantiles
       end
 
       def probe_gc

data/lib/gitlab_exporter/sidekiq.rb

@@ -1,4 +1,5 @@
 require "sidekiq/api"
+require "sidekiq/scheduled"
 require "digest"
 
 module GitLab
@@ -7,9 +8,6 @@ module GitLab
     #
     # It takes the Redis URL Sidekiq is connected to
     class SidekiqProber
-      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
-
       # The maximum depth (from the head) of each queue to probe. Probing the
       # entirety of a very large queue will take longer and run the risk of
       # timing out. But when we have a very large queue, we are most in need of
@@ -35,7 +33,7 @@ module GitLab
         end
       end
 
-      def initialize(opts, metrics: PrometheusMetrics.new, logger: nil)
+      def initialize(metrics: PrometheusMetrics.new, logger: nil, **opts)
         @opts    = opts
         @metrics = metrics
         @logger  = logger
@@ -72,45 +70,40 @@ module GitLab
         self
       end
 
-      # Count worker classes present in Sidekiq queues. This uses a Lua
-      # script to find all jobs in all queues. That script will block
-      # all other Redis commands:
-      # https://redis.io/commands/eval#atomicity-of-scripts
-      #
-      # The script is generally fast, but may be slower with very large
-      # queues, which is why this is not enabled by default.
       def probe_jobs
+        puts "[REMOVED] probe_jobs is now considered obsolete and does not emit any metrics,"\
+             " please use probe_jobs_limit instead"
+
+        self
+      end
+
+      def probe_future_sets
+        now = Time.now.to_f
         with_sidekiq do
-          job_stats = {}
+          Sidekiq.redis do |conn|
+            Sidekiq::Scheduled::SETS.each do |set|
+              # Default to 0; if all jobs are due in the future, there is no "negative" delay.
+              delay = 0
 
-          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
+              _job, timestamp = conn.zrangebyscore(set, "-inf", now.to_s, limit: [0, 1], withscores: true).first
+              delay = now - timestamp if timestamp
 
-          job_stats.each do |class_name, count|
-            @metrics.add("sidekiq_enqueued_jobs", count, name: class_name)
+              @metrics.add("sidekiq_#{set}_set_processing_delay_seconds", delay)
+
+              # zcount is O(log(N)) (prob. binary search), so is still quick even with large sets
+              @metrics.add("sidekiq_#{set}_set_backlog_count",
+                           conn.zcount(set, "-inf", now.to_s))
+            end
           end
         end
-
-        self
       end
 
-      # This does the same as #probe_jobs, but only looks at the first
-      # PROBE_JOBS_LIMIT jobs in each queue. This means that we run a
+      # Count worker classes present in Sidekiq queues. This only looks at the
+      # first PROBE_JOBS_LIMIT jobs in each queue. This means that we run a
       # single LRANGE command for each queue, which does not block other
-      # commands. For queues over PROBE_JOBS_LIMIT in size, this means
-      # that we will not have completely accurate statistics, but the
-      # probe performance will also not degrade as the queue gets
-      # larger.
-      #
-      # DO NOT USE this and probe_jobs together, as they export the same
-      # metric (sidekiq_enqueued_jobs).
+      # commands. For queues over PROBE_JOBS_LIMIT in size, this means that we
+      # will not have completely accurate statistics, but the probe performance
+      # will also not degrade as the queue gets larger.
       def probe_jobs_limit
         with_sidekiq do
           job_stats = Hash.new(0)
@@ -218,14 +211,9 @@ module GitLab
       def 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.
-          conn.redis.script(:load, QUEUE_JOB_STATS_SCRIPT) unless conn.redis.script(:exists, QUEUE_JOB_STATS_SHA)
+          @connected = (conn.ping == "PONG")
         end
-
-        @connected = true
       rescue Redis::BaseConnectionError => e
         @logger&.error "Error connecting to the Redis: #{e}"
         @connected = false

data/lib/gitlab_exporter/version.rb

@@ -1,5 +1,5 @@
 module GitLab
   module Exporter
-    VERSION = "10.5.0".freeze
+    VERSION = "11.2.0".freeze
   end
 end

data/lib/gitlab_exporter/web_exporter.rb

@@ -89,7 +89,7 @@ module GitLab
 
             get "/#{probe_name}" do
               content_type "text/plain; version=0.0.4"
-              prober = Prober.new(opts, metrics: PrometheusMetrics.new(include_timestamp: false), logger: logger)
+              prober = Prober.new(metrics: PrometheusMetrics.new(include_timestamp: false), logger: logger, **opts)
 
               prober.probe_all
               prober.write_to(response)

data/spec/database/bloat_spec.rb

@@ -26,7 +26,7 @@ describe GitLab::Exporter::Database::BloatCollector do
 end
 
 describe GitLab::Exporter::Database::BloatProber do
-  let(:opts) { { bloat_types: %i[btree table] } }
+  let(:opts) { { bloat_types: %i[btree table], connection_string: "" } }
   let(:metrics) { double("PrometheusMetrics", add: nil) }
   let(:collector) { double("BloatCollector", run: data) }
 
@@ -43,7 +43,7 @@ describe GitLab::Exporter::Database::BloatProber do
   end
 
   describe "#probe_db" do
-    subject { described_class.new(opts, metrics: metrics, collector: collector, logger: STDOUT).probe_db }
+    subject { described_class.new(metrics: metrics, collector: collector, logger: STDOUT, **opts).probe_db }
 
     before do
       expect(collector).to receive(:logger=).with(STDOUT)
@@ -92,7 +92,7 @@ describe GitLab::Exporter::Database::BloatProber do
   describe "#write_to" do
     let(:target) { double }
     let(:metrics) { double("PrometheusMetrics", to_s: double) }
-    subject { described_class.new(opts, metrics: metrics).write_to(target) }
+    subject { described_class.new(metrics: metrics, **opts).write_to(target) }
 
     it "writes to given target" do
       expect(target).to receive(:write).with(metrics.to_s)

data/spec/database/ci_builds_spec.rb

@@ -216,11 +216,12 @@ describe GitLab::Exporter::Database do
   describe GitLab::Exporter::Database::CiBuildsProber do
     let(:writer) { StringIO.new }
     let(:prober) do
-      opts = { connection_string: "host=localhost",
-               created_builds_counting_disabled: created_builds_counting_disabled,
-               unarchived_traces_offset_minutes: unarchived_traces_offset_minutes }
-      described_class.new(opts,
-                          metrics: GitLab::Exporter::PrometheusMetrics.new(include_timestamp: false))
+      described_class.new(
+        connection_string: "host=localhost",
+        created_builds_counting_disabled: created_builds_counting_disabled,
+        unarchived_traces_offset_minutes: unarchived_traces_offset_minutes,
+        metrics: GitLab::Exporter::PrometheusMetrics.new(include_timestamp: false)
+      )
     end
 
     before do

data/spec/git_spec.rb

@@ -34,17 +34,17 @@ context "With valid pair of repositories" do
   end
 
   describe GitLab::Exporter::GitProber do
-    let(:options) { GitProberOptions.new(repos.cloned_repo, {}) }
+    let(:options) { { source: repos.cloned_repo, labels: {} } }
     let(:output) { StringIO.new }
 
     it "probes and monitors a pull" do
-      prober = GitLab::Exporter::GitProber.new(options)
+      prober = GitLab::Exporter::GitProber.new(**options)
       prober.probe_pull.write_to(output)
       expect(output.string).to match(/git_pull_time_milliseconds \d+ \d+/)
     end
 
     it "probes and monitors a push" do
-      prober = GitLab::Exporter::GitProber.new(options)
+      prober = GitLab::Exporter::GitProber.new(**options)
       prober.probe_push.write_to(output)
       expect(output.string).to match(/git_push_time_milliseconds \d+ \d+/)
     end

data/spec/ruby_spec.rb

@@ -3,7 +3,7 @@ require "gitlab_exporter/ruby"
 require "gitlab_exporter/prober"
 
 describe GitLab::Exporter::RubyProber do
-  let(:prober) { GitLab::Exporter::Prober.new(options) }
+  let(:prober) { GitLab::Exporter::Prober.new(**options) }
 
   let(:options) do
     {

data/spec/spec_helper.rb

@@ -40,8 +40,6 @@ class GitRepoBuilder
   end
 end
 
-GitProberOptions = Struct.new(:source, :labels)
-
 class CLIArgs
   def initialize(args)
     @arguments = args

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-exporter
 version: !ruby/object:Gem::Version
-  version: 10.5.0
+  version: 11.2.0
 platform: ruby
 authors:
 - Pablo Carranza
@@ -112,16 +112,16 @@ dependencies:
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.8.1
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.8.1
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +189,6 @@ files:
 - 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
 - lib/gitlab_exporter/version.rb
 - lib/gitlab_exporter/web_exporter.rb

data/lib/gitlab_exporter/sidekiq_queue_job_stats.lua

@@ -1,42 +0,0 @@
---
--- Adapted from https://github.com/mperham/sidekiq/blob/2f9258e4fe77991c526f7a65c92bcf792eef8338/lib/sidekiq/api.rb#L231
---
-local queue_name      = KEYS[1]
-local initial_size    = redis.call('llen', queue_name)
-local deleted_size    = 0
-local page            = 0
-local page_size       = 2000
-local temp_job_stats  = {}
-local final_job_stats = {}
-
-while true do
-  local range_start = page * page_size - deleted_size
-  local range_end   = range_start + page_size - 1
-  local entries     = redis.call('lrange', queue_name, range_start, range_end)
-
-  if #entries == 0 then
-    break
-  end
-
-  page = page + 1
-
-  for index, entry in next, entries do
-    local class = cjson.decode(entry)['class']
-    if class ~= nil then
-      if temp_job_stats[class] ~= nil then
-        temp_job_stats[class] = temp_job_stats[class] + 1
-      else
-        temp_job_stats[class] = 1
-      end
-    end
-  end
-
-  deleted_size = initial_size - redis.call('llen', queue_name)
-end
-
-for class, count in next, temp_job_stats do
-  local stat_entry = {class, count}
-  table.insert(final_job_stats, stat_entry)
-end
-
-return final_job_stats