gitlab-exporter 15.6.0 → 16.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be5eae9de48805398cb677af26e8b81df7435975413610d772873982e9169ca0
-  data.tar.gz: 56d752f6f03d1624ac336d98565a198b7eee29a237b38e11c920aceda4eee7e4
+  metadata.gz: f8f9e18ad6f1758709b718bb67c3491f654a01078aa7835462a0e346731adff9
+  data.tar.gz: affa763080262ed9621f7d51f8342aaebb2ca8cd5f6296b730a02a042d62b816
 SHA512:
-  metadata.gz: '08ce3e0e1a87ff46fc48e69ec458ae795a2ed2e117c4ccdc05c4fd036051d56e73bc8edd9ae270e7a52b9fa012c5c8f343595ffd1a8da55e3dfa468b9d4f1127'
-  data.tar.gz: ab467b4ae68d9a8b3bc5ea7a68d0130378b5859cee0160079aff9aac7f3bb6e48b609d213d558965c0badffcedddc3b8926921c059f765263a5d6ef23ab8132a
+  metadata.gz: 7148d67304d3605314d65ce4c33a4450f33853a086da26150ee19532353db76d05d43326de068894f5d88ee879496ead866917ca2753e37623affab5e9b02292
+  data.tar.gz: 8d677307d6a128a01c695ce1cec716f31673032ad744bb600a89e713e9ae32ffa39e93ab22790d4e09fca6f485c1664e000ddf627d1bab31ad49e18d5e6f3891

data/.gitlab-ci.yml

@@ -7,7 +7,7 @@ include:
   - template: Security/Dependency-Scanning.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml
 
 variables:
-  RUBY_VERSION: "2.7"
+  RUBY_VERSION: "3.3"
 
 stages:
   - test
@@ -17,6 +17,7 @@ stages:
 default:
   image: ruby:${RUBY_VERSION}
   cache:
+    key: ruby-${RUBY_VERSION}
     paths:
       - vendor
   tags:
@@ -26,6 +27,15 @@ default:
   - git config --global user.email "bot@gitlab.com"
   - git config --global user.name "Bot User"
   - bundle config set --local deployment true
+  - |
+     # Bundler 2.7.1 and up require Ruby 3.2 and up, so
+     # to avoid https://github.com/rubygems/rubygems/issues/5380 use an
+     # older Bundler version.
+     case ${RUBY_VERSION} in
+       "3.0"|"3.1")
+           export BUNDLER_VERSION="2.4.20"
+           ;;
+     esac
   - bundle install -j $(nproc)
 
 workflow:
@@ -43,7 +53,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", "3.3", "3.4"]
 
 rspec_integration:
   script:
@@ -78,7 +88,7 @@ rspec_integration:
     REDIS_SENTINEL_PASSWORD: "my-sentinel-password"
   parallel:
     matrix:
-      - RUBY_VERSION: ["2.7", "3.0", "3.1", "3.2"]
+      - RUBY_VERSION: ["3.0", "3.1", "3.2", "3.3", "3.4"]
 
 rubocop:
   script:

data/.rubocop.yml

@@ -1,7 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   DisplayCopNames: true
 
 # Just use double quotes please

data/.rubocop_todo.yml

@@ -1,19 +1,14 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-01-11 12:24:03 UTC using RuboCop version 0.93.1.
+# on 2025-08-06 20:59:18 UTC using RuboCop version 1.79.1.
 # 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.
-# Include: **/*.gemspec
-Gemspec/RequiredRubyVersion:
-  Exclude:
-    - 'gitlab-exporter.gemspec'
-
 # Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'spec/git_spec.rb'
@@ -26,38 +21,32 @@ Lint/MissingCopEnableDirective:
     - 'spec/database/ci_builds_spec.rb'
     - 'spec/git_process_proper_spec.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Lint/NonDeterministicRequireOrder:
-  Exclude:
-    - 'spec/spec_helper.rb'
-
-# Offense count: 16
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
-# ExcludedMethods: refine
+# Offense count: 24
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
+# AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 349
+  Max: 297
 
-# Offense count: 1
-# Configuration parameters: IgnoredMethods.
+# Offense count: 2
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 8
 
 # Offense count: 1
-# Configuration parameters: IgnoredMethods.
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 9
 
 # Offense count: 1
-# Configuration parameters: EnforcedStyle, AllowModifiersOnSymbols.
-# SupportedStyles: inline, group
-Style/AccessModifierDeclarations:
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: respond_to_missing?
+Style/OptionalBooleanParameter:
   Exclude:
-    - 'lib/gitlab_exporter/util.rb'
+    - 'lib/gitlab_exporter/prometheus.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
+# Offense count: 3
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
 # AllowedMethods: present?, blank?, presence, try, try!
 Style/SafeNavigation:
   Exclude:

data/.ruby-version

@@ -1 +1 @@
-2.7.7
+3.0.7

data/Gemfile

@@ -3,6 +3,5 @@ source "https://rubygems.org"
 gemspec
 
 group :test do
-  gem "rspec", "~>3.12"
-  gem "rubocop", "~>0.42"
+  gem "rubocop", "~>1.0"
 end

data/Gemfile.lock

@@ -1,51 +1,58 @@
 PATH
   remote: .
   specs:
-    gitlab-exporter (15.6.0)
-      connection_pool (= 2.2.5)
+    gitlab-exporter (16.1.0)
+      connection_pool (= 2.5.3)
       deep_merge (~> 1.2.2)
-      faraday (>= 1.8.0, <= 2.8.1)
-      pg (= 1.5.9)
-      puma (= 5.6.8)
+      faraday (= 2.13.4)
+      pg (= 1.6.1)
+      puma (= 6.6.1)
       quantile (= 0.2.1)
-      redis (= 4.5.0)
-      redis-namespace (= 1.9.0)
+      redis (= 4.8.1)
+      redis-namespace (= 1.11.0)
       sidekiq (= 6.5.12)
-      sinatra (~> 2.2.0)
-      webrick (~> 1.7)
+      sinatra (~> 3.2.0)
+      webrick (~> 1.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
+    ast (2.4.3)
     base64 (0.2.0)
-    connection_pool (2.2.5)
+    connection_pool (2.5.3)
     deep_merge (1.2.2)
     diff-lcs (1.5.0)
-    faraday (2.8.1)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
+    faraday (2.13.4)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
     faraday-net_http (3.0.2)
-    mustermann (2.0.2)
+    json (2.13.2)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
     nio4r (2.7.4)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    parallel (1.27.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
-    pg (1.5.9)
-    puma (5.6.8)
+      racc
+    pg (1.6.1)
+    prism (1.4.0)
+    puma (6.6.1)
       nio4r (~> 2.0)
     quantile (0.2.1)
+    racc (1.8.1)
     rack (2.2.15)
-    rack-protection (2.2.4)
-      rack
-    rainbow (3.0.0)
-    redis (4.5.0)
-    redis-namespace (1.9.0)
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
+      rack (~> 2.2, >= 2.2.4)
+    rainbow (3.1.1)
+    redis (4.8.1)
+    redis-namespace (1.11.0)
       redis (>= 4)
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
+    regexp_parser (2.11.0)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -59,30 +66,35 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (0.93.1)
+    rubocop (1.79.1)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
-      rexml
-      rubocop-ast (>= 0.6.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.46.0, < 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, < 4.0)
+    rubocop-ast (1.46.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     sidekiq (6.5.12)
       connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
       redis (>= 4.5.0, < 5)
-    sinatra (2.2.4)
-      mustermann (~> 2.0)
-      rack (~> 2.2)
-      rack-protection (= 2.2.4)
+    sinatra (3.2.0)
+      mustermann (~> 3.0)
+      rack (~> 2.2, >= 2.2.4)
+      rack-protection (= 3.2.0)
       tilt (~> 2.0)
     tilt (2.6.0)
-    unicode-display_width (1.7.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
     webrick (1.9.1)
 
 PLATFORMS
@@ -90,9 +102,9 @@ PLATFORMS
 
 DEPENDENCIES
   gitlab-exporter!
-  rspec (~> 3.12)
+  rspec (~> 3.12.0)
   rspec-expectations (~> 3.12.0)
-  rubocop (~> 0.42)
+  rubocop (~> 1.0)
 
 BUNDLED WITH
-   2.4.20
+   2.7.1

data/gitlab-exporter.gemspec

@@ -20,19 +20,19 @@ Gem::Specification.new do |s|
   s.homepage      = "https://gitlab.com/gitlab-org/ruby/gems/gitlab-exporter"
   s.license       = "MIT"
 
-  s.add_runtime_dependency "connection_pool", "2.2.5"
+  s.required_ruby_version = Gem::Requirement.new(">= 3.0")
+
+  s.add_runtime_dependency "connection_pool", "2.5.3"
   s.add_runtime_dependency "deep_merge", "~> 1.2.2"
-  # Lock to 2.8.1 until RubyGems 3.5.5 is shipped with the fix for
-  # https://github.com/rubygems/rubygems/issues/7374
-  s.add_runtime_dependency "faraday", [">= 1.8.0", "<= 2.8.1"]
-  s.add_runtime_dependency "pg", "1.5.9"
-  s.add_runtime_dependency "puma", "5.6.8"
+  s.add_runtime_dependency "faraday", "2.13.4"
+  s.add_runtime_dependency "pg", "1.6.1"
+  s.add_runtime_dependency "puma", "6.6.1"
   s.add_runtime_dependency "quantile", "0.2.1"
-  s.add_runtime_dependency "redis", "4.5.0"
-  s.add_runtime_dependency "redis-namespace", "1.9.0"
+  s.add_runtime_dependency "redis", "4.8.1"
+  s.add_runtime_dependency "redis-namespace", "1.11.0"
   s.add_runtime_dependency "sidekiq", "6.5.12"
-  s.add_runtime_dependency "sinatra", "~> 2.2.0"
-  s.add_runtime_dependency "webrick", "~> 1.7"
+  s.add_runtime_dependency "sinatra", "~> 3.2.0"
+  s.add_runtime_dependency "webrick", "~> 1.9"
 
   s.add_development_dependency "rspec", "~> 3.12.0"
   s.add_development_dependency "rspec-expectations", "~> 3.12.0"

data/lib/gitlab_exporter/cli.rb

@@ -2,20 +2,6 @@ require "yaml"
 require "deep_merge"
 require "English"
 
-# 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
@@ -58,7 +44,7 @@ module GitLab
           @options = options(args)
           args = @options.parse!
           @source = args.shift
-          @target = args.shift || STDOUT
+          @target = args.shift || $stdout
           @labels ||= {}
         end
 
@@ -93,7 +79,7 @@ module GitLab
 
       # Database tuple stats runner.
       #
-      # It will take a database connection string and print results to STDOUT
+      # It will take a database connection string and print results to $stdout
       class DatabaseTupleStats
         COMMAND_NAME = "db-tuple-stats".freeze
 
@@ -101,7 +87,7 @@ module GitLab
           @options = options(args)
           @options.parse!
 
-          @target = args.shift || STDOUT
+          @target = args.shift || $stdout
           @target = File.open(@target, "a") if @target.is_a?(String)
         end
 
@@ -135,7 +121,7 @@ module GitLab
 
       # Database row counts query runner.
       #
-      # This will take the database connection and print the result to STDOUT
+      # This will take the database connection and print the result to $stdout
       class DatabaseRowCounts
         COMMAND_NAME = "row-counts".freeze
 
@@ -143,7 +129,7 @@ module GitLab
           @options = options(args)
           @options.parse!
 
-          @target = args.shift || STDOUT
+          @target = args.shift || $stdout
           @target = File.open(@target, "a") if @target.is_a?(String)
         end
 
@@ -248,7 +234,7 @@ module GitLab
           @options = options(args)
           @options.parse!
 
-          @target = args.shift || STDOUT
+          @target = args.shift || $stdout
           @target = File.open(@target, "a") if @target.is_a?(String)
         end
 
@@ -285,7 +271,7 @@ module GitLab
 
       # Sidekiq runner.
       #
-      # It will take a Redis connection URL and print results to STDOUT
+      # It will take a Redis connection URL and print results to $stdout
       class SidekiqRunner
         COMMAND_NAME = "sidekiq".freeze
 
@@ -293,7 +279,7 @@ module GitLab
           @options = options(args)
           @options.parse!
 
-          @target = args.shift || STDOUT
+          @target = args.shift || $stdout
           @target = File.open(@target, "a") if @target.is_a?(String)
         end
 
@@ -329,7 +315,7 @@ module GitLab
                                                          redis_sentinels: @redis_sentinels,
                                                          redis_sentinel_username: @redis_sentinel_username,
                                                          redis_sentinel_password: @redis_sentinel_password,
-                                                         logger: Logger.new(STDERR))
+                                                         logger: Logger.new($stderr))
 
           prober
             .probe_stats
@@ -357,7 +343,7 @@ module GitLab
           @options = options(args)
           @options.parse!
 
-          @target = args.shift || STDOUT
+          @target = args.shift || $stdout
           @target = File.open(@target, "a") if @target.is_a?(String)
         end
 

data/lib/gitlab_exporter/database/ci_builds.rb

@@ -191,7 +191,7 @@ module GitLab
           results = []
 
           query = ee? ? BUILDS_QUERY_EE : BUILDS_QUERY_CE
-          query = query % [status] # rubocop:disable Style/FormatString
+          query %= [status]
           exec_query_with_custom_random_page_cost(query).each do |row|
             results << transform_builds_row_to_values(row)
           end

data/lib/gitlab_exporter/database/row_count.rb

@@ -202,7 +202,7 @@ module GitLab
 
           result.map do |row|
             labels = {}
-            (query_hash[:fields] || []).each do |key, _| labels[key] = row[key.to_s] end
+            (query_hash[:fields] || {}).each_key do |key| labels[key] = row[key.to_s] end
             { "count": row["count"], "labels": labels }
           end
         end
@@ -233,7 +233,7 @@ module GitLab
           query_string << " FROM #{query[:select]}"
           query_string << " #{query[:joins]}"       if query[:joins]
           query_string << " WHERE #{query[:where]}" if query[:where]
-          query_string << " GROUP BY " + query[:fields].keys.join(", ") if query[:fields]
+          query_string << " GROUP BY #{query[:fields].keys.join(', ')}" if query[:fields]
           query_string << ";"
         end
       end

data/lib/gitlab_exporter/database/zoekt.rb

@@ -5,30 +5,30 @@ module GitLab
       class ZoektCollector < Base
         QUERY = <<~SQL.freeze
           WITH task_counts AS (
-            SELECT 
+            SELECT
               zoekt_node_id,
               COUNT(*) AS count
-            FROM 
+            FROM
               zoekt_tasks
-            WHERE 
+            WHERE
               perform_at <= $1
               AND state IN (0, 1)
-            GROUP BY 
+            GROUP BY
               zoekt_node_id
           )
-          SELECT 
+          SELECT
             n.id AS node_id,
             n.metadata ->> 'name' AS node_name,
             COALESCE(tc.count, 0) AS task_count
-          FROM 
+          FROM
             zoekt_nodes n
-          LEFT JOIN 
+          LEFT JOIN
             task_counts tc ON n.id = tc.zoekt_node_id
         SQL
 
         ZOEKT_ENABLED_QUERY = <<~SQL.freeze
           SELECT
-            zoekt_settings ->> 'zoekt_indexing_enabled' AS zoekt_indexing_enabled 
+            zoekt_settings ->> 'zoekt_indexing_enabled' AS zoekt_indexing_enabled
           FROM application_settings
           ORDER BY ID DESC
           LIMIT 1

data/lib/gitlab_exporter/git.rb

@@ -101,10 +101,10 @@ module GitLab
 
         Utils.pgrep("^git ").each do |pid|
           process_cmd = begin
-                          File.read("/proc/#{pid}/cmdline")
-                        rescue StandardError
-                          "" # Process file is gone (race condition)
-                        end
+            File.read("/proc/#{pid}/cmdline")
+          rescue StandardError
+            "" # Process file is gone (race condition)
+          end
           subcommand  = self.class.extract_subcommand(process_cmd)
           next unless subcommand # Unlikely, but just to be safe
 
@@ -142,7 +142,7 @@ module GitLab
 
         cmd_splitted.shift # Because it's "git"
         cmd_splitted.shift while cmd_splitted.first &&
-                                 (cmd_splitted.first.empty? || cmd_splitted.first !~ /^[^-][a-z\-]*$/)
+                                 (cmd_splitted.first.empty? || cmd_splitted.first !~ /^[^-][a-z-]*$/)
 
         cmd_splitted[0]
       end

data/lib/gitlab_exporter/memstats/mapping.rb

@@ -27,23 +27,9 @@ module GitLab
       class Mapping
         FIELDS = %w[size rss shared_clean shared_dirty private_clean private_dirty swap pss].freeze
 
-        attr_reader :address_start
-        attr_reader :address_end
-        attr_reader :perms
-        attr_reader :offset
-        attr_reader :device_major
-        attr_reader :device_minor
-        attr_reader :inode
-        attr_reader :region
+        attr_reader :address_start, :address_end, :perms, :offset, :device_major, :device_minor, :inode, :region
 
-        attr_accessor :size
-        attr_accessor :rss
-        attr_accessor :shared_clean
-        attr_accessor :shared_dirty
-        attr_accessor :private_dirty
-        attr_accessor :private_clean
-        attr_accessor :swap
-        attr_accessor :pss
+        attr_accessor :size, :rss, :shared_clean, :shared_dirty, :private_dirty, :private_clean, :swap, :pss
 
         def initialize(lines)
           FIELDS.each do |field|

data/lib/gitlab_exporter/prober.rb

@@ -11,7 +11,7 @@ module GitLab
       end
 
       def probe_all
-        @prober_opts.each do |_probe_name, params|
+        @prober_opts.each_value do |params|
           Utils.wrap_in_array(params[:opts]).each do |opts|
             prober = params[:class].new(metrics: @metrics, logger: @logger, **opts)
             params[:methods].each do |meth|

data/lib/gitlab_exporter/tls_helper.rb

@@ -1,6 +1,6 @@
 # Contains helper methods to generate TLS related configuration for web servers
 module TLSHelper
-  CERT_REGEX = /-----BEGIN CERTIFICATE-----(?:.|\n)+?-----END CERTIFICATE-----/.freeze
+  CERT_REGEX = /-----BEGIN CERTIFICATE-----(?:.|\n)+?-----END CERTIFICATE-----/
 
   def validate_tls_config(config)
     %i[tls_cert_path tls_key_path].each do |key|

data/lib/gitlab_exporter/version.rb

@@ -1,5 +1,5 @@
 module GitLab
   module Exporter
-    VERSION = "15.6.0".freeze
+    VERSION = "16.1.0".freeze
   end
 end

data/spec/database/bloat_spec.rb

@@ -43,10 +43,10 @@ describe GitLab::Exporter::Database::BloatProber do
   end
 
   describe "#probe_db" do
-    subject { described_class.new(metrics: metrics, collector: collector, logger: STDOUT, **opts).probe_db }
+    subject { described_class.new(metrics: metrics, collector: collector, logger: $stdout, **opts).probe_db }
 
     before do
-      expect(collector).to receive(:logger=).with(STDOUT)
+      expect(collector).to receive(:logger=).with($stdout)
     end
 
     it "invokes the collector for each bloat type" do

data/spec/database/row_count_spec.rb

@@ -3,9 +3,9 @@ require "gitlab_exporter/database/row_count"
 
 describe GitLab::Exporter::Database::RowCountCollector do
   let(:query) {
-    { project_1: { select: :projects, where: "id=1" },
-      project_2: { select: :projects, where: "id=2" },
-      project_3: { select: :projects, fields: { is_public: { definition: "visibility_level == 20" } } } }
+    { project1: { select: :projects, where: "id=1" },
+      project2: { select: :projects, where: "id=2" },
+      project3: { select: :projects, fields: { is_public: { definition: "visibility_level == 20" } } } }
   }
   let(:collector) { described_class.new(connection_string: "host=localhost") }
 
@@ -26,29 +26,29 @@ describe GitLab::Exporter::Database::RowCountCollector do
 
     it "executes all the queries" do
       expect(collector.run).to eq(
-        project_1: [{ count: 0, labels: {} }],
-        project_2: [{ count: 6, labels: {} }],
-        project_3: [{ count: 3, labels: { is_public: true  } },
-                    { count: 6, labels: { is_public: false } }]
+        project1: [{ count: 0, labels: {} }],
+        project2: [{ count: 6, labels: {} }],
+        project3: [{ count: 3, labels: { is_public: true } },
+                   { count: 6, labels: { is_public: false } }]
       )
     end
 
     context "when selected_queries is passed" do
-      let(:collector) { described_class.new(connection_string: "host=localhost", selected_queries: ["project_2"]) }
+      let(:collector) { described_class.new(connection_string: "host=localhost", selected_queries: ["project2"]) }
 
       it "executes the selected queries" do
-        expect(collector.run).to eq(project_2: [{ count: 6, labels: {} }])
+        expect(collector.run).to eq(project2: [{ count: 6, labels: {} }])
       end
     end
   end
 
   describe "#construct_query" do
     it "accepts a table and where clause" do
-      expect(collector.send(:construct_query, query[:project_1])).to eq "SELECT COUNT(*) FROM projects WHERE id=1;"
+      expect(collector.send(:construct_query, query[:project1])).to eq "SELECT COUNT(*) FROM projects WHERE id=1;"
     end
 
     it "accepts a table and group (field) clause" do
-      expect(collector.send(:construct_query, query[:project_3])).to eq \
+      expect(collector.send(:construct_query, query[:project3])).to eq \
         "SELECT COUNT(*), (visibility_level == 20) AS is_public FROM projects GROUP BY is_public;"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-exporter
 version: !ruby/object:Gem::Version
-  version: 15.6.0
+  version: 16.1.0
 platform: ruby
 authors:
 - Pablo Carranza
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 2.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 2.5.3
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -42,50 +42,44 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-    - - "<="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.13.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-    - - "<="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.13.4
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.6.8
+        version: 6.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.6.8
+        version: 6.6.1
 - !ruby/object:Gem::Dependency
   name: quantile
   requirement: !ruby/object:Gem::Requirement
@@ -106,28 +100,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.8.1
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -148,28 +142,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -275,7 +269,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="