enhanced_errors 2.0.5 → 2.1.0

data/lib/enhanced_errors.rb

@@ -2,113 +2,200 @@
 
 require 'set'
 require 'json'
+require 'monitor'
 
-require_relative 'enhanced/integrations/rspec_error_failure_message'
 require_relative 'enhanced/colors'
+require_relative 'enhanced/exception'
 
 IGNORED_EXCEPTIONS = %w[SystemExit NoMemoryError SignalException Interrupt
-                        ScriptError LoadError NotImplementedError SyntaxError
-                        RSpec::Expectations::ExpectationNotMetError
-                        RSpec::Matchers::BuiltIn::RaiseError
-                        SystemStackError Psych::BadAlias]
+ ScriptError LoadError NotImplementedError SyntaxError
+ RSpec::Expectations::ExpectationNotMetError
+ RSpec::Matchers::BuiltIn::RaiseError
+ SystemStackError Psych::BadAlias]
 
 class EnhancedErrors
   extend ::Enhanced
 
   class << self
-    attr_accessor :enabled, :config_block, :max_length, :on_capture_hook,
-                  :eligible_for_capture, :trace, :skip_list, :capture_rescue,
-                  :override_messages
+    def mutex
+      @monitor ||= Monitor.new
+    end
+
+    attr_accessor :enabled, :config_block, :on_capture_hook, :eligible_for_capture, :trace, :override_messages
 
     GEMS_REGEX = %r{[\/\\]gems[\/\\]}
     RSPEC_EXAMPLE_REGEXP = /RSpec::ExampleGroups::[A-Z0-9]+.*/
     DEFAULT_MAX_LENGTH = 2000
-
-    # Maximum binding infos we will track per-exception instance. This is intended as an extra
-    # safety rail, not a normal scenario.
     MAX_BINDING_INFOS = 3
 
-    # Add @__memoized and @__inspect_output to the skip list so they don't appear in output
-    RSPEC_SKIP_LIST = Set.new([
+    RSPEC_SKIP_LIST = [
+                                :@__inspect_output,
+                                :@__memoized,
+                                :@assertion_delegator,
+                                :@assertion_instance,
                                 :@assertions,
-                                :@integration_session,
+                                :@connection_subscriber,
                                 :@example,
-                                :@assertion_delegator,
                                 :@fixture_cache,
                                 :@fixture_cache_key,
-                                :@fixture_connections,
                                 :@fixture_connection_pools,
-                                :@loaded_fixtures,
-                                :@connection_subscriber,
-                                :@saved_pool_configs,
-                                :@assertion_instance,
+                                :@fixture_connections,
+                                :@integration_session,
                                 :@legacy_saved_pool_configs,
+                                :@loaded_fixtures,
                                 :@matcher_definitions,
-                                :@__memoized,
-                                :@__inspect_output
-                              ]).freeze
+                                :@saved_pool_configs
+                              ].freeze
 
-    RAILS_SKIP_LIST = Set.new([
+    RAILS_SKIP_LIST = [
                                 :@new_record,
                                 :@attributes,
                                 :@association_cache,
                                 :@readonly,
                                 :@previously_new_record,
-                                :@_routes, # usually just shows #<ActionDispatch::Routing::RouteSet:0x000000016087d708>
+                                :@_routes,
                                 :@routes,
                                 :@app,
+                                :@arel_table,
+                                :@assertion_instance,
+                                :@association_cache,
+                                :@attributes,
                                 :@destroyed,
-                                :@response, #usually big, gets truncated anyway
-                                :@marked_for_destruction,
                                 :@destroyed_by_association,
-                                :@primary_key,
-                                :@strict_loading,
-                                :@assertion_instance,
-                                :@strict_loading_mode,
+                                :@find_by_statement_cache,
+                                :@generated_relation_method,
+                                :@integration_session,
+                                :@marked_for_destruction,
                                 :@mutations_before_last_save,
                                 :@mutations_from_database,
-                                :@integration_session,
-                                :@relation_delegate_cache,
+                                :@new_record,
                                 :@predicate_builder,
-                                :@generated_relation_method,
-                                :@find_by_statement_cache,
-                                :@arel_table,
+                                :@previously_new_record,
+                                :@primary_key,
+                                :@readonly,
+                                :@relation_delegate_cache,
+                                :@response,
                                 :@response_klass,
-                              ]).freeze
+                                :@routes,
+                                :@strict_loading,
+                                :@strict_loading_mode
+                              ].freeze
+
+    MINITEST_SKIP_LIST = [:@NAME, :@failures, :@time].freeze
 
-    DEFAULT_SKIP_LIST = (RAILS_SKIP_LIST + RSPEC_SKIP_LIST).freeze
+    DEFAULT_SKIP_LIST = (RAILS_SKIP_LIST + RSPEC_SKIP_LIST + MINITEST_SKIP_LIST)
 
     @enabled = false
+    @max_length = nil
+    @capture_rescue = nil
+    @skip_list = nil
+    @capture_events = nil
+    @debug = nil
+    @output_format = nil
+    @eligible_for_capture = nil
+    @original_global_variables = nil
+    @trace = nil
+    @override_messages = nil
+    @rspec_failure_message_loaded = nil
 
-    def max_length(value = nil)
-      if value.nil?
-        @max_length ||= DEFAULT_MAX_LENGTH
-      else
-        @max_length = value
+    # Default values
+    @max_capture_events = -1   # -1 means no limit
+    @capture_events_count = 0
+
+    # Thread-safe getters and setters
+    def enabled=(val)
+      mutex.synchronize { @enabled = val }
+    end
+
+    def enabled
+      mutex.synchronize { @enabled }
+    end
+
+    def capture_rescue=(val)
+      mutex.synchronize { @capture_rescue = val }
+    end
+
+    def capture_rescue
+      mutex.synchronize {  @capture_rescue }
+    end
+
+    def capture_events_count
+      mutex.synchronize { @capture_events_count }
+    end
+
+    def capture_events_count=(val)
+      mutex.synchronize { @capture_events_count = val }
+    end
+
+    def max_capture_events
+      mutex.synchronize { @max_capture_events }
+    end
+
+    def max_capture_events=(value)
+      mutex.synchronize do
+        @max_capture_events = value
+        if @max_capture_events == 0
+          # Disable capturing
+          if @enabled
+            puts "EnhancedErrors: max_capture_events set to 0, disabling capturing."
+            @enabled = false
+            @trace&.disable
+            @rspec_tracepoint&.disable
+            @minitest_trace&.disable
+          end
+        end
       end
-      @max_length
     end
 
-    def capture_rescue(value = nil)
-      if value.nil?
-        @capture_rescue = @capture_rescue.nil? ? false : @capture_rescue
-      else
-        @capture_rescue = value
+    def increment_capture_events_count
+      mutex.synchronize do
+        @capture_events_count += 1
+        # Check if we've hit the limit
+        if @max_capture_events > 0 && @capture_events_count >= @max_capture_events
+          # puts "EnhancedErrors: max_capture_events limit (#{@max_capture_events}) reached, disabling capturing."
+          @enabled = false
+        end
+      end
+    end
+
+    def reset_capture_events_count
+      mutex.synchronize do
+        @capture_events_count = 0
+        @enabled = true
+        @rspec_tracepoint.enable if @rspec_tracepoint
+        @trace.enable if @trace
+      end
+    end
+
+    def max_length(value = nil)
+      mutex.synchronize do
+        if value.nil?
+          @max_length ||= DEFAULT_MAX_LENGTH
+        else
+          @max_length = value
+        end
+        @max_length
       end
-      @capture_rescue
     end
 
     def skip_list
-      @skip_list ||= DEFAULT_SKIP_LIST.dup
+      mutex.synchronize do
+        @skip_list ||= DEFAULT_SKIP_LIST
+      end
     end
 
-    # takes an exception and bindings, calculates the variables message
-    # and modifies the exceptions .message to display the variables
     def override_exception_message(exception, binding_or_bindings)
-      # Ensure binding_or_bindings is always an array for compatibility
-      return exception if binding_or_bindings.nil? || binding_or_bindings.empty? || exception.respond_to?(:unaltered_message)
+      return nil unless exception
+      rspec_binding = !(binding_or_bindings.nil? || binding_or_bindings.empty?)
+      exception_binding = (exception.binding_infos.length > 0)
+      has_message = !(exception.respond_to?(:unaltered_message))
+      return nil unless (rspec_binding || exception_binding) && has_message
+
       variable_str = EnhancedErrors.format(binding_or_bindings)
       message_str = exception.message
+      if exception.respond_to?(:captured_variables) && !message_str.include?(exception.captured_variables)
+        message_str += exception.captured_variables
+      end
       exception.define_singleton_method(:unaltered_message) { message_str }
       exception.define_singleton_method(:message) do
         "#{message_str}#{variable_str}"
@@ -117,26 +204,32 @@ class EnhancedErrors
     end
 
     def add_to_skip_list(*vars)
-      skip_list.merge(vars)
+      mutex.synchronize do
+        @skip_list.concat(vars)
+      end
     end
 
     def enhance_exceptions!(enabled: true, debug: false, capture_events: nil, override_messages: false, **options, &block)
-      require_relative 'enhanced/exception'
-
-      @output_format = nil
-      @eligible_for_capture = nil
-      @original_global_variables = nil
-      @override_messages = override_messages
+      mutex.synchronize do
+        @trace&.disable
+        @trace = nil
 
-      if !enabled
+        @output_format = nil
+        @eligible_for_capture = nil
         @original_global_variables = nil
-        @enabled = false
-        @trace&.disable
-      else
-        # if there's an old one, disable it before replacing it
-        # this seems to actually matter, although it seems like it
-        # shouldn't
-        @trace&.disable
+        @override_messages = override_messages
+
+        # Ensure these are not nil
+        @max_capture_events = -1 if @max_capture_events.nil?
+        @capture_events_count = 0
+
+        @rspec_failure_message_loaded = true
+
+        if !enabled
+          @original_global_variables = nil
+          @enabled = false
+          return
+        end
 
         @enabled = true
         @debug = debug
@@ -148,8 +241,6 @@ class EnhancedErrors
             send(setter_method, value)
           elsif respond_to?(key)
             send(key, value)
-          else
-            # Ignore unknown options
           end
         end
 
@@ -158,64 +249,107 @@ class EnhancedErrors
 
         validate_and_set_capture_events(capture_events)
 
+        # If max_capture_events == 0, capturing is off from the start.
+        if @max_capture_events == 0
+          @enabled = false
+          return
+        end
+
         events = @capture_events ? @capture_events.to_a : default_capture_events
         @trace = TracePoint.new(*events) do |tp|
           handle_tracepoint_event(tp)
         end
 
-        @trace.enable
+        # Only enable trace if still enabled and not limited
+        if @enabled && (@max_capture_events == -1 || @capture_events_count < @max_capture_events)
+          @trace.enable
+        end
       end
     end
 
     def safe_prepend_module(target_class, mod)
-      if defined?(target_class) && target_class.is_a?(Module)
-        target_class.prepend(mod)
-        true
-      else
-        false
+      mutex.synchronize do
+        if defined?(target_class) && target_class.is_a?(Module)
+          target_class.prepend(mod)
+          true
+        else
+          false
+        end
       end
     end
 
     def safely_prepend_rspec_custom_failure_message
-      return if @rspec_failure_message_loaded
-      if defined?(RSpec::Core::Example) && !RSpec::Core::Example < Enhanced::Integrations::RSpecErrorFailureMessage
-        RSpec::Core::Example.prepend(Enhanced::Integrations::RSpecErrorFailureMessage)
-        @rspec_failure_message_loaded = true
+      mutex.synchronize do
+        return if @rspec_failure_message_loaded
+        if defined?(RSpec::Core::Example) && !RSpec::Core::Example < Enhanced::Integrations::RSpecErrorFailureMessage
+          RSpec::Core::Example.prepend(Enhanced::Integrations::RSpecErrorFailureMessage)
+          @rspec_failure_message_loaded = true
+        end
       end
     rescue => e
       puts "Failed to prepend RSpec custom failure message: #{e.message}"
     end
 
+    def is_a_minitest?(klass)
+      klass.ancestors.include?(Minitest::Test) && klass.name != 'Minitest::Test'
+    end
 
-    def start_rspec_binding_capture
-      @rspec_example_binding = nil
-
-      # In the Exception binding infos, I observed that re-setting
-      # the tracepoint without disabling it seemed to accumulate traces
-      # in the test suite where things are disabled and re-enabled often.
-      @rspec_tracepoint&.disable
+    def start_minitest_binding_capture
+      mutex.synchronize do
+        @minitest_trace = TracePoint.new(:return) do |tp|
+          next unless tp.method_id.to_s.start_with?('test_') && is_a_minitest?(tp.defined_class)
+          @minitest_test_binding = tp.binding
+        end
+        @minitest_trace.enable
+      end
+    end
 
-      @rspec_tracepoint = TracePoint.new(:b_return) do |tp|
-        # This is super-kluge-y and should be replaced with... something TBD
+    def stop_minitest_binding_capture
+      mutex.synchronize do
+        @minitest_trace&.disable
+        @minitest_trace = nil
+        convert_binding_to_binding_info(@minitest_test_binding) if @minitest_test_binding
+      end
+    end
 
-        # early easy checks to nope out of the object name and other checks
-        if tp.method_id.nil? && !(tp.path.include?('rspec')) && tp.path.end_with?('_spec.rb')
-         # fixes cases where class and name are screwed up or overridden
-          if determine_object_name(tp) =~ RSPEC_EXAMPLE_REGEXP
-            @rspec_example_binding = tp.binding
+    def start_rspec_binding_capture
+      mutex.synchronize do
+        @rspec_example_binding = nil
+        @capture_next_binding = false
+        @rspec_tracepoint&.disable
+        @enabled = true if @enabled.nil?
+
+        @rspec_tracepoint = TracePoint.new(:raise, :b_return) do |tp|
+          # This trickery is to help us identify the anonymous block return we want to grab
+          if tp.event == :b_return
+            next unless @capture_next_binding && @rspec_example_binding.nil?
+            if @capture_next_binding && tp.method_id.nil? && !(tp.path.include?('rspec')) && tp.path.end_with?('_spec.rb')
+              if determine_object_name(tp) =~ RSPEC_EXAMPLE_REGEXP
+                increment_capture_events_count
+                @rspec_example_binding = tp.binding
+              end
+            end
+          elsif tp.event == :raise
+            if tp.raised_exception.class.name == 'RSpec::Expectations::ExpectationNotMetError'
+              @capture_next_binding ||= true
+            else
+              handle_tracepoint_event(tp)
+            end
           end
         end
-
+        @rspec_tracepoint.enable
       end
-
-      @rspec_tracepoint.enable
     end
 
     def stop_rspec_binding_capture
-      @rspec_tracepoint&.disable
-      binding_info = convert_binding_to_binding_info(@rspec_example_binding) if @rspec_example_binding
-      @rspec_example_binding = nil
-      binding_info
+      mutex.synchronize do
+        @rspec_tracepoint&.disable
+        @rspec_tracepoint = nil
+        binding_info = convert_binding_to_binding_info(@rspec_example_binding) if @rspec_example_binding
+        @capture_next_binding = false
+        @rspec_example_binding = nil
+        binding_info
+      end
     end
 
     def convert_binding_to_binding_info(b, capture_let_variables: true)
@@ -228,7 +362,6 @@ class EnhancedErrors
       instance_vars = receiver.instance_variables
       instances = instance_vars.map { |var| [var, safe_instance_variable_get(receiver, var)] }.to_h
 
-      # Capture let variables only for RSpec captures
       lets = {}
       if capture_let_variables && instance_vars.include?(:@__memoized)
         outer_memoized = receiver.instance_variable_get(:@__memoized)
@@ -257,59 +390,66 @@ class EnhancedErrors
         capture_event: 'RSpecContext'
       }
 
-      # Apply skip list to remove @__memoized and @__inspect_output from output
-      # but only after extracting let variables.
       default_on_capture(binding_info)
     end
 
     def eligible_for_capture(&block)
-      if block_given?
-        @eligible_for_capture = block
-      else
-        @eligible_for_capture ||= method(:default_eligible_for_capture)
+      mutex.synchronize do
+        if block_given?
+          @eligible_for_capture = block
+        else
+          @eligible_for_capture ||= method(:default_eligible_for_capture)
+        end
       end
     end
 
     def on_capture(&block)
-      if block_given?
-        @on_capture_hook = block
-      else
-        @on_capture_hook ||= method(:default_on_capture)
+      mutex.synchronize do
+        if block_given?
+          @on_capture_hook = block
+        else
+          @on_capture_hook ||= method(:default_on_capture)
+        end
       end
     end
 
     def on_capture=(value)
-      self.on_capture_hook = value
+      mutex.synchronize do
+        @on_capture_hook = value
+      end
     end
 
     def on_format(&block)
-      if block_given?
-        @on_format_hook = block
-      else
-        @on_format_hook ||= method(:default_on_format)
+      mutex.synchronize do
+        if block_given?
+          @on_format_hook = block
+        else
+          @on_format_hook ||= method(:default_on_format)
+        end
       end
     end
 
     def on_format=(value)
-      @on_format_hook = value
+      mutex.synchronize do
+        @on_format_hook = value
+      end
     end
 
     def format(captured_binding_infos = [], output_format = get_default_format_for_environment)
       return '' if captured_binding_infos.nil? || captured_binding_infos.empty?
 
-      # If captured_binding_infos is already an array, use it directly; otherwise, wrap it in an array.
-      binding_infos = captured_binding_infos.is_a?(Array) ? captured_binding_infos : [captured_binding_infos]
-
-      result = binding_infos_array_to_string(binding_infos, output_format)
+      result = binding_infos_array_to_string(captured_binding_infos, output_format)
 
-      if @on_format_hook
-        begin
-          result = @on_format_hook.call(result)
-        rescue
-          result = ''
+      mutex.synchronize do
+        if @on_format_hook
+          begin
+            result = @on_format_hook.call(result)
+          rescue
+            result = ''
+          end
+        else
+          result = default_on_format(result)
         end
-      else
-        result = default_on_format(result)
       end
 
       result
@@ -318,48 +458,55 @@ class EnhancedErrors
     def binding_infos_array_to_string(captured_bindings, format = :terminal)
       return '' if captured_bindings.nil? || captured_bindings.empty?
       captured_bindings = [captured_bindings] unless captured_bindings.is_a?(Array)
-      Colors.enabled = format == :terminal
+      Colors.enabled = (format == :terminal)
       formatted_bindings = captured_bindings.to_a.map { |binding_info| binding_info_string(binding_info) }
       format == :json ? JSON.pretty_generate(captured_bindings) : "\n#{formatted_bindings.join("\n")}"
     end
 
     def get_default_format_for_environment
-      return @output_format unless @output_format.nil?
-      env = ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
-      @output_format = case env
-                       when 'development', 'test'
-                         if running_in_ci?
-                           :plaintext
+      mutex.synchronize do
+        return @output_format unless @output_format.nil?
+        env = ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
+        @output_format = case env
+                         when 'development', 'test'
+                           if running_in_ci?
+                             :plaintext
+                           else
+                             :terminal
+                           end
+                         when 'production'
+                           :json
                          else
                            :terminal
                          end
-                       when 'production'
-                         :json
-                       else
-                         :terminal
-                       end
+      end
     end
 
     def running_in_ci?
-      return @running_in_ci if defined?(@running_in_ci)
-      ci_env_vars = {
-        'CI' => ENV['CI'],
-        'JENKINS' => ENV['JENKINS'],
-        'GITHUB_ACTIONS' => ENV['GITHUB_ACTIONS'],
-        'CIRCLECI' => ENV['CIRCLECI'],
-        'TRAVIS' => ENV['TRAVIS'],
-        'APPVEYOR' => ENV['APPVEYOR'],
-        'GITLAB_CI' => ENV['GITLAB_CI']
-      }
-      @running_in_ci = ci_env_vars.any? { |_, value| value.to_s.downcase == 'true' }
+      mutex.synchronize do
+        return @running_in_ci if defined?(@running_in_ci)
+        ci_env_vars = {
+          'CI' => ENV['CI'],
+          'JENKINS' => ENV['JENKINS'],
+          'GITHUB_ACTIONS' => ENV['GITHUB_ACTIONS'],
+          'CIRCLECI' => ENV['CIRCLECI'],
+          'TRAVIS' => ENV['TRAVIS'],
+          'APPVEYOR' => ENV['APPVEYOR'],
+          'GITLAB_CI' => ENV['GITLAB_CI']
+        }
+        @running_in_ci = ci_env_vars.any? { |_, value| value.to_s.downcase == 'true' }
+      end
     end
 
     def apply_skip_list(binding_info)
-      variables = binding_info[:variables]
-      variables[:instances]&.reject! { |var, _| skip_list.include?(var) || (var.to_s.start_with?('@_') && !@debug) }
-      variables[:locals]&.reject! { |var, _| skip_list.include?(var) }
-      return binding_info unless @debug
-      variables[:globals]&.reject! { |var, _| skip_list.include?(var) }
+      mutex.synchronize do
+        variables = binding_info[:variables]
+        variables[:instances]&.reject! { |var, _| skip_list.include?(var) || (var.to_s.start_with?('@_') && !@debug) }
+        variables[:locals]&.reject! { |var, _| skip_list.include?(var) }
+        if @debug
+          variables[:globals]&.reject! { |var, _| skip_list.include?(var) }
+        end
+      end
       binding_info
     end
 
@@ -394,7 +541,6 @@ class EnhancedErrors
         result += "\n#{Colors.green('Instances:')}\n#{variable_description(instance_vars_to_display)}"
       end
 
-      # Display let variables for RSpec captures
       if variables[:lets] && !variables[:lets].empty?
         result += "\n#{Colors.green('Let Variables:')}\n#{variable_description(variables[:lets])}"
       end
@@ -403,9 +549,13 @@ class EnhancedErrors
         result += "\n#{Colors.green('Globals:')}\n#{variable_description(variables[:globals])}"
       end
 
-      if result.length > max_length
-        result = result[0...max_length] + "... (truncated)"
+      mutex.synchronize do
+        max_len = @max_length || DEFAULT_MAX_LENGTH
+        if result.length > max_len
+          result = result[0...max_len] + "... (truncated)"
+        end
       end
+
       result + "\n"
     rescue => e
       puts "#{e.message}"
@@ -414,12 +564,18 @@ class EnhancedErrors
 
     private
 
+
     def handle_tracepoint_event(tp)
-      return unless @enabled
+      # Check enabled outside the synchronized block for speed, but still safe due to re-check inside.
+      return unless mutex.synchronize { @enabled }
       return if Thread.current[:enhanced_errors_processing] || Thread.current[:on_capture] || ignored_exception?(tp.raised_exception)
+
       Thread.current[:enhanced_errors_processing] = true
       exception = tp.raised_exception
-      capture_me = !exception.frozen? && EnhancedErrors.eligible_for_capture.call(exception)
+
+      capture_me = mutex.synchronize do
+        !exception.frozen? && (@eligible_for_capture || method(:default_eligible_for_capture)).call(exception)
+      end
 
       unless capture_me
         Thread.current[:enhanced_errors_processing] = false
@@ -442,19 +598,19 @@ class EnhancedErrors
         [var, safe_instance_variable_get(binding_context.receiver, var)]
       }.to_h
 
-      # No let variables for exceptions
       lets = {}
 
       globals = {}
-      if @debug
-        globals = (global_variables - @original_global_variables).map { |var|
-          [var, get_global_variable_value(var)]
-        }.to_h
+      mutex.synchronize do
+        if @debug
+          globals = (global_variables - @original_global_variables.to_a).map { |var|
+            [var, get_global_variable_value(var)]
+          }.to_h
+        end
       end
 
       capture_event = safe_to_s(tp.event)
       location = "#{safe_to_s(tp.path)}:#{safe_to_s(tp.lineno)}"
-
       binding_info = {
         source: location,
         object: tp.self,
@@ -472,11 +628,12 @@ class EnhancedErrors
       }
 
       binding_info = default_on_capture(binding_info)
+      on_capture_hook_local = mutex.synchronize { @on_capture_hook }
 
-      if on_capture_hook
+      if on_capture_hook_local
         begin
           Thread.current[:on_capture] = true
-          binding_info = on_capture_hook.call(binding_info)
+          binding_info = on_capture_hook_local.call(binding_info)
         rescue
           binding_info = nil
         ensure
@@ -486,15 +643,15 @@ class EnhancedErrors
 
       if binding_info
         binding_info = validate_binding_format(binding_info)
-
         if binding_info && exception.binding_infos.length >= MAX_BINDING_INFOS
-          # delete from the middle of the array as the ends are most interesting
           exception.binding_infos.delete_at(MAX_BINDING_INFOS / 2.round)
         end
-
         if binding_info
           exception.binding_infos << binding_info
-          override_exception_message(exception, exception.binding_infos) if @override_messages
+          mutex.synchronize do
+            override_exception_message(exception, exception.binding_infos) if @override_messages
+          end
+          increment_capture_events_count
         end
       end
     rescue
@@ -508,52 +665,54 @@ class EnhancedErrors
     end
 
     def test_name
-      if defined?(RSpec)
-        RSpec&.current_example&.full_description
+      begin
+        defined?(RSpec) ? RSpec&.current_example&.full_description : nil
+      rescue
+        nil
       end
-    rescue
-      nil
     end
 
     def default_capture_events
-      return @default_capture_events if @default_capture_events
-      events = [:raise]
-      if capture_rescue && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.3.0')
-        events << :rescue
+      mutex.synchronize do
+        events = [:raise]
+        rescue_available = !!(Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.3.0'))
+        if capture_rescue && rescue_available
+          events << :rescue
+        end
+        events
       end
-      @default_capture_events = events
     end
 
     def validate_and_set_capture_events(capture_events)
-      if capture_events.nil?
-        @capture_events = default_capture_events
-        return
-      end
+      mutex.synchronize do
+        if capture_events.nil?
+          @capture_events = default_capture_events
+          return
+        end
 
-      unless valid_capture_events?(capture_events)
-        puts "EnhancedErrors: Invalid capture_events provided. Falling back to defaults."
-        @capture_events = default_capture_events
-        return
-      end
+        unless valid_capture_events?(capture_events)
+          puts "EnhancedErrors: Invalid capture_events provided. Falling back to defaults."
+          @capture_events = default_capture_events
+          return
+        end
 
-      if capture_events.include?(:rescue) && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.3.0')
-        puts "EnhancedErrors: Warning: :rescue capture_event not supported below Ruby 3.3.0, ignoring it."
-        capture_events = capture_events - [:rescue]
-      end
+        if capture_events.include?(:rescue) && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.3.0')
+          puts "EnhancedErrors: Warning: :rescue capture_event not supported below Ruby 3.3.0, ignoring it."
+          capture_events = capture_events - [:rescue]
+        end
 
-      if capture_events.empty?
-        puts "No valid capture_events provided to EnhancedErrors.enhance_exceptions! Falling back to defaults."
-        @capture_events = default_capture_events
-        return
-      end
+        if capture_events.empty?
+          puts "No valid capture_events provided to EnhancedErrors.enhance_exceptions! Falling back to defaults."
+          @capture_events = default_capture_events
+          return
+        end
 
-      @capture_events = capture_events.to_set
+        @capture_events = capture_events
+      end
     end
 
     def valid_capture_events?(capture_events)
-      return false unless capture_events.is_a?(Array) || capture_events.is_a?(Set)
-      valid_types = [:raise, :rescue].to_set
-      capture_events.to_set.subset?(valid_types)
+      capture_events.is_a?(Array) && [:raise, :rescue] && capture_events
     end
 
     def extract_arguments(tp, method_name)
@@ -578,14 +737,7 @@ class EnhancedErrors
 
     def determine_object_name(tp, method_name = '')
       begin
-        # These tricks are used to get around the fact that `tp.self` can be a class that is
-        # wired up with method_missing where every direct call alters the class. This is true
-        # on certain builders or config objects and caused problems.
-
-        # Directly bind and call the `class` method to avoid triggering `method_missing`
         self_class = Object.instance_method(:class).bind(tp.self).call
-
-        # Similarly, bind and call `singleton_class` safely
         singleton_class = Object.instance_method(:singleton_class).bind(tp.self).call
 
         if self_class && tp.defined_class == singleton_class
@@ -597,7 +749,7 @@ class EnhancedErrors
           method_suffix = method_name && !method_name.empty? ? "##{method_name}" : ""
           "#{object_class_name}#{method_suffix}"
         end
-      rescue Exception => e
+      rescue
         '[ErrorGettingName]'
       end
     end
@@ -621,7 +773,7 @@ class EnhancedErrors
 
     def variable_description(vars_hash)
       vars_hash.map do |name, value|
-        "  #{Colors.purple(name)}: #{format_variable(value)}\n"
+        " #{Colors.purple(name)}: #{format_variable(value)}\n"
       end.join
     rescue
       ''
@@ -639,8 +791,10 @@ class EnhancedErrors
     end
 
     def awesome_print_available?
-      return @awesome_print_available unless @awesome_print_available.nil?
-      @awesome_print_available = defined?(AwesomePrint)
+      mutex.synchronize do
+        return @awesome_print_available unless @awesome_print_available.nil?
+        @awesome_print_available = defined?(AwesomePrint)
+      end
     end
 
     def safe_inspect(variable)
@@ -682,7 +836,7 @@ class EnhancedErrors
     end
 
     def default_on_capture(binding_info)
-      EnhancedErrors.apply_skip_list(binding_info)
+      apply_skip_list(binding_info)
     end
 
     def default_eligible_for_capture(exception)