Merge branch 'fix-unicorn-sampler-workers-count' into 'master'

Make unicorn_workers to return meaningful results

Closes #63659

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

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/gitlab/metrics/samplers/unicorn_sampler.rb b/lib/gitlab/metrics/samplers/unicorn_sampler.rb
index 9af7e0afed4..355f938704e 100644
--- a/lib/gitlab/metrics/samplers/unicorn_sampler.rb
+++ b/lib/gitlab/metrics/samplers/unicorn_sampler.rb
@@ -54,7 +54,16 @@ module Gitlab
         end
 
         def unicorn_workers_count
-          `pgrep -f '[u]nicorn_rails worker.+ #{Rails.root.to_s}'`.split.count
+          http_servers.sum(&:worker_processes) # rubocop: disable CodeReuse/ActiveRecord
+        end
+
+        # Traversal of ObjectSpace is expensive, on fully loaded application
+        # it takes around 80ms. The instances of HttpServers are not a subject
+        # to change so we can cache the list of servers.
+        def http_servers
+          return [] unless defined?(::Unicorn::HttpServer)
+
+          @http_servers ||= ObjectSpace.each_object(::Unicorn::HttpServer).to_a
         end
       end
     end