rails_semantic_logger 4.4.6 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de0436e82a0d6ed583904e4da19a5dbc5611e7673b1b9904b0b4757f00e71057
-  data.tar.gz: 42335c2218f2d434f352f695c9ce2cc9362c7b7cbe70664a3585d5910c91e6f7
+  metadata.gz: '0816ddc6820dfc94fed6b737d023c2cfdc6e6df3019d34ff1e71c40a2a6ccb2f'
+  data.tar.gz: b0c7f329c6e1ecf72687617155d994b6c37ef731d5166e30b76543a41e825efb
 SHA512:
-  metadata.gz: e0681cc160523f2cef6b6c5fdb169147150bf26470ce628210877e41691911fd81c0f800320dea191d61c6e7be0e3b2ad9d6bf259d0b711caad1c934ec914a72
-  data.tar.gz: 3e276c344146b0b16b71b1bfa915b0e8d602c20c750322fca09179c95ac3d85a1138e7b8bbaa96fc62f30effaf09d36cde8e5e7eb8268edbcf3f0e7f1c597f3c
+  metadata.gz: c42fadbc4b768c9f64f719e36cdf453bc80b88639fd8fe169704ae5b37375be8706b59d3ede6ef8a6eac090a0433be1fe514e90ea306f2f1288f026042e48b18
+  data.tar.gz: f16dec6c5a4336c0d0a0a2862891ec2117cbf103257a759e8611376725167476bc090c2444a7011df7b4c4e323583f2d5392dd498dea72e03f23f3555c45bde8

data/README.md

@@ -1,13 +1,13 @@
 # Rails Semantic Logger
-[![Gem Version](https://img.shields.io/gem/v/rails_semantic_logger.svg)](https://rubygems.org/gems/rails_semantic_logger) [![Build Status](https://travis-ci.org/rocketjob/rails_semantic_logger.svg?branch=master)](https://travis-ci.org/rocketjob/rails_semantic_logger) [![Downloads](https://img.shields.io/gem/dt/rails_semantic_logger.svg)](https://rubygems.org/gems/rails_semantic_logger) [![License](https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg)](http://opensource.org/licenses/Apache-2.0) ![](https://img.shields.io/badge/status-Production%20Ready-blue.svg) [![Gitter chat](https://img.shields.io/badge/IRC%20(gitter)-Support-brightgreen.svg)](https://gitter.im/rocketjob/support)
+[![Gem Version](https://img.shields.io/gem/v/rails_semantic_logger.svg)](https://rubygems.org/gems/rails_semantic_logger) [![Build Status](https://github.com/reidmorrison/rails_semantic_logger/workflows/build/badge.svg)](https://github.com/reidmorrison/rails_semantic_logger/actions?query=workflow%3Abuild) [![Downloads](https://img.shields.io/gem/dt/rails_semantic_logger.svg)](https://rubygems.org/gems/rails_semantic_logger) [![License](https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg)](http://opensource.org/licenses/Apache-2.0) ![](https://img.shields.io/badge/status-Production%20Ready-blue.svg)
 
-Rails Semantic Logger replaces the Rails default logger with [Semantic Logger](http://github.com/rocketjob/semantic_logger)
+Rails Semantic Logger replaces the Rails default logger with [Semantic Logger](https://logger.rocketjob.io/)
 
-* http://github.com/rocketjob/rails_semantic_logger
+* http://github.com/reidmorrison/rails_semantic_logger
 
 ## Documentation
 
-For complete documentation see: http://rocketjob.github.io/semantic_logger/rails
+For complete documentation see: https://logger.rocketjob.io/rails
 
 ## Upgrading to Semantic Logger v4.4
 
@@ -21,13 +21,13 @@ SemanticLogger::Processor.instance.instance_variable_set(:@queue, Queue.new)
 
 ## Supports
 
-For the complete list of supported Ruby and Rails versions, see the [Testing file](https://github.com/rocketjob/rails_semantic_logger/blob/master/.travis.yml).
+For the complete list of supported Ruby and Rails versions, see the [Testing file](https://github.com/reidmorrison/rails_semantic_logger/blob/master/.travis.yml).
 
 ## Author
 
 [Reid Morrison](https://github.com/reidmorrison)
 
-[Contributors](https://github.com/rocketjob/rails_semantic_logger/graphs/contributors)
+[Contributors](https://github.com/reidmorrison/rails_semantic_logger/graphs/contributors)
 
 ## Versioning
 

data/lib/rails_semantic_logger.rb

@@ -52,3 +52,7 @@ module RailsSemanticLogger
 
   private_class_method :subscriber_patterns, :unattach
 end
+
+require("rails_semantic_logger/extensions/mongoid/config") if defined?(Mongoid)
+require("rails_semantic_logger/extensions/active_support/logger") if defined?(ActiveSupport::Logger)
+require("rails_semantic_logger/extensions/rack/server") if defined?(Rack::Server)

data/lib/rails_semantic_logger/action_controller/log_subscriber.rb

@@ -15,10 +15,10 @@ module RailsSemanticLogger
           # Unused, but needed for Devise 401 status code monkey patch to still work.
           ::ActionController::Base.log_process_action(payload)
 
-          # According to PR https://github.com/rocketjob/rails_semantic_logger/pull/37/files
+          # According to PR https://github.com/reidmorrison/rails_semantic_logger/pull/37/files
           # payload[:params] is not always a Hash.
           payload[:params] = payload[:params].to_unsafe_h unless payload[:params].is_a?(Hash)
-          payload[:params].except!(*INTERNAL_PARAMS)
+          payload[:params] = payload[:params].except(*INTERNAL_PARAMS)
           payload.delete(:params) if payload[:params].empty?
 
           format           = payload[:format]
@@ -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,
@@ -39,7 +40,8 @@ module RailsSemanticLogger
           partial: from_rails_root(event.payload[:identifier])
         }
         payload[:within] = from_rails_root(event.payload[:layout]) if event.payload[:layout]
-        payload[:cache]  = payload[:cache_hit] unless event.payload[:cache_hit].nil?
+        payload[:cache]  = event.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,
@@ -58,7 +60,8 @@ module RailsSemanticLogger
           template: from_rails_root(identifier),
           count:    event.payload[:count]
         }
-        payload[:cache_hits] = payload[:cache_hits] if payload[:cache_hits]
+        payload[:cache_hits] = event.payload[:cache_hits] if event.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

@@ -5,29 +5,34 @@ module RailsSemanticLogger
     class LogSubscriber < ::ActiveSupport::LogSubscriber
       def enqueue(event)
         log_with_formatter event: event do |fmt|
-          "Enqueued #{fmt.job_info}"
+          {message: "Enqueued #{fmt.job_info}"}
         end
       end
 
       def enqueue_at(event)
         log_with_formatter event: event do |fmt|
-          "Enqueued #{fmt.job_info} at #{fmt.scheduled_at}"
+          {message: "Enqueued #{fmt.job_info} at #{fmt.scheduled_at}"}
         end
       end
 
       def perform_start(event)
         log_with_formatter event: event do |fmt|
-          "Performing #{fmt.job_info}"
+          {message: "Performing #{fmt.job_info}"}
         end
       end
 
       def perform(event)
         ex = event.payload[:exception_object]
         if ex
-          logger.error ex
+          log_with_formatter event: event, log_duration: true, level: :error do |fmt|
+            {
+              message: "Error performing #{fmt.job_info} in #{event.duration.round(2)}ms",
+              exception: ex
+            }
+          end
         else
           log_with_formatter event: event, log_duration: true do |fmt|
-            "Performed #{fmt.job_info} in #{event.duration.round(2)}ms"
+            {message: "Performed #{fmt.job_info} in #{event.duration.round(2)}ms"}
           end
         end
       end
@@ -78,7 +83,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)
@@ -103,10 +112,10 @@ module RailsSemanticLogger
         end
       end
 
-      def log_with_formatter(**kw_args)
+      def log_with_formatter(level: :info, **kw_args)
         fmt = EventFormatter.new(**kw_args)
         msg = yield fmt
-        logger.info msg, fmt.payload
+        logger.public_send(level, **msg, payload: fmt.payload)
       end
 
       def logger

data/lib/rails_semantic_logger/active_record/log_subscriber.rb

@@ -31,6 +31,8 @@ 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_payload[:cached] = event.payload[:cached]
 
         log = {
           message:  name,
@@ -40,7 +42,7 @@ module RailsSemanticLogger
 
         # Log the location of the query itself.
         if logger.send(:level_index) >= SemanticLogger.backtrace_level_index
-          log[:backtrace] = SemanticLogger::Utils.strip_backtrace
+          log[:backtrace] = SemanticLogger::Utils.strip_backtrace(caller)
         end
 
         logger.debug(log)
@@ -52,7 +54,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 +117,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 +166,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 || :nil, value]
+      end
+
       def type_casted_binds_v5_0_3(binds, casted_binds)
         casted_binds || ::ActiveRecord::Base.connection.type_casted_binds(binds)
       end
@@ -171,6 +198,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/engine.rb

@@ -127,18 +127,20 @@ module RailsSemanticLogger
 
     # After any initializers run, but after the gems have been loaded
     config.after_initialize do
+      config = Rails.application.config
+
       # Replace the Bugsnag logger
-      Bugsnag.configure { |config| config.logger = SemanticLogger[Bugsnag] } if defined?(Bugsnag)
+      Bugsnag.configure { |bugsnag_config| bugsnag_config.logger = SemanticLogger[Bugsnag] } if defined?(Bugsnag)
 
       # Rails Patches
-      require("rails_semantic_logger/extensions/action_cable/tagged_logger_proxy") if defined?(ActionCable)
-      require("rails_semantic_logger/extensions/action_controller/live") if defined?(ActionController::Live)
-      require("rails_semantic_logger/extensions/action_dispatch/debug_exceptions") if defined?(ActionDispatch::DebugExceptions)
-      if defined?(ActionView::StreamingTemplateRenderer::Body)
+      require("rails_semantic_logger/extensions/action_cable/tagged_logger_proxy") if defined?(::ActionCable)
+      require("rails_semantic_logger/extensions/action_controller/live") if defined?(::ActionController::Live)
+      require("rails_semantic_logger/extensions/action_dispatch/debug_exceptions") if defined?(::ActionDispatch::DebugExceptions)
+      if defined?(::ActionView::StreamingTemplateRenderer::Body)
         require("rails_semantic_logger/extensions/action_view/streaming_template_renderer")
       end
       require("rails_semantic_logger/extensions/active_job/logging") if defined?(::ActiveJob)
-      require("rails_semantic_logger/extensions/active_model_serializers/logging") if defined?(ActiveModelSerializers)
+      require("rails_semantic_logger/extensions/active_model_serializers/logging") if defined?(::ActiveModelSerializers)
 
       if config.rails_semantic_logger.semantic
         # Active Job
@@ -174,7 +176,8 @@ module RailsSemanticLogger
 
         # Silence asset logging by applying a filter to the Rails logger itself, not any of the appenders.
         if config.rails_semantic_logger.quiet_assets && config.assets.prefix
-          assets_regex                                    = %r(\A/{0,2}#{config.assets.prefix})
+          assets_root                                     = config.relative_url_root.to_s + config.assets.prefix
+          assets_regex                                    = %r(\A/{0,2}#{assets_root})
           RailsSemanticLogger::Rack::Logger.logger.filter = ->(log) { log.payload[:path] !~ assets_regex if log.payload }
         end
 
@@ -211,6 +214,15 @@ module RailsSemanticLogger
 
       # Re-open appenders after Spring has forked a process
       Spring.after_fork { |_job| ::SemanticLogger.reopen } if defined?(Spring.after_fork)
+
+      console do |_app|
+        # Don't use a background thread for logging
+        SemanticLogger.sync!
+        SemanticLogger.add_appender(io: STDERR, formatter: :color)
+
+        # Include method names on log entries in the console
+        SemanticLogger.backtrace_level = SemanticLogger.default_level
+      end
     end
   end
 end

data/lib/rails_semantic_logger/extensions/action_controller/live.rb

@@ -2,6 +2,7 @@
 ActionController::Live
 module ActionController
   module Live
+    undef_method :log_error
     def log_error(exception)
       logger.fatal(exception)
     end

data/lib/rails_semantic_logger/extensions/action_dispatch/debug_exceptions.rb

@@ -4,6 +4,7 @@ module ActionDispatch
   class DebugExceptions
     private
 
+    undef_method :log_error
     def log_error(_request, wrapper)
       ActiveSupport::Deprecation.silence do
         ActionController::Base.logger.fatal(wrapper.exception)

data/lib/rails_semantic_logger/extensions/action_view/streaming_template_renderer.rb

@@ -6,6 +6,7 @@ module ActionView
     class Body
       private
 
+      undef_method :log_error
       def log_error(exception)
         ActionView::Base.logger.fatal(exception)
       end

data/lib/rails_semantic_logger/extensions/active_support/logger.rb

@@ -0,0 +1,24 @@
+require "active_support/logger"
+
+module ActiveSupport
+  # More hacks to try and stop Rails from being it's own worst enemy.
+  class Logger
+    class << self
+      undef :logger_outputs_to?, :broadcast
+    end
+
+    # Prevent Console from trying to merge loggers
+    def self.logger_outputs_to?(*args)
+      true
+    end
+
+    # Prevent broadcasting since SemanticLogger already supports multiple loggers
+    def self.broadcast(logger)
+      Module.new
+    end
+
+    def self.new(*args, **kwargs)
+      SemanticLogger[self]
+    end
+  end
+end

data/lib/rails_semantic_logger/extensions/active_support/tagged_logging.rb

@@ -0,0 +1,8 @@
+module ActiveSupport
+  module TaggedLogging
+    # Semantic Logger already does tagged logging
+    def self.new(logger)
+      logger
+    end
+  end
+end

data/lib/rails_semantic_logger/extensions/mongoid/config.rb

@@ -0,0 +1,11 @@
+require "mongoid/config"
+
+module Mongoid
+  module Config
+    private
+
+    # Remove log overrides
+    def set_log_levels
+    end
+  end
+end

data/lib/rails_semantic_logger/extensions/rack/server.rb

@@ -0,0 +1,12 @@
+module RailsSemanticLogger
+  module Rack
+    module Server
+      def daemonize_app
+        super
+        SemanticLogger.reopen
+      end
+    end
+  end
+end
+
+Rack::Server.prepend(RailsSemanticLogger::Rack::Server)

data/lib/rails_semantic_logger/extensions/rails/server.rb

@@ -5,6 +5,8 @@ module Rails
     private
 
     def log_to_stdout
+      wrapped_app # touch the app so the logger is set up
+
       SemanticLogger.add_appender(io: $stdout, formatter: :color)
     end
   end

data/lib/rails_semantic_logger/rack/logger.rb

@@ -54,7 +54,7 @@ module RailsSemanticLogger
           payload: {
             method: request.request_method,
             path:   request.filtered_path,
-            ip:     request.ip
+            ip:     request.remote_ip
           }
         }
       end

data/lib/rails_semantic_logger/version.rb

@@ -1,3 +1,3 @@
 module RailsSemanticLogger
-  VERSION = "4.4.6".freeze
+  VERSION = "4.6.1".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.6.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2021-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -44,17 +44,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.8'
 description:
 email:
-- reidmo@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -75,11 +74,15 @@ files:
 - lib/rails_semantic_logger/extensions/action_view/streaming_template_renderer.rb
 - lib/rails_semantic_logger/extensions/active_job/logging.rb
 - lib/rails_semantic_logger/extensions/active_model_serializers/logging.rb
+- lib/rails_semantic_logger/extensions/active_support/logger.rb
+- lib/rails_semantic_logger/extensions/active_support/tagged_logging.rb
+- lib/rails_semantic_logger/extensions/mongoid/config.rb
+- lib/rails_semantic_logger/extensions/rack/server.rb
 - lib/rails_semantic_logger/extensions/rails/server.rb
 - lib/rails_semantic_logger/options.rb
 - lib/rails_semantic_logger/rack/logger.rb
 - lib/rails_semantic_logger/version.rb
-homepage: https://github.com/rocketjob/rails_semantic_logger
+homepage: https://logger.rocketjob.io
 licenses:
 - Apache-2.0
 metadata: {}
@@ -91,14 +94,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Feature rich logging framework that replaces the Rails logger.