airbrake 6.0.0 → 6.1.0.rc.1

data/lib/airbrake/rack/session_filter.rb

@@ -5,6 +5,14 @@ module Airbrake
     #
     # @since v5.7.0
     class SessionFilter
+      ##
+      # @return [Integer]
+      attr_reader :weight
+
+      def initialize
+        @weight = 96
+      end
+
       ##
       # @see {Airbrake::FilterChain#refine}
       def call(notice)

data/lib/airbrake/rails.rb

@@ -0,0 +1,79 @@
+module Airbrake
+  module Rails
+    ##
+    # This railtie works for any Rails application that supports railties (Rails
+    # 3.2+ apps). It makes Airbrake Ruby work with Rails and report errors
+    # occurring in the application automatically.
+    class Railtie < ::Rails::Railtie
+      initializer('airbrake.middleware') do |app|
+        # Since Rails 3.2 the ActionDispatch::DebugExceptions middleware is
+        # responsible for logging exceptions and showing a debugging page in
+        # case the request is local. We want to insert our middleware after
+        # DebugExceptions, so we don't notify Airbrake about local requests.
+
+        if ::Rails.version.start_with?('5.')
+          # Avoid the warning about deprecated strings.
+          # Insert after DebugExceptions, since ConnectionManagement doesn't
+          # exist in Rails 5 anymore.
+          app.config.middleware.insert_after(
+            ActionDispatch::DebugExceptions,
+            Airbrake::Rack::Middleware
+          )
+        elsif defined?(ActiveRecord)
+          # Insert after ConnectionManagement to avoid DB connection leakage:
+          # https://github.com/airbrake/airbrake/pull/568
+          app.config.middleware.insert_after(
+            ActiveRecord::ConnectionAdapters::ConnectionManagement,
+            'Airbrake::Rack::Middleware'
+          )
+        else
+          # Insert after DebugExceptions for apps without ActiveRecord.
+          app.config.middleware.insert_after(
+            ActionDispatch::DebugExceptions,
+            'Airbrake::Rack::Middleware'
+          )
+        end
+      end
+
+      rake_tasks do
+        # Report exceptions occurring in Rake tasks.
+        require 'airbrake/rake'
+
+        # Defines tasks such as `airbrake:test` & `airbrake:deploy`.
+        require 'airbrake/rake/tasks'
+      end
+
+      initializer('airbrake.action_controller') do
+        ActiveSupport.on_load(:action_controller) do
+          # Patches ActionController with methods that allow us to retrieve
+          # interesting request data. Appends that information to notices.
+          require 'airbrake/rails/action_controller'
+          include Airbrake::Rails::ActionController
+        end
+      end
+
+      initializer('airbrake.active_record') do
+        ActiveSupport.on_load(:active_record) do
+          # Reports exceptions occurring in some bugged ActiveRecord callbacks.
+          # Applicable only to the versions of Rails lower than 4.2.
+          require 'airbrake/rails/active_record'
+          include Airbrake::Rails::ActiveRecord
+        end
+      end
+
+      initializer('airbrake.active_job') do
+        ActiveSupport.on_load(:active_job) do
+          # Reports exceptions occurring in ActiveJob jobs.
+          require 'airbrake/rails/active_job'
+          include Airbrake::Rails::ActiveJob
+        end
+      end
+
+      runner do
+        at_exit do
+          Airbrake.notify_sync($ERROR_INFO) if $ERROR_INFO
+        end
+      end
+    end
+  end
+end

data/lib/airbrake/rails/active_record.rb

@@ -19,7 +19,7 @@ module Airbrake
       # rubocop:disable Lint/RescueException
       def run_callbacks(kind, *args, &block)
         # Let the post process handle the exception if it's not a bugged hook.
-        return super unless [:commit, :rollback].include?(kind)
+        return super unless %i[commit rollback].include?(kind)
 
         # Handle the exception ourselves. The 'ex' exception won't be
         # propagated, therefore we must notify it here.

data/lib/airbrake/rails/railtie.rb

@@ -1,79 +1,5 @@
-module Airbrake
-  module Rails
-    ##
-    # This railtie works for any Rails application that supports railties (Rails
-    # 3.2+ apps). It makes Airbrake Ruby work with Rails and report errors
-    # occurring in the application automatically.
-    class Railtie < ::Rails::Railtie
-      initializer('airbrake.middleware') do |app|
-        # Since Rails 3.2 the ActionDispatch::DebugExceptions middleware is
-        # responsible for logging exceptions and showing a debugging page in
-        # case the request is local. We want to insert our middleware after
-        # DebugExceptions, so we don't notify Airbrake about local requests.
+require 'airbrake/rails'
 
-        if ::Rails.version.start_with?('5.')
-          # Avoid the warning about deprecated strings.
-          # Insert after DebugExceptions, since ConnectionManagement doesn't
-          # exist in Rails 5 anymore.
-          app.config.middleware.insert_after(
-            ActionDispatch::DebugExceptions,
-            Airbrake::Rack::Middleware
-          )
-        elsif defined?(ActiveRecord)
-          # Insert after ConnectionManagement to avoid DB connection leakage:
-          # https://github.com/airbrake/airbrake/pull/568
-          app.config.middleware.insert_after(
-            ActiveRecord::ConnectionAdapters::ConnectionManagement,
-            'Airbrake::Rack::Middleware'
-          )
-        else
-          # Insert after DebugExceptions for apps without ActiveRecord.
-          app.config.middleware.insert_after(
-            ActionDispatch::DebugExceptions,
-            'Airbrake::Rack::Middleware'
-          )
-        end
-      end
-
-      rake_tasks do
-        # Report exceptions occurring in Rake tasks.
-        require 'airbrake/rake/task_ext'
-
-        # Defines tasks such as `airbrake:test` & `airbrake:deploy`.
-        require 'airbrake/rake/tasks'
-      end
-
-      initializer('airbrake.action_controller') do
-        ActiveSupport.on_load(:action_controller) do
-          # Patches ActionController with methods that allow us to retrieve
-          # interesting request data. Appends that information to notices.
-          require 'airbrake/rails/action_controller'
-          include Airbrake::Rails::ActionController
-        end
-      end
-
-      initializer('airbrake.active_record') do
-        ActiveSupport.on_load(:active_record) do
-          # Reports exceptions occurring in some bugged ActiveRecord callbacks.
-          # Applicable only to the versions of Rails lower than 4.2.
-          require 'airbrake/rails/active_record'
-          include Airbrake::Rails::ActiveRecord
-        end
-      end
-
-      initializer('airbrake.active_job') do
-        ActiveSupport.on_load(:active_job) do
-          # Reports exceptions occurring in ActiveJob jobs.
-          require 'airbrake/rails/active_job'
-          include Airbrake::Rails::ActiveJob
-        end
-      end
-
-      runner do
-        at_exit do
-          Airbrake.notify_sync($ERROR_INFO) if $ERROR_INFO
-        end
-      end
-    end
-  end
-end
+warn "DEPRECATION WARNING: Requiring 'airbrake/rails/railtie' is " \
+     "deprecated and will be removed in the next MAJOR release. Require " \
+     "'airbrake/rails' instead."

data/lib/airbrake/rake.rb

@@ -0,0 +1,64 @@
+# This is not bulletproof, but if this file is executed before a task
+# definition, we can grab tasks descriptions and locations.
+# See: https://goo.gl/ksn6PE
+Rake::TaskManager.record_task_metadata = true
+
+module Rake
+  ##
+  # Redefine +Rake::Task#execute+, so it can report errors to Airbrake.
+  class Task
+    # Store the original method to use it later.
+    alias execute_without_airbrake execute
+
+    ##
+    # A wrapper around the original +#execute+, that catches all errors and
+    # notifies Airbrake.
+    #
+    # rubocop:disable Lint/RescueException
+    def execute(args = nil)
+      execute_without_airbrake(args)
+    rescue Exception => ex
+      notify_airbrake(ex, args)
+      raise ex
+    end
+    # rubocop:enable Lint/RescueException
+
+    private
+
+    def notify_airbrake(exception, args)
+      Airbrake.notify_sync(exception) do |notice|
+        notice[:context][:component] = 'rake'
+        notice[:context][:action] = name
+        notice[:params] = {
+          rake_task: task_info,
+          execute_args: args,
+          argv: ARGV.join(' ')
+        }
+      end
+    end
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize
+    def task_info
+      info = {}
+
+      info[:name] = name
+      info[:timestamp] = timestamp.to_s
+      info[:investigation] = investigation
+
+      info[:full_comment] = full_comment if full_comment
+      info[:arg_names] = arg_names if arg_names.any?
+      info[:arg_description] = arg_description if arg_description
+      info[:locations] = locations if locations.any?
+      info[:sources] = sources if sources.any?
+
+      if prerequisite_tasks.any?
+        info[:prerequisite_tasks] = prerequisite_tasks.map do |p|
+          p.__send__(:task_info)
+        end
+      end
+
+      info
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize
+  end
+end

data/lib/airbrake/rake/task_ext.rb

@@ -1,66 +1,5 @@
-# This is not bulletproof, but if this file is executed before a task
-# definition, we can grab tasks descriptions and locations.
-# See: https://goo.gl/ksn6PE
-Rake::TaskManager.record_task_metadata = true
+require 'airbrake/rake'
 
-module Rake
-  ##
-  # Redefine +Rake::Task#execute+, so it can report errors to Airbrake.
-  class Task
-    # Store the original method to use it later.
-    alias execute_without_airbrake execute
-
-    ##
-    # A wrapper around the original +#execute+, that catches all errors and
-    # notifies Airbrake.
-    #
-    # rubocop:disable Lint/RescueException
-    def execute(args = nil)
-      execute_without_airbrake(args)
-    rescue Exception => ex
-      notify_airbrake(ex, args)
-      raise ex
-    end
-    # rubocop:enable Lint/RescueException
-
-    private
-
-    def notify_airbrake(exception, args)
-      return unless (notice = Airbrake.build_notice(exception))
-
-      notice[:context][:component] = 'rake'
-      notice[:context][:action] = name
-      notice[:params] = {
-        rake_task: task_info,
-        execute_args: args,
-        argv: ARGV.join(' ')
-      }
-
-      Airbrake.notify_sync(notice)
-    end
-
-    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize
-    def task_info
-      info = {}
-
-      info[:name] = name
-      info[:timestamp] = timestamp.to_s
-      info[:investigation] = investigation
-
-      info[:full_comment] = full_comment if full_comment
-      info[:arg_names] = arg_names if arg_names.any?
-      info[:arg_description] = arg_description if arg_description
-      info[:locations] = locations if locations.any?
-      info[:sources] = sources if sources.any?
-
-      if prerequisite_tasks.any?
-        info[:prerequisite_tasks] = prerequisite_tasks.map do |p|
-          p.__send__(:task_info)
-        end
-      end
-
-      info
-    end
-    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize
-  end
-end
+warn "DEPRECATION WARNING: Requiring 'airbrake/rake/task_ext' is " \
+     "deprecated and will be removed in the next MAJOR release. Require " \
+     "'airbrake/rake' instead."

data/lib/airbrake/rake/tasks.rb

@@ -68,7 +68,7 @@ namespace :airbrake do
       # Avoid loading the environment to speed up the deploy task and try guess
       # the initializer file location.
       if initializer.exist?
-        load initializer
+        load(initializer) unless Airbrake[:default]
       else
         Rake::Task[:environment].invoke
       end
@@ -106,8 +106,19 @@ namespace :airbrake do
            " environment will be used."
     end
 
+    unless (repo = ENV['REPOSITORY_URL'])
+      repo = `git remote get-url origin 2>/dev/null`.chomp
+      if repo.empty?
+        puts "Airbrake couldn't identify your app's repository."
+      else
+        puts "Airbrake couldn't identify your app's repository, so the " \
+             "'origin' remote url '#{repo}' will be used."
+      end
+    end
+
     url = "https://airbrake.io/api/v3/projects/#{id}/heroku-deploys?key=#{key}"
     url << "&environment=#{env}"
+    url << "&repository=#{repo}" unless repo.empty?
 
     command = %(heroku addons:create deployhooks:http --url="#{url}")
     command << " --app #{app}" if app

data/lib/airbrake/resque.rb

@@ -0,0 +1,17 @@
+module Resque
+  module Failure
+    ##
+    # Provides Resque integration with Airbrake.
+    #
+    # @since v5.0.0
+    # @see https://github.com/resque/resque/wiki/Failure-Backends
+    class Airbrake < Base
+      def save
+        ::Airbrake.notify_sync(exception, payload) do |notice|
+          notice[:context][:component] = 'resque'
+          notice[:context][:action] = payload['class'].to_s
+        end
+      end
+    end
+  end
+end

data/lib/airbrake/resque/failure.rb

@@ -1,18 +1,5 @@
-module Resque
-  module Failure
-    ##
-    # Provides Resque integration with Airbrake.
-    #
-    # @since v5.0.0
-    # @see https://github.com/resque/resque/wiki/Failure-Backends
-    class Airbrake < Base
-      def save
-        return unless (notice = ::Airbrake.build_notice(exception, payload))
-        notice[:context][:component] = 'resque'
-        notice[:context][:action] = payload['class'].to_s
+require 'airbrake/resque'
 
-        ::Airbrake.notify_sync(notice)
-      end
-    end
-  end
-end
+warn "DEPRECATION WARNING: Requiring 'airbrake/resque/failure' is " \
+     "deprecated and will be removed in the next MAJOR release. Require " \
+     "'airbrake/resque' instead."

data/lib/airbrake/shoryuken.rb

@@ -0,0 +1,41 @@
+module Airbrake
+  module Shoryuken
+    ##
+    # Provides integration with Shoryuken.
+    class ErrorHandler
+      # rubocop:disable Lint/RescueException
+      def call(worker, queue, _sqs_msg, body)
+        yield
+      rescue Exception => exception
+        notify_airbrake(exception, worker, queue, body)
+
+        raise exception
+      end
+      # rubocop:enable Lint/RescueException
+
+      private
+
+      def notify_airbrake(exception, worker, queue, body)
+        Airbrake.notify(exception, notice_context(queue, body)) do |notice|
+          notice[:context][:component] = 'shoryuken'
+          notice[:context][:action] = worker.class.to_s
+        end
+      end
+
+      def notice_context(queue, body)
+        {
+          queue: queue,
+          body: body.is_a?(Array) ? { batch: body } : { body: body }
+        }
+      end
+    end
+  end
+end
+
+if defined?(::Shoryuken)
+  Shoryuken.configure_server do |config|
+    config.server_middleware do |chain|
+      chain.add Airbrake::Shoryuken::ErrorHandler
+    end
+  end
+end

data/lib/airbrake/shoryuken/error_handler.rb

@@ -1,44 +1,5 @@
-module Airbrake
-  module Shoryuken
-    ##
-    # Provides integration with Shoryuken.
-    class ErrorHandler
-      # rubocop:disable Lint/RescueException
-      def call(worker, queue, _sqs_msg, body)
-        yield
-      rescue Exception => exception
-        notify_airbrake(exception, worker, queue, body)
+require 'airbrake/shoryuken'
 
-        raise exception
-      end
-      # rubocop:enable Lint/RescueException
-
-      private
-
-      def notify_airbrake(exception, worker, queue, body)
-        notice = Airbrake.build_notice(exception, notice_context(queue, body))
-        return unless notice
-
-        notice[:context][:component] = 'shoryuken'
-        notice[:context][:action] = worker.class.to_s
-
-        Airbrake.notify(notice)
-      end
-
-      def notice_context(queue, body)
-        {
-          queue: queue,
-          body: body.is_a?(Array) ? { batch: body } : { body: body }
-        }
-      end
-    end
-  end
-end
-
-if defined?(::Shoryuken)
-  Shoryuken.configure_server do |config|
-    config.server_middleware do |chain|
-      chain.add Airbrake::Shoryuken::ErrorHandler
-    end
-  end
-end
+warn "DEPRECATION WARNING: Requiring 'airbrake/shoryuken/error_handler' is " \
+     "deprecated and will be removed in the next MAJOR release. Require " \
+     "'airbrake/shoryuken' instead."