callstacking-rails 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1da66ff58acecfefd9f52e259cb9d69eb54e8328a4fee36ed130e26f968d61a2
-  data.tar.gz: 2d8bc0b54633d9a17e607ee1c7006d7d728e999c5a5d5c6bfc93dd9090a1a19e
+  metadata.gz: db3f273ed8ae89ee3727de24fa80f8a3621ebb9aa5997874cf8f8f2607f9595b
+  data.tar.gz: facd7b5f062db3b4e50ecdd78857b5b0635119a8aa07589bc1e9fa03583bf036
 SHA512:
-  metadata.gz: 737cf8e5ddf9467a6ce6ca2ae1ebeee369f5e9200b7893440fb923ecbe21638ac0ec0430ab909cddd29910b5a4bc83d04436fd2cf304109b88d7d64768232789
-  data.tar.gz: 8f8afdfc52b192dd8e688e5f28dc8f93306241bc4347cc3c90144d7a6b7b9f210b0d9eb6037b288e6bbc4c68554e71456261fd736e5ea5e5fde6402c29051d53
+  metadata.gz: a74d58ed4f01a8a466ae81d763499d4a0004a97bdaee5cf8fe7aba47d97b367dbbc4ba7d2f1e8d2be0bff8d450b09a99b8de1fb4f738baa67664623583884660
+  data.tar.gz: 104df4887100b79f1d056fc24e7690dee30404a5c3827fd9d7fcce2c6c84e74124649a98e6c71c77cd62310d227b5987ee306d2f09f4816b3825adf32250aeb4

data/lib/callstacking/rails/instrument.rb

@@ -11,7 +11,7 @@ module Callstacking
         @spans = spans
         @span_modules = Set.new
         @settings = Callstacking::Rails::Settings.new
-        @root  = Regexp.new(::Rails.root.to_s)
+        @root  = Regexp.new(::Rails.root.to_s) # <-------
       end
 
       def instrument_method(klass, method_name, application_level: true)
@@ -19,7 +19,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 method_path =~ /#{::Rails.root.to_s}/ && application_level
 
         return if method_path =~ /initializer/i
 
@@ -82,6 +82,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 +92,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)

data/lib/callstacking/rails/loader.rb

@@ -3,10 +3,9 @@ require "rails"
 module Callstacking
   module Rails
     class Loader
-      attr_accessor :root, :spans, :instrumenter, :klasses, :excluded
+      attr_accessor :root, :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 +16,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 =~ root &&
+            !klasses.include?(klass) &&
+            !excluded_klass
+              instrumenter.instrument_klass(klass)
+              klasses << klass
           end
         end
 

data/lib/callstacking/rails/version.rb

@@ -1,5 +1,5 @@
 module Callstacking
   module Rails
-    VERSION = "0.1.21"
+    VERSION = "0.1.22"
   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.22
 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