callstacking-rails 0.1.22 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db3f273ed8ae89ee3727de24fa80f8a3621ebb9aa5997874cf8f8f2607f9595b
-  data.tar.gz: facd7b5f062db3b4e50ecdd78857b5b0635119a8aa07589bc1e9fa03583bf036
+  metadata.gz: 32743c94e97432eef4a4977e0e123eb7f2539d99e6505ee7b05c6e1d3fb32ee6
+  data.tar.gz: fa3c04dcba5a84dd926d5ae21c9b0238c9d4843f396d66066ea3406c851f8b6a
 SHA512:
-  metadata.gz: a74d58ed4f01a8a466ae81d763499d4a0004a97bdaee5cf8fe7aba47d97b367dbbc4ba7d2f1e8d2be0bff8d450b09a99b8de1fb4f738baa67664623583884660
-  data.tar.gz: 104df4887100b79f1d056fc24e7690dee30404a5c3827fd9d7fcce2c6c84e74124649a98e6c71c77cd62310d227b5987ee306d2f09f4816b3825adf32250aeb4
+  metadata.gz: b4fc6ea5d0ca80b91035456422c18fdda3f132602cee7117289c9e994b50e119962ba0b0d3ccbb67a3862f28b55e915b1923cf638a12bd83490568ff1190b752
+  data.tar.gz: 6a2b8ffdb61cf8d76fcabbd80215228e44d37b914678c3f4c4c8e9e0ffb44e12562639501896c662f355a3ca1b9fd58e73c425cfe3b03aa8a1d3a985e8f6d0a8

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,21 +5,23 @@ 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)
         method_path = (klass.instance_method(method_name).source_location.first rescue nil) ||
           (klass.method(method_name).source_location.first rescue nil)
 
+        # method was not defined in Ruby (i.e. native)
+        return if method_path.nil?
+
         # Application level method definitions
-        return if method_path =~ /#{::Rails.root.to_s}/ && application_level
+        return if application_level && !(method_path =~ /#{::Rails.root.to_s}/)
 
         return if method_path =~ /initializer/i
 
@@ -146,7 +148,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,9 +3,8 @@ require "rails"
 module Callstacking
   module Rails
     class Loader
-      attr_accessor :root, :instrumenter, :klasses, :excluded
+      attr_accessor :instrumenter, :klasses, :excluded
       def initialize(instrumenter, excluded: [])
-        @root = Regexp.new(::Rails.root.to_s)
         @excluded = excluded
         @instrumenter = instrumenter
         @klasses = Set.new
@@ -18,7 +17,7 @@ module Callstacking
 
           excluded_klass = excluded.any? { |ex| path =~ /#{ex}/ }
 
-          if path =~ root &&
+          if path =~ /#{::Rails.root.to_s}/ &&
             !klasses.include?(klass) &&
             !excluded_klass
               instrumenter.instrument_klass(klass)

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.22"
+    VERSION = "0.1.24"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: callstacking-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.24
 platform: ruby
 authors:
 - Jim Jones