Merge branch 'master' into patch-1

Author: brianr

lib/rollbar/notifier.rb

@@ -607,26 +607,25 @@ def send_using_eventmachine(body)
     def eventmachine_callback(req)
       req.callback do
         if req.response_header.status == 200
-          log_info '[Rollbar] Success'
+          log_debug '[Rollbar] Success'
         else
           log_warning '[Rollbar] Got unexpected status code from Rollbar.io api: ' \
-            "#{req.response_header.status}"
-          log_info "[Rollbar] Response: #{req.response}"
+            "#{req.response_header.status}, response: #{req.response}"
         end
       end
     end
 
     def eventmachine_errback(req)
       req.errback do
         log_warning(
-          "[Rollbar] Call to API failed, status code: #{req.response_header.status}"
+          "[Rollbar] Call to API failed, status code: #{req.response_header.status}, "\
+            "response: #{req.response}"
         )
-        log_info "[Rollbar] Error's response: #{req.response}"
       end
     end
 
     def send_item(item)
-      log_info '[Rollbar] Sending item'
+      log_debug '[Rollbar] Sending item'
 
       body = item.dump
       return unless body
@@ -640,7 +639,7 @@ def send_item(item)
     end
 
     def send_body(body)
-      log_info '[Rollbar] Sending json'
+      log_debug '[Rollbar] Sending json'
 
       uri = URI.parse(configuration.endpoint)
 
@@ -750,12 +749,12 @@ def handle_net_retries
 
     def handle_response(response)
       if response.code == '200'
-        log_info '[Rollbar] Success'
+        log_debug '[Rollbar] Success'
       else
         log_warning(
-          "[Rollbar] Got unexpected status code from Rollbar api: #{response.code}"
+          "[Rollbar] Got unexpected status code from Rollbar api: #{response.code}, " \
+            "response: #{response.body}"
         )
-        log_info "[Rollbar] Response: #{response.body}"
         configuration.execute_hook(:on_error_response, response)
       end
     end
@@ -769,7 +768,7 @@ def ssl_verify_mode
     end
 
     def do_write_item(item)
-      log_info '[Rollbar] Writing item to file'
+      log_debug '[Rollbar] Writing item to file'
 
       body = item.dump
       return unless body
@@ -783,7 +782,7 @@ def do_write_item(item)
         @file.flush
         update_file(@file, file_name)
 
-        log_info '[Rollbar] Success'
+        log_debug '[Rollbar] Success'
       rescue IOError => e
         log_error "[Rollbar] Error opening/writing to file: #{e}"
       end
@@ -846,7 +845,7 @@ def failsafe_body(reason)
     def schedule_item(item)
       return unless item
 
-      log_info '[Rollbar] Scheduling item'
+      log_debug '[Rollbar] Scheduling item'
 
       if configuration.use_async
         process_async_item(item)

spec/controllers/home_controller_spec.rb

@@ -249,22 +249,22 @@ def send_req(meth, path, args)
 
   describe "GET 'index'" do
     it 'should be successful and report two messages' do
-      logger_mock.should_receive(:info).with('[Rollbar] Success').twice
+      logger_mock.should_receive(:debug).with('[Rollbar] Success').twice
       get 'index'
       expect(response.status).to eq(200)
     end
   end
 
   describe "'report_exception'", :type => 'request' do
     it 'should raise a NameError and report an exception after a GET' do
-      logger_mock.should_receive(:info).with('[Rollbar] Success').once
+      logger_mock.should_receive(:debug).with('[Rollbar] Success').once
 
       get '/report_exception'
       expect(response.status).to eq(200)
     end
 
     it 'should raise a NameError and have PUT params in the reported exception' do
-      logger_mock.should_receive(:info).with('[Rollbar] Success')
+      logger_mock.should_receive(:debug).with('[Rollbar] Success')
 
       send_req(:put, '/report_exception', wrap_process_args(:putparam => 'putval'))
 
@@ -274,7 +274,7 @@ def send_req(meth, path, args)
 
     context 'using deprecated report_exception' do
       it 'reports the errors successfully' do
-        logger_mock.should_receive(:info).with('[Rollbar] Success')
+        logger_mock.should_receive(:debug).with('[Rollbar] Success')
 
         send_req(:put, '/deprecated_report_exception',
                  wrap_process_args(:putparam => 'putval'))
@@ -285,7 +285,7 @@ def send_req(meth, path, args)
     end
 
     it 'should raise a NameError and have JSON POST params' do
-      logger_mock.should_receive(:info).with('[Rollbar] Success')
+      logger_mock.should_receive(:debug).with('[Rollbar] Success')
       @request.env['HTTP_ACCEPT'] = 'application/json'
 
       params = { :jsonparam => 'jsonval' }.to_json
@@ -316,7 +316,7 @@ def send_req(meth, path, args)
 
     context 'when Rails Error Subscriber is enabled', if: ::Rails.gem_version >= ::Gem::Version.new('7.1.0') do
       it '`handle` should not raise an error and report a warning via rails error subscriber' do
-        logger_mock.should_receive(:info).with('[Rollbar] Success').never
+        logger_mock.should_receive(:debug).with('[Rollbar] Success').never
 
         expect(Rollbar).to receive(:log) do |level, _, extra|
           expect(extra[:custom_data_method_context]).to be_eql('application')
@@ -327,7 +327,7 @@ def send_req(meth, path, args)
       end
 
       it '`handle` should report a warning via rails error subscriber when capture_uncaught is false' do
-        logger_mock.should_receive(:info).with('[Rollbar] Success').never
+        logger_mock.should_receive(:debug).with('[Rollbar] Success').never
 
         Rollbar.configure do |config|
           config.capture_uncaught = false
@@ -342,7 +342,7 @@ def send_req(meth, path, args)
       end
 
       it '`report` should raise an error and report an error via rails error subscriber' do
-        logger_mock.should_receive(:info).with('[Rollbar] Success').never
+        logger_mock.should_receive(:debug).with('[Rollbar] Success').never
 
         expect(Rollbar).to receive(:log) do |level, _, extra|
           expect(extra[:custom_data_method_context]).to be_eql('application')
@@ -355,7 +355,7 @@ def send_req(meth, path, args)
       end
 
       it 'uncaught exception should raise an error and report an error via rails error subscriber' do
-        logger_mock.should_receive(:info).with('[Rollbar] Success').never
+        logger_mock.should_receive(:debug).with('[Rollbar] Success').never
 
         expect(Rollbar).to receive(:log) do |level, _, extra|
           expect(extra[:custom_data_method_context]).to be_eql('application.action_dispatch')
@@ -368,7 +368,7 @@ def send_req(meth, path, args)
       end
 
       it 'uncaught exception should not report an error when capture_uncaught is not set' do
-        logger_mock.should_receive(:info).with('[Rollbar] Success').never
+        logger_mock.should_receive(:debug).with('[Rollbar] Success').never
 
         Rollbar.configure do |config|
           config.capture_uncaught = false
@@ -384,7 +384,7 @@ def send_req(meth, path, args)
 
     context 'when Rails Error Subscriber is enabled in unsupported Rails', if: ::Rails.gem_version < ::Gem::Version.new('7.1.0') do
       it 'uncaught exception should raise an error and report via middleware' do
-        logger_mock.should_receive(:info).with('[Rollbar] Success').once
+        logger_mock.should_receive(:debug).with('[Rollbar] Success').once
 
         expect do
           get '/cause_exception'
@@ -431,7 +431,7 @@ def send_req(meth, path, args)
       end
 
       it 'should include locals in extra data' do
-        logger_mock.should_receive(:info).with('[Rollbar] Success').once
+        logger_mock.should_receive(:debug).with('[Rollbar] Success').once
 
         expect {
           get '/cause_exception_with_locals?test_fibers=true'
@@ -468,7 +468,7 @@ def send_req(meth, path, args)
       end
 
       it 'should not include locals in extra data' do
-        logger_mock.should_receive(:info).with('[Rollbar] Success').once
+        logger_mock.should_receive(:debug).with('[Rollbar] Success').once
 
         expect { get '/cause_exception_with_locals' }.to raise_exception(NoMethodError)
         expect(Rollbar.last_report[:body][:trace][:frames][-1][:locals]).to be_eql(nil)
@@ -478,7 +478,7 @@ def send_req(meth, path, args)
 
   describe "'cause_exception'", :type => 'request' do
     it 'should raise an uncaught exception and report a message' do
-      logger_mock.should_receive(:info).with('[Rollbar] Success').once
+      logger_mock.should_receive(:debug).with('[Rollbar] Success').once
 
       expect { get '/cause_exception' }.to raise_exception(NameError)
     end
@@ -517,7 +517,7 @@ def send_req(meth, path, args)
       end
 
       it 'middleware should catch the exception and only report to rollbar once' do
-        logger_mock.should_receive(:info).with('[Rollbar] Success').once
+        logger_mock.should_receive(:debug).with('[Rollbar] Success').once
 
         get '/cause_exception'
       end

spec/rollbar/middleware/sinatra_spec.rb

@@ -280,7 +280,7 @@ def app
         end
 
         it 'should include locals in extra data' do
-          logger_mock.should_receive(:info).with('[Rollbar] Success').once
+          logger_mock.should_receive(:debug).with('[Rollbar] Success').once
 
           expect { get '/cause_exception_with_locals' }.to raise_exception(NoMethodError)
 
@@ -315,7 +315,7 @@ def app
         end
 
         it 'should not include locals in extra data' do
-          logger_mock.should_receive(:info).with('[Rollbar] Success').once
+          logger_mock.should_receive(:debug).with('[Rollbar] Success').once
 
           expect { get '/cause_exception_with_locals' }.to raise_exception(NoMethodError)
           expect(Rollbar.last_report[:body][:trace][:frames][-1][:locals]).to be_eql(nil)

spec/rollbar_bc_spec.rb

@@ -23,14 +23,14 @@
     end
 
     it 'should report simple messages' do
-      logger_mock.should_receive(:info).with('[Rollbar] Scheduling item')
-      logger_mock.should_receive(:info).with('[Rollbar] Success')
+      logger_mock.should_receive(:debug).with('[Rollbar] Scheduling item')
+      logger_mock.should_receive(:debug).with('[Rollbar] Success')
 
       Rollbar.report_message('Test message')
     end
 
     it 'should not report anything when disabled' do
-      logger_mock.should_not_receive(:info).with('[Rollbar] Success')
+      logger_mock.should_not_receive(:debug).with('[Rollbar] Success')
 
       Rollbar.configure do |config|
         config.enabled = false
@@ -40,7 +40,7 @@
     end
 
     it 'should report messages with extra data' do
-      logger_mock.should_receive(:info).with('[Rollbar] Success')
+      logger_mock.should_receive(:debug).with('[Rollbar] Success')
       Rollbar.report_message(
         'Test message with extra data',
         'debug',
@@ -58,20 +58,20 @@
       expect(logger_mock).to_not receive(:error).with(
         /\[Rollbar\] Reporting internal error encountered while sending data to Rollbar./
       )
-      logger_mock.should_receive(:info).with('[Rollbar] Scheduling item')
-      logger_mock.should_receive(:info).with('[Rollbar] Success')
+      logger_mock.should_receive(:debug).with('[Rollbar] Scheduling item')
+      logger_mock.should_receive(:debug).with('[Rollbar] Success')
 
       Rollbar.error('Test message with circular extra data', a)
     end
 
     it 'should be able to report form validation errors when they are present' do
-      logger_mock.should_receive(:info).with('[Rollbar] Success')
+      logger_mock.should_receive(:debug).with('[Rollbar] Success')
       user.errors.add(:example, 'error')
       user.report_validation_errors_to_rollbar
     end
 
     it 'should not report form validation errors when they are not present' do
-      logger_mock.should_not_receive(:info).with('[Rollbar] Success')
+      logger_mock.should_not_receive(:debug).with('[Rollbar] Success')
       user.errors.clear
       user.report_validation_errors_to_rollbar
     end
@@ -98,8 +98,8 @@
 
     it 'should report simple messages' do
       allow(Rollbar).to receive(:notifier).and_return(notifier)
-      logger_mock.should_receive(:info).with('[Rollbar] Scheduling item')
-      logger_mock.should_receive(:info).with('[Rollbar] Success')
+      logger_mock.should_receive(:debug).with('[Rollbar] Scheduling item')
+      logger_mock.should_receive(:debug).with('[Rollbar] Success')
       Rollbar.report_message_with_request('Test message')
 
       Rollbar.last_report[:request].should be_nil
@@ -109,8 +109,8 @@
     it 'should report messages with request, person data and extra data' do
       Rollbar.last_report = nil
 
-      logger_mock.should_receive(:info).with('[Rollbar] Scheduling item')
-      logger_mock.should_receive(:info).with('[Rollbar] Success')
+      logger_mock.should_receive(:debug).with('[Rollbar] Scheduling item')
+      logger_mock.should_receive(:debug).with('[Rollbar] Success')
 
       request_data = {
         :params => { :foo => 'bar' }
@@ -156,12 +156,12 @@
     let(:logger_mock) { double('Rails.logger').as_null_object }
 
     it 'should report exceptions without person or request data' do
-      logger_mock.should_receive(:info).with('[Rollbar] Success')
+      logger_mock.should_receive(:debug).with('[Rollbar] Success')
       Rollbar.report_exception(@exception)
     end
 
     it 'should not report anything when disabled' do
-      logger_mock.should_not_receive(:info).with('[Rollbar] Success')
+      logger_mock.should_not_receive(:debug).with('[Rollbar] Success')
       Rollbar.configure do |config|
         config.enabled = false
       end
@@ -196,7 +196,12 @@
     end
 
     it 'should report exceptions with request and person data' do
-      logger_mock.should_receive(:info).with('[Rollbar] Success')
+      logger_mock.should_receive(:debug).with('[Rollbar] Success')
+      logger_mock.should_receive(:info).with(
+        a_string_matching(
+          /^\[Rollbar\] Details: \S+ \(only available if report was successful\)$/
+        )
+      ).once
       request_data = {
         :params => { :foo => 'bar' },
         :url => 'http://localhost/',
@@ -217,7 +222,12 @@
     # Skip jruby 1.9+ (https://github.com/jruby/jruby/issues/2373)
     if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' && (RUBY_VERSION !~ /^1\.9/)
       it 'should work with an IO object as rack.errors' do
-        logger_mock.should_receive(:info).with('[Rollbar] Success')
+        logger_mock.should_receive(:debug).with('[Rollbar] Success')
+        logger_mock.should_receive(:info).with(
+          a_string_matching(
+            /^\[Rollbar\] Details: \S+ \(only available if report was successful\)$/
+          )
+        ).once
 
         request_data = {
           :params => { :foo => 'bar' },
@@ -245,6 +255,7 @@
         config.exception_level_filters = { 'NameError' => 'ignore' }
       end
 
+      logger_mock.should_not_receive(:debug)
       logger_mock.should_not_receive(:info)
       logger_mock.should_not_receive(:error)
 
@@ -256,6 +267,7 @@
         config.ignored_person_ids += [1]
       end
 
+      logger_mock.should_not_receive(:debug)
       logger_mock.should_not_receive(:info)
       logger_mock.should_not_receive(:error)
 
@@ -302,7 +314,12 @@
                    .with(@exception)
                    .at_least(:once)
                    .and_return('info')
-      logger_mock.should_receive(:info)
+      logger_mock.should_receive(:debug).with('[Rollbar] Success').once
+      logger_mock.should_receive(:info).with(
+        a_string_matching(
+          /^\[Rollbar\] Details: \S+ \(only available if report was successful\)$/
+        )
+      ).once
       logger_mock.should_not_receive(:error)
 
       Rollbar.report_exception(@exception)