rails_semantic_logger 4.4.6 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de0436e82a0d6ed583904e4da19a5dbc5611e7673b1b9904b0b4757f00e71057
-  data.tar.gz: 42335c2218f2d434f352f695c9ce2cc9362c7b7cbe70664a3585d5910c91e6f7
+  metadata.gz: 073a9356b40dc5616e3e4b179ea108d7419dc9e4bba685c230e41acd93ca48d4
+  data.tar.gz: 106766c0a81ed7a2d7b25c7810aa1edac1eedf5638426373209b168d7ea57b43
 SHA512:
-  metadata.gz: e0681cc160523f2cef6b6c5fdb169147150bf26470ce628210877e41691911fd81c0f800320dea191d61c6e7be0e3b2ad9d6bf259d0b711caad1c934ec914a72
-  data.tar.gz: 3e276c344146b0b16b71b1bfa915b0e8d602c20c750322fca09179c95ac3d85a1138e7b8bbaa96fc62f30effaf09d36cde8e5e7eb8268edbcf3f0e7f1c597f3c
+  metadata.gz: fd450ba87b0d22e139fd7afa626ed4fb8566e3ebc70880c05fe2c73c1ff5067a8d3626a8bddd742160a3d25eced3f8e4431e1fac96432f0fe53e6ec740c78d46
+  data.tar.gz: 2bee7d442cab44140f00b9ca74d0b343d6e19933953487c5b21c094bea0c7f811f2bb6014090eda6a778eb1ebd8209f86a9b4c3afb471fd1fa9955ad3fc160e4

data/lib/rails_semantic_logger/action_controller/log_subscriber.rb

@@ -37,6 +37,9 @@ module RailsSemanticLogger
             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

data/lib/rails_semantic_logger/action_view/log_subscriber.rb

@@ -23,6 +23,7 @@ module RailsSemanticLogger
           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 @@ module RailsSemanticLogger
         }
         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 @@ module RailsSemanticLogger
           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,

data/lib/rails_semantic_logger/active_job/log_subscriber.rb

@@ -78,7 +78,11 @@ module RailsSemanticLogger
         end
 
         def formatted_args
-          JSON.pretty_generate(job.arguments.map { |arg| format(arg) })
+          if defined?(job.class.log_arguments?) && !job.class.log_arguments?
+            ""
+          else
+            JSON.pretty_generate(job.arguments.map { |arg| format(arg) })
+          end
         end
 
         def format(arg)

data/lib/rails_semantic_logger/active_record/log_subscriber.rb

@@ -31,6 +31,7 @@ module RailsSemanticLogger
 
         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,
@@ -52,7 +53,7 @@ module RailsSemanticLogger
 
       # When multiple values are received for a single bound field, it is converted into an array
       def add_bind_value(binds, key, value)
-        key        = key.downcase.to_sym
+        key        = key.downcase.to_sym unless key.nil?
         value      = (Array(binds[key]) << value) if binds.key?(key)
         binds[key] = value
       end
@@ -115,6 +116,16 @@ module RailsSemanticLogger
         binds
       end
 
+      def bind_values_v6_1(payload)
+        binds         = {}
+        casted_params = type_casted_binds(payload[:type_casted_binds])
+        payload[:binds].each_with_index do |attr, i|
+          attr_name, value = render_bind(attr, casted_params[i])
+          add_bind_value(binds, attr_name, value)
+        end
+        binds
+      end
+
       def render_bind_v4_2(column, value)
         if column
           if column.binary?
@@ -154,6 +165,21 @@ module RailsSemanticLogger
         [attr&.name, value]
       end
 
+      def render_bind_v6_1(attr, value)
+        case attr
+        when ActiveModel::Attribute
+          if attr.type.binary? && attr.value
+            value = "<#{attr.value_for_database.to_s.bytesize} bytes of binary data>"
+          end
+        when Array
+          attr = attr.first
+        else
+          attr = nil
+        end
+
+        [attr&.name, value]
+      end
+
       def type_casted_binds_v5_0_3(binds, casted_binds)
         casted_binds || ::ActiveRecord::Base.connection.type_casted_binds(binds)
       end
@@ -171,6 +197,10 @@ module RailsSemanticLogger
         alias bind_values bind_values_v5_0_3
         alias render_bind render_bind_v5_0_3
         alias type_casted_binds type_casted_binds_v5_0_3
+      elsif Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR > 0 # ~> 6.1.0
+        alias bind_values bind_values_v6_1
+        alias render_bind render_bind_v6_1
+        alias type_casted_binds type_casted_binds_v5_1_5
       elsif Rails::VERSION::MAJOR >= 5 # ~> 5.1.5 && ~> 5.0.7 && 6.x.x
         alias bind_values bind_values_v5_1_5
         alias render_bind render_bind_v5_0_3

data/lib/rails_semantic_logger/version.rb

@@ -1,3 +1,3 @@
 module RailsSemanticLogger
-  VERSION = "4.4.6".freeze
+  VERSION = "4.5.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_semantic_logger
 version: !ruby/object:Gem::Version
-  version: 4.4.6
+  version: 4.5.0
 platform: ruby
 authors:
 - Reid Morrison
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2021-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Feature rich logging framework that replaces the Rails logger.