callstacking-rails 0.1.38 → 0.1.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2ec5f755326bf3ff3f9f11b95efc965f51cda6f8638871903e9d34ffc0c21d6
-  data.tar.gz: 4b667c05824c43681b1cd7c1174314895ad2e6c64e388faaa95b27b63b7593bf
+  metadata.gz: 18d409b7fd6bca47f9057af1f92d38e158e602d7cc4aa1c60dc850083f23d975
+  data.tar.gz: 6901e6b9dbdf8bc18f4b5469787fcc4e3f4570f5291e2546e0cd61df054e0387
 SHA512:
-  metadata.gz: 4b31b6c061b7d2c92c258616c1ae6be21e69de9752ba2115f25e373391acdf10531245e5961ce619c67b66ee6c5841819f10d4e1bbb06a38cd79fff31242765b
-  data.tar.gz: d7fd6bf8f1954efcc15455d1f7bfbfefb2c670bfbf95d4db589a46faa9cd495d156f157e484ecd7b5f225d50cd6506a61c77597ff6cc5adf75578a74ef913801
+  metadata.gz: 783bcd0a682399ba3565c45acfaa642aa8e98f80ee2b6cc7076f9d9ce6ba95479de69a28365f80764f64cf4b9701a87b7e793601768eb02510ec0ee485b47068
+  data.tar.gz: 6b01ddfc45792a3e5f2b34fff44659976e446722fff1bcd72d099f314793675b2ef9b0fc7786bb5b6fd11fff1900ad0e27dae9b5326a2675b67e2e2a0d81f328

data/lib/callstacking/rails/instrument.rb

@@ -42,6 +42,9 @@ module Callstacking
             path = method(__method__).super_method.source_location&.first || ''
             line_no = method(__method__).super_method.source_location&.last || ''
 
+            method_source = ''
+            method_source = method(__method__).super_method.source if settings.analyze_source?
+
             p, l = caller.find { |c| c.to_s =~ /#{::Rails.root.to_s}/}&.split(':')
 
             spans = tmp_module.instance_variable_get(:@spans)
@@ -50,9 +53,9 @@ module Callstacking
 
             arguments = Callstacking::Rails::Instrument.arguments_for(method(__method__).super_method, args)
 
-            span.call_entry(klass, method_name, arguments, p || path, l || line_no)
+            span.call_entry(klass, method_name, arguments, p || path, l || line_no, method_source)
             return_val = super(*args, &block)
-            span.call_return(klass, method_name, p || path, l || line_no, return_val)
+            span.call_return(klass, method_name, p || path, l || line_no, return_val, method_source)
 
             return_val
           end
@@ -67,6 +70,9 @@ module Callstacking
             path = method(__method__).super_method.source_location&.first || ''
             line_no = method(__method__).super_method.source_location&.last || ''
 
+            method_source = ''
+            method_source = method(__method__).super_method.source if settings.analyze_source?
+
             p, l = caller.find { |c| c.to_s =~ /#{::Rails.root.to_s}/}&.split(':')
 
             spans = tmp_module.instance_variable_get(:@spans)
@@ -75,9 +81,9 @@ module Callstacking
 
             arguments = Callstacking::Rails::Instrument.arguments_for(method(__method__).super_method, args)
 
-            span.call_entry(klass, method_name, arguments, p || path, l || line_no)
+            span.call_entry(klass, method_name, arguments, p || path, l || line_no, method_source)
             return_val = super(*args, **kwargs, &block)
-            span.call_return(klass, method_name, p || path, l || line_no, return_val)
+            span.call_return(klass, method_name, p || path, l || line_no, return_val, method_source)
 
             return_val
           end

data/lib/callstacking/rails/settings.rb

@@ -63,10 +63,15 @@ module Callstacking
         !enabled?
       end
 
+      def analyze_source?
+        settings[:analyze_source] || false
+      end
+
       def save(email, password, url)
         props = { auth_token: '',
                   url: url,
-                  enabled: true
+                  enabled: true,
+                  analyze_source: false,
         }
 
         props = { Callstacking::Rails::Env.environment => {

data/lib/callstacking/rails/spans.rb

@@ -18,15 +18,15 @@ module Callstacking
         @nesting_level
       end
 
-      def call_entry(klass, method_name, arguments, path, line_no)
+      def call_entry(klass, method_name, arguments, path, line_no, method_source)
         @nesting_level+=1
         @previous_entry = previous_event(klass, method_name)
-        @call_entry_callback.call(@nesting_level, increment_order_num, klass, method_name, arguments, path, line_no)
+        @call_entry_callback.call(@nesting_level, increment_order_num, klass, method_name, arguments, path, line_no, method_source)
       end
 
-      def call_return(klass, method_name, path, line_no, return_val)
+      def call_return(klass, method_name, path, line_no, return_val, method_source)
         @call_return_callback.call(coupled_callee(klass, method_name), @nesting_level,
-                                   increment_order_num, klass, method_name, path, line_no, return_val)
+                                   increment_order_num, klass, method_name, path, line_no, return_val, method_source)
         @nesting_level-=1
       end
 

data/lib/callstacking/rails/trace.rb

@@ -68,12 +68,12 @@ module Callstacking
       private
 
       def init_callbacks(tuid)
-        @spans.on_call_entry do |nesting_level, order_num, klass, method_name, arguments, path, line_no|
-          create_call_entry(tuid, nesting_level, order_num, klass, method_name, arguments, path, line_no, @traces)
+        @spans.on_call_entry do |nesting_level, order_num, klass, method_name, arguments, path, line_no, method_source|
+          create_call_entry(tuid, nesting_level, order_num, klass, method_name, arguments, path, line_no, @traces, method_source)
         end
 
-        @spans.on_call_return do |coupled_callee, nesting_level, order_num, klass, method_name, path, line_no, return_val|
-          create_call_return(tuid, coupled_callee, nesting_level, order_num, klass, method_name, path, line_no, return_val, @traces)
+        @spans.on_call_return do |coupled_callee, nesting_level, order_num, klass, method_name, path, line_no, return_val, method_source|
+          create_call_return(tuid, coupled_callee, nesting_level, order_num, klass, method_name, path, line_no, return_val, @traces, method_source)
         end
       end
 
@@ -97,7 +97,7 @@ module Callstacking
         "#{exception.backtrace[0]}".html_safe
       end
 
-      def create_call_return(tuid, coupled_callee, nesting_level, order_num, klass, method_name, path, line_no, return_val, traces)
+      def create_call_return(tuid, coupled_callee, nesting_level, order_num, klass, method_name, path, line_no, return_val, traces, method_source)
         lock.synchronize do
           traces << { tuid: tuid,
                       type: TRACE_CALL_RETURN,
@@ -112,11 +112,12 @@ module Callstacking
                       return_value: return_value(return_val),
                       coupled_callee: coupled_callee,
                       message: nil,
+                      method_source: method_source,
           }
         end
       end
 
-      def create_call_entry(tuid, nesting_level, order_num, klass, method_name, arguments, path, line_no, traces)
+      def create_call_entry(tuid, nesting_level, order_num, klass, method_name, arguments, path, line_no, traces, method_source)
         lock.synchronize do
           traces << { tuid: tuid,
                       type: TRACE_CALL_ENTRY,
@@ -131,6 +132,7 @@ module Callstacking
                       coupled_callee: nil,
                       local_variables: {},
                       message: nil,
+                      method_source: method_source,
           }
         end
       end
@@ -150,6 +152,7 @@ module Callstacking
                       return_value: nil,
                       coupled_callee: false,
                       local_variables: {},
+                      method_source: '',
           }
         end
       end

data/lib/callstacking/rails/version.rb

@@ -1,5 +1,5 @@
 module Callstacking
   module Rails
-    VERSION = "0.1.38"
+    VERSION = "0.1.39"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: callstacking-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.38
+  version: 0.1.39
 platform: ruby
 authors:
 - Jim Jones
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-25 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: method_source
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement