gitlab-exporter 13.1.0 → 13.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e25742f97cb40db0a84768e5b780c3d4d29af3c35ce456cc54ab5cebbf39ded7
-  data.tar.gz: 13cf4d4d86554c783d9c7cb1a7c9db42189b0fd6fe520e10f15b084cb5b43761
+  metadata.gz: 8a115af5d2f6c523fe9a6fb55e09e47bbae42b6fdee96d20e2f0987e758546be
+  data.tar.gz: cbb66dac910580239114923f0b70ad40a6580cac4a1b29e69e308559c6619e3e
 SHA512:
-  metadata.gz: 7f48b26649ec291a96b41976d6b674171667c43ab0f8de188809e9d22fdb3d0ee0d17c33ac1ef30a4f217f1f52c701335a88ed600a915797d8013a264359bdde
-  data.tar.gz: 954a83f62a78a78244503a2b47c5bfe9fc2fac338e46cf692d03731b53b459ec715e83b4bbd5df5320c55efe47c8e7db17b0af944fb490e09ee1b1453b4bf6a3
+  metadata.gz: bfe2f5921dbd280826ba2e959d1bdc09fdf721f691e32c31f12e8948805a4103b30e29cc3286b56be1c4fd9d7e766b5b5e4b7df8ae117d1a53a6b03e4bfdda7d
+  data.tar.gz: d0dde2e781ad6599e7944c400d2efd92272b43c813229a26754cf944da6972563154c35d9f5f1f75678ecb4537edef61cb6cc13f0a8cb433a7a5922b4c755993

data/.gitlab-ci.yml

@@ -7,7 +7,7 @@ include:
   - 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"
+  RUBY_VERSION: "3.2"
 
 stages:
   - test
@@ -43,7 +43,7 @@ rspec:
   before_script: *before_scripts
   parallel:
     matrix:
-      - RUBY_VERSION: ["2.7", "3.0", "3.1", "3.2"]
+      - RUBY_VERSION: ["3.0", "3.1", "3.2"]
 
 rspec_integration:
   script:
@@ -55,7 +55,7 @@ rspec_integration:
     REDIS_URL: "redis://redis"
   parallel:
     matrix:
-      - RUBY_VERSION: ["2.7", "3.0", "3.1", "3.2"]
+      - RUBY_VERSION: ["3.0", "3.1", "3.2"]
 
 rubocop:
   script:

data/.rubocop_todo.yml

@@ -1,19 +1,35 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-01-11 12:24:03 UTC using RuboCop version 0.93.1.
+# on 2023-09-25 18:54:37 UTC using RuboCop version 1.56.3.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-# Configuration parameters: Include.
+# Configuration parameters: Severity, Include.
 # Include: **/*.gemspec
 Gemspec/RequiredRubyVersion:
   Exclude:
     - 'gitlab-exporter.gemspec'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleAlignWith, Severity.
+# SupportedStylesAlignWith: start_of_line, begin
+Layout/BeginEndAlignment:
+  Exclude:
+    - 'lib/gitlab_exporter/git.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Layout/RescueEnsureAlignment:
+  Exclude:
+    - 'lib/gitlab_exporter/git.rb'
+
 # Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'spec/git_spec.rb'
@@ -27,38 +43,83 @@ Lint/MissingCopEnableDirective:
     - 'spec/git_process_proper_spec.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
 Lint/NonDeterministicRequireOrder:
   Exclude:
     - 'spec/spec_helper.rb'
 
-# Offense count: 16
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
-# ExcludedMethods: refine
+# Offense count: 17
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
+# AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 349
+  Max: 285
 
-# Offense count: 1
-# Configuration parameters: IgnoredMethods.
+# Offense count: 3
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 8
 
 # Offense count: 1
-# Configuration parameters: IgnoredMethods.
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 9
 
+# Offense count: 9
+# Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
+# SupportedStyles: snake_case, normalcase, non_integer
+# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
+Naming/VariableNumber:
+  Exclude:
+    - 'spec/database/row_count_spec.rb'
+
+# Offense count: 16
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: separated, grouped
+Style/AccessorGrouping:
+  Exclude:
+    - 'lib/gitlab_exporter/memstats/mapping.rb'
+
+# Offense count: 8
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/GlobalStdStream:
+  Exclude:
+    - 'lib/gitlab_exporter/cli.rb'
+    - 'spec/database/bloat_spec.rb'
+
 # Offense count: 1
-# Configuration parameters: EnforcedStyle, AllowModifiersOnSymbols.
-# SupportedStyles: inline, group
-Style/AccessModifierDeclarations:
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowedReceivers.
+# AllowedReceivers: Thread.current
+Style/HashEachMethods:
   Exclude:
     - 'lib/gitlab_exporter/util.rb'
 
+# Offense count: 9
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: respond_to_missing?
+Style/OptionalBooleanParameter:
+  Exclude:
+    - 'lib/gitlab_exporter/prometheus.rb'
+    - 'lib/gitlab_exporter/sidekiq.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantRegexpEscape:
+  Exclude:
+    - 'lib/gitlab_exporter/git.rb'
+
 # Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
 # AllowedMethods: present?, blank?, presence, try, try!
 Style/SafeNavigation:
   Exclude:
     - 'lib/gitlab_exporter/database/base.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Mode.
+Style/StringConcatenation:
+  Exclude:
+    - 'lib/gitlab_exporter/database/row_count.rb'

data/.ruby-version

@@ -1 +1 @@
-2.7.7
+3.2.2

data/Gemfile

@@ -4,5 +4,5 @@ gemspec
 
 group :test do
   gem "rspec", "~>3.12"
-  gem "rubocop", "~>0.42"
+  gem "rubocop", "~> 1.52"
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-exporter (13.1.0)
+    gitlab-exporter (13.3.0)
       connection_pool (= 2.2.5)
       faraday (~> 1.8.0)
       pg (= 1.5.3)
@@ -16,7 +16,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
+    ast (2.4.2)
+    base64 (0.1.1)
     connection_pool (2.2.5)
     diff-lcs (1.5.0)
     faraday (1.8.0)
@@ -38,26 +39,30 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
     multipart-post (2.2.3)
     mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
     nio4r (2.5.8)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     pg (1.5.3)
     puma (5.6.5)
       nio4r (~> 2.0)
     quantile (0.2.1)
+    racc (1.7.1)
     rack (2.2.5)
     rack-protection (2.2.4)
       rack
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     redis (4.4.0)
     redis-namespace (1.9.0)
       redis (>= 4)
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
+    regexp_parser (2.8.1)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -71,18 +76,21 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (0.93.1)
+    rubocop (1.56.3)
+      base64 (~> 0.1.1)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
-      rexml
-      rubocop-ast (>= 0.6.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.4.0)
-      parser (>= 2.7.1.5)
-    ruby-progressbar (1.11.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     sidekiq (6.4.0)
       connection_pool (>= 2.2.2)
@@ -94,7 +102,7 @@ GEM
       rack-protection (= 2.2.4)
       tilt (~> 2.0)
     tilt (2.0.11)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.4.2)
     webrick (1.7.0)
 
 PLATFORMS
@@ -104,7 +112,7 @@ DEPENDENCIES
   gitlab-exporter!
   rspec (~> 3.12)
   rspec-expectations (~> 3.12.0)
-  rubocop (~> 0.42)
+  rubocop (~> 1.52)
 
 BUNDLED WITH
    2.4.5

data/config/gitlab-exporter.yml.example

@@ -95,6 +95,8 @@ probes:
     opts:
       redis_url: "redis://localhost:6379"
       redis_enable_client: true
+      probe_namespaced: true
+      probe_non_namespaced: true
 
   ruby: &ruby
     class_name: RubyProber

data/gitlab-exporter.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.description   = "GitLab metrics exporter to use with prometheus"
   s.authors       = ["Pablo Carranza"]
   s.email         = "pablo@gitlab.com"
+  s.required_ruby_version = ">= 3.0.0"
 
   s.files         = `git ls-files -z`.split("\x0")
 

data/lib/gitlab_exporter/cli.rb

@@ -1,19 +1,5 @@
 require "yaml"
 
-# TODO: Remove this once we're on Ruby 3
-# https://gitlab.com/gitlab-org/gitlab/-/issues/393651
-unless YAML.respond_to?(:safe_load_file)
-  module YAML # rubocop:disable Style/Documentation
-    # Temporary Ruby 2 back-compat workaround.
-    #
-    # This method only exists as of stdlib 3.0.0:
-    # https://ruby-doc.org/stdlib-3.0.0/libdoc/psych/rdoc/Psych.html
-    def self.safe_load_file(path, **options)
-      YAML.safe_load(File.read(path), **options)
-    end
-  end
-end
-
 module GitLab
   module Exporter
     # Stores runner classes in a single place

data/lib/gitlab_exporter/sidekiq.rb

@@ -7,6 +7,7 @@ module GitLab
     # A prober for Sidekiq queues
     #
     # It takes the Redis URL Sidekiq is connected to
+    # rubocop:disable Metrics/ClassLength
     class SidekiqProber
       # 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
@@ -37,35 +38,24 @@ module GitLab
         @opts    = opts
         @metrics = metrics
         @logger  = logger
+
+        @probe_namespaced = !!opts[:probe_namespaced] # rubocop:disable Style/DoubleNegation
+        @probe_non_namespaced = !!opts[:probe_non_namespaced] # rubocop:disable Style/DoubleNegation
+
+        # to maintain backward compatibility if the config is missing values
+        @probe_namespaced = true if opts[:probe_namespaced].nil? && opts[:probe_non_namespaced].nil?
       end
 
       def probe_stats
-        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
+        with_sidekiq { _probe_stats } if @probe_namespaced
+        with_sidekiq(false) { _probe_stats(false) } if @probe_non_namespaced
 
         self
       end
 
       def probe_queues
-        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
+        with_sidekiq { _probe_queues } if @probe_namespaced
+        with_sidekiq(false) { _probe_queues(false) } if @probe_non_namespaced
 
         self
       end
@@ -78,24 +68,8 @@ module GitLab
       end
 
       def probe_future_sets
-        now = Time.now.to_f
-        with_sidekiq do
-          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
-
-              _job, timestamp = conn.zrangebyscore(set, "-inf", now.to_s, limit: [0, 1], withscores: true).first
-              delay = now - timestamp if timestamp
-
-              @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
+        with_sidekiq { _probe_future_sets } if @probe_namespaced
+        with_sidekiq(false) { _probe_future_sets(false) } if @probe_non_namespaced
       end
 
       # Count worker classes present in Sidekiq queues. This only looks at the
@@ -105,57 +79,22 @@ module GitLab
       # 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)
-
-          Sidekiq::Queue.all.each do |queue|
-            Sidekiq.redis do |conn|
-              conn.lrange("queue:#{queue.name}", 0, PROBE_JOBS_LIMIT).each do |job|
-                job_class = Sidekiq.load_json(job)["class"]
-
-                job_stats[job_class] += 1
-              end
-            end
-          end
-
-          job_stats.each do |class_name, count|
-            @metrics.add("sidekiq_enqueued_jobs", count, name: class_name)
-          end
-        end
+        with_sidekiq { _probe_jobs_limit } if @probe_namespaced
+        with_sidekiq(false) { _probe_jobs_limit(false) } if @probe_non_namespaced
 
         self
       end
 
       def probe_workers
-        with_sidekiq do
-          worker_stats = Hash.new(0)
-
-          Sidekiq::Workers.new.map do |_pid, _tid, work|
-            job_klass = work["payload"]["class"]
-
-            worker_stats[job_klass] += 1
-          end
-
-          worker_stats.each do |class_name, count|
-            @metrics.add("sidekiq_running_jobs", count, name: class_name)
-          end
-        end
+        with_sidekiq { _probe_workers } if @probe_namespaced
+        with_sidekiq(false) { _probe_workers(false) } if @probe_non_namespaced
 
         self
       end
 
       def probe_retries
-        with_sidekiq do
-          retry_stats = Hash.new(0)
-
-          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)
-          end
-        end
+        with_sidekiq { _probe_retries } if @probe_namespaced
+        with_sidekiq(false) { _probe_retries(false) } if @probe_non_namespaced
 
         self
       end
@@ -177,12 +116,106 @@ module GitLab
 
       private
 
-      def with_sidekiq
+      def _probe_workers(namespace = true)
+        labels = add_namespace_labels? ? { namespaced: namespace } : {}
+        worker_stats = Hash.new(0)
+
+        Sidekiq::Workers.new.map do |_pid, _tid, work|
+          job_klass = work["payload"]["class"]
+
+          worker_stats[job_klass] += 1
+        end
+
+        worker_stats.each do |class_name, count|
+          @metrics.add("sidekiq_running_jobs", count, **labels.merge({ name: class_name }))
+        end
+      end
+
+      def _probe_future_sets(namespace = true)
+        labels = add_namespace_labels? ? { namespaced: namespace } : {}
+        now = Time.now.to_f
+        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
+
+            _job, timestamp = conn.zrangebyscore(set, "-inf", now.to_s, limit: [0, 1], withscores: true).first
+            delay = now - timestamp if timestamp
+
+            @metrics.add("sidekiq_#{set}_set_processing_delay_seconds", delay, **labels)
+
+            # 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), **labels)
+          end
+        end
+      end
+
+      def _probe_stats(namespace = true)
+        stats = Sidekiq::Stats.new
+        labels = add_namespace_labels? ? { namespaced: namespace } : {}
+
+        @metrics.add("sidekiq_jobs_processed_total", stats.processed, **labels)
+        @metrics.add("sidekiq_jobs_failed_total", stats.failed, **labels)
+        @metrics.add("sidekiq_jobs_enqueued_size", stats.enqueued, **labels)
+        @metrics.add("sidekiq_jobs_scheduled_size", stats.scheduled_size, **labels)
+        @metrics.add("sidekiq_jobs_retry_size", stats.retry_size, **labels)
+        @metrics.add("sidekiq_jobs_dead_size", stats.dead_size, **labels)
+
+        @metrics.add("sidekiq_default_queue_latency_seconds", stats.default_queue_latency, **labels)
+        @metrics.add("sidekiq_processes_size", stats.processes_size, **labels)
+        @metrics.add("sidekiq_workers_size", stats.workers_size, **labels)
+      end
+
+      def _probe_queues(namespace = true)
+        Sidekiq::Queue.all.each do |queue|
+          labels = { name: queue.name }
+          labels[:namespaced] = namespace if add_namespace_labels?
+
+          @metrics.add("sidekiq_queue_size", queue.size, **labels)
+          @metrics.add("sidekiq_queue_latency_seconds", queue.latency, **labels)
+          @metrics.add("sidekiq_queue_paused", queue.paused? ? 1 : 0, **labels)
+        end
+      end
+
+      def _probe_jobs_limit(namespace = true)
+        labels = add_namespace_labels? ? { namespaced: namespace } : {}
+        job_stats = Hash.new(0)
+
+        Sidekiq::Queue.all.each do |queue|
+          Sidekiq.redis do |conn|
+            conn.lrange("queue:#{queue.name}", 0, PROBE_JOBS_LIMIT).each do |job|
+              job_class = Sidekiq.load_json(job)["class"]
+
+              job_stats[job_class] += 1
+            end
+          end
+        end
+
+        job_stats.each do |class_name, count|
+          @metrics.add("sidekiq_enqueued_jobs", count, **labels.merge({ name: class_name }))
+        end
+      end
+
+      def _probe_retries(namespace = true)
+        labels = add_namespace_labels? ? { namespaced: namespace } : {}
+        retry_stats = Hash.new(0)
+
+        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, **labels.merge({ name: class_name }))
+        end
+      end
+
+      def with_sidekiq(namespaced = true)
         # 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]
+          config.redis = self.class.connection_pool[redis_options(namespaced)]
         end
 
         return unless connected?
@@ -190,14 +223,14 @@ module GitLab
         yield
       end
 
-      def redis_options
+      def redis_options(namespaced = true)
         options = {
           url: @opts[:redis_url],
-          namespace: "resque:gitlab",
           connect_timeout: 1,
           reconnect_attempts: 0
         }
 
+        options[:namespace] = "resque:gitlab" if namespaced
         options[:id] = nil unless redis_enable_client?
         options
       end
@@ -218,6 +251,11 @@ module GitLab
         @logger&.error "Error connecting to the Redis: #{e}"
         @connected = false
       end
+
+      def add_namespace_labels?
+        @probe_namespaced && @probe_non_namespaced
+      end
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/gitlab_exporter/version.rb

@@ -1,5 +1,5 @@
 module GitLab
   module Exporter
-    VERSION = "13.1.0".freeze
+    VERSION = "13.3.0".freeze
   end
 end

data/spec/sidekiq_spec.rb

@@ -0,0 +1,64 @@
+require "spec_helper"
+require "gitlab_exporter/sidekiq"
+
+describe GitLab::Exporter::SidekiqProber do
+  let(:probe_list) { %w[probe_stats probe_queues probe_future_sets probe_jobs_limit probe_workers probe_retries] }
+  let(:opt) { {} }
+  let(:probe) { described_class.new(**opt) }
+
+  before do
+    # stub connection as we want check if the probe methods are called
+    # with the right namespace argument
+    allow(probe).to receive(:connected?).and_return(true)
+  end
+
+  context "when no namespace options are defined" do
+    it "defaults to probing non-namespaced keys only" do
+      probe_list.each do |probe_type|
+        expect(probe).not_to receive("_#{probe_type}".to_sym).with(false)
+        expect(probe).to receive("_#{probe_type}".to_sym).with(no_args)
+
+        probe.send(probe_type)
+      end
+    end
+  end
+
+  context "when probing both namespaces" do
+    let(:opt) { { probe_non_namespaced: true, probe_namespaced: true } }
+
+    it "probes both namespaces" do
+      probe_list.each do |probe_type|
+        expect(probe).to receive("_#{probe_type}".to_sym).with(false)
+        expect(probe).to receive("_#{probe_type}".to_sym).with(no_args)
+
+        probe.send(probe_type)
+      end
+    end
+  end
+
+  context "when probing non-namespaced only" do
+    let(:opt) { { probe_non_namespaced: true } }
+
+    it "probes non-namespaced only" do
+      probe_list.each do |probe_type|
+        expect(probe).to receive("_#{probe_type}".to_sym).with(false)
+        expect(probe).not_to receive("_#{probe_type}".to_sym).with(no_args)
+
+        probe.send(probe_type)
+      end
+    end
+  end
+
+  context "when probing namespace only" do
+    let(:opt) { { probe_namespaced: true } }
+
+    it "probes namespaced only" do
+      probe_list.each do |probe_type|
+        expect(probe).not_to receive("_#{probe_type}".to_sym).with(false)
+        expect(probe).to receive("_#{probe_type}".to_sym).with(no_args)
+
+        probe.send(probe_type)
+      end
+    end
+  end
+end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-exporter
 version: !ruby/object:Gem::Version
-  version: 13.1.0
+  version: 13.3.0
 platform: ruby
 authors:
 - Pablo Carranza
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2016-07-27 00:00:00.000000000 Z
@@ -235,13 +235,14 @@ files:
 - spec/memstats_spec.rb
 - spec/prometheus_metrics_spec.rb
 - spec/ruby_spec.rb
+- spec/sidekiq_spec.rb
 - spec/spec_helper.rb
 - spec/util_spec.rb
 homepage: http://gitlab.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -249,15 +250,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: GitLab metrics exporter
 test_files:
@@ -273,5 +274,6 @@ test_files:
 - spec/memstats_spec.rb
 - spec/prometheus_metrics_spec.rb
 - spec/ruby_spec.rb
+- spec/sidekiq_spec.rb
 - spec/spec_helper.rb
 - spec/util_spec.rb