gitlab-exporter 7.1.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2590101193dd650767c1f39170beb0b54661c188b7c1222fa7d01d59ee1f442a
-  data.tar.gz: 9237f257766fefe33cf0e398a86d44ecae609a393c046c7e5203b07a74adaca4
+  metadata.gz: b3fb1c9119047242e695cb956c7a68f7c19f564f7a274c8d503b7d4b984eed03
+  data.tar.gz: fb77e078e08dbc9f8f81a1a82dc070944fbf49af3944c90a8e30eac59ca1c39a
 SHA512:
-  metadata.gz: 4109296df37f483e64b5c3f9c9da8ce6359a8b36cbb8b2bc7a40c3147ee0401fafee78829b6e67e43167b1a859d771669e6f94e85f7ebf8529a7bbea45be6431
-  data.tar.gz: e4d05c4fad006d5a27f693887320b6f2a633f96b1109e97f7e89f5b990d695528b72ef2e7b876901d520df3f4be6c6b24850208228923c227443e06b70b81988
+  metadata.gz: 0c75097275454229a38f351618bc7eef530534726fa16d3d06b1c8fb95d5fdacc43a84d4d9781963bf27b8afc7700699bfe32d5f0f8516403edf7d5fa5a6555a
+  data.tar.gz: 1eb96b35d5a80166dc5f587dce7de896d7533cf5822d5a17b220c0d09d858b01e5d02cfc7bbd8710b6002591efd9181cfab063b8fa8bfee698beca672536e83a

data/.gitlab-ci.yml

@@ -1,17 +1,26 @@
+include:
+  - template: Security/DAST.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml
+  - template: Security/Container-Scanning.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml
+  - 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
+  - template: Security/License-Scanning.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/License-Scanning.gitlab-ci.yml
+  - 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
+
 default:
-  image: "ruby:2.3"
-  before_script:
-    - git config --global user.email "bot@gitlab.com"
-    - git config --global user.name "Bot User"
-    - bundle install -j $(nproc) --path vendor
+  image: ruby:2.7
   cache:
     paths:
       - vendor
   tags:
     - gitlab-org
 
+.before_scripts: &before_scripts
+  - git config --global user.email "bot@gitlab.com"
+  - git config --global user.name "Bot User"
+  - bundle install -j $(nproc) --path vendor
+
 workflow:
-  rules:
+  rules: &workflow_rules
     # For merge requests, create a pipeline.
     - if: '$CI_MERGE_REQUEST_IID'
     # For `master` branch, create a pipeline (this includes on schedules, pushes, merges, etc.).
@@ -22,15 +31,18 @@ workflow:
 rspec:
   script:
     - bundle exec rspec spec -f d -c
+  before_script: *before_scripts
 
 rubocop:
   script:
     - bundle exec rubocop
+  before_script: *before_scripts
 
-include:
-  - template: Security/DAST.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml
-  - template: Security/Container-Scanning.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml
-  - 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
-  - template: Security/License-Scanning.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/License-Scanning.gitlab-ci.yml
-  - template: Security/SAST.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml
+license_scanning:
+  rules: *workflow_rules
+
+gemnasium-dependency_scanning:
+  rules: *workflow_rules
 
+secret_detection:
+  rules: *workflow_rules

data/.rubocop.yml

@@ -1,5 +1,7 @@
+inherit_from: .rubocop_todo.yml
+
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.7
   DisplayCopNames: true
 
 # Just use double quotes please
@@ -20,15 +22,15 @@ Style/RaiseArgs:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
+# Commonly used screens these days easily fit more than 80 characters.
+Layout/LineLength:
+  Max: 120
+
 Metrics/MethodLength:
   Max: 15
 
 Metrics/AbcSize:
   Enabled: false
 
-# Commonly used screens these days easily fit more than 80 characters.
-Metrics/LineLength:
-  Max: 120
-
 Metrics/ClassLength:
   Max: 150

data/.rubocop_todo.yml

@@ -0,0 +1,64 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2021-01-11 12:24:03 UTC using RuboCop version 0.93.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
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - 'spec/git_spec.rb'
+    - 'spec/util_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: MaximumRangeSize.
+Lint/MissingCopEnableDirective:
+  Exclude:
+    - '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
+Metrics/BlockLength:
+  Max: 349
+
+# Offense count: 1
+# Configuration parameters: IgnoredMethods.
+Metrics/CyclomaticComplexity:
+  Max: 8
+
+# Offense count: 1
+# Configuration parameters: IgnoredMethods.
+Metrics/PerceivedComplexity:
+  Max: 9
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, AllowModifiersOnSymbols.
+# SupportedStyles: inline, group
+Style/AccessModifierDeclarations:
+  Exclude:
+    - 'lib/gitlab_exporter/util.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
+# AllowedMethods: present?, blank?, presence, try, try!
+Style/SafeNavigation:
+  Exclude:
+    - 'lib/gitlab_exporter/database/base.rb'

data/.ruby-version

@@ -0,0 +1 @@
+2.7.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-exporter (7.1.0)
+    gitlab-exporter (9.0.0)
       connection_pool (~> 2.2.1)
       pg (~> 1.1)
       quantile (~> 0.2.0)
@@ -13,23 +13,25 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
+    ast (2.4.1)
     connection_pool (2.2.3)
     diff-lcs (1.3)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-    parser (2.5.1.0)
-      ast (~> 2.4.0)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
     pg (1.2.3)
-    powerpack (0.1.1)
     quantile (0.2.1)
     rack (2.2.3)
     rack-protection (2.0.8.1)
       rack
-    rainbow (2.1.0)
+    rainbow (3.0.0)
     redis (4.1.4)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
+    regexp_parser (2.0.3)
+    rexml (3.2.4)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -43,13 +45,18 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubocop (0.42.0)
-      parser (>= 2.3.1.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+    rubocop (0.93.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.4.0)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.2)
     sidekiq (5.2.9)
       connection_pool (~> 2.2, >= 2.2.2)
@@ -62,7 +69,7 @@ GEM
       rack-protection (= 2.0.8.1)
       tilt (~> 2.0)
     tilt (2.0.10)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
@@ -74,4 +81,4 @@ DEPENDENCIES
   rubocop (~> 0.42)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/bin/gitlab-exporter

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 
 require "optparse"
 require "gitlab_exporter"

data/config/gitlab-exporter.yml.example

@@ -6,6 +6,7 @@ db_common: &db_common
 
 # Web server config
 server:
+  name: puma # cf. https://github.com/sinatra/sinatra#available-settings
   listen_address: 0.0.0.0
   listen_port: 9168
   # Maximum amount of memory to use in megabytes, after which the process is killed

data/gitlab-exporter.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "gitlab_exporter/version"
 
@@ -20,13 +20,13 @@ Gem::Specification.new do |s|
   s.homepage      = "http://gitlab.com"
   s.license       = "MIT"
 
+  s.add_runtime_dependency "connection_pool", "~> 2.2.1"
   s.add_runtime_dependency "pg", "~> 1.1"
-  s.add_runtime_dependency "sinatra", "~> 2.0.4"
   s.add_runtime_dependency "quantile", "~> 0.2.0"
-  s.add_runtime_dependency "sidekiq", "~> 5.2.1"
   s.add_runtime_dependency "redis", "~> 4.1.2"
   s.add_runtime_dependency "redis-namespace", "~> 1.6.0"
-  s.add_runtime_dependency "connection_pool", "~> 2.2.1"
+  s.add_runtime_dependency "sidekiq", "~> 5.2.1"
+  s.add_runtime_dependency "sinatra", "~> 2.0.4"
 
   s.add_development_dependency "rspec", "~> 3.7.0"
   s.add_development_dependency "rspec-expectations", "~> 3.7.0"

data/lib/gitlab_exporter/cli.rb

@@ -19,8 +19,7 @@ module GitLab
       # Empty runner that will raise an InvalidCLICommand when executed to provide the usage
       # in the exception message
       class NullRunner
-        def initialize(args)
-        end
+        def initialize(args); end
 
         def run
           fail InvalidCLICommand.new("Usage: #{EXECUTABLE_NAME} <command> [options] [arguments...]\n\n"\

data/lib/gitlab_exporter/database/base.rb

@@ -31,13 +31,11 @@ module GitLab
 
         def with_connection_pool
           connection_pool.with do |conn|
-            begin
-              yield conn
-            rescue PG::UnableToSend => e
-              @logger.warn "Error sending to the database: #{e}" if @logger
-              conn.reset
-              raise e
-            end
+            yield conn
+          rescue PG::UnableToSend => e
+            @logger.warn "Error sending to the database: #{e}" if @logger
+            conn.reset
+            raise e
           end
         rescue PG::Error => e
           @logger.error "Error connecting to the database: #{e}" if @logger

data/lib/gitlab_exporter/database/bloat.rb

@@ -3,6 +3,8 @@ module GitLab
     module Database
       # Helper to collect bloat metrics.
       class BloatCollector < Base
+        attr_writer :logger
+
         def run(type = :btree)
           execute(self.class.query_for(type)).each_with_object({}) do |row, h|
             h[row["object_name"]] = row
@@ -33,16 +35,18 @@ module GitLab
 
       # Prober class to gather bloat metrics
       class BloatProber
-        METRIC_KEYS = %w(bloat_ratio bloat_size extra_size real_size).freeze
+        METRIC_KEYS = %w[bloat_ratio bloat_size extra_size real_size].freeze
 
         attr_reader :metrics, :collector, :bloat_types
 
         def initialize(opts,
                        metrics: PrometheusMetrics.new,
-                       collector: BloatCollector.new(connection_string: opts[:connection_string]))
+                       collector: BloatCollector.new(connection_string: opts[:connection_string]),
+                       logger: nil)
           @metrics = metrics
           @collector = collector
-          @bloat_types = opts[:bloat_types] || %i(btree table)
+          @collector.logger = logger
+          @bloat_types = opts[:bloat_types] || %i[btree table]
         end
 
         def probe_db

data/lib/gitlab_exporter/database/bloat_btree.sql

@@ -12,73 +12,90 @@ SELECT current_database(), nspname AS schemaname, tblname, idxname AS object_nam
   END AS bloat_size,
   100 * (relpages-est_pages_ff)::float / relpages AS bloat_ratio,
   is_na
-  -- , 100-(sub.pst).avg_leaf_density, est_pages, index_tuple_hdr_bm, maxalign, pagehdr, nulldatawidth, nulldatahdrwidth, sub.reltuples, sub.relpages -- (DEBUG INFO)
+  -- , 100-(pst).avg_leaf_density AS pst_avg_bloat, est_pages, index_tuple_hdr_bm, maxalign, pagehdr, nulldatawidth, nulldatahdrwidth, reltuples, relpages -- (DEBUG INFO)
 FROM (
   SELECT coalesce(1 +
-       ceil(reltuples/floor((bs-pageopqdata-pagehdr)/(4+nulldatahdrwidth)::float)), 0 -- ItemIdData size + computed avg size of a tuple (nulldatahdrwidth)
-    ) AS est_pages,
-    coalesce(1 +
-       ceil(reltuples/floor((bs-pageopqdata-pagehdr)*fillfactor/(100*(4+nulldatahdrwidth)::float))), 0
-    ) AS est_pages_ff,
-    bs, nspname, table_oid, tblname, idxname, relpages, fillfactor, is_na
-    -- , stattuple.pgstatindex(quote_ident(nspname)||'.'||quote_ident(idxname)) AS pst, index_tuple_hdr_bm, maxalign, pagehdr, nulldatawidth, nulldatahdrwidth, reltuples -- (DEBUG INFO)
+         ceil(reltuples/floor((bs-pageopqdata-pagehdr)/(4+nulldatahdrwidth)::float)), 0 -- ItemIdData size + computed avg size of a tuple (nulldatahdrwidth)
+      ) AS est_pages,
+      coalesce(1 +
+         ceil(reltuples/floor((bs-pageopqdata-pagehdr)*fillfactor/(100*(4+nulldatahdrwidth)::float))), 0
+      ) AS est_pages_ff,
+      bs, nspname, tblname, idxname, relpages, fillfactor, is_na
+      -- , pgstatindex(idxoid) AS pst, index_tuple_hdr_bm, maxalign, pagehdr, nulldatawidth, nulldatahdrwidth, reltuples -- (DEBUG INFO)
   FROM (
-    SELECT maxalign, bs, nspname, tblname, idxname, reltuples, relpages, relam, table_oid, fillfactor,
-      ( index_tuple_hdr_bm +
-          maxalign - CASE -- Add padding to the index tuple header to align on MAXALIGN
-            WHEN index_tuple_hdr_bm%maxalign = 0 THEN maxalign
-            ELSE index_tuple_hdr_bm%maxalign
-          END
-        + nulldatawidth + maxalign - CASE -- Add padding to the data to align on MAXALIGN
-            WHEN nulldatawidth = 0 THEN 0
-            WHEN nulldatawidth::integer%maxalign = 0 THEN maxalign
-            ELSE nulldatawidth::integer%maxalign
-          END
-      )::numeric AS nulldatahdrwidth, pagehdr, pageopqdata, is_na
-      -- , index_tuple_hdr_bm, nulldatawidth -- (DEBUG INFO)
-    FROM (
-      SELECT
-        i.nspname, i.tblname, i.idxname, i.reltuples, i.relpages, i.relam, a.attrelid AS table_oid,
-        current_setting('block_size')::numeric AS bs, fillfactor,
-        CASE -- MAXALIGN: 4 on 32bits, 8 on 64bits (and mingw32 ?)
-          WHEN version() ~ 'mingw32' OR version() ~ '64-bit|x86_64|ppc64|ia64|amd64' THEN 8
-          ELSE 4
-        END AS maxalign,
-        /* per page header, fixed size: 20 for 7.X, 24 for others */
-        24 AS pagehdr,
-        /* per page btree opaque data */
-        16 AS pageopqdata,
-        /* per tuple header: add IndexAttributeBitMapData if some cols are null-able */
-        CASE WHEN max(coalesce(s.null_frac,0)) = 0
-          THEN 2 -- IndexTupleData size
-          ELSE 2 + (( 32 + 8 - 1 ) / 8) -- IndexTupleData size + IndexAttributeBitMapData size ( max num filed per index + 8 - 1 /8)
-        END AS index_tuple_hdr_bm,
-        /* data len: we remove null values save space using it fractionnal part from stats */
-        sum( (1-coalesce(s.null_frac, 0)) * coalesce(s.avg_width, 1024)) AS nulldatawidth,
-        max( CASE WHEN a.atttypid = 'pg_catalog.name'::regtype THEN 1 ELSE 0 END ) > 0 AS is_na
-      FROM pg_attribute AS a
-        JOIN (
-          SELECT nspname, tbl.relname AS tblname, idx.relname AS idxname, idx.reltuples, idx.relpages, idx.relam,
-            indrelid, indexrelid, indkey::smallint[] AS attnum,
-            coalesce(substring(
-              array_to_string(idx.reloptions, ' ')
-               from 'fillfactor=([0-9]+)')::smallint, 90) AS fillfactor
-          FROM pg_index
-            JOIN pg_class idx ON idx.oid=pg_index.indexrelid
-            JOIN pg_class tbl ON tbl.oid=pg_index.indrelid
-            JOIN pg_namespace ON pg_namespace.oid = idx.relnamespace
-          WHERE pg_index.indisvalid AND tbl.relkind = 'r' AND idx.relpages > 0
-        ) AS i ON a.attrelid = i.indexrelid
-        JOIN pg_stats AS s ON s.schemaname = i.nspname
-          AND ((s.tablename = i.tblname AND s.attname = pg_catalog.pg_get_indexdef(a.attrelid, a.attnum, TRUE)) -- stats from tbl
-          OR   (s.tablename = i.idxname AND s.attname = a.attname))-- stats from functionnal cols
-        JOIN pg_type AS t ON a.atttypid = t.oid
-      WHERE a.attnum > 0
-      GROUP BY 1, 2, 3, 4, 5, 6, 7, 8, 9
-    ) AS s1
-  ) AS s2
-    JOIN pg_am am ON s2.relam = am.oid WHERE am.amname = 'btree'
-) AS sub
-WHERE NOT is_na
-AND   nspname = 'public'
-ORDER BY 2,3,4;
+      SELECT maxalign, bs, nspname, tblname, idxname, reltuples, relpages, idxoid, fillfactor,
+            ( index_tuple_hdr_bm +
+                maxalign - CASE -- Add padding to the index tuple header to align on MAXALIGN
+                  WHEN index_tuple_hdr_bm%maxalign = 0 THEN maxalign
+                  ELSE index_tuple_hdr_bm%maxalign
+                END
+              + nulldatawidth + maxalign - CASE -- Add padding to the data to align on MAXALIGN
+                  WHEN nulldatawidth = 0 THEN 0
+                  WHEN nulldatawidth::integer%maxalign = 0 THEN maxalign
+                  ELSE nulldatawidth::integer%maxalign
+                END
+            )::numeric AS nulldatahdrwidth, pagehdr, pageopqdata, is_na
+            -- , index_tuple_hdr_bm, nulldatawidth -- (DEBUG INFO)
+      FROM (
+          SELECT n.nspname, i.tblname, i.idxname, i.reltuples, i.relpages,
+              i.idxoid, i.fillfactor, current_setting('block_size')::numeric AS bs,
+              CASE -- MAXALIGN: 4 on 32bits, 8 on 64bits (and mingw32 ?)
+                WHEN version() ~ 'mingw32' OR version() ~ '64-bit|x86_64|ppc64|ia64|amd64' THEN 8
+                ELSE 4
+              END AS maxalign,
+              /* per page header, fixed size: 20 for 7.X, 24 for others */
+              24 AS pagehdr,
+              /* per page btree opaque data */
+              16 AS pageopqdata,
+              /* per tuple header: add IndexAttributeBitMapData if some cols are null-able */
+              CASE WHEN max(coalesce(s.null_frac,0)) = 0
+                  THEN 2 -- IndexTupleData size
+                  ELSE 2 + (( 32 + 8 - 1 ) / 8) -- IndexTupleData size + IndexAttributeBitMapData size ( max num filed per index + 8 - 1 /8)
+              END AS index_tuple_hdr_bm,
+              /* data len: we remove null values save space using it fractionnal part from stats */
+              sum( (1-coalesce(s.null_frac, 0)) * coalesce(s.avg_width, 1024)) AS nulldatawidth,
+              max( CASE WHEN i.atttypid = 'pg_catalog.name'::regtype THEN 1 ELSE 0 END ) > 0 AS is_na
+          FROM (
+              SELECT ct.relname AS tblname, ct.relnamespace, ic.idxname, ic.attpos, ic.indkey, ic.indkey[ic.attpos], ic.reltuples, ic.relpages, ic.tbloid, ic.idxoid, ic.fillfactor,
+                  coalesce(a1.attnum, a2.attnum) AS attnum, coalesce(a1.attname, a2.attname) AS attname, coalesce(a1.atttypid, a2.atttypid) AS atttypid,
+                  CASE WHEN a1.attnum IS NULL
+                  THEN ic.idxname
+                  ELSE ct.relname
+                  END AS attrelname
+              FROM (
+                  SELECT idxname, reltuples, relpages, tbloid, idxoid, fillfactor, indkey,
+                      pg_catalog.generate_series(1,indnatts) AS attpos
+                  FROM (
+                      SELECT ci.relname AS idxname, ci.reltuples, ci.relpages, i.indrelid AS tbloid,
+                          i.indexrelid AS idxoid,
+                          coalesce(substring(
+                              array_to_string(ci.reloptions, ' ')
+                              from 'fillfactor=([0-9]+)')::smallint, 90) AS fillfactor,
+                          i.indnatts,
+                          pg_catalog.string_to_array(pg_catalog.textin(
+                              pg_catalog.int2vectorout(i.indkey)),' ')::int[] AS indkey
+                      FROM pg_catalog.pg_index i
+                      JOIN pg_catalog.pg_class ci ON ci.oid = i.indexrelid
+                      WHERE ci.relam=(SELECT oid FROM pg_am WHERE amname = 'btree')
+                      AND ci.relpages > 0
+                  ) AS idx_data
+              ) AS ic
+              JOIN pg_catalog.pg_class ct ON ct.oid = ic.tbloid
+              LEFT JOIN pg_catalog.pg_attribute a1 ON
+                  ic.indkey[ic.attpos] <> 0
+                  AND a1.attrelid = ic.tbloid
+                  AND a1.attnum = ic.indkey[ic.attpos]
+              LEFT JOIN pg_catalog.pg_attribute a2 ON
+                  ic.indkey[ic.attpos] = 0
+                  AND a2.attrelid = ic.idxoid
+                  AND a2.attnum = ic.attpos
+            ) i
+            JOIN pg_catalog.pg_namespace n ON n.oid = i.relnamespace
+            JOIN pg_catalog.pg_stats s ON s.schemaname = n.nspname
+                                      AND s.tablename = i.attrelname
+                                      AND s.attname = i.attname
+            GROUP BY 1,2,3,4,5,6,7,8,9,10,11
+      ) AS rows_data_stats
+  ) AS rows_hdr_pdg_stats
+) AS relation_stats
+ORDER BY nspname, tblname, idxname;

data/lib/gitlab_exporter/database/bloat_table.sql

@@ -1,5 +1,5 @@
 -- Originally from: https://github.com/ioguix/pgsql-bloat-estimation/blob/master/table/table_bloat.sql
-/* WARNING: executed with a non-superuser role, the query inspect only tables you are granted to read.
+/* WARNING: executed with a non-superuser role, the query inspect only tables and materialized view (9.3+) you are granted to read.
 * This query is compatible with PostgreSQL 9.0 and more
 */
 SELECT current_database(), schemaname, tblname AS object_name, bs*tblpages AS real_size,
@@ -16,12 +16,12 @@ SELECT current_database(), schemaname, tblname AS object_name, bs*tblpages AS re
     THEN 100 * (tblpages - est_tblpages_ff)/tblpages::float
     ELSE 0
   END AS bloat_ratio, is_na
-  -- , (pst).free_percent + (pst).dead_tuple_percent AS real_frag
+  -- , tpl_hdr_size, tpl_data_size, (pst).free_percent + (pst).dead_tuple_percent AS real_frag -- (DEBUG INFO)
 FROM (
   SELECT ceil( reltuples / ( (bs-page_hdr)/tpl_size ) ) + ceil( toasttuples / 4 ) AS est_tblpages,
     ceil( reltuples / ( (bs-page_hdr)*fillfactor/(tpl_size*100) ) ) + ceil( toasttuples / 4 ) AS est_tblpages_ff,
     tblpages, fillfactor, bs, tblid, schemaname, tblname, heappages, toastpages, is_na
-    -- , stattuple.pgstattuple(tblid) AS pst
+    -- , tpl_hdr_size, tpl_data_size, pgstattuple(tblid) AS pst -- (DEBUG INFO)
   FROM (
     SELECT
       ( 4 + tpl_hdr_size + tpl_data_size + (2*ma)
@@ -29,6 +29,7 @@ FROM (
         - CASE WHEN ceil(tpl_data_size)::int%ma = 0 THEN ma ELSE ceil(tpl_data_size)::int%ma END
       ) AS tpl_size, bs - page_hdr AS size_per_block, (heappages + toastpages) AS tblpages, heappages,
       toastpages, reltuples, toasttuples, bs, page_hdr, tblid, schemaname, tblname, fillfactor, is_na
+      -- , tpl_hdr_size, tpl_data_size
     FROM (
       SELECT
         tbl.oid AS tblid, ns.nspname AS schemaname, tbl.relname AS tblname, tbl.reltuples,
@@ -40,24 +41,24 @@ FROM (
         current_setting('block_size')::numeric AS bs,
         CASE WHEN version()~'mingw32' OR version()~'64-bit|x86_64|ppc64|ia64|amd64' THEN 8 ELSE 4 END AS ma,
         24 AS page_hdr,
-        23 + CASE WHEN MAX(coalesce(null_frac,0)) > 0 THEN ( 7 + count(*) ) / 8 ELSE 0::int END
-          + CASE WHEN tbl.relhasoids THEN 4 ELSE 0 END AS tpl_hdr_size,
-        sum( (1-coalesce(s.null_frac, 0)) * coalesce(s.avg_width, 1024) ) AS tpl_data_size,
+        23 + CASE WHEN MAX(coalesce(s.null_frac,0)) > 0 THEN ( 7 + count(s.attname) ) / 8 ELSE 0::int END
+           + CASE WHEN bool_or(att.attname = 'oid' and att.attnum < 0) THEN 4 ELSE 0 END AS tpl_hdr_size,
+        sum( (1-coalesce(s.null_frac, 0)) * coalesce(s.avg_width, 0) ) AS tpl_data_size,
         bool_or(att.atttypid = 'pg_catalog.name'::regtype)
-          OR count(att.attname) <> count(s.attname) AS is_na
+          OR sum(CASE WHEN att.attnum > 0 THEN 1 ELSE 0 END) <> count(s.attname) AS is_na
       FROM pg_attribute AS att
         JOIN pg_class AS tbl ON att.attrelid = tbl.oid
         JOIN pg_namespace AS ns ON ns.oid = tbl.relnamespace
         LEFT JOIN pg_stats AS s ON s.schemaname=ns.nspname
           AND s.tablename = tbl.relname AND s.inherited=false AND s.attname=att.attname
         LEFT JOIN pg_class AS toast ON tbl.reltoastrelid = toast.oid
-      WHERE att.attnum > 0 AND NOT att.attisdropped
-        AND tbl.relkind = 'r'
-      GROUP BY 1,2,3,4,5,6,7,8,9,10, tbl.relhasoids
+      WHERE NOT att.attisdropped
+        AND tbl.relkind in ('r','m')
+      GROUP BY 1,2,3,4,5,6,7,8,9,10
       ORDER BY 2,3
     ) AS s
   ) AS s2
 ) AS s3
-WHERE NOT is_na
+-- WHERE NOT is_na
 --   AND tblpages*((pst).free_percent + (pst).dead_tuple_percent)::float4/100 >= 1
-AND   schemaname= 'public';
+ORDER BY schemaname, tblname;

data/lib/gitlab_exporter/database/ci_builds.rb

@@ -391,6 +391,7 @@ module GitLab
 
         def include_bool_if_row_defined(row, field)
           return {} unless row[field.to_s]
+
           { field => row[field.to_s] == "t" ? "yes" : "no" }
         end
 
@@ -470,7 +471,7 @@ module GitLab
 
         def add_ci_created_pending_builds(metric_name, value, labels)
           add_metric_with_namespace_label(metric_name,
-                                          [:namespace, :shared_runners, :has_minutes],
+                                          %i[namespace shared_runners has_minutes],
                                           value,
                                           labels)
         end
@@ -505,8 +506,8 @@ module GitLab
         def add_ci_running_builds(value, labels)
           add_metric_with_namespace_label(
             "ci_running_builds",
-            [:runner, :namespace, :runner_type, :scheduled,
-             :triggered, :mirror, :mirror_trigger_builds, :has_minutes],
+            %i[runner namespace runner_type scheduled
+               triggered mirror mirror_trigger_builds has_minutes],
             value,
             labels
           )

data/lib/gitlab_exporter/database/row_count.rb

@@ -29,7 +29,7 @@ module GitLab
 
         MIRROR_QUERY = {
           select: :projects,
-          joins:  <<~SQL,
+          joins: <<~SQL,
             INNER JOIN project_mirror_data ON project_mirror_data.project_id = projects.id
             INNER JOIN namespaces AS root_namespaces ON root_namespaces.id = (
               WITH RECURSIVE "base_and_ancestors" AS (
@@ -112,9 +112,9 @@ module GitLab
               ON users.id = u.user_id",
             where: "user_type IS NULL",
             fields: {
-              admin:        {},
-              external:     {},
-              state:        {},
+              admin: {},
+              external: {},
+              state: {},
               access_level: { definition: "COALESCE(u.access_level, 0)" }
             }
           },
@@ -122,14 +122,14 @@ module GitLab
             select: :projects,
             fields: {
               visibility_level: {},
-              archived:         {}
+              archived: {}
             }
           },
           groups: {
             select: :namespaces,
             fields: {
               visibility_level: {},
-              root:             { definition: "(parent_id IS NULL)" }
+              root: { definition: "(parent_id IS NULL)" }
             }
           }
         }.freeze
@@ -175,6 +175,14 @@ module GitLab
 
         def execute(query)
           with_connection_pool do |conn|
+            conn.exec(query).map_types!(type_map_for_results(conn))
+          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:
@@ -187,10 +195,8 @@ module GitLab
               tm.add_coder(old_coder.dup.tap { |c| c.oid = value[:oid] })
             end
 
-            conn.exec(query).map_types!(tm)
+            tm
           end
-        rescue PG::UndefinedTable, PG::UndefinedColumn
-          nil
         end
 
         # Not private so I can test it without meta programming tricks

data/lib/gitlab_exporter/database/tuple_stats.rb

@@ -5,7 +5,7 @@ module GitLab
       #
       # It takes a connection string (e.g. "dbname=test port=5432")
       class TupleStatsCollector < Base
-        COLUMNS = %w(relname seq_tup_read idx_tup_fetch n_tup_ins n_tup_upd n_tup_del n_tup_hot_upd n_dead_tup seq_scan)
+        COLUMNS = %w[relname seq_tup_read idx_tup_fetch n_tup_ins n_tup_upd n_tup_del n_tup_hot_upd n_dead_tup seq_scan]
                   .join(",")
         QUERY   = <<-SQL.freeze
           SELECT #{COLUMNS}
@@ -35,9 +35,11 @@ module GitLab
 
           result.each do |table_name, tuple_stats|
             tuple_stats.each do |column_name, value|
+              next if value.is_a?(Numeric)
+
               @metrics.add("gitlab_database_stat_table_#{column_name}",
                            value.to_f,
-                           table_name: table_name) unless value.is_a?(Numeric)
+                           table_name: table_name)
             end
           end
 

data/lib/gitlab_exporter/git.rb

@@ -13,6 +13,7 @@ module GitLab
     class Git
       def initialize(repo)
         fail "Repository #{repo} does not exists" unless Dir.exist? repo
+
         @repo = repo
         @tracker = TimeTracker.new
       end
@@ -35,6 +36,7 @@ module GitLab
       def execute(command)
         result = CommandResult.new(*Open3.capture2e(command, chdir: @repo))
         fail "Command #{command} failed with status #{result.status}\n#{result.stdout}" if result.failed?
+
         result
       end
     end
@@ -96,7 +98,7 @@ module GitLab
         Utils.pgrep("^git ").each do |pid|
           process_cmd = begin
                           File.read("/proc/#{pid}/cmdline")
-                        rescue
+                        rescue StandardError
                           "" # Process file is gone (race condition)
                         end
           subcommand  = self.class.extract_subcommand(process_cmd)
@@ -131,6 +133,7 @@ module GitLab
 
       def self.extract_subcommand(cmd)
         return if cmd.empty?
+
         cmd_splitted = cmd.split("\u0000") # cmdline does not return it space-separated
 
         cmd_splitted.shift # Because it's "git"

data/lib/gitlab_exporter/memstats.rb

@@ -87,7 +87,7 @@ module GitLab
               end
             end
           end
-        rescue => e
+        rescue StandardError => e
           puts "Error: #{e}"
           @valid = false
           create_memstats_not_available(totals)

data/lib/gitlab_exporter/memstats/mapping.rb

@@ -25,7 +25,7 @@ module GitLab
       # Locked:                0 kB
       # VmFlags: rd ex mr mw me dw sd
       class Mapping
-        FIELDS = %w(size rss shared_clean shared_dirty private_clean private_dirty swap pss).freeze
+        FIELDS = %w[size rss shared_clean shared_dirty private_clean private_dirty swap pss].freeze
 
         attr_reader :address_start
         attr_reader :address_end

data/lib/gitlab_exporter/process.rb

@@ -105,9 +105,7 @@ module GitLab
           ::GitLab::Exporter::MemStats::Mapping::FIELDS.each do |field|
             value = stats.totals[field]
 
-            if value >= 0
-              @metrics.add("process_smaps_#{field}_bytes", value * 1024, @use_quantiles, **labels)
-            end
+            @metrics.add("process_smaps_#{field}_bytes", value * 1024, @use_quantiles, **labels) if value >= 0
           end
         end
 

data/lib/gitlab_exporter/sidekiq.rb

@@ -53,21 +53,19 @@ module GitLab
         self
       end
 
-      def probe_jobs # rubocop:disable Metrics/MethodLength
+      def probe_jobs
         return self unless connected?
 
         job_stats = {}
 
         Sidekiq::Queue.all.each do |queue|
-          begin
-            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
+          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_stats.each do |class_name, count|
@@ -153,7 +151,7 @@ module GitLab
                          end
                          true
                        end
-      rescue Redis::CannotConnectError, Redis::TimeoutError # rubocop:disable Lint/HandleExceptions
+      rescue Redis::CannotConnectError, Redis::TimeoutError
         # Maybe we're trying connecting to a slave
       end
 
@@ -164,6 +162,7 @@ module GitLab
           # 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)
         end
       end

data/lib/gitlab_exporter/util.rb

@@ -24,7 +24,7 @@ module GitLab
     # Helper methods, some stuff was copied from ActiveSupport
     module Utils
       def camel_case_string(str)
-        str.gsub(/(?:_|^)([a-z\d]*)/i) { $1.capitalize } # rubocop:disable PerlBackrefs
+        str.gsub(/(?:_|^)([a-z\d]*)/i) { $1.capitalize } # rubocop:disable Style/PerlBackrefs
       end
       module_function :camel_case_string
 

data/lib/gitlab_exporter/version.rb

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

data/lib/gitlab_exporter/web_exporter.rb

@@ -24,7 +24,7 @@ module GitLab
         private
 
         def memory_usage
-          io = IO.popen(%W(ps -o rss= -p #{$PID}))
+          io = IO.popen(%W[ps -o rss= -p #{$PID}])
 
           mem = io.read
           io.close
@@ -36,6 +36,8 @@ module GitLab
       end
 
       class << self
+        DEFAULT_WEB_SERVER = "webrick".freeze
+
         def setup(config)
           setup_server(config[:server])
           setup_probes(config[:probes])
@@ -52,6 +54,7 @@ module GitLab
         def setup_server(config)
           config ||= {}
 
+          set(:server, config.fetch(:name, DEFAULT_WEB_SERVER))
           set(:bind, config.fetch(:listen_address, "0.0.0.0"))
           set(:port, config.fetch(:listen_port, 9168))
         end

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] } }
   let(:metrics) { double("PrometheusMetrics", add: nil) }
   let(:collector) { double("BloatCollector", run: data) }
 
@@ -43,7 +43,11 @@ describe GitLab::Exporter::Database::BloatProber do
   end
 
   describe "#probe_db" do
-    subject { described_class.new(opts, metrics: metrics, collector: collector).probe_db }
+    subject { described_class.new(opts, metrics: metrics, collector: collector, logger: STDOUT).probe_db }
+
+    before do
+      expect(collector).to receive(:logger=).with(STDOUT)
+    end
 
     it "invokes the collector for each bloat type" do
       expect(collector).to receive(:run).with(:btree)

data/spec/database/ci_builds_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "gitlab_exporter/database/ci_builds"
 
-# rubocop:disable Metrics/LineLength
+# rubocop:disable Layout/LineLength
 describe GitLab::Exporter::Database do
   let(:set_random_page_cost_query) { "SET random_page_cost" }
   let(:builds_query_ee) { "SELECT BUILDS EE" }
@@ -100,35 +100,35 @@ describe GitLab::Exporter::Database do
     allow(Time).to receive(:now).and_return(time_now)
 
     allow(connection).to receive(:exec).with(builds_query_ee)
-      .and_return([builds_query_row_ee("f", "created", "1", "f", 10),
-                   builds_query_row_ee("t", "pending", "1", "t", 30),
-                   builds_query_row_ee("f", "created", "2", "f", 20),
-                   builds_query_row_ee("t", "pending", "2", "t", 50),
-                   builds_query_row_ee("t", "pending", "3", "f", 1),
-                   builds_query_row_ee("t", "pending", "4", "t", 2),
-                   builds_query_row_ee("f", "pending", "5", "f", 2)])
+                                       .and_return([builds_query_row_ee("f", "created", "1", "f", 10),
+                                                    builds_query_row_ee("t", "pending", "1", "t", 30),
+                                                    builds_query_row_ee("f", "created", "2", "f", 20),
+                                                    builds_query_row_ee("t", "pending", "2", "t", 50),
+                                                    builds_query_row_ee("t", "pending", "3", "f", 1),
+                                                    builds_query_row_ee("t", "pending", "4", "t", 2),
+                                                    builds_query_row_ee("f", "pending", "5", "f", 2)])
     allow(connection).to receive(:exec).with(builds_query_ce)
-      .and_return([builds_query_row_ce("f", "created", "1", 10),
-                   builds_query_row_ce("t", "pending", "1", 30),
-                   builds_query_row_ce("f", "created", "2", 20),
-                   builds_query_row_ce("t", "pending", "2", 50),
-                   builds_query_row_ce("t", "pending", "3", 1),
-                   builds_query_row_ce("t", "pending", "4", 2),
-                   builds_query_row_ce("f", "pending", "5", 2)])
+                                       .and_return([builds_query_row_ce("f", "created", "1", 10),
+                                                    builds_query_row_ce("t", "pending", "1", 30),
+                                                    builds_query_row_ce("f", "created", "2", 20),
+                                                    builds_query_row_ce("t", "pending", "2", 50),
+                                                    builds_query_row_ce("t", "pending", "3", 1),
+                                                    builds_query_row_ce("t", "pending", "4", 2),
+                                                    builds_query_row_ce("f", "pending", "5", 2)])
 
     allow(connection).to receive(:exec).with(stale_builds_query).and_return([{ "count" => 2 }])
 
     allow(connection).to receive(:exec).with(per_runner_query_ee)
-      .and_return([per_runner_query_row_ee(1, "instance_type", 1, "f", "f", 1, nil, "t", 15),
-                   per_runner_query_row_ee(2, "project_type", 2, "t", "t", nil, 3, "f", 5),
-                   per_runner_query_row_ee(2, "project_type", 3, "t", "t", nil, 3, "t", 5),
-                   per_runner_query_row_ee(3, "project_type", 4, "t", "t", nil, 3, "f", 5)])
+                                       .and_return([per_runner_query_row_ee(1, "instance_type", 1, "f", "f", 1, nil, "t", 15),
+                                                    per_runner_query_row_ee(2, "project_type", 2, "t", "t", nil, 3, "f", 5),
+                                                    per_runner_query_row_ee(2, "project_type", 3, "t", "t", nil, 3, "t", 5),
+                                                    per_runner_query_row_ee(3, "project_type", 4, "t", "t", nil, 3, "f", 5)])
 
     allow(connection).to receive(:exec).with(per_runner_query_ce)
-      .and_return([per_runner_query_row_ce(1, "instance_type", 1, 1, nil, 15),
-                   per_runner_query_row_ce(2, "project_type", 2, nil, 3, 5),
-                   per_runner_query_row_ce(2, "project_type", 3, nil, 3, 5),
-                   per_runner_query_row_ce(3, "project_type", 4, nil, 3, 5)])
+                                       .and_return([per_runner_query_row_ce(1, "instance_type", 1, 1, nil, 15),
+                                                    per_runner_query_row_ce(2, "project_type", 2, nil, 3, 5),
+                                                    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]

data/spec/git_process_proper_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "gitlab_exporter"
 
-# rubocop:disable Metrics/LineLength
+# rubocop:disable Layout/LineLength
 describe GitLab::Exporter::GitProcessProber do
   describe ".extract_subcommand" do
     it "extract git subcommand" do

data/spec/memstats_spec.rb

@@ -14,11 +14,11 @@ describe GitLab::Exporter::MemStats do
   it "parses the data properly" do
     expect(subject.valid?).to be_truthy
 
-    nonzero_fields = %w(size rss shared_clean shared_dirty private_dirty pss)
-    zero_fields = %w(private_clean swap)
+    nonzero_fields = %w[size rss shared_clean shared_dirty private_dirty pss]
+    zero_fields = %w[private_clean swap]
 
     nonzero_fields.each do |field|
-      expect(subject.totals[field]).to be > 0 # rubocop:disable Style/NumericPredicate
+      expect(subject.totals[field]).to be > 0
     end
 
     zero_fields.each do |field|

data/spec/spec_helper.rb

@@ -51,11 +51,9 @@ class CLIArgs
     yield self
   end
 
-  def on(*args)
-  end
+  def on(*args); end
 
-  def banner=(banner)
-  end
+  def banner=(banner); end
 
   def parse!
     @arguments

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-exporter
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Pablo Carranza
@@ -11,33 +11,33 @@ cert_chain: []
 date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: quantile
   requirement: !ruby/object:Gem::Requirement
@@ -53,61 +53,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 4.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 4.1.2
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: redis-namespace
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 5.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
-  name: connection_pool
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +146,8 @@ files:
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".ruby-version"
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
@@ -206,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: GitLab metrics exporter