Remove trace-related Backtrace code

rmosolgo · Jan 28, 2025 · f7e8606 · f7e8606
1 parent b001c11
commit f7e8606
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 212 deletions.
diff --git a/lib/graphql/backtrace.rb b/lib/graphql/backtrace.rb
@@ -2,8 +2,6 @@
 require "graphql/backtrace/inspect_result"
 require "graphql/backtrace/table"
 require "graphql/backtrace/traced_error"
-require "graphql/backtrace/tracer"
-require "graphql/backtrace/trace"
 module GraphQL
   # Wrap unhandled errors with {TracedError}.
   #

diff --git a/lib/graphql/backtrace/trace.rb b/lib/graphql/backtrace/trace.rb
diff --git a/lib/graphql/backtrace/tracer.rb b/lib/graphql/backtrace/tracer.rb
diff --git a/lib/graphql/execution/multiplex.rb b/lib/graphql/execution/multiplex.rb
@@ -35,10 +35,6 @@ def initialize(schema:, queries:, context:, max_complexity:)
         @current_trace = @context[:trace] || schema.new_trace(multiplex: self)
         @dataloader = @context[:dataloader] ||= @schema.dataloader_class.new
         @tracers = schema.tracers + (context[:tracers] || [])
-        # Support `context: {backtrace: true}`
-        if context[:backtrace] && !@tracers.include?(GraphQL::Backtrace::Tracer)
-          @tracers << GraphQL::Backtrace::Tracer
-        end
         @max_complexity = max_complexity
       end
     end

diff --git a/lib/graphql/query.rb b/lib/graphql/query.rb
@@ -127,14 +127,6 @@ def initialize(schema, query_string = nil, query: nil, document: nil, context: n
       context_tracers = (context ? context.fetch(:tracers, []) : [])
       @tracers = schema.tracers + context_tracers
 
-      # Support `ctx[:backtrace] = true` for wrapping backtraces
-      if context && context[:backtrace] && !@tracers.include?(GraphQL::Backtrace::Tracer)
-        if schema.trace_class <= GraphQL::Tracing::CallLegacyTracers
-          context_tracers += [GraphQL::Backtrace::Tracer]
-          @tracers << GraphQL::Backtrace::Tracer
-        end
-      end
-
       if !context_tracers.empty? && !(schema.trace_class <= GraphQL::Tracing::CallLegacyTracers)
         raise ArgumentError, "context[:tracers] are not supported without `trace_with(GraphQL::Tracing::CallLegacyTracers)` in the schema configuration, please add it."
       end

diff --git a/lib/graphql/schema.rb b/lib/graphql/schema.rb
@@ -167,9 +167,6 @@ def trace_class(new_class = nil)
           mods.each { |mod| new_class.include(mod) }
           new_class.include(DefaultTraceClass)
           trace_mode(:default, new_class)
-          backtrace_class = Class.new(new_class)
-          backtrace_class.include(GraphQL::Backtrace::Trace)
-          trace_mode(:default_backtrace, backtrace_class)
         end
         trace_class_for(:default, build: true)
       end
@@ -216,11 +213,6 @@ def build_trace_mode(mode)
           const_set(:DefaultTrace, Class.new(base_class) do
             include DefaultTraceClass
           end)
-        when :default_backtrace
-          schema_base_class = trace_class_for(:default, build: true)
-          const_set(:DefaultTraceBacktrace, Class.new(schema_base_class) do
-            include(GraphQL::Backtrace::Trace)
-          end)
         else
           # First, see if the superclass has a custom-defined class for this.
           # Then, if it doesn't, use this class's default trace
@@ -1455,22 +1447,8 @@ def new_trace(mode: nil, **options)
         target = options[:query] || options[:multiplex]
         mode ||= target && target.context[:trace_mode]
 
-        trace_mode = if mode
-          mode
-        elsif target && target.context[:backtrace]
-          if default_trace_mode != :default
-            raise ArgumentError, "Can't use `context[:backtrace]` with a custom default trace mode (`#{dm.inspect}`)"
-          else
-            own_trace_modes[:default_backtrace] ||= build_trace_mode(:default_backtrace)
-            options_trace_mode = :default
-            :default_backtrace
-          end
-        else
-          default_trace_mode
-        end
-
-        options_trace_mode ||= trace_mode
-        base_trace_options = trace_options_for(options_trace_mode)
+        trace_mode = mode || default_trace_mode
+        base_trace_options = trace_options_for(trace_mode)
         trace_options = base_trace_options.merge(options)
         trace_class_for_mode = trace_class_for(trace_mode, build: true)
         trace_class_for_mode.new(**trace_options)

diff --git a/lib/graphql/tracing/trace.rb b/lib/graphql/tracing/trace.rb
@@ -8,7 +8,7 @@ module Tracing
     # "Trace modes" are subclasses of this with custom tracing modules mixed in.
     #
     # A trace module may implement any of the methods on `Trace`, being sure to call `super`
-    # to continue any tracing hooks and call the actual runtime behavior. See {GraphQL::Backtrace::Trace} for example.
+    # to continue any tracing hooks and call the actual runtime behavior.
     #
     class Trace
       # @param multiplex [GraphQL::Execution::Multiplex, nil]