Merge branch 'bjk/56788_unicorn_labels' into 'master'

Clean up unicorn sampler metric labels

Closes #56788

See merge request gitlab-org/gitlab-ce!24626

4 files changed, 13 insertions, 6 deletions

diff --git a/changelogs/unreleased/56788-unicorn-metric-labels.yml b/changelogs/unreleased/56788-unicorn-metric-labels.yml
new file mode 100644
index 00000000000..824c981780c
--- /dev/null
+++ b/changelogs/unreleased/56788-unicorn-metric-labels.yml
@@ -0,0 +1,5 @@
+---
+title: Clean up unicorn sampler metric labels
+merge_request: 24626
+author: bjk-gitlab
+type: fixed
diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md
index c9a2778b3a4..6ea0ac0d495 100644
--- a/doc/administration/monitoring/prometheus/gitlab_metrics.md
+++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md
@@ -48,6 +48,8 @@ The following metrics are available:
 | upload_file_does_not_exist        | Counter   | 10.7 in EE, 11.5 in CE  | Number of times an upload record could not find its file |
 | failed_login_captcha_total        | Gauge | 11.0 | Counter of failed CAPTCHA attempts during login |
 | successful_login_captcha_total    | Gauge | 11.0 | Counter of successful CAPTCHA attempts during login |
+| unicorn_active_connections        | Gauge | 11.0 | The number of active Unicorn connections (workers) |
+| unicorn_queued_connections        | Gauge | 11.0 | The number of queued Unicorn connections |
 
 ### Ruby metrics
 
diff --git a/lib/gitlab/metrics/samplers/unicorn_sampler.rb b/lib/gitlab/metrics/samplers/unicorn_sampler.rb
index 4c4ec026823..4c5b849cc51 100644
--- a/lib/gitlab/metrics/samplers/unicorn_sampler.rb
+++ b/lib/gitlab/metrics/samplers/unicorn_sampler.rb
@@ -23,13 +23,13 @@ module Gitlab
 
         def sample
           Raindrops::Linux.tcp_listener_stats(tcp_listeners).each do |addr, stats|
-            unicorn_active_connections.set({ type: 'tcp', address: addr }, stats.active)
-            unicorn_queued_connections.set({ type: 'tcp', address: addr }, stats.queued)
+            unicorn_active_connections.set({ socket_type: 'tcp', socket_address: addr }, stats.active)
+            unicorn_queued_connections.set({ socket_type: 'tcp', socket_address: addr }, stats.queued)
           end
 
           Raindrops::Linux.unix_listener_stats(unix_listeners).each do |addr, stats|
-            unicorn_active_connections.set({ type: 'unix', address: addr }, stats.active)
-            unicorn_queued_connections.set({ type: 'unix', address: addr }, stats.queued)
+            unicorn_active_connections.set({ socket_type: 'unix', socket_address: addr }, stats.active)
+            unicorn_queued_connections.set({ socket_type: 'unix', socket_address: addr }, stats.queued)
           end
         end
 
diff --git a/spec/lib/gitlab/metrics/samplers/unicorn_sampler_spec.rb b/spec/lib/gitlab/metrics/samplers/unicorn_sampler_spec.rb
index 771b633a2b9..4b03f3c2532 100644
--- a/spec/lib/gitlab/metrics/samplers/unicorn_sampler_spec.rb
+++ b/spec/lib/gitlab/metrics/samplers/unicorn_sampler_spec.rb
@@ -37,7 +37,7 @@ describe Gitlab::Metrics::Samplers::UnicornSampler do
         end
 
         it 'updates metrics type unix and with addr' do
-          labels = { type: 'unix', address: socket_address }
+          labels = { socket_type: 'unix', socket_address: socket_address }
 
           expect(subject).to receive_message_chain(:unicorn_active_connections, :set).with(labels, 'active')
           expect(subject).to receive_message_chain(:unicorn_queued_connections, :set).with(labels, 'queued')
@@ -69,7 +69,7 @@ describe Gitlab::Metrics::Samplers::UnicornSampler do
         end
 
         it 'updates metrics type unix and with addr' do
-          labels = { type: 'tcp', address: tcp_socket_address }
+          labels = { socket_type: 'tcp', socket_address: tcp_socket_address }
 
           expect(subject).to receive_message_chain(:unicorn_active_connections, :set).with(labels, 'active')
           expect(subject).to receive_message_chain(:unicorn_queued_connections, :set).with(labels, 'queued')