Merge pull request reidmorrison#115 from zach-taylor/log-allocations

Adds allocations to the payload for controller, view, and sql logs

Author: reidmorrison

lib/rails_semantic_logger/action_controller/log_subscriber.rb

@@ -37,6 +37,9 @@ def process_action(event)
             payload[key] = payload[key].to_f.round(2) if key.to_s =~ /(.*)_runtime/
           end
 
+          # Rails 6+ includes allocation count
+          payload[:allocations] = event.allocations if event.respond_to?(:allocations)
+
           payload[:status_message] = ::Rack::Utils::HTTP_STATUS_CODES[payload[:status]] if payload[:status].present?
 
           # Causes excessive log output with Rails 5 RC1

lib/rails_semantic_logger/action_view/log_subscriber.rb

@@ -23,6 +23,7 @@ def render_template(event)
           template: from_rails_root(event.payload[:identifier])
         }
         payload[:within] = from_rails_root(event.payload[:layout]) if event.payload[:layout]
+        payload[:allocations] = event.allocations if event.respond_to?(:allocations)
 
         logger.measure(
           self.class.rendered_log_level,
@@ -40,6 +41,7 @@ def render_partial(event)
         }
         payload[:within] = from_rails_root(event.payload[:layout]) if event.payload[:layout]
         payload[:cache]  = payload[:cache_hit] unless event.payload[:cache_hit].nil?
+        payload[:allocations] = event.allocations if event.respond_to?(:allocations)
 
         logger.measure(
           self.class.rendered_log_level,
@@ -59,6 +61,7 @@ def render_collection(event)
           count:    event.payload[:count]
         }
         payload[:cache_hits] = payload[:cache_hits] if payload[:cache_hits]
+        payload[:allocations] = event.allocations if event.respond_to?(:allocations)
 
         logger.measure(
           self.class.rendered_log_level,

lib/rails_semantic_logger/active_record/log_subscriber.rb

@@ -31,6 +31,7 @@ def sql(event)
 
         log_payload         = {sql: payload[:sql]}
         log_payload[:binds] = bind_values(payload) unless (payload[:binds] || []).empty?
+        log_payload[:allocations] = event.allocations if event.respond_to?(:allocations)
 
         log = {
           message:  name,

test/active_record_test.rb

@@ -28,6 +28,7 @@ class ActiveRecordTest < Minitest::Test
         assert actual[:message].include?("Sample"), actual[:message]
         assert actual[:payload], actual
         assert actual[:payload][:sql], actual[:payload]
+        assert_instance_of Integer, actual[:payload][:allocations] if Rails.version.to_i >= 6
       end
 
       it "sql with query cache" do

test/controllers/articles_controller_test.rb

@@ -61,5 +61,6 @@ def params
     assert_equal "OK", payload[:status_message], payload
     assert (payload[:view_runtime] >= 0.0), payload
     assert((payload[:db_runtime] >= 0.0), payload) unless defined?(JRuby)
+    assert_instance_of Integer, payload[:allocations] if Rails.version.to_i >= 6
   end
 end