callstacking-rails 0.1.35 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11d37da94e52c249d1b591d2a0c5dfef5f55c133e5336bea6b4db341a839dffa
-  data.tar.gz: fd8b20d2b04e23b3833da9ac7fd122e6b6fff36a6b60313fda462651c5876d4a
+  metadata.gz: 5bec15f7021fd8dc471e7c1c6a1c77809d83ef10f9f8689bc6a77436570eacaa
+  data.tar.gz: 2125659cc1c9696fa7d36e7b62fc028d3fc499a6bded81f13f0cd8afd14a79ce
 SHA512:
-  metadata.gz: 3f8908e29235fdd5a35fb176b0569042f9fc8c395d4cfebaaa87e62c1068a95500d5e6e67490168788ba58787ba811ecc3c623a831620f0df5a9642b5c4dd6b6
-  data.tar.gz: 28d4e721755cddcaa11535defc51523c64323aca6162831cc8e436ea3ec032a4aebdfc84884464f78ec48a93eaa0228a09f82b352e84bbfdeec2b23c4e5e1c45
+  metadata.gz: 85c474951aba42deb68dc55e81a3e97c79595deb7820b0c3e7b14a447b7030c450c3d1c170487bf9d84d1094f242f9a024b3c83d16b9524202cd0907b97137d1
+  data.tar.gz: b841f58228f06ef87986d1a488cf04c840abace6619b18c90bb4a6c5a1b783524b7d25dd226d5f1f9a08b41d5a67a0eeb13e6e1935aa0fb4248927b3cd6fc653

data/lib/callstacking/rails/engine.rb

@@ -73,7 +73,7 @@ module Callstacking
         true
       end
 
-      def self.stop_tracing(controller)
+      def self.stop_tracing(controller, exception)
         Logger.log("Callstacking::Rails::Engine.stop_tracing")
         
         settings.disable!
@@ -86,8 +86,12 @@ module Callstacking
           end
         end
 
-        trace&.end_trace(controller)
-        
+        trace&.end_trace(controller, exception)
+
+        lock.synchronize do
+          spans[Thread.current.object_id]&.reset
+        end
+
         true
       end
     end

data/lib/callstacking/rails/helpers/instrument_helper.rb

@@ -4,11 +4,15 @@ module Callstacking
       module InstrumentHelper
         extend ActiveSupport::Concern
         def callstacking_setup
+          exception = nil
           Callstacking::Rails::Engine.start_tracing(self)
 
           yield
+        rescue Exception => e
+          exception = e
+          raise e
         ensure
-          Callstacking::Rails::Engine.stop_tracing(self)
+          Callstacking::Rails::Engine.stop_tracing(self, exception)
         end
       end
     end

data/lib/callstacking/rails/spans.rb

@@ -5,9 +5,7 @@ module Callstacking
       attr_accessor :call_entry_callback, :call_return_callback
 
       def initialize
-        @nesting_level = -1
-        @order_num = -1
-        @previous_entry = nil
+        reset
       end
 
       def increment_order_num
@@ -40,6 +38,12 @@ module Callstacking
         @call_return_callback = block
       end
 
+      def reset
+        @nesting_level = -1
+        @order_num = -1
+        @previous_entry = nil
+      end
+
       private
       def previous_event(klass, method_name)
         "#{klass}:#{method_name}"

data/lib/callstacking/rails/trace.rb

@@ -5,6 +5,11 @@ require "callstacking/rails/helpers/heads_up_display_helper"
 module Callstacking
   module Rails
     class Trace
+      TRACE_CALL_ENTRY  = 'TraceCallEntry'
+      TRACE_CALL_RETURN = 'TraceCallReturn'
+      TRACE_MESSAGE     = 'TraceMessage'
+      TRACE_EXCEPTION   = 'TraceException'
+
       include Callstacking::Rails::Helpers::HeadsUpDisplayHelper
       
       attr_accessor :spans, :client, :lock, :traces
@@ -44,16 +49,16 @@ module Callstacking
                       controller.request.headers, controller.request.params, @traces)
       end
 
-      def end_trace(controller)
+      def end_trace(controller, exception)
         return if @trace_id.nil? || @tuid.nil?
         
-        complete_request(@trace_id, @tuid,
+        complete_request(@trace_id, @tuid, exception,
                          controller.action_name, controller.controller_name,
                          controller.action_name, controller.request.format,
                          controller.request&.original_url,
                          @traces, MAX_TRACE_ENTRIES)
 
-        inject_hud(@settings, controller.request, controller.response)
+        inject_hud(@settings, controller.request, controller.response) if ::Rails.env.development? || ::Rails.env.test?
       end
 
       def self.trace_log_clear
@@ -87,10 +92,15 @@ module Callstacking
         "Started request: #{method} #{controller}##{action} as #{format}"
       end
 
+      def exception_message(exception, method, controller, action, format)
+        "#{exception.class} #{exception.message}<br/><br/>" \
+        "#{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)
         lock.synchronize do
           traces << { tuid: tuid,
-                      type: 'TraceCallReturn',
+                      type: TRACE_CALL_RETURN,
                       order_num: order_num,
                       nesting_level: nesting_level,
                       local_variables: {},
@@ -109,7 +119,7 @@ module Callstacking
       def create_call_entry(tuid, nesting_level, order_num, klass, method_name, arguments, path, line_no, traces)
         lock.synchronize do
           traces << { tuid: tuid,
-                      type: 'TraceCallEntry',
+                      type: TRACE_CALL_ENTRY,
                       order_num: order_num,
                       nesting_level: nesting_level,
                       args: arguments,
@@ -125,10 +135,10 @@ module Callstacking
         end
       end
 
-      def create_message(tuid, message, order_num, traces)
+      def create_message(tuid, message, order_num, traces, type = TRACE_MESSAGE)
         lock.synchronize do
           traces << { tuid: tuid,
-                      type: 'TraceMessage',
+                      type: type,
                       order_num: order_num,
                       nesting_level: 0,
                       message: message,
@@ -182,11 +192,17 @@ module Callstacking
         url
       end
 
-      def complete_request(trace_id, tuid, method, controller, action, format, original_url, traces, max_trace_entries)
+      def complete_request(trace_id, tuid, exception, method, controller,
+                           action, format, original_url, traces, max_trace_entries)
         return if do_not_track_request?(original_url, format)
 
-        create_message(tuid, completed_request_message(method, controller, action, format),
-                       spans.increment_order_num, traces)
+        if exception.present?
+          create_message(tuid, exception_message(exception, method, controller, action, format),
+                         spans.increment_order_num, traces, TRACE_EXCEPTION)
+        else
+          create_message(tuid, completed_request_message(method, controller, action, format),
+                         spans.increment_order_num, traces)
+        end
 
         send_traces!(trace_id, traces[0..max_trace_entries])
       end

data/lib/callstacking/rails/version.rb

@@ -1,5 +1,5 @@
 module Callstacking
   module Rails
-    VERSION = "0.1.35"
+    VERSION = "0.1.36"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: callstacking-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.36
 platform: ruby
 authors:
 - Jim Jones
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-15 00:00:00.000000000 Z
+date: 2023-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails