Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 8 insertions, 2 deletions

diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index 0d5daeefe90..02418c45e73 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -33,7 +33,7 @@ module Gitlab
           GitalyServer: {
             address: Gitlab::GitalyClient.address(repository.storage),
             token: Gitlab::GitalyClient.token(repository.storage),
-            features: Feature::Gitaly.server_feature_flags(
+            call_metadata: Feature::Gitaly.server_feature_flags(
               user: ::Feature::Gitaly.user_actor(user),
               repository: repository,
               project: ::Feature::Gitaly.project_actor(repository.container),
@@ -48,6 +48,12 @@ module Gitlab
           attrs[:GitConfigOptions] << "receive.maxInputSize=#{receive_max_input_size.megabytes}"
         end
 
+        attrs[:GitalyServer][:call_metadata].merge!(
+          'user_id' => attrs[:GL_ID].presence,
+          'username' => attrs[:GL_USERNAME].presence,
+          'remote_ip' => Gitlab::ApplicationContext.current_context_attribute(:remote_ip).presence
+        ).compact!
+
         attrs
       end
 
@@ -257,7 +263,7 @@ module Gitlab
         {
           address: Gitlab::GitalyClient.address(repository.shard),
           token: Gitlab::GitalyClient.token(repository.shard),
-          features: Feature::Gitaly.server_feature_flags(
+          call_metadata: Feature::Gitaly.server_feature_flags(
             user: ::Feature::Gitaly.user_actor,
             repository: repository,
             project: ::Feature::Gitaly.project_actor(repository.container),