Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

1 files changed, 7 insertions, 0 deletions

diff --git a/lib/gitlab/instrumentation_helper.rb b/lib/gitlab/instrumentation_helper.rb
index a865a6392f0..c10c4a7bedf 100644
--- a/lib/gitlab/instrumentation_helper.rb
+++ b/lib/gitlab/instrumentation_helper.rb
@@ -29,6 +29,7 @@ module Gitlab
       instrument_rack_attack(payload)
       instrument_cpu(payload)
       instrument_thread_memory_allocations(payload)
+      instrument_load_balancing(payload)
     end
 
     def instrument_gitaly(payload)
@@ -104,6 +105,12 @@ module Gitlab
       payload.merge!(counters) if counters
     end
 
+    def instrument_load_balancing(payload)
+      load_balancing_payload = ::Gitlab::Metrics::Subscribers::LoadBalancing.load_balancing_payload
+
+      payload.merge!(load_balancing_payload)
+    end
+
     # Returns the queuing duration for a Sidekiq job in seconds, as a float, if the
     # `enqueued_at` field or `created_at` field is available.
     #