logstasher 1.2.2 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3e2a517ff797eeb35b1c466b049d05eea6696530
-  data.tar.gz: a6b0a8c2c0bb2ff23228d41cc2e367d923b1a95d
+SHA256:
+  metadata.gz: 7af8fd26cf9b944ead0bf8b8b2df3a75aa405ca1e726529e7cccb1a38ae30e8d
+  data.tar.gz: aec3c7b2e41fefcb6f9c8b378c91d332537387685da9951cf741ab4ff2a0d9e3
 SHA512:
-  metadata.gz: 1ceb248367ef8affaca292516fa82719b8e767c43105eea7c3ccb46ac46f2d426f1b2374100f3ae529509917643317ef29ef462898266902855523bfca615636
-  data.tar.gz: 4210f0f0214bf5d5cbc82d4f8b26b911d00fe5822d9b5043769c9a67a99956e58587e933ea72f92509513298cc81e691b1c020d0646e21a1ac74ed81fac85b96
+  metadata.gz: b65801d4d765f1f75f8939ee77e0ac88a5831e126f4428741097bce1b01b2c1ffe90a926aee5617bfe3355c9bfc80825299cfefd9666e52da008a22ad43368f7
+  data.tar.gz: 0d9bc2de4e965343f0ab12241d76e62a3e661b9bafa824cb532ee4df9768562ec83055af0c8462277b62efc8a0afdfc154b940bc38919500ec8a693bfce5009d

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'
@@ -10,8 +12,8 @@ module LogStasher
       def render_template(event)
         logstash_event(event)
       end
-      alias :render_partial :render_template
-      alias :render_collection :render_template
+      alias render_partial render_template
+      alias render_collection render_template
 
       def logger
         LogStasher.logger
@@ -31,11 +33,11 @@ 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)
-        {  identifier: from_rails_root(data[:identifier]) }
+        { identifier: from_rails_root(data[:identifier]) }
       end
 
       def request_context
@@ -49,16 +51,15 @@ module LogStasher
       def event_data(event)
         {
           name: event.name,
-          transaction_id: event.transaction_id,
+          transaction_id: event.transaction_id
         }
       end
 
       def runtimes(event)
         {
-          duration: event.duration,
-        }.inject({}) do |runtimes, (name, runtime)|
+          duration: event.duration
+        }.each_with_object({}) do |(name, runtime), runtimes|
           runtimes[name] = runtime.to_f.round(2) if runtime
-          runtimes
         end
       end
     end

data/lib/logstasher/active_job/log_subscriber.rb

@@ -1,13 +1,21 @@
-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
 
 module LogStasher
   module ActiveJob
-    class LogSubscriber < ::ActiveJob::Logging::LogSubscriber
+    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
@@ -54,20 +62,20 @@ module LogStasher
 
         tags = ['job', type]
         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_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]),
+          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) }
+        { duration: event.duration.to_f.round(2) }
       end
 
       def extract_exception(event)
@@ -75,7 +83,7 @@ module LogStasher
       end
 
       def extract_scheduled_at(event)
-        { :scheduled_at => scheduled_at(event) }
+        { scheduled_at: scheduled_at(event) }
       end
 
       def request_context
@@ -84,9 +92,8 @@ module LogStasher
 
       # 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 }
+        ::ActiveJob::Arguments.serialize(job.arguments)
       end
-
     end
   end
-end if defined?(::ActiveJob::Logging::LogSubscriber)
+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,11 +11,9 @@ module LogStasher
 
       def identity(event)
         lsevent = logstash_event(event)
-        if logger && lsevent
-          logger << lsevent.to_json + "\n"
-        end
+        logger << "#{lsevent.to_json}\n" if logger && lsevent
       end
-      alias :sql :identity
+      alias sql identity
 
       def logger
         LogStasher.logger
@@ -22,9 +22,14 @@ module LogStasher
       private
 
       def logstash_event(event)
-        data = event.payload
+        self.class.runtime += event.duration
+        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)
@@ -32,7 +37,7 @@ module LogStasher
         data.merge! LogStasher.store
         data.merge! extract_custom_fields(data)
 
-        tags = [ 'request' ]
+        tags = ['request']
         tags.push('exception') if data[:exception]
         LogStasher.build_logstash_event(data, tags)
       end
@@ -45,7 +50,7 @@ module LogStasher
         if event.duration
           { duration: event.duration.to_f.round(2) }
         else
-          {  }
+          {}
         end
       end
 

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)
@@ -44,40 +46,35 @@ module LogStasher
       end
 
       def extract_path(payload)
-        payload[:path].split("?").first
+        payload[:path].split('?').first
       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)
         if payload[:status]
-          { :status => payload[:status].to_i }
+          { status: payload[:status].to_i }
         else
-          { :status => 0 }
+          { status: 0 }
         end
       end
 
       def runtimes(event)
         {
-          :duration => event.duration,
-          :view => event.payload[:view_runtime],
-          :db => event.payload[:db_runtime]
-        }.inject({}) do |runtimes, (name, runtime)|
+          duration: event.duration,
+          view: event.payload[:view_runtime],
+          db: event.payload[:db_runtime]
+        }.each_with_object({}) do |(name, runtime), runtimes|
           runtimes[name] = runtime.to_f.round(2) if runtime
-          runtimes
         end
       end
 
-      def location(event)
+      def location(_event)
         if location = Thread.current[:logstasher_location]
           Thread.current[:logstasher_location] = nil
-          { :location => location }
+          { location: location }
         else
           {}
         end
@@ -88,13 +85,17 @@ module LogStasher
         if payload[:exception]
           exception, message = payload[:exception]
           status = ::ActionDispatch::ExceptionWrapper.status_code_for_exception(exception)
-          if LogStasher.backtrace
-            backtrace = $!.backtrace.join("\n")
+          backtrace = if LogStasher.backtrace
+            if LogStasher.backtrace_filter.respond_to?(:call)
+              LogStasher.backtrace_filter.call($!.backtrace).join("\n")
+            else
+              $!.backtrace.join("\n")
+            end
           else
-            backtrace = $!.backtrace.first
+            $!.backtrace.first
           end
           message = "#{exception}\n#{message}\n#{backtrace}"
-          { :status => status, :error => message }
+          { status: status, error: message }
         else
           {}
         end

data/lib/logstasher/active_support/mailer_log_subscriber.rb

@@ -1,21 +1,28 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/class/attribute'
 require 'active_support/log_subscriber'
 
 module LogStasher
   module ActiveSupport
     class MailerLogSubscriber < ::ActiveSupport::LogSubscriber
-      MAILER_FIELDS = [:mailer, :action, :message_id, :from, :to]
+      MAILER_FIELDS = %i[mailer action message_id from to].freeze
 
       def deliver(event)
-        process_event(event, ['mailer', 'deliver'])
+        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, ['mailer', 'receive'])
+        process_event(event, %w[mailer receive])
       end
 
       def process(event)
-        process_event(event, ['mailer', 'process'])
+        process_event(event, %w[mailer process])
       end
 
       def logger
@@ -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
@@ -5,7 +7,7 @@ module LogStasher
         (!CustomFields.custom_fields.empty? && data.extract!(*CustomFields.custom_fields)) || {}
       end
     end
-    
+
     def self.clear
       Thread.current[:logstasher_custom_fields] = []
     end

data/lib/logstasher/device/redis.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require 'redis'
 
 module LogStasher
   module Device
     class Redis
-
       attr_reader :options, :redis
 
       def initialize(options = {})
@@ -23,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
@@ -36,7 +37,7 @@ module LogStasher
         when 'channel'
           redis.publish(key, log)
         else
-          fail "Unknown data type #{data_type}"
+          raise "Unknown data type #{data_type}"
         end
       end
 
@@ -51,12 +52,12 @@ module LogStasher
       end
 
       def default_options
-          { key: 'logstash', data_type: 'list' }
+        { key: 'logstash', data_type: 'list' }
       end
 
       def validate_options
-        unless ['list', 'channel'].include?(options[:data_type])
-          fail 'Expected :data_type to be either "list" or "channel"'
+        unless %w[list channel].include?(options[:data_type])
+          raise 'Expected :data_type to be either "list" or "channel"'
         end
       end
     end

data/lib/logstasher/event.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'json'
+require 'time'
+require 'date'
+
+module LogStasher
+  class Event
+    def initialize(data = {})
+      @cancelled = false
+
+      @data = data
+      if data.include?('@timestamp')
+        t = data['@timestamp']
+        data['@timestamp'] = Time.parse(t).gmtime.iso8601(3) if t.is_a?(String)
+      else
+        data['@timestamp'] = ::Time.now.utc.iso8601(3)
+      end
+      data['@version'] = '1' unless @data.include?('@version')
+    end
+
+    def to_s
+      to_json.to_s
+    end
+
+    def to_json(*args)
+      @data.to_json(*args)
+    end
+
+    def [](key)
+      @data[key]
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LogStasher
   module ActionController
     module Instrumentation
@@ -9,17 +11,17 @@ module LogStasher
         super(*args)
         LogStasher::CustomFields.clear
       end
-      
+
       private
 
       # this method is called from within super of process_action.
       def append_info_to_payload(payload) #:nodoc:
         LogStasher.add_default_fields_to_payload(payload, request)
-        if self.respond_to?(:logstasher_add_custom_fields_to_request_context)
+        if respond_to?(:logstasher_add_custom_fields_to_request_context)
           logstasher_add_custom_fields_to_request_context(LogStasher.request_context)
         end
 
-        if self.respond_to?(:logstasher_add_custom_fields_to_payload)
+        if respond_to?(:logstasher_add_custom_fields_to_payload)
           before_keys = payload.keys.clone
           logstasher_add_custom_fields_to_payload(payload)
           after_keys = payload.keys
@@ -38,7 +40,7 @@ module LogStasher
           payload[key] = value
         end
       end
-      
+
       def add_custom_fields_to_store
         LogStasher.store[:ip] = request.remote_ip
         LogStasher.store[:route] = "#{request.params[:controller]}##{request.params[:action]}"

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

@@ -1,14 +1,20 @@
+# frozen_string_literal: true
+
 module ActionController
   module Instrumentation
-    alias :orig_process_action :process_action
+    alias orig_process_action process_action
     def process_action(*args)
       raw_payload = {
-          :controller => self.class.name,
-          :action     => self.action_name,
-          :params     => request.filtered_parameters,
-          :format     => request.format.try(:ref),
-          :method     => request.method,
-          :path       => (request.fullpath rescue "unknown")
+        controller: self.class.name,
+        action: action_name,
+        params: request.filtered_parameters,
+        format: request.format.try(:ref),
+        method: request.method,
+        path: begin
+          request.fullpath
+        rescue StandardError
+          'unknown'
+        end
       }
 
       LogStasher.add_default_fields_to_payload(raw_payload, request)
@@ -16,14 +22,14 @@ module ActionController
       LogStasher.clear_request_context
       LogStasher.add_default_fields_to_request_context(request)
 
-      ActiveSupport::Notifications.instrument("start_processing.action_controller", raw_payload.dup)
+      ActiveSupport::Notifications.instrument('start_processing.action_controller', raw_payload.dup)
 
-      ActiveSupport::Notifications.instrument("process_action.action_controller", raw_payload) do |payload|
-        if self.respond_to?(:logstasher_add_custom_fields_to_request_context)
+      ActiveSupport::Notifications.instrument('process_action.action_controller', raw_payload) do |payload|
+        if respond_to?(:logstasher_add_custom_fields_to_request_context)
           logstasher_add_custom_fields_to_request_context(LogStasher.request_context)
         end
 
-        if self.respond_to?(:logstasher_add_custom_fields_to_payload)
+        if respond_to?(:logstasher_add_custom_fields_to_payload)
           before_keys = raw_payload.keys.clone
           logstasher_add_custom_fields_to_payload(raw_payload)
           after_keys = raw_payload.keys
@@ -45,6 +51,6 @@ module ActionController
         result
       end
     end
-    alias :logstasher_process_action :process_action
+    alias logstasher_process_action process_action
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/rack/logger'
 
 module Rails
@@ -17,8 +19,7 @@ module Rails
       end
 
       # Overwrites Rails 3.0/3.1 code that logs new requests
-      def before_dispatch(env)
-      end
+      def before_dispatch(env); end
     end
   end
 end

data/lib/logstasher/railtie.rb

@@ -1,9 +1,26 @@
+# frozen_string_literal: true
+
 require 'rails/railtie'
 require 'action_view/log_subscriber'
 require 'action_controller/log_subscriber'
 require 'socket'
 
 module LogStasher
+  def default_source
+    case RUBY_PLATFORM
+    when /darwin/
+      # NOTE: MacOS Sierra and later are setting `.local`
+      # hostnames that even as real hostnames without the `.local` part,
+      # are still unresolvable. One reliable way to get an IP is to
+      # 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&.ip_address
+    else
+      IPSocket.getaddress(Socket.gethostname)
+    end
+  end
+
   class Railtie < Rails::Railtie
     config.logstasher = ::ActiveSupport::OrderedOptions.new
     config.logstasher.enabled = false
@@ -14,15 +31,16 @@ module LogStasher
     config.logstasher.record_enabled = false
     config.logstasher.view_enabled = true
     config.logstasher.job_enabled = true
+    config.logstasher.source = LogStasher.default_source
 
     # Try loading the config/logstasher.yml if present
     env = Rails.env.to_sym || :development
-    config_file = File.expand_path "./config/logstasher.yml"
+    config_file = File.expand_path './config/logstasher.yml'
 
     # Load and ERB templating of YAML files
-    LOGSTASHER = File.exists?(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|
+    initializer :logstasher, before: :load_config_initializers do |app|
       if LOGSTASHER.present?
         # process common configs
         LogStasher.process_config(app.config.logstasher, LOGSTASHER)
@@ -30,7 +48,8 @@ module LogStasher
         LogStasher.process_config(app.config.logstasher, LOGSTASHER[env].symbolize_keys) if LOGSTASHER.key? env
       end
 
-      app.config.action_dispatch.rack_cache[:verbose] = false if app.config.action_dispatch.rack_cache
+      app.config.action_dispatch.rack_cache[:verbose] = false if rack_cache_hashlike?(app)
+
       LogStasher.setup_before(app.config.logstasher) if app.config.logstasher.enabled
     end
 
@@ -39,20 +58,9 @@ module LogStasher
         LogStasher.setup(config.logstasher) if config.logstasher.enabled
       end
     end
-  end
 
-  def default_source
-    case RUBY_PLATFORM
-    when /darwin/
-      # NOTE: MacOS Sierra and later are setting `.local`
-      # hostnames that even as real hostnames without the `.local` part,
-      # are still unresolvable. One reliable way to get an IP is to
-      # 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
-    else
-      IPSocket.getaddress(Socket.gethostname)
+    def rack_cache_hashlike?(app)
+      app.config.action_dispatch.rack_cache&.respond_to?(:[]=)
     end
   end
 
@@ -74,5 +82,8 @@ module LogStasher
     config.backtrace = yml_config[:backtrace] if yml_config.key? :backtrace
     config.logger_path = yml_config[:logger_path] if yml_config.key? :logger_path
     config.log_level = yml_config[:log_level] if yml_config.key? :log_level
+    if yml_config.key? :log_controller_parameters
+      config.log_controller_parameters = yml_config[:log_controller_parameters]
+    end
   end
 end

data/lib/logstasher/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LogStasher
-  VERSION = "1.2.2"
+  VERSION = '2.1.5'
 end

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'
@@ -6,6 +8,7 @@ require 'logstasher/action_view/log_subscriber' if defined?(ActionView)
 require 'logstasher/active_job/log_subscriber' if defined?(ActiveJob)
 require 'logstasher/rails_ext/action_controller/base'
 require 'logstasher/custom_fields'
+require 'logstasher/event'
 require 'request_store'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/string/inflections'
@@ -17,7 +20,8 @@ module LogStasher
   REQUEST_CONTEXT_KEY = :logstasher_request_context
 
   attr_accessor :logger, :logger_path, :enabled, :log_controller_parameters, :source, :backtrace,
-    :controller_monkey_patch, :field_renaming
+                :controller_monkey_patch, :field_renaming, :backtrace_filter
+
   # Setting the default to 'unknown' to define the default behaviour
   @source = 'unknown'
   # By default log the backtrace of exceptions
@@ -26,27 +30,27 @@ module LogStasher
   def remove_existing_log_subscriptions
     ::ActiveSupport::LogSubscriber.log_subscribers.each do |subscriber|
       case subscriber.class.name
-        when 'ActionView::LogSubscriber'
-          unsubscribe(:action_view, subscriber)
-        when 'ActionController::LogSubscriber'
-          unsubscribe(:action_controller, subscriber)
-        when 'ActionMailer::LogSubscriber'
-          unsubscribe(:action_mailer, subscriber)
-        when 'ActiveRecord::LogSubscriber'
-          unsubscribe(:active_record, subscriber)
-        when 'ActiveJob::Logging::LogSubscriber'
-          unsubscribe(:active_job, subscriber)
+      when 'ActionView::LogSubscriber'
+        unsubscribe(:action_view, subscriber)
+      when 'ActionController::LogSubscriber'
+        unsubscribe(:action_controller, subscriber)
+      when 'ActionMailer::LogSubscriber'
+        unsubscribe(:action_mailer, subscriber)
+      when 'ActiveRecord::LogSubscriber'
+        unsubscribe(:active_record, subscriber)
+      when 'ActiveJob::LogSubscriber' # For Rails 6
+        unsubscribe(:active_job, subscriber)
+      when 'ActiveJob::Logging::LogSubscriber' # For Rails 5
+        unsubscribe(:active_job, subscriber)
       end
     end
   end
 
   def unsubscribe(component, subscriber)
-    events = subscriber.public_methods(false).reject{ |method| method.to_s == 'call' }
+    events = subscriber.public_methods(false).reject { |method| method.to_s == 'call' }
     events.each do |event|
       ::ActiveSupport::Notifications.notifier.listeners_for("#{event}.#{component}").each do |listener|
-        if listener.instance_variable_get('@delegate') == subscriber
-          ::ActiveSupport::Notifications.unsubscribe listener
-        end
+        ::ActiveSupport::Notifications.unsubscribe listener if listener.instance_variable_get('@delegate') == subscriber
       end
     end
   end
@@ -56,14 +60,14 @@ module LogStasher
     payload[:route] = "#{request.params[:controller]}##{request.params[:action]}"
     payload[:request_id] = request.env['action_dispatch.request_id']
     LogStasher::CustomFields.add(:ip, :route, :request_id)
-    if self.log_controller_parameters
+    if log_controller_parameters
       payload[:parameters] = payload[:params].except(*::ActionController::LogSubscriber::INTERNAL_PARAMS)
       LogStasher::CustomFields.add(:parameters)
     end
   end
 
   def add_custom_fields(&block)
-    wrapped_block = Proc.new do |fields|
+    wrapped_block = proc do |fields|
       LogStasher::CustomFields.add(*LogStasher.store.keys)
       instance_exec(fields, &block)
     end
@@ -72,7 +76,7 @@ module LogStasher
   end
 
   def add_custom_fields_to_request_context(&block)
-    wrapped_block = Proc.new do |fields|
+    wrapped_block = proc do |fields|
       instance_exec(fields, &block)
       LogStasher::CustomFields.add(*fields.keys)
     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
@@ -100,31 +103,32 @@ module LogStasher
 
   def setup(config)
     # Path instrumentation class to insert our hook
-    if (! config.controller_monkey_patch && config.controller_monkey_patch != false) || config.controller_monkey_patch == true
+    if (!config.controller_monkey_patch && config.controller_monkey_patch != false) || config.controller_monkey_patch == true
       require 'logstasher/rails_ext/action_controller/metal/instrumentation'
     end
-    self.suppress_app_logs(config)
+    suppress_app_logs(config)
     self.logger_path = config.logger_path || "#{Rails.root}/log/logstash_#{Rails.env}.log"
-    self.logger = config.logger || new_logger(self.logger_path)
-    self.logger.level = config.log_level || Logger::WARN
+    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.set_data_for_rake
-    self.set_data_for_console
+    self.log_controller_parameters = !config.log_controller_parameters.nil?
+    self.backtrace = !config.backtrace.nil? unless config.backtrace.nil?
+    self.backtrace_filter = config.backtrace_filter
+    set_data_for_rake
+    set_data_for_console
     self.field_renaming = Hash(config.field_renaming)
   end
 
   def set_data_for_rake
-    self.request_context['request_id'] = ::Rake.application.top_level_tasks if self.called_as_rake?
+    request_context['request_id'] = ::Rake.application.top_level_tasks if called_as_rake?
   end
 
   def set_data_for_console
-    self.request_context['request_id'] = "#{Process.pid}" if self.called_as_console?
+    request_context['request_id'] = Process.pid.to_s if called_as_console?
   end
 
   def called_as_rake?
-    File.basename($0) == 'rake'
+    File.basename($PROGRAM_NAME) == 'rake'
   end
 
   def called_as_console?
@@ -158,10 +162,10 @@ module LogStasher
   #   LogStasher.info("message", tags:["tag1", "tag2"])
   #   LogStasher.info("message", timing:1234)
   #   LogStasher.info(custom1:"yes", custom2:"no")
-  def log(severity, message, additional_fields={})
-    if self.logger && self.logger.send("#{severity}?")
+  def log(severity, message, additional_fields = {})
+    if logger&.send("#{severity}?")
 
-      data = {'level' => severity}
+      data = { 'level' => severity }
       if message.respond_to?(:to_hash)
         data.merge!(message.to_hash)
       else
@@ -172,16 +176,16 @@ module LogStasher
       tags = Array(additional_fields.delete(:tags) || 'log')
 
       data.merge!(additional_fields)
-      self.logger << build_logstash_event(data, tags).to_json + "\n"
+      logger << "#{build_logstash_event(data, tags).to_json}\n"
 
     end
   end
 
   def build_logstash_event(data, tags)
     field_renaming.each do |old_name, new_name|
-        data[new_name] = data.delete(old_name) if data.key?(old_name)
+      data[new_name] = data.delete(old_name) if data.key?(old_name)
     end
-    ::LogStash::Event.new(data.merge('source' => self.source, 'tags' => tags))
+    Event.new(data.merge('source' => source, 'tags' => tags))
   end
 
   def store
@@ -204,7 +208,7 @@ module LogStasher
     end
   end
 
-  %w( fatal error warn info debug unknown ).each do |severity|
+  %w[fatal error warn info debug unknown].each do |severity|
     eval <<-EOM, nil, __FILE__, __LINE__ + 1
       def #{severity}(message=nil, additional_fields={})
         self.log(:#{severity}, message, additional_fields)
@@ -213,7 +217,7 @@ module LogStasher
   end
 
   def enabled?
-    self.enabled || false
+    enabled || false
   end
 
   private

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: logstasher
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.1.5
 platform: ruby
 authors:
 - Shadab Ahmed
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-28 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-event
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '5.2'
   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
@@ -38,34 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +58,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.14'
 description: Awesome rails logs
 email:
 - shadab.ansari@gmail.com
@@ -123,6 +95,7 @@ files:
 - lib/logstasher/active_support/mailer_log_subscriber.rb
 - lib/logstasher/custom_fields.rb
 - lib/logstasher/device/redis.rb
+- lib/logstasher/event.rb
 - lib/logstasher/rails_ext/action_controller/base.rb
 - lib/logstasher/rails_ext/action_controller/metal/instrumentation.rb
 - lib/logstasher/rails_ext/rack/logger.rb
@@ -132,7 +105,7 @@ homepage: https://github.com/shadabahmed/logstasher
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,9 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Awesome rails logs
 test_files: []