logstasher 2.0.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e438a36935fc002e2de28f362171174d01908e321a432a45c0b6d5ba607593ff
-  data.tar.gz: 2076d9f4e694686bafc239e90f3c426feee7fcc74a9904352700704b1c8d2bd5
+  metadata.gz: 33158a121af27be0e9bd17ac2c3e9ac3e40823a52db857ad9954d370d339eb63
+  data.tar.gz: cf62d43543a0b3b6948c1c29233c5eedfd21188f9f0cb6f98fdf9276f933b54f
 SHA512:
-  metadata.gz: 7b8face2936949f9cf382336ef8e88da96ff848ea8f088f70eeedba7d6e76f923cb206b06b9cbb10b03ad28dda22cea70415d1686f662617a8175c9f6b7b2aa2
-  data.tar.gz: 7aa9af505594a1109b438c85a5196cfa5d46ac9591c53a4d3425790ed40d02f812c067a760d387b222bebbce8bae74585437d2a2e47cc8baa92e908d24c9aaee
+  metadata.gz: 9f403b9a4d329f51c981ed6b57ab1ff2e6ef4ecc58f0943c59eb6d136b9cbdda39d8a904f02511258972fb99597a66ff75a8f53ac17906e837867400a83d66d7
+  data.tar.gz: 57e572d794e472c73496f163023b3f61379998d0e80a4e9cc73d7c37fbbbf2a1999dd53697b897e0a8034d6362184cd86020162409406ecfd68716014bda9bf0

data/lib/logstasher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'logstasher/version'
 require 'logstasher/active_support/log_subscriber'
 require 'logstasher/active_support/mailer_log_subscriber'
@@ -36,7 +38,9 @@ module LogStasher
         unsubscribe(:action_mailer, subscriber)
       when 'ActiveRecord::LogSubscriber'
         unsubscribe(:active_record, subscriber)
-      when 'ActiveJob::Logging::LogSubscriber'
+      when 'ActiveJob::LogSubscriber' # For Rails 6
+        unsubscribe(:active_job, subscriber)
+      when 'ActiveJob::Logging::LogSubscriber' # For Rails 5
         unsubscribe(:active_job, subscriber)
       end
     end
@@ -89,7 +93,6 @@ module LogStasher
   end
 
   def setup_before(config)
-    require 'logstash-event'
     self.enabled = config.enabled
     LogStasher::ActiveSupport::LogSubscriber.attach_to :action_controller if config.controller_enabled
     LogStasher::ActiveSupport::MailerLogSubscriber.attach_to :action_mailer if config.mailer_enabled
@@ -108,8 +111,8 @@ module LogStasher
     self.logger = config.logger || new_logger(logger_path)
     logger.level = config.log_level || Logger::WARN
     self.source = config.source unless config.source.nil?
-    self.log_controller_parameters = !!config.log_controller_parameters
-    self.backtrace = !!config.backtrace unless config.backtrace.nil?
+    self.log_controller_parameters = !config.log_controller_parameters.nil?
+    self.backtrace = !config.backtrace.nil? unless config.backtrace.nil?
     set_data_for_rake
     set_data_for_console
     self.field_renaming = Hash(config.field_renaming)
@@ -124,7 +127,7 @@ module LogStasher
   end
 
   def called_as_rake?
-    File.basename($0) == 'rake'
+    File.basename($PROGRAM_NAME) == 'rake'
   end
 
   def called_as_console?
@@ -159,7 +162,7 @@ module LogStasher
   #   LogStasher.info("message", timing:1234)
   #   LogStasher.info(custom1:"yes", custom2:"no")
   def log(severity, message, additional_fields = {})
-    if logger && logger.send("#{severity}?")
+    if logger&.send("#{severity}?")
 
       data = { 'level' => severity }
       if message.respond_to?(:to_hash)
@@ -172,7 +175,7 @@ module LogStasher
       tags = Array(additional_fields.delete(:tags) || 'log')
 
       data.merge!(additional_fields)
-      logger << build_logstash_event(data, tags).to_json + "\n"
+      logger << "#{build_logstash_event(data, tags).to_json}\n"
 
     end
   end

data/lib/logstasher/action_view/log_subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/notifications'
 require 'action_view/log_subscriber'
 require 'logstasher/custom_fields'
@@ -31,7 +33,7 @@ module LogStasher
 
         tags = []
         tags.push('exception') if data[:exception]
-        logger << LogStasher.build_logstash_event(data, tags).to_json + "\n"
+        logger << "#{LogStasher.build_logstash_event(data, tags).to_json}\n"
       end
 
       def extract_data(data)

data/lib/logstasher/active_job/log_subscriber.rb

@@ -1,91 +1,98 @@
-begin
-  # `rescue nil` didn't work for some Ruby versions
+# frozen_string_literal: true
+
+# For Rails 6.0 or below, require the logging module which contains LogSubscriber
+if ActiveJob::VERSION::MAJOR < 6 || (ActiveJob::VERSION::MAJOR == 6 && ActiveJob::VERSION::MINOR.zero?)
   require 'active_job/logging'
-rescue LoadError
+else
+  require 'active_job/log_subscriber'
 end
 
-if defined?(::ActiveJob::Logging::LogSubscriber)
-  module LogStasher
-    module ActiveJob
-      class LogSubscriber < ::ActiveJob::Logging::LogSubscriber
-        def enqueue(event)
-          process_event(event, 'enqueue')
-        end
-
-        def enqueue_at(event)
-          process_event(event, 'enqueue_at')
-        end
-
-        def perform(event)
-          process_event(event, 'perform')
-
-          # Revert the request id back, in the event that the inline adapter is being used or a
-          # perform_now was used.
-          LogStasher.request_context[:request_id] = Thread.current[:old_request_id]
-          Thread.current[:old_request_id] = nil
-        end
-
-        def perform_start(event)
-          # Use the job_id as the request id, so that any custom logging done for a job
-          # shares a request id, and has the job id in each log line.
-          #
-          # It's not being set when the job is enqueued, so enqueuing a job will have it's default
-          # request_id. In a lot of cases, it will be because of a web request.
-          #
-          # Hang onto the old request id, so we can revert after the job is done being performed.
-          Thread.current[:old_request_id] = LogStasher.request_context[:request_id]
-          LogStasher.request_context[:request_id] = event.payload[:job].job_id
-
-          process_event(event, 'perform_start')
-        end
-
-        def logger
-          LogStasher.logger
-        end
-
-        private
-
-        def process_event(event, type)
-          data = extract_metadata(event)
-          data.merge! extract_exception(event)
-          data.merge! extract_scheduled_at(event) if type == 'enqueue_at'
-          data.merge! extract_duration(event) if type == 'perform'
-          data.merge! request_context
-
-          tags = ['job', type]
-          tags.push('exception') if data[:exception]
-          logger << LogStasher.build_logstash_event(data, tags).to_json + "\n"
-        end
-
-        def extract_metadata(event)
-          {
-            job_id: event.payload[:job].job_id,
-            queue_name: queue_name(event),
-            job_class: event.payload[:job].class.to_s,
-            job_args: args_info(event.payload[:job])
-          }
-        end
-
-        def extract_duration(event)
-          { duration: event.duration.to_f.round(2) }
-        end
-
-        def extract_exception(event)
-          event.payload.slice(:exception)
-        end
-
-        def extract_scheduled_at(event)
-          { scheduled_at: scheduled_at(event) }
-        end
-
-        def request_context
-          LogStasher.request_context
-        end
-
-        # The default args_info makes a string. We need objects to turn into JSON.
-        def args_info(job)
-          job.arguments.map { |arg| arg.try(:to_global_id).try(:to_s) || arg }
-        end
+module LogStasher
+  module ActiveJob
+    BASE_SUBSCRIBER = if defined?(::ActiveJob::LogSubscriber)
+                        ::ActiveJob::LogSubscriber
+                      else
+                        ::ActiveJob::Logging::LogSubscriber
+                      end
+
+    class LogSubscriber < BASE_SUBSCRIBER
+      def enqueue(event)
+        process_event(event, 'enqueue')
+      end
+
+      def enqueue_at(event)
+        process_event(event, 'enqueue_at')
+      end
+
+      def perform(event)
+        process_event(event, 'perform')
+
+        # Revert the request id back, in the event that the inline adapter is being used or a
+        # perform_now was used.
+        LogStasher.request_context[:request_id] = Thread.current[:old_request_id]
+        Thread.current[:old_request_id] = nil
+      end
+
+      def perform_start(event)
+        # Use the job_id as the request id, so that any custom logging done for a job
+        # shares a request id, and has the job id in each log line.
+        #
+        # It's not being set when the job is enqueued, so enqueuing a job will have it's default
+        # request_id. In a lot of cases, it will be because of a web request.
+        #
+        # Hang onto the old request id, so we can revert after the job is done being performed.
+        Thread.current[:old_request_id] = LogStasher.request_context[:request_id]
+        LogStasher.request_context[:request_id] = event.payload[:job].job_id
+
+        process_event(event, 'perform_start')
+      end
+
+      def logger
+        LogStasher.logger
+      end
+
+      private
+
+      def process_event(event, type)
+        data = extract_metadata(event)
+        data.merge! extract_exception(event)
+        data.merge! extract_scheduled_at(event) if type == 'enqueue_at'
+        data.merge! extract_duration(event) if type == 'perform'
+        data.merge! request_context
+
+        tags = ['job', type]
+        tags.push('exception') if data[:exception]
+        logger << "#{LogStasher.build_logstash_event(data, tags).to_json}\n"
+      end
+
+      def extract_metadata(event)
+        {
+          job_id: event.payload[:job].job_id,
+          queue_name: queue_name(event),
+          job_class: event.payload[:job].class.to_s,
+          job_args: args_info(event.payload[:job])
+        }
+      end
+
+      def extract_duration(event)
+        { duration: event.duration.to_f.round(2) }
+      end
+
+      def extract_exception(event)
+        event.payload.slice(:exception)
+      end
+
+      def extract_scheduled_at(event)
+        { scheduled_at: scheduled_at(event) }
+      end
+
+      def request_context
+        LogStasher.request_context
+      end
+
+      # The default args_info makes a string. We need objects to turn into JSON.
+      def args_info(job)
+        ::ActiveJob::Arguments.serialize(job.arguments)
       end
     end
   end

data/lib/logstasher/active_record/log_subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/notifications'
 require 'active_record/log_subscriber'
 require 'logstasher/custom_fields'
@@ -9,7 +11,7 @@ module LogStasher
 
       def identity(event)
         lsevent = logstash_event(event)
-        logger << lsevent.to_json + "\n" if logger && lsevent
+        logger << "#{lsevent.to_json}\n" if logger && lsevent
       end
       alias sql identity
 
@@ -21,9 +23,13 @@ module LogStasher
 
       def logstash_event(event)
         self.class.runtime += event.duration
-        data = event.payload
+        data = event.payload.dup
+
+        return if data[:name] == 'SCHEMA'
 
-        return if 'SCHEMA' == data[:name]
+        # A connection cannot be converted to JSON as it fails with
+        # SystemStackError when running against ActiveSupport JSON patches.
+        data.delete(:connection)
 
         data.merge! runtimes(event)
         data.merge! extract_sql(data)

data/lib/logstasher/active_support/log_subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/class/attribute'
 require 'active_support/log_subscriber'
 require 'logstasher/custom_fields'
@@ -20,7 +22,7 @@ module LogStasher
 
         tags = ['request']
         tags.push('exception') if payload[:exception]
-        logger << LogStasher.build_logstash_event(data, tags).to_json + "\n"
+        logger << "#{LogStasher.build_logstash_event(data, tags).to_json}\n"
       end
 
       def redirect_to(event)
@@ -48,11 +50,7 @@ module LogStasher
       end
 
       def extract_format(payload)
-        if ::ActionPack::VERSION::MAJOR == 3 && ::ActionPack::VERSION::MINOR == 0
-          payload[:formats].first
-        else
-          payload[:format]
-        end
+        payload[:format]        
       end
 
       def extract_status(payload)

data/lib/logstasher/active_support/mailer_log_subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/class/attribute'
 require 'active_support/log_subscriber'
 
@@ -10,6 +12,11 @@ module LogStasher
         process_event(event, %w[mailer deliver])
       end
 
+      # This method will only be invoked on Rails 6.0 and prior.
+      # Starting in Rails 6.0 the receive method was deprecated in
+      # favor of ActionMailbox.  The receive method was removed
+      # from ActionMailer in Rails 6.1, and there doesn't appear to
+      # be corresponding instrumentation for ActionMailbox.
       def receive(event)
         process_event(event, %w[mailer receive])
       end
@@ -26,7 +33,7 @@ module LogStasher
 
       def process_event(event, tags)
         data = LogStasher.request_context.merge(extract_metadata(event.payload))
-        logger << LogStasher.build_logstash_event(data, tags).to_json + "\n"
+        logger << "#{LogStasher.build_logstash_event(data, tags).to_json}\n"
       end
 
       def extract_metadata(payload)

data/lib/logstasher/custom_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LogStasher
   module CustomFields
     module LogSubscriber

data/lib/logstasher/device/redis.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'redis'
 
 module LogStasher
@@ -22,7 +24,7 @@ module LogStasher
       def redis_options
         unless @redis_options
           default_keys = default_options.keys
-          @redis_options = options.select { |k, _v| !default_keys.include?(k) }
+          @redis_options = options.reject { |k, _v| default_keys.include?(k) }
         end
 
         @redis_options

data/lib/logstasher/event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'time'
 require 'date'

data/lib/logstasher/rails_ext/action_controller/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LogStasher
   module ActionController
     module Instrumentation

data/lib/logstasher/rails_ext/action_controller/metal/instrumentation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionController
   module Instrumentation
     alias orig_process_action process_action

data/lib/logstasher/rails_ext/rack/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/rack/logger'
 
 module Rails

data/lib/logstasher/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/railtie'
 require 'action_view/log_subscriber'
 require 'action_controller/log_subscriber'
@@ -20,7 +22,7 @@ module LogStasher
     config_file = File.expand_path './config/logstasher.yml'
 
     # Load and ERB templating of YAML files
-    LOGSTASHER = File.exist?(config_file) ? YAML.load(ERB.new(File.read(config_file)).result).symbolize_keys : nil
+    LOGSTASHER = File.exist?(config_file) ? YAML.safe_load(ERB.new(File.read(config_file)).result).symbolize_keys : nil
 
     initializer :logstasher, before: :load_config_initializers do |app|
       if LOGSTASHER.present?
@@ -42,7 +44,7 @@ module LogStasher
     end
 
     def rack_cache_hashlike?(app)
-      app.config.action_dispatch.rack_cache && app.config.action_dispatch.rack_cache.respond_to?(:[]=)
+      app.config.action_dispatch.rack_cache&.respond_to?(:[]=)
     end
   end
 
@@ -55,7 +57,7 @@ module LogStasher
       # get all available IP address lists and use the first one.
       # This will always be `127.0.0.1`.
       address_info = Socket.ip_address_list.first
-      address_info && address_info.ip_address
+      address_info&.ip_address
     else
       IPSocket.getaddress(Socket.gethostname)
     end

data/lib/logstasher/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LogStasher
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstasher
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Shadab Ahmed
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-27 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: logstash-event
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Awesome rails logs