gitlab-exporter 13.3.0 → 13.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a115af5d2f6c523fe9a6fb55e09e47bbae42b6fdee96d20e2f0987e758546be
-  data.tar.gz: cbb66dac910580239114923f0b70ad40a6580cac4a1b29e69e308559c6619e3e
+  metadata.gz: ef90bbddd738fecc23deb3342a8c24461289d1286c46c1d5d1879da07f32991d
+  data.tar.gz: 94e6b7eea624ee7a07aa435f3985e03006a8d8ab042d7958f2d1150b71a64d3a
 SHA512:
-  metadata.gz: bfe2f5921dbd280826ba2e959d1bdc09fdf721f691e32c31f12e8948805a4103b30e29cc3286b56be1c4fd9d7e766b5b5e4b7df8ae117d1a53a6b03e4bfdda7d
-  data.tar.gz: d0dde2e781ad6599e7944c400d2efd92272b43c813229a26754cf944da6972563154c35d9f5f1f75678ecb4537edef61cb6cc13f0a8cb433a7a5922b4c755993
+  metadata.gz: 67c47e28e6685067027922a2e12ec106b6eb4f14e1475dccb8a6430ae53e7a4e0bb111f0d2e83c4559ac38b49cb69aac6ead4308ee1534763cb9434761573085
+  data.tar.gz: 2066407a7735b144e4c84179b8b585d8ea4dddee4d74592a2538bd3ccd1d8c69610efa3d9a7fa9cb4a6d2aa26cc61578cb564015305f56f60627ea48f56a7f7c

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

data/.rubocop_todo.yml

@@ -1,35 +1,19 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-09-25 18:54:37 UTC using RuboCop version 1.56.3.
+# 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: Severity, Include.
+# Configuration parameters: 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'
@@ -43,83 +27,38 @@ Lint/MissingCopEnableDirective:
     - 'spec/git_process_proper_spec.rb'
 
 # Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
+# Cop supports --auto-correct.
 Lint/NonDeterministicRequireOrder:
   Exclude:
     - 'spec/spec_helper.rb'
 
-# Offense count: 17
-# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
-# AllowedMethods: refine
+# Offense count: 16
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
+# ExcludedMethods: refine
 Metrics/BlockLength:
-  Max: 285
+  Max: 349
 
-# Offense count: 3
-# Configuration parameters: AllowedMethods, AllowedPatterns.
+# Offense count: 1
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 8
 
 # Offense count: 1
-# Configuration parameters: AllowedMethods, AllowedPatterns.
+# Configuration parameters: IgnoredMethods.
 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
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowedReceivers.
-# AllowedReceivers: Thread.current
-Style/HashEachMethods:
+# Configuration parameters: EnforcedStyle, AllowModifiersOnSymbols.
+# SupportedStyles: inline, group
+Style/AccessModifierDeclarations:
   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
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
+# Cop supports --auto-correct.
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
 # 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 @@
-3.2.2
+2.7.7

data/Gemfile

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-exporter (13.3.0)
+    gitlab-exporter (13.4.0)
       connection_pool (= 2.2.5)
       faraday (~> 1.8.0)
       pg (= 1.5.3)
@@ -16,8 +16,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
-    base64 (0.1.1)
+    ast (2.4.1)
     connection_pool (2.2.5)
     diff-lcs (1.5.0)
     faraday (1.8.0)
@@ -39,30 +38,26 @@ 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.23.0)
-    parser (3.2.2.3)
+    parallel (1.20.1)
+    parser (3.0.0.0)
       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.1.1)
+    rainbow (3.0.0)
     redis (4.4.0)
     redis-namespace (1.9.0)
       redis (>= 4)
-    regexp_parser (2.8.1)
-    rexml (3.2.6)
+    regexp_parser (2.0.3)
+    rexml (3.2.4)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -76,21 +71,18 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.56.3)
-      base64 (~> 0.1.1)
-      json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+    rubocop (0.93.1)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    ruby-progressbar (1.13.0)
+      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.5)
     sidekiq (6.4.0)
       connection_pool (>= 2.2.2)
@@ -102,7 +94,7 @@ GEM
       rack-protection (= 2.2.4)
       tilt (~> 2.0)
     tilt (2.0.11)
-    unicode-display_width (2.4.2)
+    unicode-display_width (1.7.0)
     webrick (1.7.0)
 
 PLATFORMS
@@ -112,7 +104,7 @@ DEPENDENCIES
   gitlab-exporter!
   rspec (~> 3.12)
   rspec-expectations (~> 3.12.0)
-  rubocop (~> 1.52)
+  rubocop (~> 0.42)
 
 BUNDLED WITH
    2.4.5

data/gitlab-exporter.gemspec

@@ -10,7 +10,6 @@ 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,5 +1,19 @@
 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

@@ -23,6 +23,9 @@ module GitLab
       # needed to be re-initialized
       POOL_TIMEOUT = 90
 
+      # Lock for Sidekiq.redis which we need to modify, but is not concurrency safe.
+      SIDEKIQ_REDIS_LOCK = Mutex.new
+
       PrometheusMetrics.describe("sidekiq_enqueued_jobs",
                                  "Total number of jobs enqueued by class name. Only inspects the first #{PROBE_JOBS_LIMIT} jobs per queue.") # rubocop:disable Layout/LineLength
 
@@ -211,16 +214,15 @@ module GitLab
       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(namespaced)]
-        end
+        SIDEKIQ_REDIS_LOCK.synchronize {
+          Sidekiq.configure_client do |config|
+            config.redis = self.class.connection_pool[redis_options(namespaced)]
+          end
 
-        return unless connected?
+          return unless connected?
 
-        yield
+          yield
+        }
       end
 
       def redis_options(namespaced = true)

data/lib/gitlab_exporter/version.rb

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

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-exporter
 version: !ruby/object:Gem::Version
-  version: 13.3.0
+  version: 13.4.0
 platform: ruby
 authors:
 - Pablo Carranza
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2016-07-27 00:00:00.000000000 Z
@@ -242,7 +242,7 @@ homepage: http://gitlab.com
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -250,15 +250,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: GitLab metrics exporter
 test_files: