airbrake 5.2.3 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37c591519802f031d50d9436d0574a31cd0a9a2c
-  data.tar.gz: ab00bbd5f8f8ae62467fe06926a9c45f65d723e0
+  metadata.gz: a96428e2bedf218d51dbfa97b0a45dc64dd80346
+  data.tar.gz: 08300938d9bb375d0a7422e45bb540d8d67fe2ad
 SHA512:
-  metadata.gz: 730b23edf1a791669aae0d976758012107df564acda93da1765463b82eb5a21fc83f0b66e667c4acfe1358d013dfe55d43c7601d8012ee3a4f2a3671ddf4e66a
-  data.tar.gz: 1097e9a4877b4f79ceb319387a80ddc7674d8db8938ad937bd7775aa4e056f2d18f88caff20916fbd7c7c299480aeeacabc10731fa19dddb3baf7b0d1ed833f5
+  metadata.gz: a390a0c5451cbf3cd25a8f381780c20693359837b8c8fafe39e47c42d320d64ad00e8f0d46e4294515698fd81c6973551d18b57605ebbc8c61d9452679c80471
+  data.tar.gz: 361d10bbe6a3592ea1dd0eaedeb6f8551600026ebbc8586f06f359c14e0024d0d2e091027a0be9250201992878f5cba32673ce563498610c07acae4ce6e27a4b

data/lib/airbrake/rack/middleware.rb

@@ -36,6 +36,8 @@ module Airbrake
 
       def notify_airbrake(exception, env)
         notice = NoticeBuilder.new(env).build_notice(exception)
+        return unless notice
+
         Airbrake.notify(notice)
       end
 

data/lib/airbrake/rack/notice_builder.rb

@@ -39,7 +39,8 @@ module Airbrake
       # @param [Exception] exception
       # @return [Airbrake::Notice] the notice with extra information
       def build_notice(exception)
-        notice = Airbrake.build_notice(exception)
+        return unless (notice = Airbrake.build_notice(exception))
+
         NoticeBuilder.builders.each { |builder| builder.call(notice, @request) }
         notice
       end

data/lib/airbrake/rails/action_controller.rb

@@ -13,7 +13,8 @@ module Airbrake
       # Attaches information from the Rack env.
       # @see Airbrake#notify, #notify_airbrake_sync
       def notify_airbrake(exception, parameters = {}, notifier = :default)
-        Airbrake.notify(build_notice(exception), parameters, notifier)
+        return unless (notice = build_notice(exception))
+        Airbrake.notify(notice, parameters, notifier)
       end
 
       ##
@@ -21,7 +22,8 @@ module Airbrake
       # Attaches information from the Rack env.
       # @see Airbrake#notify_sync, #notify_airbrake
       def notify_airbrake_sync(exception, parameters = {}, notifier = :default)
-        Airbrake.notify_sync(build_notice(exception), parameters, notifier)
+        return unless (notice = build_notice(exception))
+        Airbrake.notify_sync(notice, parameters, notifier)
       end
 
       ##

data/lib/airbrake/rails/active_job.rb

@@ -6,15 +6,27 @@ module Airbrake
       extend ActiveSupport::Concern
 
       included do
+        if ::Rails.application.config.respond_to?(:active_job)
+          active_job_cfg = ::Rails.application.config.active_job
+          is_resque_adapter = (active_job_cfg.queue_adapter == :resque)
+        end
+
         rescue_from(Exception) do |exception|
-          notice = Airbrake.build_notice(exception)
+          next unless (notice = Airbrake.build_notice(exception))
 
           notice[:context][:component] = 'active_job'
           notice[:context][:action] = self.class.name
 
           notice[:params] = as_json
 
-          Airbrake.notify(notice)
+          # We special case Resque because it kills our workers by forking, so
+          # we use synchronous delivery instead.
+          if is_resque_adapter
+            Airbrake.notify_sync(notice)
+          else
+            Airbrake.notify(notice)
+          end
+
           raise exception
         end
       end

data/lib/airbrake/rake/task_ext.rb

@@ -18,7 +18,16 @@ module Rake
     def execute(args = nil)
       execute_without_airbrake(args)
     rescue Exception => ex
-      notice = Airbrake.build_notice(ex)
+      notify_airbrake(ex, args)
+      raise ex
+    end
+    # rubocop:enable Lint/RescueException
+
+    private
+
+    def notify_airbrake(exception, args)
+      return unless (notice = Airbrake.build_notice(exception))
+
       notice[:context][:component] = 'rake'
       notice[:context][:action] = name
       notice[:params] = {
@@ -28,11 +37,7 @@ module Rake
       }
 
       Airbrake.notify_sync(notice)
-      raise ex
     end
-    # rubocop:enable Lint/RescueException
-
-    private
 
     # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize
     def task_info

data/lib/airbrake/version.rb

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

data/lib/generators/airbrake_initializer.rb.erb

@@ -51,7 +51,6 @@ Airbrake.configure do |c|
   # 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.

data/spec/apps/rails/logs/50.log

@@ -0,0 +1,19 @@
+# Logfile created on 2016-05-10 16:31:24 +0300 by logger.rb/53141
+D, [2016-05-10T16:31:25.086078 #98450] DEBUG -- :    (0.3ms)  CREATE TABLE "books" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar) 
+D, [2016-05-10T16:31:25.090933 #98450] DEBUG -- :    (0.1ms)  CREATE TABLE "delayed_jobs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "priority" integer DEFAULT 0 NOT NULL, "attempts" integer DEFAULT 0 NOT NULL, "handler" text NOT NULL, "last_error" text, "run_at" datetime, "locked_at" datetime, "failed_at" datetime, "locked_by" varchar, "queue" varchar, "created_at" datetime, "updated_at" datetime) 
+D, [2016-05-10T16:31:25.091415 #98450] DEBUG -- :    (0.3ms)  select sqlite_version(*)
+D, [2016-05-10T16:31:25.091748 #98450] DEBUG -- :    (0.1ms)  CREATE  INDEX "delayed_jobs_priority" ON "delayed_jobs" ("priority", "run_at")
+D, [2016-05-10T16:31:25.093052 #98450] DEBUG -- :    (0.1ms)  CREATE TABLE "ar_internal_metadata" ("key" varchar PRIMARY KEY, "value" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+D, [2016-05-10T16:31:25.100105 #98450] DEBUG -- :   ActiveRecord::InternalMetadata Load (0.1ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" ORDER BY "ar_internal_metadata"."key" ASC LIMIT ?  [["LIMIT", 1]]
+D, [2016-05-10T16:31:25.104885 #98450] DEBUG -- :    (0.0ms)  begin transaction
+D, [2016-05-10T16:31:25.105700 #98450] DEBUG -- :   SQL (0.1ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["key", "environment"], ["value", "test"], ["created_at", 2016-05-10 13:31:25 UTC], ["updated_at", 2016-05-10 13:31:25 UTC]]
+D, [2016-05-10T16:31:25.105852 #98450] DEBUG -- :    (0.0ms)  commit transaction
+D, [2016-05-10T16:31:45.880344 #98591] DEBUG -- :    (0.3ms)  CREATE TABLE "books" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar) 
+D, [2016-05-10T16:31:45.884666 #98591] DEBUG -- :    (0.1ms)  CREATE TABLE "delayed_jobs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "priority" integer DEFAULT 0 NOT NULL, "attempts" integer DEFAULT 0 NOT NULL, "handler" text NOT NULL, "last_error" text, "run_at" datetime, "locked_at" datetime, "failed_at" datetime, "locked_by" varchar, "queue" varchar, "created_at" datetime, "updated_at" datetime) 
+D, [2016-05-10T16:31:45.884858 #98591] DEBUG -- :    (0.0ms)  select sqlite_version(*)
+D, [2016-05-10T16:31:45.885162 #98591] DEBUG -- :    (0.1ms)  CREATE  INDEX "delayed_jobs_priority" ON "delayed_jobs" ("priority", "run_at")
+D, [2016-05-10T16:31:45.886357 #98591] DEBUG -- :    (0.1ms)  CREATE TABLE "ar_internal_metadata" ("key" varchar PRIMARY KEY, "value" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+D, [2016-05-10T16:31:45.893923 #98591] DEBUG -- :   ActiveRecord::InternalMetadata Load (0.1ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" ORDER BY "ar_internal_metadata"."key" ASC LIMIT ?  [["LIMIT", 1]]
+D, [2016-05-10T16:31:45.900088 #98591] DEBUG -- :    (0.1ms)  begin transaction
+D, [2016-05-10T16:31:45.901437 #98591] DEBUG -- :   SQL (0.1ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["key", "environment"], ["value", "test"], ["created_at", 2016-05-10 13:31:45 UTC], ["updated_at", 2016-05-10 13:31:45 UTC]]
+D, [2016-05-10T16:31:45.901639 #98591] DEBUG -- :    (0.0ms)  commit transaction

data/spec/integration/rails/rails_spec.rb

@@ -101,6 +101,24 @@ RSpec.describe "Rails integration specs" do
           with(body: /"message":"active_job error"/)
         ).to have_been_made.at_least_once
       end
+
+      context "when Airbrake is not configured" do
+        it "doesn't report errors" do
+          allow(Airbrake).to receive(:build_notice).and_return(nil)
+          allow(Airbrake).to receive(:notify)
+
+          get '/active_job'
+          sleep 2
+
+          wait_for(
+            a_request(:post, endpoint).
+            with(body: /"message":"active_job error"/)
+          ).not_to have_been_made
+
+          expect(Airbrake).to have_received(:build_notice)
+          expect(Airbrake).not_to have_received(:notify)
+        end
+      end
     end
   end
 

data/spec/unit/rack/middleware_spec.rb

@@ -77,4 +77,17 @@ RSpec.describe Airbrake::Rack::Middleware do
       expect(response[2]).to eq('Bingo bango content')
     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 { 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)
+    end
+  end
 end

data/spec/unit/rack/notice_builder_spec.rb

@@ -79,5 +79,15 @@ RSpec.describe Airbrake::Rack::NoticeBuilder do
       notice = notice_builder.build_notice(AirbrakeTestError.new)
       expect(notice[:params][:remoteIp]).to eq("127.0.0.1")
     end
+
+    context "when Airbrake is not configured" do
+      it "returns nil" do
+        allow(Airbrake).to receive(:build_notice).and_return(nil)
+        notice_builder = described_class.new('bingo' => 'bango')
+
+        expect(notice_builder.build_notice('bongo')).to be_nil
+        expect(Airbrake).to have_received(:build_notice)
+      end
+    end
   end
 end

data/spec/unit/rake/tasks_spec.rb

@@ -32,8 +32,7 @@ RSpec.describe "airbrake/rake/tasks" do
      %w(username john),
      %w(revision 123abcdef),
      %w(repository https://github.com/airbrake/airbrake'),
-     %w(version v2.0)
-    ].each do |(key, val)|
+     %w(version v2.0)].each do |(key, val)|
       include_examples 'deploy payload', key, val
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: 5.3.0
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-05-11 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.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +188,7 @@ files:
 - spec/apps/rails/dummy_app.rb
 - spec/apps/rails/dummy_task.rake
 - spec/apps/rails/logs/42.log
+- spec/apps/rails/logs/50.log
 - spec/apps/sinatra/dummy_app.rb
 - spec/integration/rack/rack_spec.rb
 - spec/integration/rails/rails_spec.rb
@@ -231,6 +232,7 @@ test_files:
 - spec/apps/rails/dummy_app.rb
 - spec/apps/rails/dummy_task.rake
 - spec/apps/rails/logs/42.log
+- spec/apps/rails/logs/50.log
 - spec/apps/sinatra/dummy_app.rb
 - spec/integration/rack/rack_spec.rb
 - spec/integration/rails/rails_spec.rb