Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

1 files changed, 5 insertions, 0 deletions

diff --git a/lib/gitlab/instrumentation_helper.rb b/lib/gitlab/instrumentation_helper.rb
index 379c27caeb7..b8d8deb3418 100644
--- a/lib/gitlab/instrumentation_helper.rb
+++ b/lib/gitlab/instrumentation_helper.rb
@@ -31,6 +31,7 @@ module Gitlab
       instrument_thread_memory_allocations(payload)
       instrument_load_balancing(payload)
       instrument_pid(payload)
+      instrument_worker_id(payload)
       instrument_uploads(payload)
       instrument_rate_limiting_gates(payload)
     end
@@ -106,6 +107,10 @@ module Gitlab
       payload[:pid] = Process.pid
     end
 
+    def instrument_worker_id(payload)
+      payload[:worker_id] = ::Prometheus::PidProvider.worker_id
+    end
+
     def instrument_thread_memory_allocations(payload)
       counters = ::Gitlab::Memory::Instrumentation.measure_thread_memory_allocations(
         ::Gitlab::RequestContext.instance.thread_memory_allocations)