Fiddle with some of the bits

Author: patch0

lib/graphql/tracing/sentry_trace.rb

@@ -13,9 +13,7 @@ module SentryTrace
         "analyze_multiplex" => "graphql.analyze_multiplex",
         "execute_multiplex" => "graphql.execute_multiplex",
         "execute_query" => "graphql.execute",
-        "execute_query_lazy" => "graphql.execute",
-        "execute_field" => "graphql.execute",
-        "execute_field_lazy" => "graphql.execute"
+        "execute_query_lazy" => "graphql.execute"
       }.each do |trace_method, platform_key|
         module_eval <<-RUBY, __FILE__, __LINE__
         def #{trace_method}(**data, &block)
@@ -49,7 +47,7 @@ def platform_resolve_type_lazy(platform_key, &block)
       end
 
       def platform_field_key(field)
-        "graphql.#{field.path}"
+        "graphql.field.#{field.path}"
       end
 
       def platform_authorized_key(type)
@@ -71,7 +69,7 @@ def instrument_execution(platform_key, trace_method, data=nil, &block)
 
           if trace_method == "execute_multiplex" && data.key?(:multiplex)
             operation_names = data[:multiplex].queries.map{|q| operation_name(q) }
-            span.set_description(operation_names.join(", ")) if operation_names.count > 1
+            span.set_description(operation_names.join(", "))
           elsif trace_method == "execute_query" && data.key?(:query)
             span.set_description(operation_name(data[:query]))
             span.set_data('graphql.document', data[:query].query_string)

lib/graphql/tracing/sentry_tracing.rb

@@ -13,8 +13,6 @@ class SentryTracing < PlatformTracing
         "execute_multiplex" => "graphql.execute_multiplex",
         "execute_query" => "graphql.execute",
         "execute_query_lazy" => "graphql.execute",
-        "execute_field" => "graphql.execute",
-        "execute_field_lazy" => "graphql.execute"
       }
 
       def platform_trace(platform_key, trace_method, data, &block)
@@ -30,16 +28,16 @@ def platform_trace(platform_key, trace_method, data, &block)
           elsif trace_method == "execute_query" && data.key?(:query)
             span.set_description(operation_name(data[:query]))
             span.set_data("graphql.document", data[:query].query_string)
-            span.set_data("graphql.operation.name", data[:query].selected_operation_name)
+            span.set_data("graphql.operation.name", data[:query].selected_operation_name) if data[:query].selected_operation_name
             span.set_data("graphql.operation.type", data[:query].selected_operation.operation_type)
           end
 
           result
         end
       end
 
-      def platform_field_key(field)
-        "graphql.#{field.path}"
+      def platform_field_key(_type, field)
+        "graphql.field.#{field.path}"
       end
 
       def platform_authorized_key(type)
@@ -55,7 +53,7 @@ def platform_resolve_type_key(type)
       def operation_name(query)
         selected_op = query.selected_operation
         if selected_op
-          [selected_op.operation_type, selected_op.name].join(" ")
+          [selected_op.operation_type, selected_op.name].compact.join(" ")
         else
           "GraphQL Operation"
         end

spec/graphql/tracing/sentry_trace_spec.rb

@@ -29,8 +29,8 @@ def thing; :thing; end
     Sentry.clear_all
   end
 
-  describe 'When Sentry is not configured' do
-    it 'does not initialize any spans' do
+  describe "When Sentry is not configured" do
+    it "does not initialize any spans" do
       Sentry.stub(:initialized?, false) do
         SentryTraceTestSchema.execute("{ int thing { str } }")
         assert_equal [], Sentry::SPAN_DATA
@@ -51,7 +51,7 @@ def thing; :thing; end
       "graphql.analyze",
       "graphql.execute",
       "graphql.authorized.Query",
-      "graphql.Query.thing",
+      "graphql.field.Query.thing",
       "graphql.authorized.Thing",
       "graphql.execute"
     ].compact
@@ -62,7 +62,7 @@ def thing; :thing; end
   it "sets span descriptions for an anonymous query" do
     SentryTraceTestSchema.execute("{ int }")
 
-    assert_equal ['query'], Sentry::SPAN_DESCRIPTIONS
+    assert_equal ["query", "query"], Sentry::SPAN_DESCRIPTIONS
   end
 
   it "sets span data for an anonymous query" do
@@ -78,7 +78,7 @@ def thing; :thing; end
   it "sets span descriptions for a named query" do
     SentryTraceTestSchema.execute("query Ab { int }")
 
-    assert_equal ['query Ab'], Sentry::SPAN_DESCRIPTIONS
+    assert_equal ["query Ab", "query Ab"], Sentry::SPAN_DESCRIPTIONS
   end
 
   it "sets span data for a named query" do

spec/graphql/tracing/sentry_tracing_spec.rb

@@ -29,8 +29,8 @@ def thing; :thing; end
     Sentry.clear_all
   end
 
-  describe 'When Sentry is not configured' do
-    it 'does not initialize any spans' do
+  describe "When Sentry is not configured" do
+    it "does not initialize any spans" do
       Sentry.stub(:initialized?, false) do
         SentryTracingTestSchema.execute("{ int thing { str } }")
         assert_equal [], Sentry::SPAN_DATA
@@ -51,7 +51,7 @@ def thing; :thing; end
       "graphql.analyze",
       "graphql.execute",
       "graphql.authorized.Query",
-      "graphql.Query.thing",
+      "graphql.field.Query.thing",
       "graphql.authorized.Thing",
       "graphql.execute"
     ].compact
@@ -60,10 +60,9 @@ def thing; :thing; end
   end
 
   it "sets span descriptions for an anonymous query" do
-    debugger
     SentryTracingTestSchema.execute("{ int }")
 
-    assert_equal ['query'], Sentry::SPAN_DESCRIPTIONS
+    assert_equal ["query", "query"], Sentry::SPAN_DESCRIPTIONS
   end
 
   it "sets span data for an anonymous query" do
@@ -79,7 +78,7 @@ def thing; :thing; end
   it "sets span descriptions for a named query" do
     SentryTracingTestSchema.execute("query Ab { int }")
 
-    assert_equal ['query Ab'], Sentry::SPAN_DESCRIPTIONS
+    assert_equal ["query Ab", "query Ab"], Sentry::SPAN_DESCRIPTIONS
   end
 
   it "sets span data for a named query" do