Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Configuration#use_exception_level_filters option #588

Merged
merged 2 commits into from
May 5, 2017
Merged

Add Configuration#use_exception_level_filters option #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3a890b
Add Configuration#use_exception_level_filters_default option
Apr 19, 2017
aa96d4f
add one more test
rokob May 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ gem 'rspec-rails', '~> 3.4'
gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]

gem 'oj', '~> 2.12.14' unless is_jruby
gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'

if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
gem 'sidekiq', '>= 2.13.0', '< 5.0'
else
gem 'sidekiq', '>= 2.13.0'
end

platforms :rbx do
gem 'minitest'
Expand Down
6 changes: 6 additions & 0 deletions docs/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,12 @@ installed, uses `girl_friday`, otherwise defaults to `Thread`.
When `true` indicates you wish to send data to Rollbar with `eventmachine`.
Won't work unless `eventmachine` is installed.

### use_exception_level_filters_default

**Default** `false`

When `true` the notifier will use the `exception_level_filters` when reporting. It can be overriden using `:use_exception_level_filters` option. see [Exception level filters](https://github.com/rollbar/rollbar-gem#exception-level-filters)

### web_base

**Default** `'https://rollbar.com'`
Expand Down
8 changes: 7 additions & 1 deletion gemfiles/rails30.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@ gem 'rspec-rails', '>= 2.14.0'
gem 'celluloid', '< 0.17.0' if RUBY_VERSION == '1.9.2'

gem 'oj', '~> 2.12.14' unless is_jruby
gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
if RUBY_VERSION > '1.8.7'
if RUBY_VERSION < '2.2.2'
gem 'sidekiq', '>= 2.13.0', '< 5.0'
else
gem 'sidekiq', '>= 2.13.0'
end
end

platforms :rbx do
gem 'minitest'
Expand Down
6 changes: 5 additions & 1 deletion gemfiles/rails31.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
gem 'sidekiq', '< 2.13.0'
else
gem 'webmock', :require => false
gem 'sidekiq', '>= 2.13.0'
if RUBY_VERSION < '2.2.2'
gem 'sidekiq', '>= 2.13.0', '< 5.0'
else
gem 'sidekiq', '>= 2.13.0'
end
end

gem 'resque'
Expand Down
6 changes: 5 additions & 1 deletion gemfiles/rails32.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
gem 'test-unit'

gem 'oj', '~> 2.12.14' unless is_jruby
gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
gem 'sidekiq', '>= 2.13.0', '< 5.0'
else
gem 'sidekiq', '>= 2.13.0'
end

platforms :rbx do
gem 'minitest'
Expand Down
6 changes: 5 additions & 1 deletion gemfiles/rails40.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
gem 'test-unit'

gem 'oj', '~> 2.12.14' unless is_jruby
gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
gem 'sidekiq', '>= 2.13.0', '< 5.0'
else
gem 'sidekiq', '>= 2.13.0'
end

platforms :rbx do
gem 'minitest'
Expand Down
6 changes: 5 additions & 1 deletion gemfiles/rails41.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ gem 'rspec-rails', '~> 3.4'
gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]

gem 'oj', '~> 2.12.14' unless is_jruby
gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
gem 'sidekiq', '>= 2.13.0', '< 5.0'
else
gem 'sidekiq', '>= 2.13.0'
end

platforms :rbx do
gem 'minitest'
Expand Down
6 changes: 5 additions & 1 deletion gemfiles/rails42.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ gem 'rake'
gem 'rspec-rails', '~> 3.4'
gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]

gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
gem 'sidekiq', '>= 2.13.0', '< 5.0'
else
gem 'sidekiq', '>= 2.13.0'
end

platforms :rbx do
gem 'minitest'
Expand Down
6 changes: 5 additions & 1 deletion gemfiles/rails50.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ gem 'rspec-mocks', '~> 3.5.0.beta3'
gem 'rake'

gem 'oj', '~> 2.12.14' unless is_jruby
gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
gem 'sidekiq', '>= 2.13.0', '< 5.0'
else
gem 'sidekiq', '>= 2.13.0'
end

platforms :rbx do
gem 'minitest'
Expand Down
6 changes: 4 additions & 2 deletions gemfiles/ruby_1_8_and_1_9_2.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_

gem 'appraisal', '= 1.0.2'
gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
gem 'celluloid', '< 0.17.0' if RUBY_VERSION == '1.9.2'
gem 'hitimes', '< 1.2.2'
gem 'jruby-openssl', :platform => :jruby
gem 'rails', '3.0.20'
Expand All @@ -15,7 +14,9 @@ gem 'rspec-rails', '>= 2.14.0'
gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]

gem 'oj', '~> 2.12.14' unless is_jruby
gem 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
gem 'sidekiq', '>= 2.13.0', '< 5.0'
end

platforms :rbx do
gem 'minitest'
Expand All @@ -25,6 +26,7 @@ platforms :rbx do
end

if RUBY_VERSION.start_with?('1.9')
gem 'celluloid', '< 0.17.0'
gem 'sucker_punch', '~> 1.0'
elsif RUBY_VERSION.start_with?('2')
gem 'sucker_punch', '~> 2.0'
Expand Down
2 changes: 2 additions & 0 deletions lib/rollbar/configuration.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ class Configuration
attr_accessor :web_base
attr_accessor :write_to_file
attr_reader :send_extra_frame_data
attr_accessor :use_exception_level_filters_default

attr_reader :project_gem_paths

Expand Down Expand Up @@ -116,6 +117,7 @@ def initialize
@write_to_file = false
@send_extra_frame_data = :none
@project_gem_paths = []
@use_exception_level_filters_default = false
end

def initialize_copy(orig)
Expand Down
10 changes: 9 additions & 1 deletion lib/rollbar/notifier.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def log(level, *args)
return 'disabled' unless configuration.enabled

message, exception, extra = extract_arguments(args)
use_exception_level_filters = extra && extra.delete(:use_exception_level_filters) == true
use_exception_level_filters = use_exception_level_filters?(extra)

return 'ignored' if ignored?(exception, use_exception_level_filters)

Expand Down Expand Up @@ -291,6 +291,14 @@ def send_failsafe(message, exception, uuid = nil, host = nil)

private

def use_exception_level_filters?(options)
option_value = options && options.delete(:use_exception_level_filters)

return option_value unless option_value.nil?

configuration.use_exception_level_filters_default
end

def call_before_process(options)
options = {
:level => options[:level],
Expand Down
86 changes: 86 additions & 0 deletions spec/rollbar_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,92 @@
Rollbar.error(exception).should == 'disabled'
end

context 'using configuration.use_exception_level_filters_default' do
before do
Rollbar.configure do |config|
config.use_exception_level_filters_default = true
end
end

context 'without use_exception_level_filters argument' do
it 'sends the correct filtered level' do
Rollbar.configure do |config|
config.exception_level_filters = { 'NameError' => 'warning' }
end

Rollbar.error(exception)

expect(Rollbar.last_report[:level]).to be_eql('warning')
end

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is missing a test when config.use_exception_level_filters_default = true has been set, and when :use_exception_level_filters => false is passed in with the Rollbar.error call.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added one

it 'ignore ignored exception classes' do
Rollbar.configure do |config|
config.exception_level_filters = { 'NameError' => 'ignore' }
end

logger_mock.should_not_receive(:info)
logger_mock.should_not_receive(:warn)
logger_mock.should_not_receive(:error)

Rollbar.error(exception)
end

it 'should not use the filters if overriden at log site' do
Rollbar.configure do |config|
config.exception_level_filters = { 'NameError' => 'ignore' }
end

Rollbar.error(exception, :use_exception_level_filters => false)

expect(Rollbar.last_report[:level]).to be_eql('error')
end
end
end

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

it 'ignore ignored exception classes' do
Rollbar.configure do |config|
config.exception_level_filters = { 'NameError' => 'ignore' }
end

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

context 'using :use_exception_level_filters option as false' 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 => false)
expect(Rollbar.last_report[:level]).to be_eql('error')
end

it 'ignore ignored exception classes' do
Rollbar.configure do |config|
config.exception_level_filters = { 'NameError' => 'ignore' }
end

Rollbar.error(exception, :use_exception_level_filters => false)

expect(Rollbar.last_report[:level]).to be_eql('error')
end
end
end

context 'using :use_exception_level_filters option as true' do
it 'sends the correct filtered level' do
Rollbar.configure do |config|
Expand Down