gitlab-exporter 16.6.0 → 16.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 741207042e803e24cf2a73e9c622606dc6814a7f335a1e512940977afac6d049
-  data.tar.gz: 27e0ec1192f33b5835e61ddd2a86df4c131673f2c46b11217648c6edc274e64b
+  metadata.gz: 8b320ac3c29627e5bca0700ab6007fb3681a286679032bccae4595af29e764fc
+  data.tar.gz: ab52c7b430a87959228fdb4483c2bf3a26f9838c983a5292dd27bb6b72123a8d
 SHA512:
-  metadata.gz: 9c5f33d6126b18c3da6ae392c5959ee6ca8b361b9af93e24fd5d9f07aa296d4dfd53717bb87fa05496570b3480b4d19ee3512e22ea6a13931a7234e4d1f5f6c6
-  data.tar.gz: 3df0acd00f63f87a674907a70e65b4be172be997c323bfd5c36d3d56fc89cbe7ee72e108c395e674b1075a4618a10befab07ae4b158008c91a102475107d89ce
+  metadata.gz: dbd696eb2e666142c275e46aff04eb9beda6739863fe505249f0074d1d8d1145fe6b41573e0f3521feee2bcde7dd2ad33e8fc76b1abc3f75e34e23d95d94258f
+  data.tar.gz: 2d426ce702f2d360b5aa8cc5ae51f4924295e717615c6da3adbd9ef1e46c241ed40e151082918fa7c963c7367c857730e1fafb41ffc328bc6b3d14879615abcf

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    gitlab-exporter (16.6.0)
+    gitlab-exporter (16.8.0)
       connection_pool (= 2.5.5)
       deep_merge (~> 1.2.2)
-      faraday (= 2.14.0)
+      faraday (= 2.14.1)
       pg (= 1.6.3)
-      puma (= 7.2.0)
+      puma (= 8.0.1)
       quantile (= 0.2.1)
       redis (= 4.8.1)
       redis-namespace (= 1.11.0)
@@ -22,7 +22,7 @@ GEM
     connection_pool (2.5.5)
     deep_merge (1.2.2)
     diff-lcs (1.5.0)
-    faraday (2.14.0)
+    faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -40,7 +40,7 @@ GEM
       racc
     pg (1.6.3)
     prism (1.9.0)
-    puma (7.2.0)
+    puma (8.0.1)
       nio4r (~> 2.0)
     quantile (0.2.1)
     racc (1.8.1)
@@ -66,7 +66,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.84.1)
+    rubocop (1.84.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)

data/gitlab-exporter.gemspec

@@ -24,9 +24,9 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "connection_pool", "2.5.5"
   s.add_runtime_dependency "deep_merge", "~> 1.2.2"
-  s.add_runtime_dependency "faraday", "2.14.0"
+  s.add_runtime_dependency "faraday", "2.14.1"
   s.add_runtime_dependency "pg", "1.6.3"
-  s.add_runtime_dependency "puma", "7.2.0"
+  s.add_runtime_dependency "puma", "8.0.1"
   s.add_runtime_dependency "quantile", "0.2.1"
   s.add_runtime_dependency "redis", "4.8.1"
   s.add_runtime_dependency "redis-namespace", "1.11.0"

data/lib/gitlab_exporter/database/zoekt.rb

@@ -62,13 +62,26 @@ module GitLab
           LIMIT 1
         SQL
 
+        # unclaimed_storage_bytes and storage_percent_used are not real columns on
+        # zoekt_nodes; they are derived in Search::Zoekt::Node. We compute them in SQL
+        # here to avoid loading every row through ActiveRecord.
         ZOEKT_NODE_STORAGE_QUERY = <<~SQL.freeze
           SELECT
-            id,
-            metadata ->> 'name' AS node_name,
-            unclaimed_storage_bytes,
-            storage_percent_used
-          FROM zoekt_nodes
+            zn.id,
+            zn.metadata ->> 'name' AS node_name,
+            (zn.usable_storage_bytes - COALESCE(zi.reserved_total, 0))::bigint
+              AS unclaimed_storage_bytes,
+            CASE
+              WHEN zn.total_bytes > 0
+                THEN zn.used_bytes::float8 / zn.total_bytes::float8
+              ELSE 0
+            END AS storage_percent_used
+          FROM zoekt_nodes zn
+          LEFT JOIN (
+            SELECT zoekt_node_id, SUM(reserved_storage_bytes) AS reserved_total
+            FROM zoekt_indices
+            GROUP BY zoekt_node_id
+          ) zi ON zi.zoekt_node_id = zn.id
         SQL
 
         ZOEKT_REPOSITORIES_STATE_QUERY = <<~SQL.freeze
@@ -163,7 +176,8 @@ module GitLab
           with_connection_pool do |conn|
             conn.exec_params(query, params)
           end
-        rescue PG::UndefinedTable, PG::UndefinedColumn
+        rescue PG::UndefinedTable, PG::UndefinedColumn => e
+          @logger&.warn("ZoektCollector query failed: #{e.class}: #{e.message.lines.first&.strip}")
           nil
         end
       end

data/lib/gitlab_exporter/sidekiq.rb

@@ -115,7 +115,7 @@ module GitLab
           Sidekiq::Queue.all.each do |queue|
             Sidekiq.redis do |conn|
               conn.lrange("queue:#{queue.name}", 0, PROBE_JOBS_LIMIT).each do |job|
-                job_class = Sidekiq.load_json(job)["class"]
+                job_class = Sidekiq.load_json(job.force_encoding("utf-8"))["class"]
 
                 job_stats[job_class] += 1
               end

data/lib/gitlab_exporter/version.rb

@@ -1,5 +1,5 @@
 module GitLab
   module Exporter
-    VERSION = "16.6.0".freeze
+    VERSION = "16.8.0".freeze
   end
 end

data/spec/database/zoekt_spec.rb

@@ -174,6 +174,33 @@ describe GitLab::Exporter::Database::ZoektCollector do
     end
   end
 
+  describe "ZOEKT_NODE_STORAGE_QUERY" do
+    subject(:query) { described_class::ZOEKT_NODE_STORAGE_QUERY }
+
+    it "selects the unclaimed_storage_bytes and storage_percent_used aliases" do
+      expect(query).to match(/AS unclaimed_storage_bytes/)
+      expect(query).to match(/AS storage_percent_used/)
+    end
+
+    it "computes unclaimed_storage_bytes from real columns rather than referencing a non-existent column" do
+      # zoekt_nodes does not have an unclaimed_storage_bytes column; it must be derived
+      # from usable_storage_bytes minus the SUM of zoekt_indices.reserved_storage_bytes.
+      expect(query).to include("usable_storage_bytes")
+      expect(query).to include("reserved_storage_bytes")
+      expect(query).to include("zoekt_indices")
+      expect(query).not_to match(/^\s*unclaimed_storage_bytes\b/)
+    end
+
+    it "computes storage_percent_used from used_bytes / total_bytes with a guard" do
+      # zoekt_nodes does not have a storage_percent_used column; it must be derived
+      # from used_bytes / total_bytes (with a divide-by-zero guard).
+      expect(query).to include("used_bytes")
+      expect(query).to include("total_bytes")
+      expect(query).to match(/total_bytes\s*>\s*0/)
+      expect(query).not_to match(/^\s*storage_percent_used\b/)
+    end
+  end
+
   describe "#zoekt_indexing_enabled?" do
     it "returns true when zoekt is enabled" do
       expect(connection).to receive(:exec)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-exporter
 version: !ruby/object:Gem::Version
-  version: 16.6.0
+  version: 16.8.0
 platform: ruby
 authors:
 - Pablo Carranza
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.0.1
 - !ruby/object:Gem::Dependency
   name: quantile
   requirement: !ruby/object:Gem::Requirement