builder_apm 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb49aa255e318beaebed1eb541cd8bf1cf01bd8f5afe9b6ece98323f76952f42
-  data.tar.gz: c1f282761fa25d4ab0d9ffcdc0a8f8d29932e0696d20a2cede3342cfb8eee6d6
+  metadata.gz: 1ce10ef00890d74a1b18ef6afb1644c0983a9ae1a5f5174aadcdcc7957dabba8
+  data.tar.gz: 1fc6f2f584168cb7081bd47be58107bbee2d8e3741306c2d3e009ef94118819c
 SHA512:
-  metadata.gz: f9ed786df7a7531c8b79a314069bfcfde5a773520b1a603b605096feff55696bdde7b4aba8ab710e5ef9f11782a41ee391de62f0b5237b0273582d3b396aa5cd
-  data.tar.gz: 25fbcc9f411b55dd3aecf5b593b64d776df83f90b06208c7045daeaf16be8c63e5fec2b452ec664ee212b2c8e8ab23c065f8a47ff3722467bbac6a3f0194de8c
+  metadata.gz: 65ce830867f91ccf8ed25a23fd632625e9b3fe8cefcdc9460ffbd0aa666653dc39ee7776d063be82f156c2a29841088c176d0d1002460654fa1d758aefd44251
+  data.tar.gz: 217349f4f9cc1f9e094849237dd650b262dbf1d0f43fb721417e05895e2d8ffc80351e425058090044614ee83656313bd8a5ff6889ff32c3387a604bc21d945c

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/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.3"
 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.3
 platform: ruby
 authors:
 - Paul Ketelle