Merge pull request #4504 from rmosolgo/fix-backtrace-true-with-other-traces

Fix backtrace: true with other trace modules

Author: rmosolgo

lib/graphql/backtrace.rb

@@ -55,9 +55,5 @@ def initialize(path:, query:, ast_node:, object:, field:, arguments:, parent_fra
         @parent_frame = parent_frame
       end
     end
-
-    class DefaultBacktraceTrace < GraphQL::Tracing::Trace
-      include GraphQL::Backtrace::Trace
-    end
   end
 end

lib/graphql/schema.rb

@@ -158,14 +158,17 @@ def trace_class(new_class = nil)
       def trace_class_for(mode)
         @trace_modes ||= {}
         @trace_modes[mode] ||= begin
-          base_class = if superclass.respond_to?(:trace_class_for)
-            superclass.trace_class_for(mode)
-          elsif mode == :default_backtrace
-            GraphQL::Backtrace::DefaultBacktraceTrace
+          if mode == :default_backtrace
+            schema_base_class = trace_class_for(:default)
+            Class.new(schema_base_class) do
+              include(GraphQL::Backtrace::Trace)
+            end
+          elsif superclass.respond_to?(:trace_class_for)
+            superclass_base_class = superclass.trace_class_for(mode)
+            Class.new(superclass_base_class)
           else
-            GraphQL::Tracing::Trace
+            Class.new(GraphQL::Tracing::Trace)
           end
-          Class.new(base_class)
         end
       end
 

spec/graphql/backtrace_spec.rb

@@ -273,4 +273,13 @@ def result
 
     assert_equal expected_res, res
   end
+
+  it "includes other trace modules when backtrace is active" do
+    custom_trace = Module.new
+    schema = Class.new(GraphQL::Schema) do
+      trace_with(custom_trace)
+    end
+    query = GraphQL::Query.new(schema, "{ __typename }", context: { backtrace: true })
+    assert_includes query.current_trace.class.ancestors, custom_trace
+  end
 end