Don't wrap GraphQL::ExecutionError with a Backtrace error

lib/graphql/schema.rb

@@ -1125,7 +1125,7 @@ def handle_or_reraise(context, err)
           end
           handler[:handler].call(err, obj, args, context, field)
         else
-          if context[:backtrace] || using_backtrace
+          if (context[:backtrace] || using_backtrace) && !err.is_a?(GraphQL::ExecutionError)
             err = GraphQL::Backtrace::TracedError.new(err, context)
           end
 

spec/graphql/backtrace_spec.rb

@@ -47,6 +47,7 @@ def execute_multiplex(multiplex:)
         "name" => Proc.new { |obj| obj[:name] == :boom ? raise("Boom!") : obj[:name] },
         "listField" => Proc.new { :not_a_list },
         "raiseField" => Proc.new { |o, a| raise("This is broken: #{a[:message]}") },
+        "executionError" => Proc.new { raise GraphQL::ExecutionError, "Client-facing error" }
       },
       "ThingWrapper" => {
         "thing" => Proc.new { |obj| obj[:thing] },
@@ -69,6 +70,7 @@ def execute_multiplex(multiplex:)
       name: String
       listField: [OtherThing]
       raiseField(message: String!): Int
+      executionError: Int
     }
 
     type ThingWrapper {
@@ -110,6 +112,10 @@ def execute_multiplex(multiplex:)
       end
     end
 
+    it "doesn't wrap GraphQL::ExecutionError" do
+      assert_equal ["Client-facing error"], backtrace_schema.execute("{ field1 { executionError } }")["errors"].map { |e| e["message"] }
+    end
+
     it "annotates crashes from user code" do
       err = assert_raises(GraphQL::Backtrace::TracedError) {
         backtrace_schema.execute <<-GRAPHQL, root_value: "Root"
@@ -295,4 +301,26 @@ def result
     query = GraphQL::Query.new(schema, "{ __typename }", context: { backtrace: true })
     assert_includes query.current_trace.class.ancestors, custom_trace
   end
+
+  describe "When validators are used" do
+    class ValidatorBacktraceSchema < GraphQL::Schema
+      class Query < GraphQL::Schema::Object
+        field :greeting, String do
+          argument :name, String, validates: { length: { minimum: 5 }}
+        end
+
+        def greeting(name:)
+          "Hello, #{name}!"
+        end
+      end
+
+      query(Query)
+      use GraphQL::Backtrace
+    end
+
+    it "works properly" do
+      assert_equal "Hello, Albert!", ValidatorBacktraceSchema.execute("{ greeting(name: \"Albert\") }")["data"]["greeting"]
+      assert_equal ["name is too short (minimum is 5)"], ValidatorBacktraceSchema.execute("{ greeting(name: \"Tim\") }")["errors"].map { |e| e["message"] }
+    end
+  end
 end