airbrake 9.2.1 → 9.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10b37a9a2800aa301044ab10d4886a1f3c505287
-  data.tar.gz: e930fa9ea09846007c8890e173bb948792953f6b
+  metadata.gz: 2c238934628051f11250e289d3c226c8480bd3ae
+  data.tar.gz: fcfd36d25c4280006f64c049422c968b6ca24cae
 SHA512:
-  metadata.gz: 04d6316c3f2332a44829c44892f913a1c6c09d0779fed70b2872d414e711a1a04cb7e62acc51ee9c1b037f5fe8f7f93d7debf2e0dbfd3552f62ec67dccabfcee
-  data.tar.gz: d00ea1b0d2137bce44df884aa0973bd44a9a0185e0a0e6e305c715c4d24f3f6fe4d4351d37ca38d3cc260af620a93ea2516fd303fb55d137f4fbc7e6b09801ee
+  metadata.gz: 1f4b6f4e2aa13eeb7d3cedfc4ed912893f9c0bafa88053aefb0a8d1794cc301ac88bc401c5a443e5185919e25a2739afde708d925fd1301703054066e67ed584
+  data.tar.gz: 891f4da4c53e22dd462db6e92ccca26dd83d956c7fc524dbad83d9d2be07dd583c639d4f26857c659ee5c5ec7531592a5be91b45b8394f322c71e7080dfbd64c

data/lib/airbrake/rack/middleware.rb

@@ -26,13 +26,12 @@ module Airbrake
       #
       # @param [Hash] env the Rack environment
       def call!(env)
-        # Rails hooks such as ActionControllerRouteSubscriber rely on this.
-        RequestStore[:routes] = {}
+        before_call(env)
 
         begin
           response = @app.call(env)
         rescue Exception => ex # rubocop:disable Lint/RescueException
-          notify_airbrake(ex, env)
+          notify_airbrake(ex)
           raise ex
         ensure
           # Clear routes for the next request.
@@ -40,27 +39,36 @@ module Airbrake
         end
 
         exception = framework_exception(env)
-        notify_airbrake(exception, env) if exception
+        notify_airbrake(exception) if exception
 
         response
       end
 
       private
 
-      def notify_airbrake(exception, env)
+      def before_call(env)
+        # Rails hooks such as ActionControllerRouteSubscriber rely on this.
+        RequestStore[:routes] = {}
+        RequestStore[:request] = find_request(env)
+      end
+
+      def find_request(env)
+        if defined?(ActionDispatch::Request)
+          ActionDispatch::Request.new(env)
+        elsif defined?(Sinatra::Request)
+          Sinatra::Request.new(env)
+        else
+          ::Rack::Request.new(env)
+        end
+      end
+
+      def notify_airbrake(exception)
         notice = Airbrake.build_notice(exception)
         return unless notice
 
         # ActionDispatch::Request correctly captures server port when using SSL:
         # See: https://github.com/airbrake/airbrake/issues/802
-        notice.stash[:rack_request] =
-          if defined?(ActionDispatch::Request)
-            ActionDispatch::Request.new(env)
-          elsif defined?(Sinatra::Request)
-            Sinatra::Request.new(env)
-          else
-            ::Rack::Request.new(env)
-          end
+        notice.stash[:rack_request] = RequestStore[:request]
 
         Airbrake.notify(notice)
       end

data/lib/airbrake/rails/action_controller_performance_breakdown_subscriber.rb

@@ -9,20 +9,38 @@ module Airbrake
         return if !routes || routes.none?
 
         event = Airbrake::Rails::Event.new(*args)
+        stash = build_stash
 
         routes.each do |route, params|
           groups = event.groups.merge(params[:groups])
           next if groups.none?
 
-          Airbrake.notify_performance_breakdown(
+          breakdown_info = {
             method: event.method,
             route: route,
             response_type: event.response_type,
             groups: groups,
             start_time: event.time
-          )
+          }
+
+          Airbrake.notify_performance_breakdown(breakdown_info, stash)
         end
       end
+
+      private
+
+      def build_stash
+        stash = {}
+        request = Airbrake::Rack::RequestStore[:request]
+        return stash unless request
+
+        stash[:request] = request
+        if (user = Airbrake::Rack::User.extract(request.env))
+          stash.merge!(user.as_json)
+        end
+
+        stash
+      end
     end
   end
 end

data/lib/airbrake/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 9.2.1
+  version: 9.2.2
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-01 00:00:00.000000000 Z
+date: 2019-05-10 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.3'
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -373,44 +373,6 @@ files:
 - lib/airbrake/version.rb
 - lib/generators/airbrake_generator.rb
 - lib/generators/airbrake_initializer.rb.erb
-- spec/apps/rack/dummy_app.rb
-- spec/apps/rails/dummy_app.rb
-- spec/apps/rails/dummy_task.rake
-- spec/apps/rails/logs/32.log
-- spec/apps/rails/logs/42.log
-- spec/apps/rails/logs/52.log
-- spec/apps/sinatra/sinatra_test_app.rb
-- spec/integration/rack/rack_spec.rb
-- spec/integration/rails/rails_spec.rb
-- spec/integration/rails/rake_spec.rb
-- spec/integration/shared_examples/rack_examples.rb
-- spec/integration/sinatra/sinatra_spec.rb
-- spec/spec_helper.rb
-- spec/support/matchers/a_notice_with.rb
-- spec/unit/logger_spec.rb
-- spec/unit/rack/context_filter_spec.rb
-- spec/unit/rack/http_headers_filter_spec.rb
-- spec/unit/rack/http_params_filter_spec.rb
-- spec/unit/rack/instrumentable_spec.rb
-- spec/unit/rack/middleware_spec.rb
-- spec/unit/rack/rack_spec.rb
-- spec/unit/rack/request_body_filter_spec.rb
-- spec/unit/rack/request_store_spec.rb
-- spec/unit/rack/route_filter_spec.rb
-- spec/unit/rack/session_filter_spec.rb
-- spec/unit/rack/user_filter_spec.rb
-- spec/unit/rack/user_spec.rb
-- spec/unit/rails/action_cable/notify_callback_spec.rb
-- spec/unit/rails/action_controller_notify_subscriber_spec.rb
-- spec/unit/rails/action_controller_performance_breakdown_subscriber_spec.rb
-- spec/unit/rails/action_controller_route_subscriber_spec.rb
-- spec/unit/rails/active_record_subscriber_spec.rb
-- spec/unit/rails/excon_spec.rb
-- spec/unit/rake/tasks_spec.rb
-- spec/unit/shoryuken_spec.rb
-- spec/unit/sidekiq/retryable_jobs_filter_spec.rb
-- spec/unit/sidekiq_spec.rb
-- spec/unit/sneakers_spec.rb
 homepage: https://airbrake.io
 licenses:
 - MIT
@@ -436,42 +398,4 @@ signing_key:
 specification_version: 4
 summary: Airbrake is an online tool that provides robust exception tracking in any
   of your Ruby applications.
-test_files:
-- spec/spec_helper.rb
-- spec/unit/sidekiq/retryable_jobs_filter_spec.rb
-- spec/unit/logger_spec.rb
-- spec/unit/rake/tasks_spec.rb
-- spec/unit/sidekiq_spec.rb
-- spec/unit/shoryuken_spec.rb
-- spec/unit/sneakers_spec.rb
-- spec/unit/rack/request_store_spec.rb
-- spec/unit/rack/request_body_filter_spec.rb
-- spec/unit/rack/http_params_filter_spec.rb
-- spec/unit/rack/http_headers_filter_spec.rb
-- spec/unit/rack/rack_spec.rb
-- spec/unit/rack/middleware_spec.rb
-- spec/unit/rack/session_filter_spec.rb
-- spec/unit/rack/context_filter_spec.rb
-- spec/unit/rack/user_filter_spec.rb
-- spec/unit/rack/instrumentable_spec.rb
-- spec/unit/rack/user_spec.rb
-- spec/unit/rack/route_filter_spec.rb
-- spec/unit/rails/action_controller_performance_breakdown_subscriber_spec.rb
-- spec/unit/rails/active_record_subscriber_spec.rb
-- spec/unit/rails/action_cable/notify_callback_spec.rb
-- spec/unit/rails/action_controller_notify_subscriber_spec.rb
-- spec/unit/rails/action_controller_route_subscriber_spec.rb
-- spec/unit/rails/excon_spec.rb
-- spec/integration/sinatra/sinatra_spec.rb
-- spec/integration/rack/rack_spec.rb
-- spec/integration/shared_examples/rack_examples.rb
-- spec/integration/rails/rake_spec.rb
-- spec/integration/rails/rails_spec.rb
-- spec/support/matchers/a_notice_with.rb
-- spec/apps/sinatra/sinatra_test_app.rb
-- spec/apps/rack/dummy_app.rb
-- spec/apps/rails/dummy_task.rake
-- spec/apps/rails/dummy_app.rb
-- spec/apps/rails/logs/42.log
-- spec/apps/rails/logs/52.log
-- spec/apps/rails/logs/32.log
+test_files: []

data/spec/apps/rack/dummy_app.rb

@@ -1,17 +0,0 @@
-DummyApp = Rack::Builder.new do
-  use Rack::ShowExceptions
-  use Airbrake::Rack::Middleware
-  use Warden::Manager
-
-  map '/' do
-    run(
-      proc do |_env|
-        [200, { 'Content-Type' => 'text/plain' }, ['Hello from index']]
-      end
-    )
-  end
-
-  map '/crash' do
-    run(proc { |_env| raise AirbrakeTestError })
-  end
-end

data/spec/apps/rails/dummy_app.rb

@@ -1,258 +0,0 @@
-require 'curb' unless Airbrake::JRUBY
-require 'excon'
-
-class DummyApp < Rails::Application
-  # Rails requires these two keys.
-  config.session_store :cookie_store, key: 'jiez4Mielu1AiHugog3shiiPhe3lai3faer'
-  config.secret_token = 'ni6aeph6aeriBiphesh8omahv6cohpue5Quah5ceiMohtuvei8'
-
-  if Gem::Version.new(Rails.version) > Gem::Version.new('3.2.0')
-    config.secret_key_base = '62773890cad9d9d584b57320f8612f8f7378a90aadcabc6ee'
-  end
-
-  # Configure a logger, without it the tests can't run.
-  vsn = Rails.version.split('').values_at(0, 2).join('')
-  log_path = File.join(File.dirname(__FILE__), 'logs', "#{vsn}.log")
-  config.logger = Logger.new(log_path)
-  Rails.logger = config.logger
-
-  config.active_support.deprecation = :stderr
-
-  config.middleware.use Warden::Manager
-
-  # In Rails 4.2.x Active Record suppresses errors raised within
-  # 'after_rollback' & 'after_commit' callbacks and only print them to the
-  # logs. In the next version, these errors will no longer be suppressed.
-  # Instead, the errors will propagate normally just like in other Active Record
-  # callbacks.
-  config.active_record.raise_in_transactional_callbacks = true if vsn == '42'
-
-  # Silences the warning, which says 'config.eager_load is set to nil'.
-  config.eager_load = false
-
-  routes.append do
-    get '/' => 'dummy#index'
-    get '/crash' => 'dummy#crash'
-    get '/breakdown' => 'dummy#breakdown'
-    get '/breakdown_view_only' => 'dummy#breakdown_view_only'
-    get '/breakdown_http' => 'dummy#breakdown_http'
-    get '/breakdown_curl_http' => 'dummy#breakdown_curl_http'
-    get '/breakdown_curl_http_easy' => 'dummy#breakdown_curl_http_easy'
-    get '/breakdown_curl_http_multi' => 'dummy#breakdown_curl_http_multi'
-    get '/breakdown_excon' => 'dummy#breakdown_excon'
-    get '/breakdown_http_rb' => 'dummy#breakdown_http_rb'
-    get '/breakdown_http_client' => 'dummy#breakdown_http_client'
-    get '/breakdown_typhoeus' => 'dummy#breakdown_typhoeus'
-    get '/notify_airbrake_helper' => 'dummy#notify_airbrake_helper'
-    get '/notify_airbrake_sync_helper' => 'dummy#notify_airbrake_sync_helper'
-    get '/active_record_after_commit' => 'dummy#active_record_after_commit'
-    get '/active_record_after_rollback' => 'dummy#active_record_after_rollback'
-    get '/active_job' => 'dummy#active_job'
-    get '/resque' => 'dummy#resque'
-    get '/delayed_job' => 'dummy#delayed_job'
-  end
-end
-
-class Book < ActiveRecord::Base
-  after_commit :raise_error_after_commit
-  after_rollback :raise_error_after_rollback
-
-  def raise_error_after_commit
-    raise AirbrakeTestError, 'after_commit'
-  end
-
-  def raise_error_after_rollback
-    raise AirbrakeTestError, 'after_rollback'
-  end
-end
-
-# ActiveJob.
-if Gem::Version.new(Rails.version) >= Gem::Version.new('4.2')
-  class BingoJob < ActiveJob::Base
-    queue_as :bingo
-
-    class BingoWrapper
-      def initialize(bingo)
-        @bingo = bingo
-      end
-    end
-
-    def perform(*_args)
-      @wrapper = BingoWrapper.new(self)
-      raise AirbrakeTestError, 'active_job error'
-    end
-  end
-end
-
-# Resque.
-class BingoWorker
-  @queue = :bingo_workers_queue
-
-  def self.perform(_bango, _bongo)
-    raise AirbrakeTestError, 'resque error'
-  end
-end
-
-# DelayedJob.
-BangoJob = Struct.new(:bingo, :bongo) do
-  def perform
-    raise AirbrakeTestError, 'delayed_job error'
-  end
-end
-
-class DummyController < ActionController::Base
-  layout 'application'
-
-  self.view_paths = [
-    ActionView::FixtureResolver.new(
-      'layouts/application.html.erb' => '<%= yield %>',
-      'dummy/index.html.erb' => 'Hello from index',
-      'dummy/notify_airbrake_helper.html.erb' => 'notify_airbrake_helper',
-      'dummy/notify_airbrake_sync_helper.html.erb' => 'notify_airbrake_helper_sync',
-      'dummy/active_record_after_commit.html.erb' => 'active_record_after_commit',
-      'dummy/active_record_after_rollback.html.erb' => 'active_record_after_rollback',
-      'dummy/active_job.html.erb' => 'active_job',
-      'dummy/resque.html.erb' => 'resque',
-      'dummy/delayed_job.html.erb' => 'delayed_job',
-      'dummy/breakdown.html.erb' => 'breakdown',
-      'dummy/breakdown_view_only.html.erb' => 'breakdown_view_only',
-      'dummy/breakdown_http.html.erb' => 'breakdown_http',
-      'dummy/breakdown_curl_http.html.erb' => 'breakdown_curl_http',
-      'dummy/breakdown_curl_http_easy.html.erb' => 'breakdown_curl_http_easy',
-      'dummy/breakdown_curl_http_multi.html.erb' => 'breakdown_curl_http_multi',
-      'dummy/breakdown_excon.erb' => 'breakdown_excon',
-      'dummy/breakdown_http_rb.erb' => 'breakdown_http_rb',
-      'dummy/breakdown_http_client.erb' => 'breakdown_http_client',
-      'dummy/breakdown_typhoeus.erb' => 'breakdown_typhoeus'
-    )
-  ]
-
-  def index; end
-
-  def crash
-    Book.create(title: 'book')
-    raise AirbrakeTestError
-  end
-
-  def breakdown
-    Book.create(title: 'breakdown')
-    Book.all
-  end
-
-  def breakdown_view_only
-    render 'dummy/breakdown.html.erb'
-  end
-
-  def breakdown_http
-    Net::HTTP.get('example.com', '/')
-    render 'dummy/breakdown_http.html.erb'
-  end
-
-  def breakdown_curl_http
-    Curl.get('example.com')
-    render 'dummy/breakdown_curl_http.html.erb'
-  end
-
-  def breakdown_curl_http_easy
-    Curl::Easy.perform('example.com')
-    render 'dummy/breakdown_curl_http_easy.html.erb'
-  end
-
-  def breakdown_curl_http_multi
-    Curl::Multi.get(['example.com'])
-    render 'dummy/breakdown_curl_http_multi.html.erb'
-  end
-
-  def breakdown_excon
-    Excon.get('http://example.com')
-    render 'dummy/breakdown_excon.html.erb'
-  end
-
-  def breakdown_http_rb
-    HTTP.get('http://example.com')
-    render 'dummy/breakdown_http_rb.html.erb'
-  end
-
-  def breakdown_http_client
-    HTTPClient.new.get('http://example.com')
-    render 'dummy/breakdown_http_client.html.erb'
-  end
-
-  def breakdown_typhoeus
-    Typhoeus.get('example.com')
-    render 'dummy/breakdown_typhoeus.html.erb'
-  end
-
-  def notify_airbrake_helper
-    notify_airbrake(AirbrakeTestError.new)
-  end
-
-  def notify_airbrake_sync_helper
-    notify_airbrake_sync(AirbrakeTestError.new)
-  end
-
-  def active_record_after_commit
-    Book.create(title: 'Bingo')
-  end
-
-  def active_record_after_rollback
-    Book.transaction do
-      Book.create(title: 'Bango')
-      raise ActiveRecord::Rollback
-    end
-  end
-
-  def active_job
-    BingoJob.perform_later('bango', 'bongo')
-  end
-
-  def resque
-    Resque.enqueue(BingoWorker, 'bango', 'bongo')
-  end
-
-  def delayed_job
-    Delayed::Job.enqueue(BangoJob.new('bingo', 'bongo'))
-  end
-end
-
-# Initializes middlewares and such.
-DummyApp.initialize!
-
-ActiveRecord::Base.connection.create_table(:books) do |t|
-  t.string(:title)
-end
-
-ActiveRecord::Migration.verbose = false
-
-# Modified version of: https://goo.gl/q8uCJq
-migration_template = File.open(
-  File.join(
-    $LOAD_PATH.grep(/delayed_job/)[0],
-    'generators/delayed_job/templates/migration.rb'
-  )
-)
-
-# need to eval the template with the migration_version intact
-migration_context = Class.new do
-  # rubocop:disable Naming/AccessorMethodName
-  def get_binding
-    binding
-  end
-  # rubocop:enable Naming/AccessorMethodName
-
-  def migration_version
-    return unless ActiveRecord::VERSION::MAJOR >= 5
-    "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
-  end
-end
-
-migration_ruby =
-  ERB.new(migration_template.read).result(migration_context.new.get_binding)
-migration_template.close
-# rubocop:disable Security/Eval
-eval(migration_ruby)
-# rubocop:enable Security/Eval
-
-ActiveRecord::Schema.define do
-  CreateDelayedJobs.up
-end