rollbar 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55ced1d6252f0c0b4881f16dc7ff96ca6bc2c62c
-  data.tar.gz: 1b014694a4e209dc360f771f2b78157c1dae993c
+  metadata.gz: 7162276edce6487cb188a1ae5b7bacfd690f5f8f
+  data.tar.gz: d9f6433968083985d404cc46ce34d5607e46b7ff
 SHA512:
-  metadata.gz: bdd18fce475312ed6945d0c1ce3a6500dd58abde4bfefef007dc22124fc3a72dc7289e52719865b9e637720a409bb9dc63c44e04a2b6ebf9dacfc2f49707dbee
-  data.tar.gz: 7856923253bb7ad7e7fb396bd607d50c2bcffcd50dda2c559a37b910be3bac58f1655ef771235816c5ad4ab2f5aca35d64af76655cadf217a95929ece7010504
+  metadata.gz: f689341a99194085a8f73f2e28c52dbce73ed44ad0bf9e81066cfd3aa7ca90e4a2ef071dd1c1e07ecb1ae80b6141f2fc5c901f7293baea0dfe64c048f4dec355
+  data.tar.gz: 447bfcd210fa8bd59eb05ee72cd53fa6a623019f76dd4c14eefd0e015c0a336e427b6f6dd7e432779199fc9fc76485c0cdd8cc1e4d7785b89d8fed5e11020889

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.4.0
+
+Possible breaking changes:
+
+- `exception_level_filters` is now applied only to "uncaught" errors (i.e. those detected by middlewares) but not to direct calls to `Rollbar.error`. If you were previously using `Rollbar.error` (or `Rollbar.warning`, etc.), the new behavior is *probably* desirable, but if it isn't, you can get the old behavior via `Rollbar.error(e, :use_exception_level_filters => true)`. The middlewares that ship with the gem also now pass this new flag.
+
 ## 1.3.2
 
 Bug fixes:

data/README.md

@@ -1,4 +1,4 @@
-# Rollbar notifier for Ruby [![Build Status](https://api.travis-ci.org/rollbar/rollbar-gem.svg?branch=v1.3.2)](https://travis-ci.org/rollbar/rollbar-gem/branches)
+# Rollbar notifier for Ruby [![Build Status](https://api.travis-ci.org/rollbar/rollbar-gem.svg?branch=v1.4.0)](https://travis-ci.org/rollbar/rollbar-gem/branches)
 
 <!-- RemoveNext -->
 Ruby gem for reporting exceptions, errors, and log messages to [Rollbar](https://rollbar.com).
@@ -9,7 +9,7 @@ Ruby gem for reporting exceptions, errors, and log messages to [Rollbar](https:/
 
 Add this line to your application's Gemfile:
 
-    gem 'rollbar', '~> 1.3.2'
+    gem 'rollbar', '~> 1.4.0'
 
 And then execute:
 
@@ -294,6 +294,12 @@ By default, all uncaught exceptions are reported at the "error" level, except fo
 
 If you'd like to customize this list, see the example code in ```config/initializers/rollbar.rb```. Supported levels: "critical", "error", "warning", "info", "debug", "ignore". Set to "ignore" to cause the exception not to be reported at all.
 
+This behavior applies to uncaught exceptions, not direct calls to `Rollbar.error()`, `Rollbar.warning()`, etc. If you are making a direct call to one of the log methods and want exception level filters to apply, pass an extra keyword argument:
+
+```ruby
+Rollbar.error(exception, :use_exception_level_filters => true)
+```
+
 ## Silencing exceptions at runtime
 
 If you just want to disable exception reporting for a single block, use ```Rollbar.silenced```:

data/lib/rollbar/better_errors.rb

@@ -15,7 +15,7 @@ module BetterErrors
         controller = env['action_controller.instance']
         request_data = controller.rollbar_request_data rescue nil
         person_data = controller.rollbar_person_data rescue nil
-        exception_data = Rollbar.scope(:request => request_data, :person => person_data).error(exception)
+        exception_data = Rollbar.scope(:request => request_data, :person => person_data).error(exception, :use_exception_level_filters => true)
       rescue => e
         Rollbar.log_warning "[Rollbar] Exception while reporting exception to Rollbar: #{e}"
       end

data/lib/rollbar/delayed_job.rb

@@ -10,7 +10,7 @@ module Rollbar
         rescue Exception => e
           if job.attempts >= ::Rollbar.configuration.dj_threshold
             data = ::Rollbar.configuration.report_dj_data ? job : nil
-            ::Rollbar.scope(:request => data).error(e)
+            ::Rollbar.scope(:request => data).error(e, :use_exception_level_filters => true)
           end
           raise e
         end

data/lib/rollbar/exception_reporter.rb

@@ -4,7 +4,7 @@ module Rollbar
       exception_message = exception.respond_to?(:message) ? exception.message : 'No Exception Message'
       Rollbar.log_debug "[Rollbar] Reporting exception: #{exception_message}"
 
-      exception_data = Rollbar.log(Rollbar.configuration.uncaught_exception_level, exception)
+      exception_data = Rollbar.log(Rollbar.configuration.uncaught_exception_level, exception, :use_exception_level_filters => true)
 
       if exception_data.is_a?(Hash)
         env['rollbar.exception_uuid'] = exception_data[:uuid]

data/lib/rollbar/goalie.rb

@@ -1,7 +1,7 @@
 module Goalie
   class CustomErrorPages
     alias_method :orig_render_exception, :render_exception
-    
+
     private
 
     def render_exception(env, exception)
@@ -10,7 +10,7 @@ module Goalie
         controller = env['action_controller.instance']
         request_data = controller.rollbar_request_data rescue nil
         person_data = controller.rollbar_person_data rescue nil
-        exception_data = Rollbar.scope(:request => request_data, :person => person_data).error(exception)
+        exception_data = Rollbar.scope(:request => request_data, :person => person_data).error(exception, :use_exception_level_filters => true)
       rescue => e
         Rollbar.log_warning "[Rollbar] Exception while reporting exception to Rollbar: #{e}"
       end

data/lib/rollbar/rake.rb

@@ -9,7 +9,7 @@ module Rollbar
         alias_method :orig_display_error_message, :display_error_message
 
         def display_error_message(ex)
-          Rollbar.error(ex)
+          Rollbar.error(ex, :use_exception_level_filters => true)
           orig_display_error_message(ex)
         end
       end

data/lib/rollbar/sidekiq.rb

@@ -12,7 +12,7 @@ if Sidekiq::VERSION < '3'
           params = msg.reject{ |k| PARAM_BLACKLIST.include?(k) }
           scope = { :request => { :params => params } }
 
-          Rollbar.scope(scope).error(e)
+          Rollbar.scope(scope).error(e, :use_exception_level_filters => true)
           raise
         end
       end
@@ -30,7 +30,7 @@ else
       params = context.reject{ |k| PARAM_BLACKLIST.include?(k) }
       scope = { :request => { :params => params } }
 
-      Rollbar.scope(scope).error(e)
+      Rollbar.scope(scope).error(e, :use_exception_level_filters => true)
     end
   end
 end

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "1.3.2"
+  VERSION = "1.4.0"
 end

data/lib/rollbar.rb

@@ -125,10 +125,14 @@ module Rollbar
         end
       end
 
-      return 'ignored' if ignored?(exception)
+      use_exception_level_filters = extra && extra.delete(:use_exception_level_filters) == true
 
-      exception_level = filtered_level(exception)
-      level = exception_level if exception_level
+      return 'ignored' if ignored?(exception, use_exception_level_filters)
+
+      if use_exception_level_filters
+        exception_level = filtered_level(exception)
+        level = exception_level if exception_level
+      end
 
       begin
         report(level, message, exception, extra)
@@ -193,9 +197,9 @@ module Rollbar
 
     private
 
-    def ignored?(exception)
+    def ignored?(exception, use_exception_level_filters = false)
       return false unless exception
-      return true if filtered_level(exception) == 'ignore'
+      return true if use_exception_level_filters && filtered_level(exception) == 'ignore'
       return true if exception.instance_variable_get(:@_rollbar_do_not_report)
 
       false
@@ -762,7 +766,7 @@ module Rollbar
       scope[:person] = person_data if person_data
 
       Rollbar.scoped(scope) do
-        Rollbar.notifier.log(level, exception)
+        Rollbar.notifier.log(level, exception, :use_exception_level_filters => true)
       end
     end
 

data/spec/rollbar/delayed_job_spec.rb

@@ -32,8 +32,12 @@ describe Rollbar::Delayed, :reconfigure_notifier => true do
     Delayed::Worker.backend = DummyBackend::Job
   end
 
+  let(:expected_args) do
+    [kind_of(FailingJob::TestException), { :use_exception_level_filters => true}]
+  end
+
   it 'sends the exception' do
-    expect_any_instance_of(Rollbar::Notifier).to receive(:error).with(kind_of(FailingJob::TestException))
+    expect_any_instance_of(Rollbar::Notifier).to receive(:error).with(*expected_args)
 
     expect do
       Delayed::Job.enqueue(FailingJob.new)

data/spec/rollbar/middleware/rack/builder_spec.rb

@@ -26,7 +26,7 @@ describe Rollbar::Middleware::Rack::Builder, :reconfigure_notifier => true do
   let(:uncaught_level) { Rollbar.configuration.uncaught_exception_level }
 
   it 'reports the error to Rollbar' do
-    expect(Rollbar).to receive(:log).with(uncaught_level, exception)
+    expect(Rollbar).to receive(:log).with(uncaught_level, exception, :use_exception_level_filters => true)
     expect { request.get('/will_crash') }.to raise_error(exception)
   end
 

data/spec/rollbar/middleware/sinatra_spec.rb

@@ -42,7 +42,7 @@ describe Rollbar::Middleware::Sinatra, :reconfigure_notifier => true do
   end
 
   let(:expected_report_args) do
-    [uncaught_level, exception]
+    [uncaught_level, exception, { :use_exception_level_filters => true }]
   end
 
   describe '#call' do

data/spec/rollbar/rake_spec.rb

@@ -12,7 +12,7 @@ describe Rollbar::Rake do
 
     it 'reports error to Rollbar' do
       expect(Rollbar::Rake).not_to receive(:skip_patch)
-      expect(Rollbar).to receive(:error).with(exception)
+      expect(Rollbar).to receive(:error).with(exception, :use_exception_level_filters => true)
       expect(application).to receive(:orig_display_error_message).with(exception)
 
       Rollbar::Rake.patch! # Really here Rake is already patched

data/spec/rollbar_bc_spec.rb

@@ -276,7 +276,7 @@ describe Rollbar do
       Rollbar.last_report.should_not be_nil
     end
 
-    it 'should allow callables to set exception filtered level' do
+    it 'should allow callables to set exception filtered level with :use_exception_level_filters option' do
       callable_mock = double
       Rollbar.configure do |config|
         config.exception_level_filters = { 'NameError' => callable_mock }

data/spec/rollbar_spec.rb

@@ -731,25 +731,48 @@ describe Rollbar do
       Rollbar.error(exception).should == 'disabled'
     end
 
-    it 'should ignore ignored exception classes' do
-      Rollbar.configure do |config|
-        config.exception_level_filters = { 'NameError' => 'ignore' }
+    context 'using :use_exception_level_filters option as true' do
+      it 'sends the correct filtered level' do
+        Rollbar.configure do |config|
+          config.exception_level_filters = { 'NameError' => 'warning' }
+        end
+
+        Rollbar.error(exception, :use_exception_level_filters => true)
+        expect(Rollbar.last_report[:level]).to be_eql('warning')
       end
 
-      logger_mock.should_not_receive(:info)
-      logger_mock.should_not_receive(:warn)
-      logger_mock.should_not_receive(:error)
+      it 'ignore ignored exception classes' do
+        Rollbar.configure do |config|
+          config.exception_level_filters = { 'NameError' => 'ignore' }
+        end
 
-      Rollbar.error(exception)
+        logger_mock.should_not_receive(:info)
+        logger_mock.should_not_receive(:warn)
+        logger_mock.should_not_receive(:error)
+
+        Rollbar.error(exception, :use_exception_level_filters => true)
+      end
     end
 
-    it 'sends the correct filtered level' do
-      Rollbar.configure do |config|
-        config.exception_level_filters = { 'NameError' => 'warning' }
+    context 'if not using :use_exception_level_filters option' do
+      it 'sends the level defined by the used method' do
+        Rollbar.configure do |config|
+          config.exception_level_filters = { 'NameError' => 'warning' }
+        end
+
+        Rollbar.error(exception)
+        expect(Rollbar.last_report[:level]).to be_eql('error')
       end
 
-      Rollbar.error(exception)
-      expect(Rollbar.last_report[:level]).to be_eql('warning')
+      it 'ignore ignored exception classes' do
+        Rollbar.configure do |config|
+          config.exception_level_filters = { 'NameError' => 'ignore' }
+        end
+
+        Rollbar.error(exception)
+
+        expect(Rollbar.last_report[:level]).to be_eql('error')
+      end
     end
 
     it "should work with an IO object as rack.errors" do
@@ -813,6 +836,7 @@ describe Rollbar do
     it 'should allow callables to set exception filtered level' do
       callable_mock = double
       saved_filters = Rollbar.configuration.exception_level_filters
+
       Rollbar.configure do |config|
         config.exception_level_filters = { 'NameError' => callable_mock }
       end
@@ -822,7 +846,7 @@ describe Rollbar do
       logger_mock.should_not_receive(:warn)
       logger_mock.should_not_receive(:error)
 
-      Rollbar.error(exception)
+      Rollbar.error(exception, :use_exception_level_filters => true)
     end
 
     it 'should not report exceptions when silenced' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json