airbrake 9.5.5 → 10.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90f7f39f6012a7e8383f50d1d99c8631582032feddaaa5a452bb7ba9afc40fc6
-  data.tar.gz: 728831ea6a9a57815fec54ac507f4712923bcfe5b012b31658ddd0c1b4d576ba
+  metadata.gz: d1bea1ce3705909bcf1406466ceab591c1c58aa138cd274c820a20b7d52e3bd1
+  data.tar.gz: bb33d7d3fe68fc0ef1c8e65d9eccb9e3b663bb88440a53bd36b4ee5e8841ce00
 SHA512:
-  metadata.gz: d899543189d807cbc393fba4643274eea3b02134fa09aec828926dc2dced70adef3071b36092fa0f3ba9809217b3c74aa8e6d25849c22cfcc88640a6d257c85b
-  data.tar.gz: ca0c24bbd41fdd983a128763c99a3ce43aef445266d71606d54263782894e9a4987dde638c08083eb037ae6cae322d51ba1f42e4b690422478f4c3550cec817b
+  metadata.gz: 37aa7af6de420774bc83c9af305591536ca98331b5ec695b30fc18e503cfe9ec14bd27a8923906f6cf83ada31b5e3536b0f075308988aee35dbec32a0a330a81
+  data.tar.gz: 6dc006e4d19670905ec22f8c843adbaa2d59c2c369264c590ce73178c5dbccf75848062c18a1132e4a944f6766a37a94a4d5b1d0e3c4be429df47d55718c9079

data/lib/airbrake.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'shellwords'
 require 'English'
 

data/lib/airbrake/capistrano.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if defined?(Capistrano::VERSION) &&
    Gem::Version.new(Capistrano::VERSION).release >= Gem::Version.new('3.0.0')
   require 'airbrake/capistrano/capistrano3'

data/lib/airbrake/capistrano/capistrano2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Airbrake
   # The Capistrano v2 integration.
   module Capistrano

data/lib/airbrake/capistrano/capistrano3.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :airbrake do
   desc "Notify Airbrake of the deploy"
   task :deploy do

data/lib/airbrake/delayed_job.rb

@@ -1,14 +1,18 @@
+# frozen_string_literal: true
+
 module Delayed
   module Plugins
     # Provides integration with Delayed Job.
-    # rubocop:disable Lint/RescueException
+    # rubocop:disable Metrics/BlockLength
     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
+            timing = ::Airbrake::Benchmark.measure do
+              # Forward the call to the next callback in the callback chain
+              block.call(job, *args)
+            end
+          rescue Exception => exception # rubocop:disable Lint/RescueException
             params = job.as_json
 
             # If DelayedJob is used through ActiveJob, it contains extra info.
@@ -17,17 +21,31 @@ module Delayed
               job_class = job.payload_object.job_data['job_class']
             end
 
+            action = job_class || job.payload_object.class.name
+
             ::Airbrake.notify(exception, params) do |notice|
               notice[:context][:component] = 'delayed_job'
-              notice[:context][:action] = job_class || job.payload_object.class.name
+              notice[:context][:action] = action
             end
 
+            ::Airbrake.notify_queue(
+              queue: action,
+              error_count: 1,
+              timing: 0.01,
+            )
+
             raise exception
+          else
+            ::Airbrake.notify_queue(
+              queue: job_class || job.payload_object.class.name,
+              error_count: 0,
+              timing: timing,
+            )
           end
         end
       end
     end
-    # rubocop:enable Lint/RescueException
+    # rubocop:enable Metrics/BlockLength
   end
 end
 

data/lib/airbrake/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'logger'
 require 'delegate'
 

data/lib/airbrake/rack.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'airbrake/rack/user'
 require 'airbrake/rack/user_filter'
 require 'airbrake/rack/context_filter'

data/lib/airbrake/rack/context_filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Rack
     # Adds context (URL, User-Agent, framework version, controller and more).
@@ -18,7 +20,12 @@ module Airbrake
         context = notice[:context]
 
         context[:url] = request.url
-        context[:userAddr] = request.ip
+        context[:userAddr] =
+          if request.respond_to?(:remote_ip)
+            request.remote_ip
+          else
+            request.ip
+          end
         context[:userAgent] = request.user_agent
 
         add_framework_version(context)
@@ -49,7 +56,7 @@ module Airbrake
           else
             {
               'rack_version' => ::Rack.version,
-              'rack_release' => ::Rack.release
+              'rack_release' => ::Rack.release,
             }
           end
       end

data/lib/airbrake/rack/http_headers_filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Rack
     # Adds HTTP request parameters.
@@ -9,7 +11,7 @@ module Airbrake
       HTTP_HEADER_PREFIXES = [
         'HTTP_'.freeze,
         'CONTENT_TYPE'.freeze,
-        'CONTENT_LENGTH'.freeze
+        'CONTENT_LENGTH'.freeze,
       ].freeze
 
       # @return [Integer]
@@ -34,7 +36,7 @@ module Airbrake
         notice[:context].merge!(
           httpMethod: request.request_method,
           referer: request.referer,
-          headers: http_headers
+          headers: http_headers,
         )
       end
     end

data/lib/airbrake/rack/http_params_filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Rack
     # Adds HTTP request parameters.

data/lib/airbrake/rack/instrumentable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Rack
     # Instrumentable holds methods that simplify instrumenting Rack apps.
@@ -15,14 +17,120 @@ module Airbrake
     # @since v9.2.0
     module Instrumentable
       def airbrake_capture_timing(method_name, label: method_name.to_s)
-        alias_method "#{method_name}_without_airbrake", method_name
+        instrumentable = ::Airbrake::Rack::Instrumentable
+        if instrumentable.should_prepend?(self, method_name)
+          instrumentable.prepend_capture_timing(self, method_name, label)
+        else
+          instrumentable.chain_capture_timing(self, method_name, label)
+        end
+        method_name
+      end
+
+      # @api private
+      def __airbrake_capture_timing_module__
+        # Module used to store prepended wrapper methods, saved as an instance
+        # variable so each target class/module gets its own module. This just
+        # a convenience to avoid prepending a lot of anonymous modules.
+        @__airbrake_capture_timing_module__ ||= ::Module.new
+      end
+      private :__airbrake_capture_timing_module__
+
+      # Using api private self methods so they don't get defined in the target
+      # class or module, but can still be called by the above method.
+
+      # @api private
+      def self.should_prepend?(klass, method_name)
+        # Don't chain already-prepended or operator methods.
+        klass.module_exec do
+          self_class_idx = ancestors.index(self)
+          method_owner_idx = ancestors.index(instance_method(method_name).owner)
+          method_owner_idx < self_class_idx || !(/\A\W/ =~ method_name).nil?
+        end
+      end
+
+      # @api private
+      def self.prepend_capture_timing(klass, method_name, label)
+        args = method_signature
+        visibility = method_visibility(klass, method_name)
+
+        # Generate the wrapper method.
+        klass.module_exec do
+          mod = __airbrake_capture_timing_module__
+          mod.module_exec do
+            module_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def #{method_name}(#{args})
+                Airbrake::Rack.capture_timing(#{label.to_s.inspect}) do
+                  super
+                end
+              end
+              #{visibility} :#{method_name}
+            RUBY
+          end
+          prepend mod
+        end
+      end
+
+      # @api private
+      def self.chain_capture_timing(klass, method_name, label)
+        args = method_signature
+        visibility = method_visibility(klass, method_name)
 
-        define_method(method_name) do |*args|
-          Airbrake::Rack.capture_timing(label) do
-            __send__("#{method_name}_without_airbrake", *args)
+        # Generate the wrapper method.
+        aliased = method_name.to_s.sub(/([?!=])$/, '')
+        punctuation = Regexp.last_match(1)
+        wrapped_method_name = "#{aliased}_without_airbrake#{punctuation}"
+        needs_removal = method_needs_removal(klass, method_name)
+        klass.module_exec do
+          alias_method wrapped_method_name, method_name
+          remove_method method_name if needs_removal
+          module_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def #{method_name}(#{args})
+              Airbrake::Rack.capture_timing(#{label.to_s.inspect}) do
+                __send__("#{aliased}_without_airbrake#{punctuation}", #{args})
+              end
+            end
+            #{visibility} :#{method_name}
+          RUBY
+        end
+      end
+
+      # @api private
+      def self.method_visibility(klass, method_name)
+        klass.module_exec do
+          if protected_method_defined?(method_name)
+            "protected".freeze
+          elsif private_method_defined?(method_name)
+            "private".freeze
+          else
+            "public".freeze
           end
         end
       end
+
+      # @api private
+      # A method instead of a constant so it isn't accessible in the target.
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7")
+        def self.method_signature
+          "*args, **kw_args, &block".freeze
+        end
+      else
+        def self.method_signature
+          "*args, &block".freeze
+        end
+      end
+
+      # @api private
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6")
+        def self.method_needs_removal(klass, method_name)
+          klass.method_defined?(method_name, false) ||
+            klass.private_method_defined?(method_name, false)
+        end
+      else
+        def self.method_needs_removal(klass, method_name)
+          klass.instance_methods(false).include?(method_name) ||
+            klass.private_instance_methods(false).include?(method_name)
+        end
+      end
     end
   end
 end

data/lib/airbrake/rack/middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Rack
     # Airbrake Rack middleware for Rails and Sinatra applications (or any other
@@ -94,7 +96,7 @@ end
   Airbrake::Rack::SessionFilter,
   Airbrake::Rack::HttpParamsFilter,
   Airbrake::Rack::HttpHeadersFilter,
-  Airbrake::Rack::RouteFilter
+  Airbrake::Rack::RouteFilter,
 ].each do |filter|
   Airbrake.add_filter(filter.new)
 end

data/lib/airbrake/rack/request_body_filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Rack
     # A filter that appends Rack request body to the notice.

data/lib/airbrake/rack/request_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Rack
     # RequestStore is a thin (and limited) wrapper around *Thread.current* that

data/lib/airbrake/rack/route_filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'airbrake/rails/app'
 
 module Airbrake

data/lib/airbrake/rack/session_filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Rack
     # Adds HTTP session.

data/lib/airbrake/rack/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Rack
     # Represents an authenticated user, which can be converted to Airbrake's

data/lib/airbrake/rack/user_filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Rack
     # Adds current user information.

data/lib/airbrake/rails.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'airbrake/rails/railtie'
 
 module Airbrake
@@ -12,7 +14,7 @@ module Airbrake
 
           # Rails.logger is not set in some Rake tasks such as
           # 'airbrake:deploy'. In this case we use a sensible fallback.
-          level: (::Rails.logger ? ::Rails.logger.level : Logger::ERROR)
+          level: (::Rails.logger ? ::Rails.logger.level : Logger::ERROR),
         )
       end
     end

data/lib/airbrake/rails/action_cable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'airbrake/rails/action_cable/notify_callback'
 
 %i[subscribe unsubscribe].each do |callback_name|

data/lib/airbrake/rails/action_cable/notify_callback.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Rails
     module ActionCable

data/lib/airbrake/rails/action_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Rails
     # Contains helper methods that can be used inside Rails controllers to send

data/lib/airbrake/rails/action_controller_notify_subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'airbrake/rails/event'
 
 module Airbrake
@@ -18,8 +20,8 @@ module Airbrake
             method: event.method,
             route: route,
             status_code: event.status_code,
-            start_time: event.time,
-            end_time: Time.new
+            timing: event.duration,
+            time: event.time,
           )
         end
       end

data/lib/airbrake/rails/action_controller_performance_breakdown_subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'airbrake/rails/event'
 
 module Airbrake
@@ -20,7 +22,8 @@ module Airbrake
             route: route,
             response_type: event.response_type,
             groups: groups,
-            start_time: event.time
+            timing: event.duration,
+            time: event.time,
           }
 
           Airbrake.notify_performance_breakdown(breakdown_info, stash)

data/lib/airbrake/rails/action_controller_route_subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'airbrake/rails/event'
 require 'airbrake/rails/app'
 
@@ -14,14 +16,14 @@ module Airbrake
 
         event = Airbrake::Rails::Event.new(*args)
         route = Airbrake::Rails::App.recognize_route(
-          Airbrake::Rack::RequestStore[:request]
+          Airbrake::Rack::RequestStore[:request],
         )
         return unless route
 
         routes[route.path] = {
           method: event.method,
           response_type: event.response_type,
-          groups: {}
+          groups: {},
         }
       end
     end

data/lib/airbrake/rails/active_job.rb

@@ -1,18 +1,12 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Rails
     # Enables support for exceptions occurring in ActiveJob jobs.
     module ActiveJob
       extend ActiveSupport::Concern
 
-      # @return [Array<Regexp>] the list of known adapters
-      ADAPTERS = [/Resque/, /Sidekiq/, /DelayedJob/].freeze
-
       def self.notify_airbrake(exception, job)
-        queue_adapter = job.class.queue_adapter.to_s
-
-        # Do not notify twice if a queue_adapter is configured already.
-        raise exception if ADAPTERS.any? { |a| a =~ queue_adapter }
-
         notice = Airbrake.build_notice(exception)
         notice[:context][:component] = 'active_job'
         notice[:context][:action] = job.class.name
@@ -23,10 +17,33 @@ module Airbrake
         raise exception
       end
 
+      def self.perform(job, block)
+        timing = Airbrake::Benchmark.measure do
+          block.call
+        end
+      rescue StandardError => exception
+        Airbrake.notify_queue(
+          queue: job.class.name,
+          error_count: 1,
+          timing: 0.01,
+        )
+        raise exception
+      else
+        Airbrake.notify_queue(
+          queue: job.class.name,
+          error_count: 0,
+          timing: timing,
+        )
+      end
+
       included do
         rescue_from(Exception) do |exception|
           Airbrake::Rails::ActiveJob.notify_airbrake(exception, self)
         end
+
+        around_perform do |job, block|
+          Airbrake::Rails::ActiveJob.perform(job, block)
+        end
       end
     end
   end

data/lib/airbrake/rails/active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Rails
     # Rails <4.2 has a bug with regard to swallowing exceptions in the

data/lib/airbrake/rails/active_record_subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'airbrake/rails/event'
 require 'airbrake/rails/backtrace_cleaner'
 
@@ -22,8 +24,8 @@ module Airbrake
             func: frame[:function],
             file: frame[:file],
             line: frame[:line],
-            start_time: event.time,
-            end_time: event.end
+            timing: event.duration,
+            time: event.time,
           )
         end
       end
@@ -33,7 +35,7 @@ module Airbrake
       def last_caller
         exception = StandardError.new
         exception.set_backtrace(
-          Airbrake::Rails::BacktraceCleaner.clean(Kernel.caller)
+          Airbrake::Rails::BacktraceCleaner.clean(Kernel.caller),
         )
         Airbrake::Backtrace.parse(exception).first || {}
       end

data/lib/airbrake/rails/app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Rails
     # App is a wrapper around Rails.application.
@@ -13,26 +15,52 @@ module Airbrake
         # Duplicate `request` because `recognize` *can* strip the request's
         # `path_info`, which results in broken engine links (when the engine has
         # an isolated namespace).
-        ::Rails.application.routes.router.recognize(request.dup) do |route, _params|
-          path =
-            if route.app.respond_to?(:app) && route.app.app.respond_to?(:engine_name)
-              "#{route.app.app.engine_name}##{route.path.spec}"
-            else
-              route.path.spec.to_s
-            end
+        request_copy = request.dup
+
+        # We must search every engine individually to find a concrete route. If
+        # we rely only on the `Rails.application.routes.router`, then the
+        # recognize call would return the root route, neglecting PATH_INFO
+        # completely. For example:
+        #   * a request is made to `marketing#pricing`
+        #   * `Rails.application` recognizes it as `marketing#/` (incorrect)
+        #   * `Marketing::Engine` recognizes it as `marketing#/pricing` (correct)
+        engines.each do |engine|
+          engine.routes.router.recognize(request_copy) do |route, _params|
+            # Skip "catch-all" routes such as:
+            #   get '*path => 'pages#about'
+            #
+            # @todo The `glob?` method was added in Rails v4.2.0.beta1. We
+            # should remove the `respond_to?` check once we drop old Rails
+            # versions support.
+            #
+            # https://github.com/rails/rails/commit/5460591f0226a9d248b7b4f89186bd5553e7768f
+            next if route.respond_to?(:glob?) && route.glob?
+
+            path =
+              if engine == ::Rails.application
+                route.path.spec.to_s
+              else
+                "#{engine.engine_name}##{route.path.spec}"
+              end
 
-          # Rails can recognize multiple routes for the given request. For
-          # example, if we visit /users/2/edit, then Rails sees these routes:
-          #   * "/users/:id/edit(.:format)"
-          #   *  "/"
-          #
-          # We return the first route as, what it seems, the most optimal
-          # approach.
-          return Route.new(path)
+            # Rails can recognize multiple routes for the given request. For
+            # example, if we visit /users/2/edit, then Rails sees these routes:
+            #   * "/users/:id/edit(.:format)"
+            #   *  "/"
+            #
+            # We return the first route as, what it seems, the most optimal
+            # approach.
+            return Route.new(path)
+          end
         end
 
         nil
       end
+
+      def self.engines
+        @engines ||= [*::Rails::Engine.subclasses, ::Rails.application]
+      end
+      private_class_method :engines
     end
   end
 end

data/lib/airbrake/rails/backtrace_cleaner.rb

@@ -1,10 +1,23 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Rails
     # BacktraceCleaner is a wrapper around Rails.backtrace_cleaner.
     class BacktraceCleaner
+      # @return [Regexp]
+      AIRBRAKE_FRAME_PATTERN = %r{/airbrake/lib/airbrake/}
+
       def self.clean(backtrace)
         ::Rails.backtrace_cleaner.clean(backtrace).first(1)
       end
     end
   end
 end
+
+if defined?(Rails)
+  # Silence own frames to let the cleaner proceed to the next line (and probably
+  # find the correct call-site coming from the app code rather this library).
+  Rails.backtrace_cleaner.add_silencer do |line|
+    line =~ Airbrake::Rails::BacktraceCleaner::AIRBRAKE_FRAME_PATTERN
+  end
+end

data/lib/airbrake/rails/curb.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Curl
   # Monkey-patch to measure request timing.
   class Easy

data/lib/airbrake/rails/event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Rails
     # Event is a wrapper around ActiveSupport::Notifications::Event.
@@ -43,10 +45,6 @@ module Airbrake
         @event.time
       end
 
-      def end
-        @event.end
-      end
-
       def groups
         groups = {}
         groups[:db] = db_runtime if db_runtime > 0
@@ -59,7 +57,7 @@ module Airbrake
 
         if @event.payload[:exception]
           status = ActionDispatch::ExceptionWrapper.status_code_for_exception(
-            @event.payload[:exception].first
+            @event.payload[:exception].first,
           )
           status = 500 if status == 0
 

data/lib/airbrake/rails/excon_subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'airbrake/rails/event'
 
 module Airbrake

data/lib/airbrake/rails/http.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HTTP
   # Monkey-patch to measure request timing.
   class Client

data/lib/airbrake/rails/http_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Monkey-patch to measure request timing.
 class HTTPClient
   alias do_get_without_airbrake do_get_block

data/lib/airbrake/rails/net_http.rb

@@ -1,10 +1,18 @@
-# Monkey-patch Net::HTTP to benchmark it.
-Net::HTTP.class_eval do
-  alias_method :request_without_airbrake, :request
+# frozen_string_literal: true
 
-  def request(request, *args, &block)
-    Airbrake::Rack.capture_timing(:http) do
-      request_without_airbrake(request, *args, &block)
+module Airbrake
+  module Rails
+    # Monkey-patch Net::HTTP to benchmark it.
+    # @api private
+    # @since v10.0.2
+    module NetHttp
+      def request(request, *args, &block)
+        Airbrake::Rack.capture_timing(:http) do
+          super(request, *args, &block)
+        end
+      end
     end
   end
 end
+
+Net::HTTP.prepend(Airbrake::Rails::NetHttp)

data/lib/airbrake/rails/railtie.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 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|
+      initializer('airbrake.middleware', after: :load_config_initializers) 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
@@ -16,20 +18,20 @@ module Airbrake
           # exist in Rails 5 anymore.
           app.config.middleware.insert_after(
             ActionDispatch::DebugExceptions,
-            Airbrake::Rack::Middleware
+            Airbrake::Rack::Middleware,
           )
         elsif defined?(::ActiveRecord::ConnectionAdapters::ConnectionManagement)
           # 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'
+            'Airbrake::Rack::Middleware',
           )
         else
           # Insert after DebugExceptions for apps without ActiveRecord.
           app.config.middleware.insert_after(
             ActionDispatch::DebugExceptions,
-            'Airbrake::Rack::Middleware'
+            'Airbrake::Rack::Middleware',
           )
         end
       end
@@ -55,21 +57,21 @@ module Airbrake
             require 'airbrake/rails/action_controller_route_subscriber'
             ActiveSupport::Notifications.subscribe(
               'start_processing.action_controller',
-              Airbrake::Rails::ActionControllerRouteSubscriber.new
+              Airbrake::Rails::ActionControllerRouteSubscriber.new,
             )
 
             # Send route stats.
             require 'airbrake/rails/action_controller_notify_subscriber'
             ActiveSupport::Notifications.subscribe(
               'process_action.action_controller',
-              Airbrake::Rails::ActionControllerNotifySubscriber.new
+              Airbrake::Rails::ActionControllerNotifySubscriber.new,
             )
 
             # Send performance breakdown: where a request spends its time.
             require 'airbrake/rails/action_controller_performance_breakdown_subscriber'
             ActiveSupport::Notifications.subscribe(
               'process_action.action_controller',
-              Airbrake::Rails::ActionControllerPerformanceBreakdownSubscriber.new
+              Airbrake::Rails::ActionControllerPerformanceBreakdownSubscriber.new,
             )
 
             require 'airbrake/rails/net_http' if defined?(Net) && defined?(Net::HTTP)
@@ -112,8 +114,8 @@ module Airbrake
             # Filter out parameters from SQL body.
             Airbrake.add_performance_filter(
               Airbrake::Filters::SqlFilter.new(
-                ::ActiveRecord::Base.connection_config[:adapter]
-              )
+                ::ActiveRecord::Base.connection_config[:adapter],
+              ),
             )
           end
         end

data/lib/airbrake/rails/typhoeus.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Typhoeus
   # Monkey-patch to measure request timing.
   class Request

data/lib/airbrake/rake.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # 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
@@ -30,7 +32,7 @@ module Rake
       notice[:params].merge!(
         rake_task: task_info,
         execute_args: args,
-        argv: ARGV.join(' ')
+        argv: ARGV.join(' '),
       )
 
       Airbrake.notify_sync(notice)

data/lib/airbrake/rake/tasks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'airbrake-ruby'
 
 namespace :airbrake do
@@ -55,7 +57,7 @@ namespace :airbrake do
       username: ENV['USERNAME'],
       revision: ENV['REVISION'],
       repository: ENV['REPOSITORY'],
-      version: ENV['VERSION']
+      version: ENV['VERSION'],
     }
     promise = Airbrake.notify_deploy(deploy_params)
     promise.then do
@@ -97,14 +99,14 @@ namespace :airbrake do
       end
     end
 
-    url = "https://airbrake.io/api/v3/projects/#{id}/heroku-deploys?key=#{key}"
+    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 = [%(heroku addons:create deployhooks:http --url="#{url.join}")]
     command << " --app #{app}" if app
 
-    puts "$ #{command}"
+    puts "$ #{command.join}"
     Bundler.with_clean_env { puts `#{command}` }
   end
 end

data/lib/airbrake/resque.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Resque
   module Failure
     # Provides Resque integration with Airbrake.
@@ -27,3 +29,33 @@ module Resque
     end
   end
 end
+
+module Resque
+  # Measures elapsed time of a job and notifies Airbrake of the execution
+  # status.
+  #
+  # @since v9.6.0
+  class Job
+    # Store the original method to use it later.
+    alias perform_without_airbrake perform
+
+    def perform
+      timing = Airbrake::Benchmark.measure do
+        perform_without_airbrake
+      end
+    rescue StandardError => exception
+      Airbrake.notify_queue_sync(
+        queue: payload['class'],
+        error_count: 1,
+        timing: 0.01,
+      )
+      raise exception
+    else
+      Airbrake.notify_queue_sync(
+        queue: payload['class'],
+        error_count: 0,
+        timing: timing,
+      )
+    end
+  end
+end

data/lib/airbrake/shoryuken.rb

@@ -1,14 +1,28 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Shoryuken
     # Provides integration with Shoryuken.
     class ErrorHandler
       # rubocop:disable Lint/RescueException
       def call(worker, queue, _sqs_msg, body)
-        yield
+        timing = Airbrake::Benchmark.measure do
+          yield
+        end
       rescue Exception => exception
         notify_airbrake(exception, worker, queue, body)
-
+        Airbrake.notify_queue(
+          queue: worker.class.to_s,
+          error_count: 1,
+          timing: 0.01,
+        )
         raise exception
+      else
+        Airbrake.notify_queue(
+          queue: worker.class.to_s,
+          error_count: 0,
+          timing: timing,
+        )
       end
       # rubocop:enable Lint/RescueException
 
@@ -24,7 +38,7 @@ module Airbrake
       def notice_context(queue, body)
         {
           queue: queue,
-          body: body.is_a?(Array) ? { batch: body } : { body: body }
+          body: body.is_a?(Array) ? { batch: body } : { body: body },
         }
       end
     end

data/lib/airbrake/sidekiq.rb

@@ -1,17 +1,30 @@
+# frozen_string_literal: true
+
 require 'airbrake/sidekiq/retryable_jobs_filter'
 
 module Airbrake
   module Sidekiq
     # Provides integration with Sidekiq v2+.
     class ErrorHandler
-      # rubocop:disable Lint/RescueException
       def call(_worker, context, _queue)
-        yield
-      rescue Exception => exception
+        timing = Airbrake::Benchmark.measure do
+          yield
+        end
+      rescue Exception => exception # rubocop:disable Lint/RescueException
         notify_airbrake(exception, context)
+        Airbrake.notify_queue(
+          queue: context['class'],
+          error_count: 1,
+          timing: 0.01,
+        )
         raise exception
+      else
+        Airbrake.notify_queue(
+          queue: context['class'],
+          error_count: 0,
+          timing: timing,
+        )
       end
-      # rubocop:enable Lint/RescueException
 
       private
 
@@ -34,14 +47,8 @@ module Airbrake
   end
 end
 
-if Sidekiq::VERSION < '3'
-  Sidekiq.configure_server do |config|
-    config.server_middleware do |chain|
-      chain.add(Airbrake::Sidekiq::ErrorHandler)
-    end
-  end
-else
-  Sidekiq.configure_server do |config|
-    config.error_handlers << Airbrake::Sidekiq::ErrorHandler.new.method(:notify_airbrake)
+Sidekiq.configure_server do |config|
+  config.server_middleware do |chain|
+    chain.add(Airbrake::Sidekiq::ErrorHandler)
   end
 end

data/lib/airbrake/sidekiq/retryable_jobs_filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Sidekiq
     # Filter that can ignore notices from jobs that failed but will be retried

data/lib/airbrake/sneakers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Airbrake
   module Sneakers
     # Provides integration with Sneakers.
@@ -10,12 +12,15 @@ module Airbrake
       # @see https://github.com/airbrake/airbrake/issues/850
       IGNORED_KEYS = %i[delivery_tag consumer channel].freeze
 
-      def call(exception, worker = nil, **context)
+      # rubocop:disable Style/OptionalArguments
+      def call(exception, worker = nil, context)
+        # Later versions add a middle argument.
         Airbrake.notify(exception, filter_context(context)) do |notice|
           notice[:context][:component] = 'sneakers'
           notice[:context][:action] = worker.class.to_s
         end
       end
+      # rubocop:enable Style/OptionalArguments
 
       private
 
@@ -32,3 +37,35 @@ module Airbrake
 end
 
 Sneakers.error_reporters << Airbrake::Sneakers::ErrorReporter.new
+
+module Sneakers
+  # @todo Migrate to Sneakers v2.12.0 middleware API when it's released
+  # @see https://github.com/jondot/sneakers/pull/364
+  module Worker
+    # Sneakers v2.7.0+ renamed `do_work` to `process_work`.
+    if method_defined?(:process_work)
+      alias process_work_without_airbrake process_work
+    else
+      alias process_work_without_airbrake do_work
+    end
+
+    def process_work(delivery_info, metadata, msg, handler)
+      timing = Airbrake::Benchmark.measure do
+        process_work_without_airbrake(delivery_info, metadata, msg, handler)
+      end
+    rescue Exception => exception # rubocop:disable Lint/RescueException
+      Airbrake.notify_queue(
+        queue: self.class.to_s,
+        error_count: 1,
+        timing: 0.01,
+      )
+      raise exception
+    else
+      Airbrake.notify_queue(
+        queue: self.class.to_s,
+        error_count: 0,
+        timing: timing,
+      )
+    end
+  end
+end

data/lib/airbrake/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # We use Semantic Versioning v2.0.0
 # More information: http://semver.org/
 module Airbrake
-  AIRBRAKE_VERSION = '9.5.5'.freeze
+  AIRBRAKE_VERSION = '10.0.4'.freeze
 end

data/lib/generators/airbrake_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Creates the Airbrake initializer file for Rails apps.
 #
 # @example Invokation from terminal

data/lib/generators/airbrake_initializer.rb.erb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Airbrake is an online tool that provides robust exception tracking in your Rails
 # applications. In doing so, it allows you to easily review errors, tie an error
 # to an individual piece of code, and trace the cause back to recent

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 9.5.5
+  version: 10.0.4
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2020-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '4.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '4.13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -254,6 +254,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.9.0
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -421,8 +435,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Airbrake is an online tool that provides robust exception tracking in any