Merge pull request #7 from Shopify/remove-query-string-from-query-ext…

…racted Remove query_string from query_extracted
Shopify · Dec 10, 2018 · c823541 · c823541
2 parents b580a42 + 0fe6310
commit c823541
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 16 deletions.
diff --git a/lib/graphql_metrics/extractor.rb b/lib/graphql_metrics/extractor.rb
@@ -97,7 +97,6 @@ def extract_query
 
       query_extracted_method.call(
         {
-          query_string: query.document.to_query_string,
           operation_type: query.selected_operation.operation_type,
           operation_name: query.selected_operation_name,
           duration: duration

diff --git a/test/redis_instrumentation.rb b/test/redis_instrumentation.rb
@@ -10,7 +10,6 @@ def query_extracted(metrics, _metadata)
       @redis.lpush(
         'query_extracted',
         {
-          query_string: metrics[:query_string],
           operation_type: metrics[:operation_type],
           operation_name: metrics[:operation_name],
           duration: metrics[:duration],

diff --git a/test/unit/instrumentation_test.rb b/test/unit/instrumentation_test.rb
@@ -89,12 +89,9 @@ def self.resolve_type(_type, obj, _ctx)
       batch_loaded_fields: extract_from_redis('batch_loaded_field_extracted'),
     }
 
-    normalize_query_string_in_actual(actual)
-
     expected = {
       queries: [
         {
-          query_string: normalize_query_string(query_string),
           operation_type: "query",
           operation_name: "MyQuery",
           duration: 0
@@ -205,12 +202,9 @@ def self.resolve_type(_type, obj, _ctx)
       batch_loaded_fields: extract_from_redis('batch_loaded_field_extracted'),
     }
 
-    normalize_query_string_in_actual(actual)
-
     expected = {
       queries: [
         {
-          query_string: normalize_query_string(query_string),
           operation_type: "mutation",
           operation_name: "MyMutation",
           duration: 0
@@ -462,12 +456,4 @@ def minimal_query
   def extract_from_redis(key)
     @redis.lrange(key, 0, -1).map { |v| eval v }.reverse
   end
-
-  def normalize_query_string_in_actual(actual)
-    actual[:queries].first[:query_string] = normalize_query_string(actual[:queries].first[:query_string])
-  end
-
-  def normalize_query_string(query_string)
-    query_string.gsub(/\n/, ' ').squish
-  end
 end