Move complexity/depth to `final_value`

Tidy tests according to reviewer comments.
Move complexity and depth calls from `initial_value` to `final_value`
Log variables as json

1 files changed, 11 insertions, 9 deletions

diff --git a/lib/gitlab/graphql/query_analyzers/logger_analyzer.rb b/lib/gitlab/graphql/query_analyzers/logger_analyzer.rb
index 1e49c894ecb..8119d232124 100644
--- a/lib/gitlab/graphql/query_analyzers/logger_analyzer.rb
+++ b/lib/gitlab/graphql/query_analyzers/logger_analyzer.rb
@@ -9,14 +9,11 @@ module Gitlab
         end
 
         def initial_value(query)
-          analyzers = [complexity_analyzer, depth_analyzer]
-          complexity, depth = GraphQL::Analysis.analyze_query(query, analyzers)
           {
             time_started: Gitlab::Metrics::System.monotonic_time,
             query_string: query.query_string,
+            query: query,
             variables: process_variables(query.provided_variables),
-            complexity: complexity,
-            depth: depth,
             duration: nil
           }
         end
@@ -26,16 +23,21 @@ module Gitlab
         end
 
         def final_value(memo)
-          memo[:duration] = "#{duration(memo[:time_started]).round(1)}ms"
-          GraphqlLogger.info(memo.except!(:time_started))
-          memo
+          analyzers = [complexity_analyzer, depth_analyzer]
+          complexity, depth = GraphQL::Analysis.analyze_query(memo[:query], analyzers)
+
+          memo[:depth] = depth
+          memo[:complexity] = complexity
+          memo[:duration] = duration(memo[:time_started]).round(1)
+
+          GraphqlLogger.info(memo.except!(:time_started, :query))
         end
 
         private
 
         def process_variables(variables)
-          if variables.respond_to?(:to_unsafe_h)
-            variables.to_unsafe_h
+          if variables.respond_to?(:to_json)
+            variables.to_json
           else
             variables
           end