airbrake 5.7.1 → 5.8.0.rc.1

data/spec/integration/rails/rails_spec.rb

@@ -141,6 +141,11 @@ RSpec.describe "Rails integration specs" do
       end
 
       context "when Airbrake is not configured" do
+        before do
+          # Make sure the Logger intergration doesn't get in the way.
+          allow_any_instance_of(Logger).to receive(:airbrake_notifier).and_return(nil)
+        end
+
         it "doesn't report errors" do
           allow(Airbrake).to receive(:build_notice).and_return(nil)
           allow(Airbrake).to receive(:notify)
@@ -216,6 +221,11 @@ RSpec.describe "Rails integration specs" do
     end
 
     context "when Airbrake is not configured" do
+      before do
+        # Make sure the Logger intergration doesn't get in the way.
+        allow_any_instance_of(Logger).to receive(:airbrake_notifier).and_return(nil)
+      end
+
       it "doesn't report errors" do
         allow(Airbrake).to receive(:build_notice).and_return(nil)
         allow(Airbrake).to receive(:notify)

data/spec/integration/shared_examples/rack_examples.rb

@@ -12,6 +12,9 @@ RSpec.shared_examples 'rack examples' do
   end
 
   before do
+    # Make sure the Logger integration doesn't get in the way.
+    allow_any_instance_of(Logger).to receive(:airbrake_notifier).and_return(nil)
+
     stub_request(:post, endpoint).to_return(status: 201, body: '{}')
   end
 

data/spec/unit/logger/logger_ext_spec.rb

@@ -0,0 +1,113 @@
+require 'spec_helper'
+
+RSpec.describe Logger do
+  let(:project_id) { 113743 }
+  let(:project_key) { 'fd04e13d806a90f96614ad8e529b2822' }
+
+  let(:endpoint) do
+    "https://airbrake.io/api/v3/projects/#{project_id}/notices?key=#{project_key}"
+  end
+
+  let(:airbrake) do
+    Airbrake::Notifier.new(project_id: project_id, project_key: project_key)
+  end
+
+  let(:logger) { Logger.new('/dev/null') }
+
+  def wait_for_a_request_with_body(body)
+    wait_for(a_request(:post, endpoint).with(body: body)).to have_been_made.once
+  end
+
+  before do
+    stub_request(:post, endpoint).to_return(status: 201, body: '{}')
+  end
+
+  describe "#airbrake" do
+    it "has the default notifier installed by default" do
+      expect(logger.airbrake_notifier).to be_an(Airbrake::Notifier)
+    end
+
+    it "installs Airbrake notifier" do
+      notifier_id = airbrake.object_id
+      expect(logger.airbrake_notifier.object_id).not_to eq(notifier_id)
+
+      logger.airbrake_notifier = airbrake
+      expect(logger.airbrake_notifier.object_id).to eq(notifier_id)
+    end
+  end
+
+  context "when Airbrake is installed" do
+    let(:out) { StringIO.new }
+    let(:logger) { Logger.new(out) }
+
+    before do
+      logger.airbrake_notifier = airbrake
+    end
+
+    it "both logs and notifies" do
+      msg = 'bingo'
+      logger.fatal(msg)
+
+      wait_for_a_request_with_body(/"message":"#{msg}"/)
+      expect(out.string).to match(/FATAL -- : #{msg}/)
+    end
+
+    it "sets the correct severity" do
+      logger.fatal('bango')
+      wait_for_a_request_with_body(/"context":{.*"severity":"critical".*}/)
+    end
+
+    it "sets the correct component" do
+      logger.fatal('bingo')
+      wait_for_a_request_with_body(/"component":"log"/)
+    end
+
+    it "strips out internal logger frames" do
+      logger.fatal('bongo')
+
+      wait_for(
+        a_request(:post, endpoint).
+        with(body: %r{"file":".+/logger.rb"})
+      ).not_to have_been_made
+      wait_for(a_request(:post, endpoint)).to have_been_made.once
+    end
+  end
+
+  describe "#airbrake_severity_level" do
+    context "when not set" do
+      it "defaults to Logger::WARN" do
+        expect(logger.airbrake_severity_level).to eq(Logger::WARN)
+      end
+    end
+
+    context "when set" do
+      before do
+        logger.airbrake_severity_level = Logger::FATAL
+      end
+
+      it "does not notify below the specified level" do
+        logger.error('bingo')
+        wait_for(a_request(:post, endpoint)).not_to have_been_made
+      end
+
+      it "notifies in the current or above level" do
+        logger.fatal('bingo')
+        wait_for(a_request(:post, endpoint)).to have_been_made
+      end
+    end
+  end
+
+  context "when Airbrake is not installed" do
+    it "only logs, never notifies" do
+      out = StringIO.new
+      l = Logger.new(out)
+      l.airbrake_notifier = nil
+      msg = 'bango'
+
+      l.fatal(msg)
+
+      wait_for(a_request(:post, endpoint)).not_to have_been_made
+      expect(out.string).to match('FATAL -- : bango')
+    end
+  end
+end

data/spec/unit/rack/middleware_spec.rb

@@ -51,7 +51,7 @@ RSpec.describe Airbrake::Rack::Middleware do
           stub_request(:post, bingo_endpoint).to_return(status: 201, body: '{}')
         end
 
-        after { Airbrake.close(notifier_name) }
+        after { Airbrake[notifier_name].close }
 
         it "notifies via the specified notifier" do
           expect do
@@ -123,14 +123,14 @@ RSpec.describe Airbrake::Rack::Middleware do
 
   context "when Airbrake is not configured" do
     it "returns nil" do
-      allow(Airbrake).to receive(:build_notice).and_return(nil)
-      allow(Airbrake).to receive(:notify)
+      allow(Airbrake[:default]).to receive(:build_notice).and_return(nil)
+      allow(Airbrake[:default]).to receive(:notify)
 
       expect { described_class.new(faulty_app).call(env_for('/')) }.
         to raise_error(AirbrakeTestError)
 
-      expect(Airbrake).to have_received(:build_notice)
-      expect(Airbrake).not_to have_received(:notify)
+      expect(Airbrake[:default]).to have_received(:build_notice)
+      expect(Airbrake[:default]).not_to have_received(:notify)
     end
   end
 end

data/spec/unit/shoryuken/error_handler_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+require 'airbrake/shoryuken/error_handler'
+
+RSpec.describe Airbrake::Shoryuken::ErrorHandler do
+  let(:error) { AirbrakeTestError.new('shoryuken error') }
+  let(:body) { { message: 'message' } }
+  let(:queue) { 'foo_queue' }
+  let(:worker) do
+    Class.new do
+      def self.to_s
+        'FooWorker'
+      end
+    end.new
+  end
+  let(:endpoint) do
+    'https://airbrake.io/api/v3/projects/113743/notices?key=fd04e13d806a90f96614ad8e529b2822'
+  end
+
+  def wait_for_a_request_with_body(body)
+    wait_for(a_request(:post, endpoint).with(body: body)).to have_been_made.once
+  end
+
+  before do
+    stub_request(:post, endpoint).to_return(status: 201, body: '{}')
+  end
+
+  context "when there's an error" do
+    it 'notifies' do
+      expect do
+        subject.call(worker, queue, nil, body) { raise error }
+      end.to raise_error(error)
+
+      wait_for_a_request_with_body(/"message":"shoryuken\serror"/)
+      wait_for_a_request_with_body(/"params":{.*"queue":"#{queue}"/)
+      wait_for_a_request_with_body(/"params":{.*"body":\{"message":"message"\}/)
+      wait_for_a_request_with_body(/"component":"shoryuken","action":"FooWorker"/)
+    end
+
+    context "and it's a batch" do
+      let(:body) { [{ message1: 'message1' }, { message2: 'message2' }] }
+
+      it 'notifies' do
+        expect do
+          subject.call(worker, queue, nil, body) { raise error }
+        end.to raise_error(error)
+
+        wait_for_a_request_with_body(/"message":"shoryuken\serror"/)
+        wait_for_a_request_with_body(/"params":{.*"queue":"#{queue}"/)
+        wait_for_a_request_with_body(
+          /"params":{.*"batch":\[\{"message1":"message1"\},\{"message2":"message2"\}\]/
+        )
+        wait_for_a_request_with_body(/"component":"shoryuken","action":"FooWorker"/)
+      end
+    end
+  end
+
+  context 'when Airbrake is not configured' do
+    it 'returns nil' do
+      allow(Airbrake).to receive(:build_notice).and_return(nil)
+      allow(Airbrake).to receive(:notify)
+
+      expect do
+        subject.call(worker, queue, nil, body) { raise error }
+      end.to raise_error(error)
+
+      expect(Airbrake).to have_received(:build_notice)
+      expect(Airbrake).not_to have_received(:notify)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 5.7.1
+  version: 5.8.0.rc.1
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -187,8 +187,8 @@ description: |
   determine the root cause.
 
   Additionally, this gem includes integrations with such popular libraries and
-  frameworks as Rails, Sinatra, Resque, Sidekiq, Delayed Job, ActiveJob and many
-  more.
+  frameworks as Rails, Sinatra, Resque, Sidekiq, Delayed Job, Shoryuken,
+  ActiveJob and many more.
 email: support@airbrake.io
 executables: []
 extensions: []
@@ -197,6 +197,7 @@ files:
 - lib/airbrake.rb
 - lib/airbrake/capistrano/tasks.rb
 - lib/airbrake/delayed_job/plugin.rb
+- lib/airbrake/logger/logger_ext.rb
 - lib/airbrake/rack/context_filter.rb
 - lib/airbrake/rack/http_headers_filter.rb
 - lib/airbrake/rack/http_params_filter.rb
@@ -211,6 +212,7 @@ files:
 - lib/airbrake/rake/task_ext.rb
 - lib/airbrake/rake/tasks.rb
 - lib/airbrake/resque/failure.rb
+- lib/airbrake/shoryuken/error_handler.rb
 - lib/airbrake/sidekiq/error_handler.rb
 - lib/airbrake/version.rb
 - lib/generators/airbrake_generator.rb
@@ -233,6 +235,7 @@ files:
 - spec/integration/sinatra/sinatra_spec.rb
 - spec/spec_helper.rb
 - spec/unit/airbrake_spec.rb
+- spec/unit/logger/logger_ext_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
@@ -241,6 +244,7 @@ files:
 - spec/unit/rack/session_filter_spec.rb
 - spec/unit/rack/user_spec.rb
 - spec/unit/rake/tasks_spec.rb
+- spec/unit/shoryuken/error_handler_spec.rb
 - spec/unit/sidekiq/error_handler_spec.rb
 homepage: https://airbrake.io
 licenses:
@@ -257,9 +261,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8
@@ -286,6 +290,7 @@ test_files:
 - spec/integration/sinatra/sinatra_spec.rb
 - spec/spec_helper.rb
 - spec/unit/airbrake_spec.rb
+- spec/unit/logger/logger_ext_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
@@ -294,4 +299,5 @@ test_files:
 - spec/unit/rack/session_filter_spec.rb
 - spec/unit/rack/user_spec.rb
 - spec/unit/rake/tasks_spec.rb
+- spec/unit/shoryuken/error_handler_spec.rb
 - spec/unit/sidekiq/error_handler_spec.rb