1 files changed, 3 insertions, 9 deletions
diff --git a/lib/gitlab/middleware/request_context.rb b/lib/gitlab/middleware/request_context.rb
index 07f6f87a68c..f609002007c 100644
--- a/lib/gitlab/middleware/request_context.rb
+++ b/lib/gitlab/middleware/request_context.rb
@@ -8,15 +8,9 @@ module Gitlab
       end
 
       def call(env)
-        # We should be using ActionDispatch::Request instead of
-        # Rack::Request to be consistent with Rails, but due to a Rails
-        # bug described in
-        # https://gitlab.com/gitlab-org/gitlab-foss/issues/58573#note_149799010
-        # hosts behind a load balancer will only see 127.0.0.1 for the
-        # load balancer's IP.
-        req = Rack::Request.new(env)
-
-        ::Gitlab::InstrumentationHelper.init_instrumentation_data(request_ip: req.ip)
+        request = ActionDispatch::Request.new(env)
+        Gitlab::RequestContext.start_request_context(request: request)
+        Gitlab::RequestContext.start_thread_context
 
         @app.call(env)
       end