airbrake 11.0.3 → 12.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd22c4ba5f388c063021267c805f9f72f9905c8e0f7a2b7e19d0f6a45c9718a9
-  data.tar.gz: b919ee2bdae1a073c939b752d9827f3d8ecd6c30f18739019f9becbf6974a605
+  metadata.gz: c85c0e09edeb08efee5cabc43e11d56a02fb9cacbb2c0e415b81d0effa3f27b1
+  data.tar.gz: e6c403b7219e58f8e296f9a2dddc510a6749b651e52569b995db6ff8b5e71b86
 SHA512:
-  metadata.gz: 2362a03c41aebeddaf2e6bcd2272760ea0fb94b88a0dcabb644ab5c9b3a72ed72281f05f314f04491e27d99fae9c5353bbfaa4fc1d43f09d3e2316f6edfb02ba
-  data.tar.gz: f260895a27e6f8e2368c2be1431344291d5dcdf731f0d4b71d4ab2f14de1265cb93759c888ad03592b02dabaa7944e9c4dfbfed4fb87b443e3aaddeba0321760
+  metadata.gz: be4e1cffdf8560bc786970f5db60fd6a85961a55ea7d5f1c87533ef338d30a0f462909879977b91e3d921f4ed4b3b616ca0fcdbcc4d18c0c5ccb01841b00be5d
+  data.tar.gz: 28c44be64dd701b8afbf286b3dbced4756b6132b807ffc00e8a89c269d91b5e6b268a5e983e87b50fc00a524bc8a71f8e6a5da15bd7d385ce0a0f9d6d141b623

data/lib/airbrake/delayed_job.rb

@@ -7,41 +7,39 @@ module Delayed
     class Airbrake < ::Delayed::Plugin
       callbacks do |lifecycle|
         lifecycle.around(:invoke_job) do |job, *args, &block|
-          begin
-            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
+          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.
-            if job.payload_object.respond_to?(:job_data)
-              params[:active_job] = job.payload_object.job_data
-              job_class = job.payload_object.job_data['job_class']
-            end
+          # 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
+            job_class = job.payload_object.job_data['job_class']
+          end
 
-            action = job_class || job.payload_object.class.name
+          action = job_class || job.payload_object.class.name
 
-            ::Airbrake.notify(exception, params) do |notice|
-              notice[:context][:component] = 'delayed_job'
-              notice[:context][:action] = action
-            end
+          ::Airbrake.notify(exception, params) do |notice|
+            notice[:context][:component] = 'delayed_job'
+            notice[:context][:action] = action
+          end
 
-            ::Airbrake.notify_queue(
-              queue: action,
-              error_count: 1,
-              timing: 0.01,
-            )
+          ::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
+          raise exception
+        else
+          ::Airbrake.notify_queue(
+            queue: job_class || job.payload_object.class.name,
+            error_count: 0,
+            timing: timing,
+          )
         end
       end
     end

data/lib/airbrake/logger.rb

@@ -9,7 +9,7 @@ module Airbrake
   #
   # @example
   #   # Create a logger like you normally do and decorate it.
-  #   logger = Airbrake::AirbrakeLogger.new(Logger.new(STDOUT))
+  #   logger = Airbrake::AirbrakeLogger.new(Logger.new($stdout))
   #
   #   # Just use the logger like you normally do.
   #   logger.fatal('oops')
@@ -24,6 +24,8 @@ module Airbrake
     attr_reader :airbrake_level
 
     def initialize(logger)
+      super
+
       __setobj__(logger)
       @airbrake_notifier = Airbrake
       self.level = logger.level

data/lib/airbrake/rack/context_filter.rb

@@ -20,14 +20,9 @@ module Airbrake
         context = notice[:context]
 
         context[:url] = request.url
-        context[:userAddr] =
-          if request.respond_to?(:remote_ip)
-            request.remote_ip
-          else
-            request.ip
-          end
         context[:userAgent] = request.user_agent
 
+        add_ip(context, request)
         add_framework_version(context)
 
         controller = request.env['action_controller.instance']
@@ -60,6 +55,15 @@ module Airbrake
             }
           end
       end
+
+      def add_ip(context, request)
+        context[:userAddr] =
+          if request.respond_to?(:remote_ip)
+            request.remote_ip
+          else
+            request.ip
+          end
+      end
     end
   end
 end

data/lib/airbrake/rack/instrumentable.rb

@@ -57,6 +57,7 @@ module Airbrake
         klass.module_exec do
           mod = __airbrake_capture_timing_module__
           mod.module_exec do
+            # rubocop:disable Style/DocumentDynamicEvalDefinition
             module_eval <<-RUBY, __FILE__, __LINE__ + 1
               def #{method_name}(#{args})
                 Airbrake::Rack.capture_timing(#{label.to_s.inspect}) do
@@ -65,6 +66,7 @@ module Airbrake
               end
               #{visibility} :#{method_name}
             RUBY
+            # rubocop:enable Style/DocumentDynamicEvalDefinition
           end
           prepend mod
         end
@@ -83,6 +85,7 @@ module Airbrake
         klass.module_exec do
           alias_method wrapped_method_name, method_name
           remove_method method_name if needs_removal
+          # rubocop:disable Style/DocumentDynamicEvalDefinition
           module_eval <<-RUBY, __FILE__, __LINE__ + 1
             def #{method_name}(#{args})
               Airbrake::Rack.capture_timing(#{label.to_s.inspect}) do
@@ -91,6 +94,7 @@ module Airbrake
             end
             #{visibility} :#{method_name}
           RUBY
+          # rubocop:enable Style/DocumentDynamicEvalDefinition
         end
       end
 

data/lib/airbrake/rack/route_filter.rb

@@ -35,7 +35,7 @@ module Airbrake
       def sinatra_route(request)
         return unless (route = request.env['sinatra.route'])
 
-        route.split(' ').drop(1).join(' ')
+        route.split.drop(1).join(' ')
       end
 
       def action_dispatch_request?(request)

data/lib/airbrake/rails.rb

@@ -11,7 +11,7 @@ module Airbrake
       level = (::Rails.logger ? ::Rails.logger.level : Logger::ERROR)
 
       if ENV['RAILS_LOG_TO_STDOUT'].present?
-        Logger.new(STDOUT, level: level)
+        Logger.new($stdout, level: level)
       else
         Logger.new(::Rails.root.join('log', 'airbrake.log'), level: level)
       end

data/lib/airbrake/shoryuken.rb

@@ -5,10 +5,8 @@ module Airbrake
     # Provides integration with Shoryuken.
     class ErrorHandler
       # rubocop:disable Lint/RescueException
-      def call(worker, queue, _sqs_msg, body)
-        timing = Airbrake::Benchmark.measure do
-          yield
-        end
+      def call(worker, queue, _sqs_msg, body, &block)
+        timing = Airbrake::Benchmark.measure(&block)
       rescue Exception => exception
         notify_airbrake(exception, worker, queue, body)
         Airbrake.notify_queue(

data/lib/airbrake/sidekiq.rb

@@ -6,10 +6,8 @@ module Airbrake
   module Sidekiq
     # Provides integration with Sidekiq v2+.
     class ErrorHandler
-      def call(_worker, context, _queue)
-        timing = Airbrake::Benchmark.measure do
-          yield
-        end
+      def call(_worker, context, _queue, &block)
+        timing = Airbrake::Benchmark.measure(&block)
       rescue Exception => exception # rubocop:disable Lint/RescueException
         notify_airbrake(exception, context)
         Airbrake.notify_queue(
@@ -38,7 +36,7 @@ module Airbrake
       # @return [String] job's name. When ActiveJob is present, retrieve
       #   job_class. When used directly, use worker's name
       def action(context)
-        klass = context['class'] || context[:job] && context[:job]['class']
+        klass = context['class'] || (context[:job] && context[:job]['class'])
         return klass unless context[:job] && context[:job]['args'].first.is_a?(Hash)
         return klass unless (job_class = context[:job]['args'].first['job_class'])
 

data/lib/airbrake/sneakers.rb

@@ -48,24 +48,22 @@ module Airbrake
       define_method(
         ::Sneakers::Worker.method_defined?(:process_work) ? :process_work : :do_work,
       ) do |delivery_info, metadata, msg, handler|
-        begin
-          timing = Airbrake::Benchmark.measure do
-            super(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,
-          )
+        timing = Airbrake::Benchmark.measure do
+          super(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

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

data/lib/generators/airbrake_generator.rb

@@ -3,22 +3,19 @@
 # Creates the Airbrake initializer file for Rails apps.
 #
 # @example Invokation from terminal
-#   rails generate airbrake PROJECT_KEY PROJECT_ID [NAME]
+#   rails generate airbrake [NAME]
 #
 class AirbrakeGenerator < Rails::Generators::Base
   # Adds current directory to source paths, so we can find the template file.
   source_root File.expand_path(__dir__)
 
-  argument :project_id, required: false
-  argument :project_key, required: false
-
   # Makes the NAME option optional, which allows to subclass from Base, so we
   # can pass arguments to the ERB template.
   #
-  # @see http://asciicasts.com/episodes/218-making-generators-in-rails-3
+  # @see https://asciicasts.com/episodes/218-making-generators-in-rails-3.html
   argument :name, type: :string, default: 'application'
 
-  desc 'Configures the Airbrake notifier with your project id and project key'
+  desc 'Configures the Airbrake notifier'
   def generate_layout
     template 'airbrake_initializer.rb.erb', 'config/initializers/airbrake.rb'
   end

data/lib/generators/airbrake_initializer.rb.erb

@@ -1,80 +1,80 @@
 # 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
-# changes. Airbrake enables for easy categorization, searching, and prioritization
-# of exceptions so that when errors occur, your team can quickly determine the
-# root cause.
+# 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
+# changes. Airbrake enables for easy categorization, searching, and
+# prioritization of exceptions so that when errors occur, your team can quickly
+# determine the root cause.
 #
 # Configuration details:
 # https://github.com/airbrake/airbrake-ruby#configuration
-Airbrake.configure do |c|
-  # You must set both project_id & project_key. To find your project_id and
-  # project_key navigate to your project's General Settings and copy the values
-  # from the right sidebar.
-  # https://github.com/airbrake/airbrake-ruby#project_id--project_key
-<% if project_id -%>
-  c.project_id = <%= project_id %>
-<% else -%>
-  c.project_id = ENV['AIRBRAKE_PROJECT_ID']
-<% end -%>
-<% if project_key -%>
-  c.project_key = '<%= project_key %>'
-<% else -%>
-  c.project_key = ENV['AIRBRAKE_API_KEY']
-<% end -%>
+if (project_id = ENV['AIRBRAKE_PROJECT_ID']) &&
+   project_key = (ENV['AIRBRAKE_PROJECT_KEY'] || ENV['AIRBRAKE_API_KEY'])
+  Airbrake.configure do |c|
+    # You must set both project_id & project_key. To find your project_id and
+    # project_key navigate to your project's General Settings and copy the
+    # values from the right sidebar.
+    # https://github.com/airbrake/airbrake-ruby#project_id--project_key
+    c.project_id = project_id
+    c.project_key = project_key
 
-  # Configures the root directory of your project. Expects a String or a
-  # Pathname, which represents the path to your project. Providing this option
-  # helps us to filter out repetitive data from backtrace frames and link to
-  # GitHub files from our dashboard.
-  # https://github.com/airbrake/airbrake-ruby#root_directory
-  c.root_directory = Rails.root
+    # Configures the root directory of your project. Expects a String or a
+    # Pathname, which represents the path to your project. Providing this option
+    # helps us to filter out repetitive data from backtrace frames and link to
+    # GitHub files from our dashboard.
+    # https://github.com/airbrake/airbrake-ruby#root_directory
+    c.root_directory = Rails.root
 
-  # By default, Airbrake Ruby outputs to STDOUT. In Rails apps it makes sense to
-  # use the Rails' logger.
-  # https://github.com/airbrake/airbrake-ruby#logger
-  c.logger = Airbrake::Rails.logger
+    # By default, Airbrake Ruby outputs to STDOUT. In Rails apps it makes sense
+    # to use the Rails' logger.
+    # https://github.com/airbrake/airbrake-ruby#logger
+    c.logger = Airbrake::Rails.logger
 
-  # Configures the environment the application is running in. Helps the Airbrake
-  # dashboard to distinguish between exceptions occurring in different
-  # environments.
-  # NOTE: This option must be set in order to make the 'ignore_environments'
-  # option work.
-  # https://github.com/airbrake/airbrake-ruby#environment
-  c.environment = Rails.env
+    # Configures the environment the application is running in. Helps the
+    # Airbrake dashboard to distinguish between exceptions occurring in
+    # different environments.
+    # NOTE: This option must be set in order to make the 'ignore_environments'
+    # option work.
+    # https://github.com/airbrake/airbrake-ruby#environment
+    c.environment = Rails.env
 
-  # Setting this option allows Airbrake to filter exceptions occurring in
-  # unwanted environments such as :test.
-  # NOTE: This option *does not* work if you don't set the 'environment' option.
-  # https://github.com/airbrake/airbrake-ruby#ignore_environments
-  c.ignore_environments = %w[test]
+    # Setting this option allows Airbrake to filter exceptions occurring in
+    # unwanted environments such as :test.  NOTE: This option *does not* work if
+    # you don't set the 'environment' option.
+    # https://github.com/airbrake/airbrake-ruby#ignore_environments
+    c.ignore_environments = %w[test]
 
-  # 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#blocklist_keys
-  c.blocklist_keys = [/password/i, /authorization/i]
+    # 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#blocklist_keys
+    c.blocklist_keys = [/password/i, /authorization/i]
 
-  # Alternatively, you can integrate with Rails' filter_parameters.
-  # Read more: https://goo.gl/gqQ1xS
-  # c.blocklist_keys = Rails.application.config.filter_parameters
-end
+    # Alternatively, you can integrate with Rails' filter_parameters.
+    # Read more: https://goo.gl/gqQ1xS
+    # c.blocklist_keys = Rails.application.config.filter_parameters
+  end
 
-# A filter that collects request body information. Enable it if you are sure you
-# don't send sensitive information to Airbrake in your body (such as passwords).
-# https://github.com/airbrake/airbrake#requestbodyfilter
-# Airbrake.add_filter(Airbrake::Rack::RequestBodyFilter.new)
+  # A filter that collects request body information. Enable it if you are sure you
+  # don't send sensitive information to Airbrake in your body (such as passwords).
+  # https://github.com/airbrake/airbrake#requestbodyfilter
+  # Airbrake.add_filter(Airbrake::Rack::RequestBodyFilter.new)
 
-# Attaches thread & fiber local variables along with general thread information.
-# Airbrake.add_filter(Airbrake::Filters::ThreadFilter.new)
+  # Attaches thread & fiber local variables along with general thread information.
+  # Airbrake.add_filter(Airbrake::Filters::ThreadFilter.new)
 
-# Attaches loaded dependencies to the notice object
-# (under context/versions/dependencies).
-# Airbrake.add_filter(Airbrake::Filters::DependencyFilter.new)
+  # Attaches loaded dependencies to the notice object
+  # (under context/versions/dependencies).
+  # Airbrake.add_filter(Airbrake::Filters::DependencyFilter.new)
 
-# If you want to convert your log messages to Airbrake errors, we offer an
-# integration with the Logger class from stdlib.
-# https://github.com/airbrake/airbrake#logger
-# Rails.logger = Airbrake::AirbrakeLogger.new(Rails.logger)
+  # If you want to convert your log messages to Airbrake errors, we offer an
+  # integration with the Logger class from stdlib.
+  # https://github.com/airbrake/airbrake#logger
+  # Rails.logger = Airbrake::AirbrakeLogger.new(Rails.logger)
+else
+  Rails.logger.warn(
+    "#{__FILE__}: Airbrake project id or project key is not set. " \
+    "Skipping Airbrake configuration"
+  )
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 11.0.3
+  version: 12.0.0
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-13 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -137,33 +137,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sneakers
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -262,20 +248,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: ethon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement
@@ -300,16 +272,16 @@ dependencies:
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.8'
 description: |
   Airbrake is an online tool that provides robust exception tracking in any of
   your Ruby applications. In doing so, it allows you to easily review errors, tie
@@ -386,14 +358,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Airbrake is an online tool that provides robust exception tracking in any