Re-apply default modules when a new default trace class is added

Author: rmosolgo

lib/graphql/schema.rb

@@ -158,6 +158,10 @@ def default_trace_mode(new_mode = nil)
 
       def trace_class(new_class = nil)
         if new_class
+          # If any modules were already added for `:default`,
+          # re-apply them here
+          mods = trace_modules_for(:default)
+          mods.each { |mod| new_class.include(mod) }
           trace_mode(:default, new_class)
           backtrace_class = Class.new(new_class)
           backtrace_class.include(GraphQL::Backtrace::Trace)

spec/graphql/tracing/trace_modes_spec.rb

@@ -148,6 +148,12 @@ def execute_query(query:)
       GraphQL::Schema.send(:own_tracers).delete(tracer_class)
       GraphQL::Schema.own_trace_modes[:default] = GraphQL::Schema.build_trace_mode(:default)
       refute_includes GraphQL::Schema.new_trace.class.ancestors, GraphQL::Tracing::CallLegacyTracers
+    ensure
+      # Since this modifies the base class, make sure it's undone for future test cases
+      GraphQL::Schema.instance_variable_get(:@own_tracers).clear
+      GraphQL::Schema.own_trace_modes.clear
+      GraphQL::Schema.own_trace_modules.clear
+      GraphQL::Schema.instance_variable_get(:@trace_options_for_mode).clear
     end
   end