airbrake 10.0.1 → 10.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6ebb0d64b92742b80afe65583bf19f6c3fc7352d146e95765b8c5b7d2d1949b
-  data.tar.gz: 2e02317eeb64c7f4ece9173b88af2033c13d630dc9072232d39a697495da3f19
+  metadata.gz: a8c1a47736f8dd93e0023e7ac0ce9d8e5e852baaba52bd725203577c3881d058
+  data.tar.gz: d0f623664683c44ca43cf29b067fe72ed4c7b7920e9390f0346ca1cc3b8ae409
 SHA512:
-  metadata.gz: b69a9609edd060362d33626f715696ce41a49f05a796ad314f7cb7258d3e7b03274ebeb7ef8c4c17fc004f64cdd56f3af51ba5c59f62acaeb2416ee7517d3af2
-  data.tar.gz: 99b1645d2b95c0d73d2bad8a2bc04960334e14e8d0d13f613d30f7666f250b05d5e0567944113302e8c6a6dc40a17fc8e897d6fc578af41af96426f07b79efc3
+  metadata.gz: 22c50e2be09ff46299ec304ef79fb28f69a4017170b5c67f8abf9633a891e8b51d7a197d6d7568b1cfe2ee11a2a2b916f12f88896d0488fb3ae37c999b277a36
+  data.tar.gz: 59747af59ca1ec23c3cd1ba31ec3e42daa922ce85bb49e1306a4b13d3b75fc8ab41365607dd7558277f301db6aaee8865862749003ce6e65aa1598fca10914bd

data/lib/airbrake/delayed_job.rb

@@ -28,7 +28,7 @@ module Delayed
               notice[:context][:action] = action
             end
 
-            ::Airbrake.notify_queue_sync(
+            ::Airbrake.notify_queue(
               queue: action,
               error_count: 1,
               timing: 0.01,
@@ -36,7 +36,7 @@ module Delayed
 
             raise exception
           else
-            ::Airbrake.notify_queue_sync(
+            ::Airbrake.notify_queue(
               queue: job_class || job.payload_object.class.name,
               error_count: 0,
               timing: timing,

data/lib/airbrake/rails/active_job.rb

@@ -6,15 +6,7 @@ module Airbrake
     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
@@ -30,14 +22,14 @@ module Airbrake
           block.call
         end
       rescue StandardError => exception
-        Airbrake.notify_queue_sync(
+        Airbrake.notify_queue(
           queue: job.class.name,
           error_count: 1,
           timing: 0.01,
         )
         raise exception
       else
-        Airbrake.notify_queue_sync(
+        Airbrake.notify_queue(
           queue: job.class.name,
           error_count: 0,
           timing: timing,

data/lib/airbrake/rails/app.rb

@@ -11,12 +11,19 @@ module Airbrake
 
       # @param [] request
       # @return [Airbrake::Rails::App::Route, nil]
+      # rubocop:disable Metrics/AbcSize
       def self.recognize_route(request)
         # Duplicate `request` because `recognize` *can* strip the request's
         # `path_info`, which results in broken engine links (when the engine has
         # an isolated namespace).
         request_copy = request.dup
 
+        # Save original script name because `router.recognize(request)` mutates
+        # it. It's a Rails bug. More info in:
+        #   * https://github.com/airbrake/airbrake/issues/1072
+        #   * https://github.com/rails/rails/issues/31152
+        original_script_name = request.env['SCRIPT_NAME']
+
         # 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
@@ -26,6 +33,20 @@ module Airbrake
         #   * `Marketing::Engine` recognizes it as `marketing#/pricing` (correct)
         engines.each do |engine|
           engine.routes.router.recognize(request_copy) do |route, _params|
+            # Restore original script name. Remove this code when/if the Rails
+            # bug is fixed: https://github.com/airbrake/airbrake/issues/1072
+            request.env['SCRIPT_NAME'] = original_script_name
+
+            # 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
@@ -46,6 +67,7 @@ module Airbrake
 
         nil
       end
+      # rubocop:enable Metrics/AbcSize
 
       def self.engines
         @engines ||= [*::Rails::Engine.subclasses, ::Rails.application]

data/lib/airbrake/rails/backtrace_cleaner.rb

@@ -4,9 +4,20 @@ 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/net_http.rb

@@ -1,12 +1,18 @@
 # frozen_string_literal: true
 
-# Monkey-patch Net::HTTP to benchmark it.
-Net::HTTP.class_eval do
-  alias_method :request_without_airbrake, :request
-
-  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

@@ -5,6 +5,8 @@ module Airbrake
     # 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.
+    #
+    # rubocop:disable Metrics/ClassLength, Metrics/BlockLength
     class Railtie < ::Rails::Railtie
       initializer('airbrake.middleware', after: :load_config_initializers) do |app|
         # Since Rails 3.2 the ActionDispatch::DebugExceptions middleware is
@@ -44,7 +46,6 @@ module Airbrake
         require 'airbrake/rake/tasks'
       end
 
-      # rubocop:disable Metrics/BlockLength
       initializer('airbrake.action_controller') do
         ActiveSupport.on_load(:action_controller, run_once: true) do
           # Patches ActionController with methods that allow us to retrieve
@@ -92,7 +93,6 @@ module Airbrake
           end
         end
       end
-      # rubocop:enable Metrics/BlockLength
 
       initializer('airbrake.active_record') do
         ActiveSupport.on_load(:active_record, run_once: true) do
@@ -112,11 +112,21 @@ module Airbrake
             )
 
             # Filter out parameters from SQL body.
-            Airbrake.add_performance_filter(
-              Airbrake::Filters::SqlFilter.new(
-                ::ActiveRecord::Base.connection_config[:adapter],
-              ),
-            )
+            if ::ActiveRecord::Base.respond_to?(:connection_db_config)
+              # Rails 6.1+ deprecates "connection_config" in favor of
+              # "connection_db_config", so we need an updated call.
+              Airbrake.add_performance_filter(
+                Airbrake::Filters::SqlFilter.new(
+                  ::ActiveRecord::Base.connection_db_config.configuration_hash[:adapter],
+                ),
+              )
+            else
+              Airbrake.add_performance_filter(
+                Airbrake::Filters::SqlFilter.new(
+                  ::ActiveRecord::Base.connection_config[:adapter],
+                ),
+              )
+            end
           end
         end
       end
@@ -142,5 +152,6 @@ module Airbrake
         end
       end
     end
+    # rubocop:enable Metrics/ClassLength, Metrics/BlockLength
   end
 end

data/lib/airbrake/version.rb

@@ -3,5 +3,5 @@
 # We use Semantic Versioning v2.0.0
 # More information: http://semver.org/
 module Airbrake
-  AIRBRAKE_VERSION = '10.0.1'.freeze
+  AIRBRAKE_VERSION = '10.0.6'.freeze
 end

data/lib/generators/airbrake_initializer.rb.erb

@@ -54,12 +54,12 @@ Airbrake.configure do |c|
   # A list of parameters that should be filtered out of what is sent to
   # Airbrake. By default, all "password" attributes will have their contents
   # replaced.
-  # https://github.com/airbrake/airbrake-ruby#blacklist_keys
-  c.blacklist_keys = [/password/i, /authorization/i]
+  # https://github.com/airbrake/airbrake-ruby#blocklist_keys
+  c.blocklist_keys = [/password/i, /authorization/i]
 
   # Alternatively, you can integrate with Rails' filter_parameters.
   # Read more: https://goo.gl/gqQ1xS
-  # c.blacklist_keys = Rails.application.config.filter_parameters
+  # c.blocklist_keys = Rails.application.config.filter_parameters
 end
 
 # A filter that collects request body information. Enable it if you are sure you

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 10.0.1
+  version: 10.0.6
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake-ruby
@@ -84,16 +84,16 @@ dependencies:
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -268,6 +268,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.12.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.12.2
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -420,7 +434,7 @@ homepage: https://airbrake.io
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -436,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Airbrake is an online tool that provides robust exception tracking in any
   of your Ruby applications.