gitlab-exporter 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdd56172f3a01bd1e0cd2f2054aee6c8e4877e39847e6d242a7e9b51e04b1289
-  data.tar.gz: fa7a64cf59169efc726326fd7fb3c3e7bc832a9a10f3ea122e4bfad53f906ec8
+  metadata.gz: 7f73ad8856766603f5e3bfc3d142c803812a121b370fc4c2f717dde81e2796ec
+  data.tar.gz: e599d10943b9ed01befbfc642f49f561665e2e6d8134bbe68f20b4e997b845a5
 SHA512:
-  metadata.gz: 2d66f6aafab68e9d9e5cbde86a81d1f28385b887e35b4032cf76a147203208708a302a0e565340bd87c25c6a99e4e11f6ba39839644f79b9e78dce0b30f1b7dd
-  data.tar.gz: 3f80aa6f2bca1afc0593150471afc532d9d01aaf299a50f6a4b54fd13dba4dd59aadaa28bc4a495a84afd5a789a7ab463396bf94bcc62357b4434ee3200aeec0
+  metadata.gz: a2229b8daf628778d9e9b5c95adb782d8cfa8a3f9cab0966696ea2b99a54592734e3ede04c73175c540e3a331199a97bc637d678a98b41edbc5223891213ddc7
+  data.tar.gz: 6b0c1f64c4c02e22d11dc2abac2286612e8546ea31d591ce50f102ab6295229ed231bc16604bdeed9f3a3b4b828e4b33bacd81422dd58dae5a49084d738f2886

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-exporter (5.0.1)
+    gitlab-exporter (5.1.0)
       connection_pool (~> 2.2.1)
       pg (~> 1.1)
       quantile (~> 0.2.0)

data/lib/gitlab_exporter/database/bloat.rb

@@ -60,7 +60,7 @@ module GitLab
         def probe_for_type(type)
           collector.run(type).each do |query_name, data|
             METRIC_KEYS.each do |key|
-              metrics.add("gitlab_database_bloat_#{type}_#{key}", data[key], query_name: query_name)
+              metrics.add("gitlab_database_bloat_#{type}_#{key}", data[key].to_f, query_name: query_name)
             end
           end
 

data/lib/gitlab_exporter/database/ci_builds.rb

@@ -463,7 +463,7 @@ module GitLab
               other_values[key] ||= 0
               other_values[key] += metric[:value]
             else
-              add_ci_created_pending_builds(metric_name, metric[:value], metric)
+              add_ci_created_pending_builds(metric_name, metric[:value].to_f, metric)
             end
           end
 
@@ -479,7 +479,7 @@ module GitLab
         end
 
         def ci_stale_builds_metrics
-          @metrics.add("ci_stale_builds", @results[:stale_builds])
+          @metrics.add("ci_stale_builds", @results[:stale_builds].to_f)
         end
 
         def metrics_per_runner
@@ -519,19 +519,19 @@ module GitLab
           labels[:namespace] = "" unless labels[:namespace]
 
           selected_labels = labels.select { |k, _| allowed_labels.include?(k) }.sort.to_h
-          @metrics.add(metric_name, value, selected_labels)
+          @metrics.add(metric_name, value.to_f, selected_labels)
         end
 
         def repeated_commands_metrics
           @results[:repeated_commands].each do |metric|
             value = metric.delete(:value)
 
-            @metrics.add("ci_repeated_commands_builds", value, metric)
+            @metrics.add("ci_repeated_commands_builds", value.to_f, metric)
           end
         end
 
         def unarchived_traces_metrics
-          @metrics.add("ci_unarchived_traces", @results[:unarchived_traces])
+          @metrics.add("ci_unarchived_traces", @results[:unarchived_traces].to_f)
         end
       end
     end

data/lib/gitlab_exporter/database/remote_mirrors.rb

@@ -48,13 +48,13 @@ module GitLab
           results.to_a.each do |row|
             @metrics.add(
               "project_remote_mirror_last_successful_update_time_seconds",
-              row["last_successful_update_at"].to_i,
+              row["last_successful_update_at"].to_f,
               project_id: row["project_id"],
               url: row["url"]
             )
             @metrics.add(
               "project_remote_mirror_last_update_time_seconds",
-              row["last_update_at"].to_i,
+              row["last_update_at"].to_f,
               project_id: row["project_id"],
               url: row["url"]
             )

data/lib/gitlab_exporter/database/row_count.rb

@@ -147,7 +147,7 @@ module GitLab
         def probe_db
           results = @collector.run
           results.each do |key, value|
-            @metrics.add("gitlab_database_rows", value.to_i, query_name: key.to_s)
+            @metrics.add("gitlab_database_rows", value.to_f, query_name: key.to_s)
           end
 
           self

data/lib/gitlab_exporter/database/tuple_stats.rb

@@ -35,7 +35,9 @@ module GitLab
 
           result.each do |table_name, tuple_stats|
             tuple_stats.each do |column_name, value|
-              @metrics.add("gitlab_database_stat_table_#{column_name}", value.to_s, table_name: table_name)
+              @metrics.add("gitlab_database_stat_table_#{column_name}",
+                           value.to_f,
+                           table_name: table_name) unless value.is_a?(Numeric)
             end
           end
 

data/lib/gitlab_exporter/prometheus.rb

@@ -16,6 +16,8 @@ module GitLab
       end
 
       def add(name, value, quantile = false, **labels)
+        fail "value '#{value}' must be a number" unless value.is_a?(Numeric)
+
         if quantile
           @quantiles[{ name: name, labels: labels }] << value
         else

data/lib/gitlab_exporter/version.rb

@@ -1,5 +1,5 @@
 module GitLab
   module Exporter
-    VERSION = "5.0.1".freeze
+    VERSION = "5.1.0".freeze
   end
 end

data/spec/database/ci_builds_spec.rb

@@ -206,27 +206,27 @@ describe GitLab::Exporter::Database do
 
     context "when executed on EE" do
       let(:expected_pending_builds) do
-        [{ namespace: "1", shared_runners: "yes", has_minutes: "yes", value: 30 },
-         { namespace: "2", shared_runners: "yes", has_minutes: "yes", value: 50 },
-         { namespace: "3", shared_runners: "yes", has_minutes: "no", value: 1 },
-         { namespace: "4", shared_runners: "yes", has_minutes: "yes", value: 2 },
-         { namespace: "5", shared_runners: "no", has_minutes: "no", value: 2 }]
+        [{ namespace: "1", shared_runners: "yes", has_minutes: "yes", value: 30.0 },
+         { namespace: "2", shared_runners: "yes", has_minutes: "yes", value: 50.0 },
+         { namespace: "3", shared_runners: "yes", has_minutes: "no", value: 1.0 },
+         { namespace: "4", shared_runners: "yes", has_minutes: "yes", value: 2.0 },
+         { namespace: "5", shared_runners: "no", has_minutes: "no", value: 2.0 }]
       end
       let(:expected_created_builds) do
-        [{ namespace: "1", shared_runners: "no", has_minutes: "no", value: 10 },
-         { namespace: "2", shared_runners: "no", has_minutes: "no", value: 20 }]
+        [{ namespace: "1", shared_runners: "no", has_minutes: "no", value: 10.0 },
+         { namespace: "2", shared_runners: "no", has_minutes: "no", value: 20.0 }]
       end
       let(:expected_per_runner) do
-        [{ runner: "1", shared_runner: "yes", namespace: "1", mirror: "no", mirror_trigger_builds: "no", scheduled: "yes", triggered: "no", has_minutes: "yes", value: 15 },
-         { runner: "2", shared_runner: "no", namespace: "2", mirror: "yes", mirror_trigger_builds: "yes", scheduled: "no", triggered: "yes", has_minutes: "no", value: 5 },
-         { runner: "2", shared_runner: "no", namespace: "3", mirror: "yes", mirror_trigger_builds: "yes", scheduled: "no", triggered: "yes", has_minutes: "yes", value: 5 },
-         { runner: "3", shared_runner: "no", namespace: "4", mirror: "yes", mirror_trigger_builds: "yes", scheduled: "no", triggered: "yes", has_minutes: "no", value: 5 }]
+        [{ runner: "1", shared_runner: "yes", namespace: "1", mirror: "no", mirror_trigger_builds: "no", scheduled: "yes", triggered: "no", has_minutes: "yes", value: 15.0 },
+         { runner: "2", shared_runner: "no", namespace: "2", mirror: "yes", mirror_trigger_builds: "yes", scheduled: "no", triggered: "yes", has_minutes: "no", value: 5.0 },
+         { runner: "2", shared_runner: "no", namespace: "3", mirror: "yes", mirror_trigger_builds: "yes", scheduled: "no", triggered: "yes", has_minutes: "yes", value: 5.0 },
+         { runner: "3", shared_runner: "no", namespace: "4", mirror: "yes", mirror_trigger_builds: "yes", scheduled: "no", triggered: "yes", has_minutes: "no", value: 5.0 }]
       end
       let(:expected_repeated_commands) do
-        [{ namespace: "1", project: "1", shared_runners: "yes", status: "pending", has_minutes: "yes", value: 10 },
-         { namespace: "2", project: "2", shared_runners: "no", status: "running", has_minutes: "no", value: 20 },
-         { namespace: "1", project: "3", shared_runners: "no", status: "pending", has_minutes: "yes", value: 30 },
-         { namespace: "2", project: "4", shared_runners: "yes", status: "running", has_minutes: "no", value: 40 }]
+        [{ namespace: "1", project: "1", shared_runners: "yes", status: "pending", has_minutes: "yes", value: 10.0 },
+         { namespace: "2", project: "2", shared_runners: "no", status: "running", has_minutes: "no", value: 20.0 },
+         { namespace: "1", project: "3", shared_runners: "no", status: "pending", has_minutes: "yes", value: 30.0 },
+         { namespace: "2", project: "4", shared_runners: "yes", status: "running", has_minutes: "no", value: 40.0 }]
       end
 
       before do
@@ -331,11 +331,11 @@ describe GitLab::Exporter::Database do
         end
 
         it "responds with stale builds Prometheus metrics" do
-          expect(subject).to match(/^ci_stale_builds 2$/m)
+          expect(subject).to match(/^ci_stale_builds 2.0$/m)
         end
 
         it "responds with unarchived traces Prometheus metrics" do
-          expect(subject).to match(/^ci_unarchived_traces 10$/m)
+          expect(subject).to match(/^ci_unarchived_traces 10.0$/m)
         end
       end
 
@@ -349,34 +349,34 @@ describe GitLab::Exporter::Database do
           prober.write_to(writer)
           output = writer.string
 
-          expect(output).to match(/^ci_stale_builds 0$/m)
+          expect(output).to match(/^ci_stale_builds 0.0$/m)
         end
       end
     end
 
     context "when executed on EE" do
       let(:ci_created_builds_expected_lines) do
-        ['ci_created_builds\{has_minutes="no",namespace="1",shared_runners="no"\} 10',
-         'ci_created_builds\{has_minutes="no",namespace="2",shared_runners="no"\} 20']
+        ['ci_created_builds\{has_minutes="no",namespace="1",shared_runners="no"\} 10.0',
+         'ci_created_builds\{has_minutes="no",namespace="2",shared_runners="no"\} 20.0']
       end
       let(:ci_pending_builds_expected_lines) do
-        ['ci_pending_builds\{has_minutes="yes",namespace="1",shared_runners="yes"\} 30',
-         'ci_pending_builds\{has_minutes="yes",namespace="2",shared_runners="yes"\} 50',
-         'ci_pending_builds\{has_minutes="no",namespace="",shared_runners="yes"\} 1',
-         'ci_pending_builds\{has_minutes="yes",namespace="",shared_runners="yes"\} 2',
-         'ci_pending_builds\{has_minutes="no",namespace="",shared_runners="no"\} 2']
+        ['ci_pending_builds\{has_minutes="yes",namespace="1",shared_runners="yes"\} 30.0',
+         'ci_pending_builds\{has_minutes="yes",namespace="2",shared_runners="yes"\} 50.0',
+         'ci_pending_builds\{has_minutes="no",namespace="",shared_runners="yes"\} 1.0',
+         'ci_pending_builds\{has_minutes="yes",namespace="",shared_runners="yes"\} 2.0',
+         'ci_pending_builds\{has_minutes="no",namespace="",shared_runners="no"\} 2.0']
       end
       let(:ci_running_builds_expected_lines) do
-        ['ci_running_builds\{has_minutes="yes",mirror="no",mirror_trigger_builds="no",namespace="1",runner="1",scheduled="yes",shared_runner="yes",triggered="no"\} 15',
-         'ci_running_builds\{has_minutes="no",mirror="yes",mirror_trigger_builds="yes",namespace="",runner="2",scheduled="no",shared_runner="no",triggered="yes"\} 5',
-         'ci_running_builds\{has_minutes="yes",mirror="yes",mirror_trigger_builds="yes",namespace="",runner="2",scheduled="no",shared_runner="no",triggered="yes"\} 5',
-         'ci_running_builds\{has_minutes="no",mirror="yes",mirror_trigger_builds="yes",namespace="",runner="3",scheduled="no",shared_runner="no",triggered="yes"\} 5']
+        ['ci_running_builds\{has_minutes="yes",mirror="no",mirror_trigger_builds="no",namespace="1",runner="1",scheduled="yes",shared_runner="yes",triggered="no"\} 15.0',
+         'ci_running_builds\{has_minutes="no",mirror="yes",mirror_trigger_builds="yes",namespace="",runner="2",scheduled="no",shared_runner="no",triggered="yes"\} 5.0',
+         'ci_running_builds\{has_minutes="yes",mirror="yes",mirror_trigger_builds="yes",namespace="",runner="2",scheduled="no",shared_runner="no",triggered="yes"\} 5.0',
+         'ci_running_builds\{has_minutes="no",mirror="yes",mirror_trigger_builds="yes",namespace="",runner="3",scheduled="no",shared_runner="no",triggered="yes"\} 5.0']
       end
       let(:ci_repeated_commands_builds_lines) do
-        ['ci_repeated_commands_builds\{namespace="1",project="1",shared_runners="yes",status="pending",has_minutes="yes"\} 10',
-         'ci_repeated_commands_builds\{namespace="2",project="2",shared_runners="no",status="running",has_minutes="no"\} 20',
-         'ci_repeated_commands_builds\{namespace="1",project="3",shared_runners="no",status="pending",has_minutes="yes"\} 30',
-         'ci_repeated_commands_builds\{namespace="2",project="4",shared_runners="yes",status="running",has_minutes="no"\} 40']
+        ['ci_repeated_commands_builds\{namespace="1",project="1",shared_runners="yes",status="pending",has_minutes="yes"\} 10.0',
+         'ci_repeated_commands_builds\{namespace="2",project="2",shared_runners="no",status="running",has_minutes="no"\} 20.0',
+         'ci_repeated_commands_builds\{namespace="1",project="3",shared_runners="no",status="pending",has_minutes="yes"\} 30.0',
+         'ci_repeated_commands_builds\{namespace="2",project="4",shared_runners="yes",status="running",has_minutes="no"\} 40.0']
       end
       let(:namespace_out_of_limit) { 2 }
 
@@ -389,25 +389,25 @@ describe GitLab::Exporter::Database do
 
     context "when executed on CE" do
       let(:ci_created_builds_expected_lines) do
-        ['ci_created_builds\{namespace="1",shared_runners="no"\} 10',
-         'ci_created_builds\{namespace="2",shared_runners="no"\} 20']
+        ['ci_created_builds\{namespace="1",shared_runners="no"\} 10.0',
+         'ci_created_builds\{namespace="2",shared_runners="no"\} 20.0']
       end
       let(:ci_pending_builds_expected_lines) do
-        ['ci_pending_builds\{namespace="1",shared_runners="yes"\} 30',
-         'ci_pending_builds\{namespace="2",shared_runners="yes"\} 50',
-         'ci_pending_builds\{namespace="",shared_runners="yes"\} 3',
-         'ci_pending_builds\{namespace="",shared_runners="no"\} 2']
+        ['ci_pending_builds\{namespace="1",shared_runners="yes"\} 30.0',
+         'ci_pending_builds\{namespace="2",shared_runners="yes"\} 50.0',
+         'ci_pending_builds\{namespace="",shared_runners="yes"\} 3.0',
+         'ci_pending_builds\{namespace="",shared_runners="no"\} 2.0']
       end
       let(:ci_running_builds_expected_lines) do
-        ['ci_running_builds\{namespace="1",runner="1",scheduled="yes",shared_runner="yes",triggered="no"\} 15',
-         'ci_running_builds\{namespace="",runner="2",scheduled="no",shared_runner="no",triggered="yes"\} 10',
-         'ci_running_builds\{namespace="",runner="3",scheduled="no",shared_runner="no",triggered="yes"\} 5']
+        ['ci_running_builds\{namespace="1",runner="1",scheduled="yes",shared_runner="yes",triggered="no"\} 15.0',
+         'ci_running_builds\{namespace="",runner="2",scheduled="no",shared_runner="no",triggered="yes"\} 10.0',
+         'ci_running_builds\{namespace="",runner="3",scheduled="no",shared_runner="no",triggered="yes"\} 5.0']
       end
       let(:ci_repeated_commands_builds_lines) do
-        ['ci_repeated_commands_builds\{namespace="1",project="1",shared_runners="yes",status="pending"\} 10',
-         'ci_repeated_commands_builds\{namespace="2",project="2",shared_runners="no",status="running"\} 20',
-         'ci_repeated_commands_builds\{namespace="1",project="3",shared_runners="no",status="pending"\} 30',
-         'ci_repeated_commands_builds\{namespace="2",project="4",shared_runners="yes",status="running"\} 40']
+        ['ci_repeated_commands_builds\{namespace="1",project="1",shared_runners="yes",status="pending"\} 10.0',
+         'ci_repeated_commands_builds\{namespace="2",project="2",shared_runners="no",status="running"\} 20.0',
+         'ci_repeated_commands_builds\{namespace="1",project="3",shared_runners="no",status="pending"\} 30.0',
+         'ci_repeated_commands_builds\{namespace="2",project="4",shared_runners="yes",status="running"\} 40.0']
       end
       let(:namespace_out_of_limit) { 0 }
 

data/spec/prometheus_metrics_spec.rb

@@ -14,4 +14,13 @@ describe GitLab::Exporter::PrometheusMetrics do
       /mymetric{mylabel="x",myotherlabel="y"} 1.3 \d*$/
     )
   end
+
+  it "fails to add a non-numeric metric value" do
+    expect {
+      subject.add("mymetric", "1.4", mylabel: "x", myotherlabel: "y").to_s
+    }.to raise_error(RuntimeError)
+    expect {
+      subject.add("mymetric", "invalid", mylabel: "x", myotherlabel: "y").to_s
+    }.to raise_error(RuntimeError)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-exporter
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Pablo Carranza
@@ -206,8 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: GitLab metrics exporter