builder_apm 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb49aa255e318beaebed1eb541cd8bf1cf01bd8f5afe9b6ece98323f76952f42
-  data.tar.gz: c1f282761fa25d4ab0d9ffcdc0a8f8d29932e0696d20a2cede3342cfb8eee6d6
+  metadata.gz: 9e345a9d0a4268df1fd70c2dd2311eba4ce9fe9172907a74ec03b6922b6623fd
+  data.tar.gz: e657d3f16327b2c8aa0a79f90a5a80f57350205fccb516ac6d58d7d1e3e0bcc9
 SHA512:
-  metadata.gz: f9ed786df7a7531c8b79a314069bfcfde5a773520b1a603b605096feff55696bdde7b4aba8ab710e5ef9f11782a41ee391de62f0b5237b0273582d3b396aa5cd
-  data.tar.gz: 25fbcc9f411b55dd3aecf5b593b64d776df83f90b06208c7045daeaf16be8c63e5fec2b452ec664ee212b2c8e8ab23c065f8a47ff3722467bbac6a3f0194de8c
+  metadata.gz: 3b644056f083a38a59fdb5f94c26f5108e72474cc5d7c01e76ef3f7d56802b0b87c96602f723e260f9b29894de749852b3c198f80dcf0c3a28960143e28cd029
+  data.tar.gz: c09bfba63427594bc9a7b51cc70122902d6407b8e65415994a934c48654a756c65a3ab4e5119aa811e491f1639107fbc2b2b27c9bb36a566d0b12a2926153da5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    builder_apm (0.1.0)
+    builder_apm (0.2.2)
       rails (>= 4.0, < 8)
       redis (~> 4.5)
 

data/lib/builder_apm/controllers/instrumenter.rb

@@ -55,11 +55,14 @@ module BuilderApm
           view_runtime: event.payload[:view_runtime],
           stack: Thread.current[:stack]
         }
-        if event.payload[:exception]
-          exception_class, exception_message = event.payload[:exception]
-          data[:exception_class] = exception_class
-          data[:exception_message] = exception_message
-          data[:exception_backtrace] = event.payload[:exception_object].backtrace #.select { |line| line.start_with?(Rails.root.to_s) }
+        
+        if event.payload[:exception_object]
+          exception = event.payload[:exception_object]
+          status = ActionDispatch::ExceptionWrapper.new(Rails.backtrace_cleaner, exception).status_code
+          data[:status] = status
+          data[:exception_class] = exception.class
+          data[:exception_message] = exception.message
+          data[:exception_backtrace] = exception.backtrace #.select { |line| line.start_with?(Rails.root.to_s) }
         end
 
         data

data/lib/builder_apm/models/instrumenter.rb

@@ -66,16 +66,21 @@ module BuilderApm
       def update_last_sql_query_data_with_instantiation_info(event)
         stack = Thread.current[:stack]
         request_id = Thread.current[:request_id]
-
+      
         return if stack.nil? || stack.empty? || request_id.nil?
-
-        last_sql = Thread.current[:stack].last[:sql_events].pop
-        if last_sql[:sql_id] == Thread.current[:sql_event_id]
-          last_sql[:record_count] = event.payload[:record_count]
-          last_sql[:class_name] = event.payload[:class_name]
+      
+        begin
+          last_sql = stack.last[:sql_events].pop
+          return unless last_sql && last_sql[:sql_id]
+      
+          if last_sql[:sql_id] == Thread.current[:sql_event_id]
+            last_sql[:record_count] = event.payload[:record_count]
+            last_sql[:class_name] = event.payload[:class_name]
+          end
+          Thread.current[:stack].last[:sql_events].push(last_sql)
+        ensure
+          Thread.current[:sql_event_id] = nil
         end
-        Thread.current[:stack].last[:sql_events].push(last_sql)
-        Thread.current[:sql_event_id] = nil
       end      
     end
   end

data/lib/builder_apm/version.rb

@@ -1,3 +1,3 @@
 module BuilderApm
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: builder_apm
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Paul Ketelle