gitlab-exporter 12.1.1 → 13.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f94ff4332c26d23722a980cda4185e84dcecf96e01ce58bf5794d73523efdb2e
-  data.tar.gz: 5b650ba2d57d2a445cd077f0d93daaf4f635815579339281be70698215a67f87
+  metadata.gz: 772759981296901f1bd6ed3d38a9f98cf882ddbc851605c8dfb31b47aceed046
+  data.tar.gz: 82f8e5ce3795f3349dd1cd053161302cf01eafe0c57485ec3074e7a8844606a9
 SHA512:
-  metadata.gz: ed42fc0e5869f7c7be443f29ded7bb4ded2242a1612042f8212baba438aeafbd3019f1011c5b46cc246cb94a8ca7887508b2c100baf05bebc8b3b2b4d9afca60
-  data.tar.gz: bac63ad5e89bfaaeb20d7483e27c89bdfa9945494f3f1a44e1daf023f1d0ee43d57b4e42e9110656f898f8806a341a9d51cc6ef5afdf1905c14a2a5640f87414
+  metadata.gz: ed3d74142e8da3b4bf367c9bf26b91b1e55a42f904e494479797d1bc10f07324e0734247a271a44e1a6db6ca745dddaddf97688d0ba659ff3e27f3f927fa6973
+  data.tar.gz: f0af44afc5e5c3d425bdfe09e1d846b550b53f9b1bc24cad7549715a8d18dc751f60dda5a8e7c934d1a0b6c2f0285ea533c64419deaab78087ef102c2161d40b

data/.gitlab-ci.yml

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

data/Gemfile

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

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    gitlab-exporter (12.1.1)
+    gitlab-exporter (13.0.3)
       connection_pool (= 2.2.5)
       faraday (~> 1.8.0)
-      pg (= 1.2.3)
+      pg (= 1.5.3)
       puma (= 5.6.5)
       quantile (= 0.2.1)
       redis (= 4.4.0)
@@ -18,7 +18,7 @@ GEM
   specs:
     ast (2.4.1)
     connection_pool (2.2.5)
-    diff-lcs (1.3)
+    diff-lcs (1.5.0)
     faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -45,7 +45,7 @@ GEM
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
-    pg (1.2.3)
+    pg (1.5.3)
     puma (5.6.5)
       nio4r (~> 2.0)
     quantile (0.2.1)
@@ -58,19 +58,19 @@ GEM
       redis (>= 4)
     regexp_parser (2.0.3)
     rexml (3.2.4)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     rubocop (0.93.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
@@ -102,8 +102,8 @@ PLATFORMS
 
 DEPENDENCIES
   gitlab-exporter!
-  rspec (~> 3.5)
-  rspec-expectations (~> 3.7.0)
+  rspec (~> 3.12)
+  rspec-expectations (~> 3.12.0)
   rubocop (~> 0.42)
 
 BUNDLED WITH

data/gitlab-exporter.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "connection_pool", "2.2.5"
   s.add_runtime_dependency "faraday", "~> 1.8.0"
-  s.add_runtime_dependency "pg", "1.2.3"
+  s.add_runtime_dependency "pg", "1.5.3"
   s.add_runtime_dependency "puma", "5.6.5"
   s.add_runtime_dependency "quantile", "0.2.1"
   s.add_runtime_dependency "redis", "4.4.0"
@@ -31,6 +31,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "sinatra", "~> 2.2.0"
   s.add_runtime_dependency "webrick", "~> 1.7"
 
-  s.add_development_dependency "rspec", "~> 3.7.0"
-  s.add_development_dependency "rspec-expectations", "~> 3.7.0"
+  s.add_development_dependency "rspec", "~> 3.12.0"
+  s.add_development_dependency "rspec-expectations", "~> 3.12.0"
 end

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
@@ -184,7 +198,7 @@ module GitLab
         def run
           validate!
 
-          config = Utils.deep_symbolize_hash_keys(YAML.load_file(@config_file))
+          config = Utils.deep_symbolize_hash_keys(YAML.safe_load_file(@config_file, aliases: true))
 
           WebExporter.setup(config)
           WebExporter.run!

data/lib/gitlab_exporter/database/row_count.rb

@@ -8,7 +8,6 @@ module GitLab
       # This class works under the assumption you do COUNT(*) queries, define
       # queries in the QUERIES constant. If in doubt how these work, read
       # #construct_query
-      # rubocop:disable Metrics/ClassLength
       class RowCountCollector < Base
         # We ignore mirrors with a next_execution_timestamp before
         # 2020-03-28 because this is when we stopped processing mirrors
@@ -118,138 +117,6 @@ module GitLab
               visibility_level: {},
               root: { definition: "(parent_id IS NULL)" }
             }
-          },
-          container_repositories_migration_pending: {
-            select: :container_repositories,
-            where: <<~SQL
-              migration_state <> 'import_done'
-              AND created_at < '2022-08-17 00:00:00'
-            SQL
-          },
-          container_repositories_pre_importing: {
-            select: :container_repositories,
-            where: "migration_state = 'pre_importing'"
-          },
-          container_repositories_importing: {
-            select: :container_repositories,
-            where: "migration_state = 'importing'"
-          },
-          container_repositories_pre_import_done: {
-            select: :container_repositories,
-            where: "migration_state = 'pre_import_done'"
-          },
-          container_repositories_import_done: {
-            select: :container_repositories,
-            where: "migration_state = 'import_done'"
-          },
-          container_repositories_import_skipped: {
-            select: :container_repositories,
-            where: "migration_state = 'import_skipped'"
-          },
-          container_repositories_import_aborted: {
-            select: :container_repositories,
-            where: "migration_state = 'import_aborted'"
-          },
-          container_repositories_migration_all_free: {
-            select: :container_repositories,
-            where: <<~SQL
-              migration_plan IN ('free', 'early_adopter')
-              OR migration_plan IS NULL
-            SQL
-          },
-          container_repositories_migration_pending_free: {
-            select: :container_repositories,
-            where: <<~SQL
-              migration_state <> 'import_done'
-              AND created_at < '2022-08-17 00:00:00'
-              AND (migration_plan IN ('free', 'early_adopter')
-                OR migration_plan IS NULL)
-            SQL
-          },
-          container_repositories_import_done_free: {
-            select: :container_repositories,
-            where: <<~SQL
-              (migration_state = 'import_done' OR created_at >= '2022-08-17 00:00:00')
-              AND (migration_plan IN ('free', 'early_adopter')
-                OR migration_plan IS NULL)
-            SQL
-          },
-          container_repositories_stalled_pre_importing: {
-            select: :container_repositories,
-            where: <<~SQL
-              migration_state = 'pre_importing'
-              AND (COALESCE(migration_pre_import_started_at, TO_TIMESTAMP(0)) < (now() - INTERVAL '20 minutes'))
-            SQL
-          },
-          container_repositories_stalled_pre_import_done: {
-            select: :container_repositories,
-            where: <<~SQL
-              migration_state = 'pre_import_done'
-              AND (COALESCE(migration_pre_import_done_at, TO_TIMESTAMP(0)) < (now() - INTERVAL '5 minutes'))
-            SQL
-          },
-          container_repositories_stalled_importing: {
-            select: :container_repositories,
-            where: <<~SQL
-              migration_state = 'importing'
-              AND (COALESCE(migration_import_started_at, TO_TIMESTAMP(0)) < (now() - INTERVAL '5 minutes'))
-            SQL
-          },
-          container_repositories_skipped_not_in_plan: {
-            select: :container_repositories,
-            where: <<~SQL
-              migration_state = 'import_skipped'
-              AND migration_skipped_reason = 0
-            SQL
-          },
-          container_repositories_skipped_too_many_retries: {
-            select: :container_repositories,
-            where: <<~SQL
-              migration_state = 'import_skipped'
-              AND migration_skipped_reason = 1
-            SQL
-          },
-          container_repositories_skipped_too_many_tags: {
-            select: :container_repositories,
-            where: <<~SQL
-              migration_state = 'import_skipped'
-              AND migration_skipped_reason = 2
-            SQL
-          },
-          container_repositories_skipped_deny_list: {
-            select: :container_repositories,
-            where: <<~SQL
-              migration_state = 'import_skipped'
-              AND migration_skipped_reason = 3
-            SQL
-          },
-          container_repositories_skipped_canceled: {
-            select: :container_repositories,
-            where: <<~SQL
-              migration_state = 'import_skipped'
-              AND migration_skipped_reason IN (4, 8)
-            SQL
-          },
-          container_repositories_skipped_not_found: {
-            select: :container_repositories,
-            where: <<~SQL
-              migration_state = 'import_skipped'
-              AND migration_skipped_reason = 5
-            SQL
-          },
-          container_repositories_skipped_native: {
-            select: :container_repositories,
-            where: <<~SQL
-              migration_state = 'import_skipped'
-              AND migration_skipped_reason = 6
-            SQL
-          },
-          container_repositories_skipped_force_canceled: {
-            select: :container_repositories,
-            where: <<~SQL
-              migration_state = 'import_skipped'
-              AND migration_skipped_reason = 7
-            SQL
           }
         }.freeze
 
@@ -315,7 +182,6 @@ module GitLab
           query_string << ";"
         end
       end
-      # rubocop:enable Metrics/ClassLength
 
       # The prober which is called when gathering metrics
       class RowCountProber

data/lib/gitlab_exporter/version.rb

@@ -1,5 +1,5 @@
 module GitLab
   module Exporter
-    VERSION = "12.1.1".freeze
+    VERSION = "13.0.3".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-exporter
 version: !ruby/object:Gem::Version
-  version: 12.1.1
+  version: 13.0.3
 platform: ruby
 authors:
 - Pablo Carranza
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -156,28 +156,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.12.0
 description: GitLab metrics exporter to use with prometheus
 email: pablo@gitlab.com
 executables: