Merge pull request rmosolgo#4402 from rmosolgo/2.0.17-tracer-fix

[2.0.17] Fix execution errors raised by fields in tracing

Author: rmosolgo

lib/graphql/schema/field.rb

@@ -740,6 +740,8 @@ def resolve(object, args, query_ctx)
         end
         # if the line above doesn't raise, re-raise
         raise
+      rescue GraphQL::ExecutionError => err
+        err
       end
 
       # @param ctx [GraphQL::Query::Context]

spec/graphql/tracing/platform_tracing_spec.rb

@@ -30,7 +30,11 @@ def platform_resolve_type_key(type)
 
     def platform_trace(platform_key, key, data)
       TRACE << platform_key
-      yield
+      res = yield
+      if res.is_a?(GraphQL::ExecutionError)
+        TRACE << "returned error"
+      end
+      res
     end
   end
 
@@ -94,6 +98,12 @@ def platform_trace(platform_key, key, data)
       assert_equal expected_trace, CustomPlatformTracer::TRACE
     end
 
+    it "gets execution errors raised from field resolution" do
+      scalar_schema = Class.new(Dummy::Schema) { use(CustomPlatformTracer, trace_scalars: true) }
+      scalar_schema.execute("{ executionError }")
+      assert_includes CustomPlatformTracer::TRACE, "returned error"
+    end
+
     it "traces resolve_type calls" do
       schema.execute(" { favoriteEdible { __typename } }")
       expected_trace = [