Merge pull request #4419 from rmosolgo/appsignal-trace-resolve-type-fix

Fix resolve_type instrumentation for resolve_type

Author: rmosolgo

lib/graphql/tracing/appsignal_trace.rb

@@ -55,6 +55,12 @@ def platform_authorized(platform_key)
         end
       end
 
+      def platform_resolve_type(platform_key)
+        Appsignal.instrument(platform_key) do
+          yield
+        end
+      end
+
       def platform_field_key(field)
         "#{field.owner.graphql_name}.#{field.graphql_name}.graphql"
       end

spec/graphql/tracing/appsignal_trace_spec.rb

@@ -23,6 +23,13 @@ class Thing < GraphQL::Schema::Object
       def str; "blah"; end
     end
 
+    class Named < GraphQL::Schema::Union
+      possible_types Thing
+      def self.resolve_type(obj, ctx)
+        Thing
+      end
+    end
+
     class Query < GraphQL::Schema::Object
       include GraphQL::Types::Relay::HasNodeField
 
@@ -34,6 +41,8 @@ def int
 
       field :thing, Thing
       def thing; :thing; end
+
+      field :named, Named, resolver_method: :thing
     end
 
     class TestSchema < GraphQL::Schema
@@ -47,7 +56,7 @@ class TestSchema < GraphQL::Schema
   end
 
   it "traces events" do
-    _res = AppsignalTraceTest::TestSchema.execute("{ int thing { str } }")
+    _res = AppsignalTraceTest::TestSchema.execute("{ int thing { str } named { ... on Thing { str } } }")
     expected_trace = [
       "execute.graphql",
       "analyze.graphql",
@@ -59,7 +68,10 @@ class TestSchema < GraphQL::Schema
       "Query.authorized.graphql",
       "Query.thing.graphql",
       "Thing.authorized.graphql",
-      "execute.graphql"
+      "Query.named.graphql",
+      "Named.resolve_type.graphql",
+      "Thing.authorized.graphql",
+      "execute.graphql",
     ]
     assert_equal expected_trace, Appsignal.instrumented
   end