gitlab-exporter 16.0.0 → 16.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9238e8cac6cf2f3ef7988d072cd7a2e2398e0304af9920fa66200965f1c4b98c
-  data.tar.gz: 6a99535403821e1b5acd5a1b9d46be11a6e97f2b6f8e1c99682faacb733ea847
+  metadata.gz: 60e275e1cea2b8841c1c8471f44d851a49b552ede909c91aca462ad60efcd3ab
+  data.tar.gz: 59c1f60fc4caed54da0048db13c3dd1566fd70bbb744f3260c16cca78012c018
 SHA512:
-  metadata.gz: 9adc56ffd8bb27659d37145b55a96eac0f8a905057ef938568054426c68f7d9693dd38915cd50467d6dd4d58e97c25210630fa2ce1e491096b07ed01e7ef6523
-  data.tar.gz: ea57211fc8eb131f13b30db56bf014363440effecd9d5ccd21e9e298116b7ee9e90ea7c1c08f91aa53198599840daa99a0b57261d926fa1ce5e28538be18c84e
+  metadata.gz: e790d3ec4ebb7e07546d5565dc14fdc62f1131b3b23cf367c502eb12e7d7ed55051dd79fed6e8c865af464d1b120eaf2fe6f4f72f3a6a581915adc342b446ad2
+  data.tar.gz: 829b42af76274c5ff4b25c9094545ea42491fc41f16bae2dec96cd3a76450beb7cca40496bbc10f926f75b0bcaa509fb9a4001a3f83b2e7dc3f1031b7554d0d3

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: "3.0"
+  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:
@@ -52,7 +62,7 @@ rspec_integration:
   services:
     - name: redis:${REDIS_VERSION}
       alias: redis-master
-    - name: bitnami/redis-sentinel:${REDIS_SENTINEL_VERSION}
+    - name: bitnamilegacy/redis-sentinel:${REDIS_SENTINEL_VERSION}
       alias: redis-sentinel
       command:
         - /bin/sh

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/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,15 +1,15 @@
 PATH
   remote: .
   specs:
-    gitlab-exporter (16.0.0)
-      connection_pool (= 2.5.3)
+    gitlab-exporter (16.2.0)
+      connection_pool (= 2.5.4)
       deep_merge (~> 1.2.2)
-      faraday (= 2.13.3)
-      pg (= 1.5.9)
-      puma (= 6.6.0)
+      faraday (= 2.14.0)
+      pg (= 1.6.2)
+      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 (~> 3.2.0)
       webrick (~> 1.9)
@@ -17,38 +17,42 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
+    ast (2.4.3)
     base64 (0.2.0)
-    connection_pool (2.5.3)
+    connection_pool (2.5.4)
     deep_merge (1.2.2)
     diff-lcs (1.5.0)
-    faraday (2.13.3)
+    faraday (2.14.0)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
     faraday-net_http (3.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 (6.6.0)
+      racc
+    pg (1.6.2)
+    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 (3.2.0)
       base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
-    rainbow (3.0.0)
-    redis (4.5.0)
-    redis-namespace (1.9.0)
+    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)
@@ -62,18 +66,21 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (0.93.1)
+    rubocop (1.81.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.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.4.0)
-      parser (>= 2.7.1.5)
-    ruby-progressbar (1.11.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.47.1)
+      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)
@@ -85,7 +92,9 @@ GEM
       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
@@ -93,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

@@ -22,14 +22,14 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = Gem::Requirement.new(">= 3.0")
 
-  s.add_runtime_dependency "connection_pool", "2.5.3"
+  s.add_runtime_dependency "connection_pool", "2.5.4"
   s.add_runtime_dependency "deep_merge", "~> 1.2.2"
-  s.add_runtime_dependency "faraday", "2.13.3"
-  s.add_runtime_dependency "pg", "1.5.9"
-  s.add_runtime_dependency "puma", "6.6.0"
+  s.add_runtime_dependency "faraday", "2.14.0"
+  s.add_runtime_dependency "pg", "1.6.2"
+  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", "~> 3.2.0"
   s.add_runtime_dependency "webrick", "~> 1.9"

data/lib/gitlab_exporter/cli.rb

@@ -44,7 +44,7 @@ module GitLab
           @options = options(args)
           args = @options.parse!
           @source = args.shift
-          @target = args.shift || STDOUT
+          @target = args.shift || $stdout
           @labels ||= {}
         end
 
@@ -79,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
 
@@ -87,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
 
@@ -121,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
 
@@ -129,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
 
@@ -234,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
 
@@ -271,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
 
@@ -279,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
 
@@ -315,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
@@ -343,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

@@ -3,45 +3,100 @@ module GitLab
     module Database
       # A helper class to collect zoekt metrics.
       class ZoektCollector < Base
-        QUERY = <<~SQL.freeze
+        # Query to get processing zoekt_tasks distribution by zoekt_node_id
+        ZOEKT_TASKS_PROCESSING_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_NODES_QUERY = <<~SQL.freeze
+          SELECT schema_version, id FROM zoekt_nodes
+        SQL
+
+        ZOEKT_REPOSITORY_SCHEMA_VERSION_QUERY = <<~SQL.freeze
+          SELECT
+            COUNT(*)
+          FROM
+            zoekt_repositories
+          INNER JOIN
+            zoekt_indices
+            ON zoekt_repositories.zoekt_index_id = zoekt_indices.id
+          WHERE
+            zoekt_indices.zoekt_node_id = $1
+            AND zoekt_repositories.schema_version < $2
+            AND zoekt_repositories.state = 10;
+        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
         SQL
 
         def run
-          return unless zoekt_indexing_enabled?
+          return {} unless zoekt_indexing_enabled?
 
-          execute(QUERY, [Time.now.utc])
+          {
+            task_processing_query_result: execute(ZOEKT_TASKS_PROCESSING_QUERY, [Time.now.utc]),
+            repositories_schema_version_query_result: repositories_schema_version_query_result
+          }.compact
         end
 
         private
 
+        def repositories_schema_version_query_result
+          hash = zoekt_node_schema_version_hash
+          return if hash.nil?
+
+          zoekt_repository_schema_version_result(hash)
+        end
+
+        def zoekt_node_schema_version_hash
+          zoekt_nodes = execute(ZOEKT_NODES_QUERY)
+          return if zoekt_nodes.nil?
+
+          hash = {}
+          zoekt_nodes.each do |row|
+            hash[row["id"]] = row["schema_version"]
+          end
+          hash
+        end
+
+        def zoekt_repository_schema_version_result(hash)
+          result = Set.new
+          hash.each do |id, schema_version|
+            query_result = execute(ZOEKT_REPOSITORY_SCHEMA_VERSION_QUERY, [id, schema_version])
+            if query_result.nil?
+              result = nil
+              break
+            end
+
+            count = query_result[0]["count"].to_i
+            result.add({ target_schema_version: schema_version, zoekt_node_id: id, unfinished_repository_count: count })
+          end
+          result
+        end
+
         def zoekt_indexing_enabled?
           @zoekt_indexing_enabled ||=
             begin
@@ -53,7 +108,7 @@ module GitLab
             end
         end
 
-        def execute(query, params)
+        def execute(query, params = [])
           with_connection_pool do |conn|
             conn.exec_params(query, params)
           end
@@ -68,6 +123,10 @@ module GitLab
                                    "Number of tasks waiting to be processed by Zoekt",
                                    "gauge")
 
+        PrometheusMetrics.describe("search_zoekt_repositories_schema_version_count",
+                                   "Number of zoekt_repositories which do not have the latest schema version",
+                                   "gauge")
+
         def initialize(metrics: PrometheusMetrics.new, **opts)
           @metrics = metrics
           @collector = opts[:collector] || ZoektCollector.new(**opts)
@@ -75,13 +134,11 @@ module GitLab
 
         def probe_db
           results = @collector.run
-          results.to_a.each do |row|
-            @metrics.add(
-              "search_zoekt_task_processing_queue_size",
-              row["task_count"].to_i,
-              node_name: row["node_name"],
-              node_id: row["node_id"]
-            )
+          results[:task_processing_query_result].to_a.each do |row|
+            add_processing_zoekt_tasks_to_metric(row)
+          end
+          results[:repositories_schema_version_query_result]&.each do |row|
+            add_zoekt_repositories_by_schema_version_to_metric(row)
           end
 
           self
@@ -89,6 +146,24 @@ module GitLab
           self
         end
 
+        def add_processing_zoekt_tasks_to_metric(row)
+          @metrics.add(
+            "search_zoekt_task_processing_queue_size",
+            row["task_count"].to_i,
+            node_name: row["node_name"],
+            node_id: row["node_id"]
+          )
+        end
+
+        def add_zoekt_repositories_by_schema_version_to_metric(row)
+          @metrics.add(
+            "search_zoekt_repositories_schema_version_count",
+            row[:unfinished_repository_count].to_i,
+            target_schema_version: row[:target_schema_version],
+            zoekt_node_id: row[:zoekt_node_id]
+          )
+        end
+
         def write_to(target)
           target.write(@metrics.to_s)
         end

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 = "16.0.0".freeze
+    VERSION = "16.2.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

data/spec/database/zoekt_spec.rb

@@ -4,8 +4,13 @@ require "gitlab_exporter/database/zoekt"
 describe GitLab::Exporter::Database::ZoektCollector do
   let(:connection_pool) { double("connection pool") }
   let(:connection) { double("connection") }
-  let(:query) { described_class::QUERY }
+  let(:zoekt_tasks_processing_query) { described_class::ZOEKT_TASKS_PROCESSING_QUERY }
+  let(:zoekt_nodes_query) { described_class::ZOEKT_NODES_QUERY }
+  let(:zoekt_nodes_query_results) { [{ "id" => "1", "schema_version" => "2302" }] }
   let(:zoekt_enabled_query) { described_class::ZOEKT_ENABLED_QUERY }
+  let(:zoekt_repository_schema_version_query) { described_class::ZOEKT_REPOSITORY_SCHEMA_VERSION_QUERY }
+
+  let(:zoekt_repository_schema_version_query_results) { [{ "count" => "1" }] }
 
   subject(:collector) { described_class.new(connection_string: "host=localhost") }
 
@@ -26,13 +31,24 @@ describe GitLab::Exporter::Database::ZoektCollector do
   describe "#run" do
     let(:zoekt_enabled_results) {}
     let(:frozen_time) { Time.new(2023, 1, 1, 0, 0, 0, 0) }
-    let(:query_results) do
+    let(:zoekt_tasks_processing_query_results) do
       [
         { "node_id" => "1", "node_name" => "zoekt-1", "task_count" => "5" },
         { "node_id" => "2", "node_name" => "zoekt-2", "task_count" => "10" }
       ]
     end
 
+    let(:zoekt_repositories_schema_version_query_results) do
+      Set.new([{ target_schema_version: "2302", zoekt_node_id: "1", unfinished_repository_count: 1 }])
+    end
+
+    let(:result) do
+      {
+        repositories_schema_version_query_result: zoekt_repositories_schema_version_query_results,
+        task_processing_query_result: zoekt_tasks_processing_query_results
+      }
+    end
+
     before do
       allow(Time).to receive(:now).and_return(frozen_time)
     end
@@ -42,10 +58,8 @@ describe GitLab::Exporter::Database::ZoektCollector do
         stub_zoekt_not_enabled
       end
 
-      it "returns nil" do
-        allow(connection).to receive(:exec_params).with(query, frozen_time).and_raise(PG::UndefinedTable)
-
-        expect(collector.run).to be_nil
+      it "returns {}" do
+        expect(collector.run).to eq({})
       end
     end
 
@@ -54,25 +68,38 @@ describe GitLab::Exporter::Database::ZoektCollector do
         stub_zoekt_enabled
       end
 
-      it "executes the query with the current time" do
-        expect(connection).to receive(:exec_params).with(query, [frozen_time]).and_return(query_results)
+      it "executes the query with correct params" do
+        expect(connection).to receive(:exec_params).with(zoekt_tasks_processing_query, [frozen_time])
+                                                   .and_return(zoekt_tasks_processing_query_results)
+        expect(connection).to receive(:exec_params).with(zoekt_nodes_query, [])
+                                                   .and_return(zoekt_nodes_query_results)
+        expect(connection).to receive(:exec_params).with(zoekt_repository_schema_version_query, %w[1 2302])
+                                                   .and_return(zoekt_repository_schema_version_query_results)
 
-        expect(collector.run).to eq(query_results)
+        expect(collector.run).to eq(result)
       end
 
       context "when PG::UndefinedTable is raised" do
-        it "returns nil" do
-          allow(connection).to receive(:exec_params).with(query, [frozen_time]).and_raise(PG::UndefinedTable)
+        it "does not includes the key which got the exception" do
+          allow(connection).to receive(:exec_params).with(zoekt_tasks_processing_query, [frozen_time])
+                                                    .and_raise(PG::UndefinedTable)
+          allow(connection).to receive(:exec_params).with(zoekt_nodes_query, [])
+                                                    .and_raise(PG::UndefinedTable)
 
-          expect(collector.run).to be_nil
+          expect(collector.run).to eq({})
         end
       end
 
       context "when PG::UndefinedColumn is raised" do
-        it "returns nil" do
-          allow(connection).to receive(:exec_params).with(query, [frozen_time]).and_raise(PG::UndefinedColumn)
-
-          expect(collector.run).to be_nil
+        it "does not includes the key which got the exception" do
+          allow(connection).to receive(:exec_params).with(zoekt_tasks_processing_query, [frozen_time])
+                                                    .and_return(zoekt_tasks_processing_query_results)
+          expect(connection).to receive(:exec_params).with(zoekt_nodes_query, [])
+                                                     .and_return(zoekt_nodes_query_results)
+          expect(connection).to receive(:exec_params).with(zoekt_repository_schema_version_query, %w[1 2302])
+                                                     .and_raise(PG::UndefinedTable)
+
+          expect(collector.run).to eq({ task_processing_query_result: zoekt_tasks_processing_query_results })
         end
       end
     end
@@ -99,10 +126,15 @@ describe GitLab::Exporter::Database::ZoektProber do
   let(:metrics) { double("PrometheusMetrics", add: nil) }
   let(:collector) { double(GitLab::Exporter::Database::ZoektCollector, run: data) }
   let(:data) do
-    [
-      { "node_id" => "1", "node_name" => "zoekt-1", "task_count" => "5" },
-      { "node_id" => "2", "node_name" => "zoekt-2", "task_count" => "10" }
-    ]
+    {
+      repositories_schema_version_query_result: Set.new(
+        [{ target_schema_version: "2302", zoekt_node_id: "1", unfinished_repository_count: 1 }]
+      ),
+      task_processing_query_result: [
+        { "node_id" => "1", "node_name" => "zoekt-1", "task_count" => "5" },
+        { "node_id" => "2", "node_name" => "zoekt-2", "task_count" => "10" }
+      ]
+    }
   end
 
   describe "#probe_db" do
@@ -123,7 +155,7 @@ describe GitLab::Exporter::Database::ZoektProber do
     it "adds metrics for each node" do
       expect(collector).to receive(:run).and_return(data)
 
-      data.each do |node_data|
+      data[:task_processing_query_result].each do |node_data|
         expect(metrics).to receive(:add)
           .with("search_zoekt_task_processing_queue_size",
                 node_data["task_count"].to_i,
@@ -131,6 +163,16 @@ describe GitLab::Exporter::Database::ZoektProber do
                 node_id: node_data["node_id"])
       end
 
+      data[:repositories_schema_version_query_result].each do |node_data|
+        expect(metrics).to receive(:add)
+          .with(
+            "search_zoekt_repositories_schema_version_count",
+            node_data[:unfinished_repository_count].to_i,
+            target_schema_version: node_data[:target_schema_version],
+            zoekt_node_id: node_data[:zoekt_node_id]
+          )
+      end
+
       probe_db
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-exporter
 version: !ruby/object:Gem::Version
-  version: 16.0.0
+  version: 16.2.0
 platform: ruby
 authors:
 - Pablo Carranza
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.3
+        version: 2.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.3
+        version: 2.5.4
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.3
+        version: 2.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.3
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.6.0
+        version: 6.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.6.0
+        version: 6.6.1
 - !ruby/object:Gem::Dependency
   name: quantile
   requirement: !ruby/object:Gem::Requirement
@@ -100,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