callstacking-rails 0.1.21 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1da66ff58acecfefd9f52e259cb9d69eb54e8328a4fee36ed130e26f968d61a2
-  data.tar.gz: 2d8bc0b54633d9a17e607ee1c7006d7d728e999c5a5d5c6bfc93dd9090a1a19e
+  metadata.gz: 14947016af46faef4737e8800c6ea1617d81abf78076e4a072380159251c8348
+  data.tar.gz: 0ff0f0eae09415b28d483ca95cb5f958e106b26472020318c7a8225897203f27
 SHA512:
-  metadata.gz: 737cf8e5ddf9467a6ce6ca2ae1ebeee369f5e9200b7893440fb923ecbe21638ac0ec0430ab909cddd29910b5a4bc83d04436fd2cf304109b88d7d64768232789
-  data.tar.gz: 8f8afdfc52b192dd8e688e5f28dc8f93306241bc4347cc3c90144d7a6b7b9f210b0d9eb6037b288e6bbc4c68554e71456261fd736e5ea5e5fde6402c29051d53
+  metadata.gz: 1e33a35232719a2e04a38ae4847ac9ad09831ca41ae134568075044b040fed4e458a4de86301a5ba97fc77bea5213f02a97e78a137d33023004dfe06b48cfca5
+  data.tar.gz: 51f3877adb56b49a595c6ee478b89f66048aa4aa2b4e8f10c2920a4e2ead2dc16c29079cf639b62f667f2e774d6f541892cbe88c1c2c581f98262e6d19dd82ed

data/lib/callstacking/rails/engine.rb

@@ -17,7 +17,7 @@ require "callstacking/rails/time_based_uuid"
 module Callstacking
   module Rails
     class Engine < ::Rails::Engine
-      EXCLUDED_TEST_CLASSES = ['test/dummy/app/models/salutation.rb'].freeze
+      EXCLUDED_TEST_CLASSES = %w[test/dummy/app/models/salutation.rb test/dummy/app/controllers/application_controller.rb].freeze
       
       cattr_accessor :spans, :trace, :settings, :instrumenter, :loader
 

data/lib/callstacking/rails/instrument.rb

@@ -5,13 +5,12 @@ module Callstacking
   module Rails
     class Instrument
       attr_accessor :spans
-      attr_reader :root, :settings, :span_modules
+      attr_reader :settings, :span_modules
 
       def initialize(spans)
         @spans = spans
         @span_modules = Set.new
         @settings = Callstacking::Rails::Settings.new
-        @root  = Regexp.new(::Rails.root.to_s)
       end
 
       def instrument_method(klass, method_name, application_level: true)
@@ -19,7 +18,7 @@ module Callstacking
           (klass.method(method_name).source_location.first rescue nil)
 
         # Application level method definitions
-        return unless method_path =~ root if application_level
+        return if application_level && !(method_path =~ /#{::Rails.root.to_s}/)
 
         return if method_path =~ /initializer/i
 
@@ -82,6 +81,7 @@ module Callstacking
           instrument_klass(klass, application_level: true)
         end
       end
+
       def disable!
         span_modules.each do |mod|
           mod.instance_methods.each do |method_name|
@@ -91,8 +91,8 @@ module Callstacking
       end
 
       def instrument_klass(klass, application_level: true)
-        relevant = all_methods(klass) - filtered
-        relevant.each { |method| instrument_method(klass, method, application_level: application_level) }
+        relevant_methods = all_methods(klass) - filtered
+        relevant_methods.each { |method| instrument_method(klass, method, application_level: application_level) }
       end
 
       def self.arguments_for(m, args)
@@ -145,7 +145,6 @@ module Callstacking
         @filtered ||= (Object.instance_methods + Object.private_instance_methods +
           Object.protected_instance_methods + Object.methods(false)).uniq
       end
-
     end
   end
 end

data/lib/callstacking/rails/loader.rb

@@ -3,10 +3,8 @@ require "rails"
 module Callstacking
   module Rails
     class Loader
-      attr_accessor :root, :spans, :instrumenter, :klasses, :excluded
+      attr_accessor :instrumenter, :klasses, :excluded
       def initialize(instrumenter, excluded: [])
-        @root = Regexp.new(::Rails.root.to_s)
-        @spans = spans
         @excluded = excluded
         @instrumenter = instrumenter
         @klasses = Set.new
@@ -17,11 +15,13 @@ module Callstacking
           klass = tp.self
           path  = tp.path
 
-          exclude = excluded.any? { |ex| path =~ /#{ex}/ }
+          excluded_klass = excluded.any? { |ex| path =~ /#{ex}/ }
 
-          if path =~ root && !exclude
-            instrumenter.instrument_klass(klass)
-            klasses << klass
+          if path =~ /#{::Rails.root.to_s}/ &&
+            !klasses.include?(klass) &&
+            !excluded_klass
+              instrumenter.instrument_klass(klass)
+              klasses << klass
           end
         end
 

data/lib/callstacking/rails/trace.rb

@@ -34,7 +34,7 @@ module Callstacking
 
           start_request(trace_id, tuid,
                         payload[:method], payload[:controller],
-                        payload[:action], payload[:format], ::Rails.root,
+                        payload[:action], payload[:format], ::Rails.root.to_s,
                         payload[:request]&.original_url || payload[:path],
                         payload[:headers], payload[:params])
         end

data/lib/callstacking/rails/version.rb

@@ -1,5 +1,5 @@
 module Callstacking
   module Rails
-    VERSION = "0.1.21"
+    VERSION = "0.1.23"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: callstacking-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.23
 platform: ruby
 authors:
 - Jim Jones
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-24 00:00:00.000000000 Z
+date: 2023-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails