Merge branch 'master' of gitlab_gitlab:gitlab-org/gitlab-cerunner-metrics-extractor

1 files changed, 1 insertions, 4 deletions

diff --git a/lib/gitlab/metrics/samplers/puma_sampler.rb b/lib/gitlab/metrics/samplers/puma_sampler.rb
index 25e40c70230..8a24d4f3663 100644
--- a/lib/gitlab/metrics/samplers/puma_sampler.rb
+++ b/lib/gitlab/metrics/samplers/puma_sampler.rb
@@ -15,7 +15,6 @@ module Gitlab
             puma_workers:            ::Gitlab::Metrics.gauge(:puma_workers, 'Total number of workers'),
             puma_running_workers:    ::Gitlab::Metrics.gauge(:puma_running_workers, 'Number of active workers'),
             puma_stale_workers:      ::Gitlab::Metrics.gauge(:puma_stale_workers, 'Number of stale workers'),
-            puma_phase:              ::Gitlab::Metrics.gauge(:puma_phase, 'Phase number (increased during phased restarts)'),
             puma_running:            ::Gitlab::Metrics.gauge(:puma_running, 'Number of running threads'),
             puma_queued_connections: ::Gitlab::Metrics.gauge(:puma_queued_connections, 'Number of connections in that worker\'s "todo" set waiting for a worker thread'),
             puma_active_connections: ::Gitlab::Metrics.gauge(:puma_active_connections, 'Number of threads processing a request'),
@@ -43,7 +42,7 @@ module Gitlab
         def puma_stats
           Puma.stats
         rescue NoMethodError
-          Rails.logger.info "PumaSampler: stats are not available yet, waiting for Puma to boot"
+          Rails.logger.info "PumaSampler: stats are not available yet, waiting for Puma to boot" # rubocop:disable Gitlab/RailsLogger
           nil
         end
 
@@ -54,7 +53,6 @@ module Gitlab
             last_status = worker['last_status']
             labels = { worker: "worker_#{worker['index']}" }
 
-            metrics[:puma_phase].set(labels, worker['phase'])
             set_worker_metrics(last_status, labels) if last_status.present?
           end
         end
@@ -76,7 +74,6 @@ module Gitlab
           metrics[:puma_workers].set(labels, stats['workers'])
           metrics[:puma_running_workers].set(labels, stats['booted_workers'])
           metrics[:puma_stale_workers].set(labels, stats['old_workers'])
-          metrics[:puma_phase].set(labels, stats['phase'])
         end
 
         def set_worker_metrics(stats, labels = {})