Merge branch 'merge_graphql_logs_with_server_logs' into 'master'

Merge graphql logs with application(controller) logs

See merge request gitlab-org/gitlab!44174

app/controllers/graphql_controller.rb

@@ -113,6 +113,12 @@ class GraphqlController < ApplicationController
 
     # Merging to :metadata will ensure these are logged as top level keys
     payload[:metadata] ||= {}
-    payload[:metadata].merge!(graphql: { operation_name: params[:operationName] })
+    payload[:metadata].merge!(graphql: logs)
+  end
+
+  def logs
+    RequestStore.store[:graphql_logs].to_h
+                .except(:duration_s, :query_string)
+                .merge(operation_name: params[:operationName])
   end
 end

lib/gitlab/graphql/query_analyzers/logger_analyzer.rb

@@ -25,7 +25,7 @@ module Gitlab
         end
 
         def call(memo, visit_type, irep_node)
-          memo
+          RequestStore.store[:graphql_logs] = memo
         end
 
         def final_value(memo)
@@ -35,6 +35,8 @@ module Gitlab
 
           memo[:depth] = depth
           memo[:complexity] = complexity
+          # This duration is not the execution time of the
+          # query but the execution time of the analyzer.
           memo[:duration_s] = duration(memo[:time_started]).round(1)
           memo[:used_fields] = field_usages.first
           memo[:used_deprecated_fields] = field_usages.second

spec/controllers/graphql_controller_spec.rb

@@ -156,9 +156,11 @@ RSpec.describe GraphqlController do
 
   describe '#append_info_to_payload' do
     let(:graphql_query) { graphql_query_for('project', { 'fullPath' => 'foo' }, %w(id name)) }
+    let(:mock_store) { { graphql_logs: { foo: :bar } } }
     let(:log_payload) { {} }
 
     before do
+      allow(RequestStore).to receive(:store).and_return(mock_store)
       allow(controller).to receive(:append_info_to_payload).and_wrap_original do |method, *|
         method.call(log_payload)
       end
@@ -168,7 +170,7 @@ RSpec.describe GraphqlController do
       post :execute, params: { query: graphql_query, operationName: 'Foo' }
 
       expect(controller).to have_received(:append_info_to_payload)
-      expect(log_payload.dig(:metadata, :graphql, :operation_name)).to eq('Foo')
+      expect(log_payload.dig(:metadata, :graphql)).to eq({ operation_name: 'Foo', foo: :bar })
     end
   end
 end