Now filtering properly previously loaded classes

callstacking · May 15, 2023 · a10bdd0 · a10bdd0
1 parent 1b1eb60
commit a10bdd0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/lib/callstacking/rails/engine.rb b/lib/callstacking/rails/engine.rb
@@ -62,8 +62,6 @@ def self.start_tracing(controller)
           instrumenter.add_span(span)
 
           if instrumenter.instrumentation_required?
-            Logger.log("Callstacking::Rails::Engine instrumenter.instrumentation_required? #{instrumenter.instrumentation_required?} #{loader.klasses.to_a}")
-
             loader.reset!
             instrumenter.enable!(loader.klasses.to_a)
           end

diff --git a/lib/callstacking/rails/loader.rb b/lib/callstacking/rails/loader.rb
@@ -14,17 +14,14 @@ def initialize(instrumenter, excluded: [])
       def instrument_existing
         objs = []
         ObjectSpace.each_object(Module){|ob| objs << [ob, ((Object.const_source_location(ob.to_s) rescue nil))].flatten}
-        objs.each{|o| filter_klass(o.first, o.last)}
+        objs.each{|o| filter_klass(o.first, o.second)}
       end
 
       def on_load
         trace = TracePoint.new(:end) do |tp|
           klass = tp.self
           path  = tp.path
 
-          Logger.log("Callstacking::Rails::Loader.on_load #{klass} #{path}")
-          Logger.log("English defined? #{Object.const_defined?('English')}")
-
           filter_klass(klass, path)
         end
 
@@ -38,6 +35,9 @@ def reset!
 
       private
       def filter_klass(klass, path)
+        return if klass.nil? || path.nil?
+        return if path == false
+
         excluded_klass = excluded.any? { |ex| path =~ /#{ex}/ }
 
         if path =~ /#{::Rails.root.to_s}/ &&

diff --git a/test/integration/thread_safety_test.rb b/test/integration/thread_safety_test.rb
@@ -24,9 +24,7 @@ class ThreadSafetyTest < ActionDispatch::IntegrationTest
       response = client.show('xxxx', url: "#{TEST_URL}#{url}")
       json     = response.body
 
-      STDERR.puts "Trace response: -- #{response.inspect} -- json #{json.inspect}"
-
-      sleep 5
+      sleep 20
 
       json['trace_entries'][1..10].each do |trace_entry|
         assert_equal klass, trace_entry['klass']