airbrake 6.0.0 → 6.1.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fd6dc0541e7ed8b5c12e51970d26ef14ad61d75
-  data.tar.gz: 5dbd13f274588c4bfe444914c0dfdd28985e8693
+  metadata.gz: b23632aa16626fa2b627b3958b9b5f9908327aaa
+  data.tar.gz: e85e64b1ee1fc6c9df543edf509e93fd2601ba51
 SHA512:
-  metadata.gz: 2463751a7a8e16c003acc7671e0a88db25878462fe6cf4fc74ff07160636c87579a1c05eddbe6f16e25fe570d61832c3ca86fc92961ea4c813e9e5d2ef1077e4
-  data.tar.gz: 2884c1a743235a0e7c25dc1f07a8f662a6d486d0de7e8fe729b2cfe4a3e33007566b2e258b40994d4495aa849e375fcbbe103637b41c78d8ac8e2729b4069a50
+  metadata.gz: 7abde81c419140fdbb0266b8a2df9f40d04cac64e67edf9b3d820033c2b0afb7de7f4ded0636920806821dfc9b765a33bb8299fdd0fccec54b719c0759417922
+  data.tar.gz: 67938ba3d514eb4b7c259581eb35139ba1857ff3491adebbc6a6c788db6673a5087cb29dbf95571fd010cc9974c401ab631040f181cb842ad10a326e49b84559

data/lib/airbrake.rb

@@ -9,24 +9,18 @@ require 'airbrake/version'
 
 # Automatically load needed files for the environment the library is running in.
 if defined?(Rack)
-  require 'airbrake/rack/user'
-  require 'airbrake/rack/context_filter'
-  require 'airbrake/rack/session_filter'
-  require 'airbrake/rack/http_params_filter'
-  require 'airbrake/rack/http_headers_filter'
-  require 'airbrake/rack/request_body_filter'
-  require 'airbrake/rack/middleware'
+  require 'airbrake/rack'
 
-  require 'airbrake/rails/railtie' if defined?(Rails)
+  require 'airbrake/rails' if defined?(Rails)
 end
 
-require 'airbrake/rake/task_ext' if defined?(Rake::Task)
-require 'airbrake/resque/failure' if defined?(Resque)
-require 'airbrake/sidekiq/error_handler' if defined?(Sidekiq)
-require 'airbrake/shoryuken/error_handler' if defined?(Shoryuken)
-require 'airbrake/delayed_job/plugin' if defined?(Delayed)
+require 'airbrake/rake' if defined?(Rake::Task)
+require 'airbrake/resque' if defined?(Resque)
+require 'airbrake/sidekiq' if defined?(Sidekiq)
+require 'airbrake/shoryuken' if defined?(Shoryuken)
+require 'airbrake/delayed_job' if defined?(Delayed)
 
-require 'airbrake/logger/airbrake_logger'
+require 'airbrake/logger'
 
 # Notify of unhandled exceptions, if there were any, but ignore SystemExit.
 at_exit do

data/lib/airbrake/delayed_job.rb

@@ -0,0 +1,49 @@
+module Delayed
+  module Plugins
+    ##
+    # Provides integration with Delayed Job.
+    # rubocop:disable Lint/RescueException
+    class Airbrake < ::Delayed::Plugin
+      callbacks do |lifecycle|
+        lifecycle.around(:invoke_job) do |job, *args, &block|
+          begin
+            # Forward the call to the next callback in the callback chain
+            block.call(job, *args)
+          rescue Exception => exception
+            params = job.as_json
+
+            # If DelayedJob is used through ActiveJob, it contains extra info.
+            if job.payload_object.respond_to?(:job_data)
+              params[:active_job] = job.payload_object.job_data
+            end
+
+            ::Airbrake.notify(exception, params) do |notice|
+              notice[:context][:component] = 'delayed_job'
+              notice[:context][:action] = job.payload_object.class.name
+            end
+
+            raise exception
+          end
+        end
+      end
+    end
+    # rubocop:enable Lint/RescueException
+  end
+end
+
+if RUBY_ENGINE == 'jruby' && defined?(Delayed::Backend::ActiveRecord::Job)
+  ##
+  # Workaround against JRuby bug:
+  # https://github.com/jruby/jruby/issues/3338
+  # rubocop:disable Style/ClassAndModuleChildren
+  class Delayed::Backend::ActiveRecord::Job
+    alias old_to_ary to_ary
+
+    def to_ary
+      old_to_ary || [self]
+    end
+  end
+  # rubocop:enable Style/ClassAndModuleChildren
+end
+
+Delayed::Worker.plugins << Delayed::Plugins::Airbrake

data/lib/airbrake/delayed_job/plugin.rb

@@ -1,51 +1,5 @@
-module Delayed
-  module Plugins
-    ##
-    # Provides integration with Delayed Job.
-    # rubocop:disable Lint/RescueException
-    class Airbrake < ::Delayed::Plugin
-      callbacks do |lifecycle|
-        lifecycle.around(:invoke_job) do |job, *args, &block|
-          begin
-            # Forward the call to the next callback in the callback chain
-            block.call(job, *args)
-          rescue Exception => exception
-            params = job.as_json
+require 'airbrake/delayed_job'
 
-            # If DelayedJob is used through ActiveJob, it contains extra info.
-            if job.payload_object.respond_to?(:job_data)
-              params[:active_job] = job.payload_object.job_data
-            end
-
-            if (notice = ::Airbrake.build_notice(exception, params))
-              notice[:context][:component] = 'delayed_job'
-              notice[:context][:action] = job.payload_object.class.name
-
-              ::Airbrake.notify(notice)
-            end
-
-            raise exception
-          end
-        end
-      end
-    end
-    # rubocop:enable Lint/RescueException
-  end
-end
-
-if RUBY_ENGINE == 'jruby' && defined?(Delayed::Backend::ActiveRecord::Job)
-  ##
-  # Workaround against JRuby bug:
-  # https://github.com/jruby/jruby/issues/3338
-  # rubocop:disable Style/ClassAndModuleChildren
-  class Delayed::Backend::ActiveRecord::Job
-    alias old_to_ary to_ary
-
-    def to_ary
-      old_to_ary || [self]
-    end
-  end
-  # rubocop:enable Style/ClassAndModuleChildren
-end
-
-Delayed::Worker.plugins << Delayed::Plugins::Airbrake
+warn "DEPRECATION WARNING: Requiring 'airbrake/delayed_job/plugin' is " \
+     "deprecated and will be removed in the next MAJOR release. Require " \
+     "'airbrake/delayed_job' instead."

data/lib/airbrake/logger.rb

@@ -0,0 +1,102 @@
+require 'logger'
+
+module Airbrake
+  ##
+  # Decorator for +Logger+ from stdlib. Endows loggers the ability to both log
+  # and report errors to Airbrake.
+  #
+  # @example
+  #   # Create a logger like you normally do and decorate it.
+  #   logger = Airbrake::AirbrakeLogger.new(Logger.new(STDOUT))
+  #
+  #   # Just use the logger like you normally do.
+  #   logger.fatal('oops')
+  class AirbrakeLogger < SimpleDelegator
+    ##
+    # @example
+    #   # Assign a default Airbrake notifier
+    #   logger.airbrake_notifier = Airbrake[:default]
+    # @return [Airbrake::Notifier] notifier to be used to send notices
+    attr_accessor :airbrake_notifier
+
+    ##
+    # @return [Integer]
+    attr_reader :airbrake_level
+
+    def initialize(logger)
+      __setobj__(logger)
+      @airbrake_notifier = Airbrake[:default]
+      @airbrake_level = Logger::WARN
+    end
+
+    ##
+    # @see Logger#warn
+    def warn(progname = nil, &block)
+      notify_airbrake(Logger::WARN, progname)
+      super
+    end
+
+    ##
+    # @see Logger#error
+    def error(progname = nil, &block)
+      notify_airbrake(Logger::ERROR, progname)
+      super
+    end
+
+    ##
+    # @see Logger#fatal
+    def fatal(progname = nil, &block)
+      notify_airbrake(Logger::FATAL, progname)
+      super
+    end
+
+    ##
+    # @see Logger#unknown
+    def unknown(progname = nil, &block)
+      notify_airbrake(Logger::UNKNOWN, progname)
+      super
+    end
+
+    ##
+    # Sets airbrake severity level. Does not permit values below `Logger::WARN`.
+    #
+    # @example
+    #   logger.airbrake_level = Logger::FATAL
+    # @return [void]
+    def airbrake_level=(level)
+      if level < Logger::WARN
+        raise "Airbrake severity level #{level} is not allowed. " \
+              "Minimum allowed level is #{Logger::WARN}"
+      end
+      @airbrake_level = level
+    end
+
+    private
+
+    def notify_airbrake(severity, progname)
+      return if severity < @airbrake_level || !@airbrake_notifier
+
+      @airbrake_notifier.notify(progname) do |notice|
+        # Get rid of unwanted internal Logger frames. Examples:
+        # * /ruby-2.4.0/lib/ruby/2.4.0/logger.rb
+        # * /gems/activesupport-4.2.7.1/lib/active_support/logger.rb
+        backtrace = notice[:errors].first[:backtrace]
+        notice[:errors].first[:backtrace] =
+          backtrace.drop_while { |frame| frame[:file] =~ %r{/logger.rb\z} }
+
+        notice[:context][:component] = 'log'
+        notice[:context][:severity] = normalize_severity(severity)
+      end
+    end
+
+    def normalize_severity(severity)
+      (case severity
+       when Logger::WARN then 'warning'
+       when Logger::ERROR, Logger::UNKNOWN then 'error'
+       when Logger::FATAL then 'critical'
+       else
+         raise "Unknown airbrake severity: #{severity}"
+       end).freeze
+    end
+  end
+end

data/lib/airbrake/logger/airbrake_logger.rb

@@ -1,106 +1,5 @@
-require 'logger'
+require 'airbrake/logger'
 
-module Airbrake
-  ##
-  # Decorator for +Logger+ from stdlib. Endows loggers the ability to both log
-  # and report errors to Airbrake.
-  #
-  # @example
-  #   # Create a logger like you normally do and decorate it.
-  #   logger = Airbrake::AirbrakeLogger.new(Logger.new(STDOUT))
-  #
-  #   # Just use the logger like you normally do.
-  #   logger.fatal('oops')
-  class AirbrakeLogger < SimpleDelegator
-    ##
-    # @example
-    #   # Assign a default Airbrake notifier
-    #   logger.airbrake_notifier = Airbrake[:default]
-    # @return [Airbrake::Notifier] notifier to be used to send notices
-    attr_accessor :airbrake_notifier
-
-    ##
-    # @example
-    #   logger.airbrake_level = Logger::FATAL
-    # @return [Integer]
-    attr_accessor :airbrake_level
-
-    def initialize(logger)
-      __setobj__(logger)
-      @airbrake_notifier = Airbrake[:default]
-      @airbrake_level = Logger::WARN
-    end
-
-    ##
-    # @see Logger#warn
-    def warn(progname = nil, &block)
-      notify_airbrake(Logger::WARN, progname)
-      super
-    end
-
-    ##
-    # @see Logger#error
-    def error(progname = nil, &block)
-      notify_airbrake(Logger::ERROR, progname)
-      super
-    end
-
-    ##
-    # @see Logger#fatal
-    def fatal(progname = nil, &block)
-      notify_airbrake(Logger::FATAL, progname)
-      super
-    end
-
-    ##
-    # @see Logger#unknown
-    def unknown(progname = nil, &block)
-      notify_airbrake(Logger::UNKNOWN, progname)
-      super
-    end
-
-    ##
-    # Sets airbrake severity level. Does not permit values below `Logger::WARN`.
-    #
-    # @example
-    #   logger.airbrake_level = Logger::FATAL
-    # @return [void]
-    def airbrake_level=(level)
-      if level < Logger::WARN
-        raise "Airbrake severity level #{level} is not allowed. " \
-              "Minimum allowed level is #{Logger::WARN}"
-      end
-      @airbrake_level = level
-    end
-
-    private
-
-    def notify_airbrake(severity, progname)
-      return if severity < @airbrake_level || !@airbrake_notifier
-
-      notice = @airbrake_notifier.build_notice(progname)
-
-      # Get rid of unwanted internal Logger frames. Examples:
-      # * /ruby-2.4.0/lib/ruby/2.4.0/logger.rb
-      # * /gems/activesupport-4.2.7.1/lib/active_support/logger.rb
-      backtrace = notice[:errors].first[:backtrace]
-      notice[:errors].first[:backtrace] =
-        backtrace.drop_while { |frame| frame[:file] =~ %r{/logger.rb\z} }
-
-      notice[:context][:component] = 'log'
-      notice[:context][:severity] = normalize_severity(severity)
-
-      @airbrake_notifier.notify(notice)
-    end
-
-    def normalize_severity(severity)
-      (case severity
-       when Logger::WARN then 'warning'
-       when Logger::ERROR, Logger::UNKNOWN then 'error'
-       when Logger::FATAL then 'critical'
-       else
-         raise "Unknown airbrake severity: #{severity}"
-       end).freeze
-    end
-  end
-end
+warn "DEPRECATION WARNING: Requiring 'airbrake/logger/airbrake_logger' is " \
+     "deprecated and will be removed in the next MAJOR release. Require " \
+     "'airbrake/logger' instead."

data/lib/airbrake/rack.rb

@@ -0,0 +1,7 @@
+require 'airbrake/rack/user'
+require 'airbrake/rack/context_filter'
+require 'airbrake/rack/session_filter'
+require 'airbrake/rack/http_params_filter'
+require 'airbrake/rack/http_headers_filter'
+require 'airbrake/rack/request_body_filter'
+require 'airbrake/rack/middleware'

data/lib/airbrake/rack/context_filter.rb

@@ -5,6 +5,10 @@ module Airbrake
     #
     # @since v5.7.0
     class ContextFilter
+      ##
+      # @return [Integer]
+      attr_reader :weight
+
       def initialize
         @framework_version =
           if defined?(::Rails) && ::Rails.respond_to?(:version)
@@ -14,6 +18,7 @@ module Airbrake
           else
             "Rack.version/#{::Rack.version} Rack.release/#{::Rack.release}"
           end.freeze
+        @weight = 99
       end
 
       ##

data/lib/airbrake/rack/http_headers_filter.rb

@@ -14,6 +14,14 @@ module Airbrake
         'CONTENT_LENGTH'.freeze
       ].freeze
 
+      ##
+      # @return [Integer]
+      attr_reader :weight
+
+      def initialize
+        @weight = 98
+      end
+
       ##
       # @see {Airbrake::FilterChain#refine}
       def call(notice)
@@ -27,7 +35,7 @@ module Airbrake
           headers
         end
 
-        notice[:environment].merge!(
+        notice[:context].merge!(
           httpMethod: request.request_method,
           referer: request.referer,
           headers: http_headers

data/lib/airbrake/rack/http_params_filter.rb

@@ -5,12 +5,20 @@ module Airbrake
     #
     # @since v5.7.0
     class HttpParamsFilter
+      ##
+      # @return [Integer]
+      attr_reader :weight
+
+      def initialize
+        @weight = 97
+      end
+
       ##
       # @see {Airbrake::FilterChain#refine}
       def call(notice)
         return unless (request = notice.stash[:rack_request])
 
-        notice[:params] = request.params
+        notice[:params].merge!(request.params)
 
         rails_params = request.env['action_dispatch.request.parameters']
         notice[:params].merge!(rails_params) if rails_params

data/lib/airbrake/rack/request_body_filter.rb

@@ -10,10 +10,15 @@ module Airbrake
     # @since v5.7.0
     # @note This filter is *not* used by default.
     class RequestBodyFilter
+      ##
+      # @return [Integer]
+      attr_reader :weight
+
       ##
       # @param [Integer] length The maximum number of bytes to read
       def initialize(length = 4096)
         @length = length
+        @weight = 95
       end
 
       ##