Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 9 insertions, 1 deletions

diff --git a/app/controllers/graphql_controller.rb b/app/controllers/graphql_controller.rb
index a1348e4d858..123102bf793 100644
--- a/app/controllers/graphql_controller.rb
+++ b/app/controllers/graphql_controller.rb
@@ -81,7 +81,7 @@ class GraphqlController < ApplicationController
   end
 
   def context
-    @context ||= { current_user: current_user }
+    @context ||= { current_user: current_user, is_sessionless_user: !!sessionless_user? }
   end
 
   def build_variables(variable_info)
@@ -107,4 +107,12 @@ class GraphqlController < ApplicationController
 
     render json: error, status: status
   end
+
+  def append_info_to_payload(payload)
+    super
+
+    # Merging to :metadata will ensure these are logged as top level keys
+    payload[:metadata] ||= {}
+    payload[:metadata].merge!(graphql: { operation_name: params[:operationName] })
+  end
 end