rollbar 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f16df0211259f30c790efadaf922efe258d549d5
-  data.tar.gz: 4d2a670ebac6ddfdf7bdf27de563efdc20adfc74
+  metadata.gz: 7575d58a3d88f1967dac6cf9d70e78d2170c1bae
+  data.tar.gz: 32d7bf74f7276b35434601f0e89c018100f93fed
 SHA512:
-  metadata.gz: 3c4379908512383a8328601c5dd13da3999c7492f9ca40b9b9e90809c9a210821616fb0da5eb80a443c7be19ae1c66127a4572816d38daf47b609fe66e78b0a1
-  data.tar.gz: d584525530951ec2d9fd65f071726a84442307e8ea466bbc7d275a0918cb30018e76688c176dd16a2846d5701d5294a36fd8d7991dab70e0fb2c7e1dc94b29f6
+  metadata.gz: 64acb033938cea26fd519fcff644a23730d9872746020bfdcaaa0a8e62e7f68c4c75461f0730fa6c816cfd5d43e7ac365b00722d22918b82c6d9d0b172ff82bb
+  data.tar.gz: 97ba117f2544e3c6fff17839355babb8a9b020b9964802fdb83874f3d3fea9be51580fdb4ca34cdcda59fe35ea68f9631bb5556eca84f632a33f5f085e8a4d25

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 1.3.1
+
+Bug fixes:
+
+- Fix bug with smart truncation for messages. See [#195](https://github.com/rollbar/rollbar-gem/issues/195) and [#196](https://github.com/rollbar/rollbar-gem/issues/196)
+- Safely catch exceptions in `process_payload` when called from an async handler. See [#196](https://github.com/rollbar/rollbar-gem/pull/196)
+
+
 ## 1.3.0
 
 Performance improvements:

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.0)](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.3.1)](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.0'
+    gem 'rollbar', '~> 1.3.1'
 
 And then execute:
 
@@ -410,11 +410,11 @@ You can supply your own handler using ```config.async_handler```. The object to
 ```ruby
 config.use_async
 config.async_handler = Proc.new { |payload|
-  Thread.new { Rollbar.process_payload(payload) }
+  Thread.new { Rollbar.process_payload_safely(payload) }
 }
 ```
 
-Make sure you pass ```payload``` to ```Rollbar.process_payload``` in your own implementation.
+Make sure you pass ```payload``` to ```Rollbar.process_payload_safely``` in your own implementation.
 
 ## Failover handlers
 

data/lib/generators/rollbar/templates/initializer.rb

@@ -46,7 +46,7 @@ Rollbar.configure do |config|
   # config.use_async = true
   # Supply your own async handler:
   # config.async_handler = Proc.new { |payload|
-  #  Thread.new { Rollbar.process_payload(payload) }
+  #  Thread.new { Rollbar.process_payload_safely(payload) }
   # }
 
   # Enable asynchronous reporting (using sucker_punch)

data/lib/rollbar.rb

@@ -31,7 +31,7 @@ module Rollbar
     Rack::Multipart::UploadedFile
   ].freeze
   PUBLIC_NOTIFIER_METHODS = %w(debug info warn warning error critical log logger
-                               process_payload scope send_failsafe log_info log_debug
+                               process_payload process_payload_safely scope send_failsafe log_info log_debug
                                log_warning log_error silenced)
 
   class Notifier
@@ -180,6 +180,15 @@ module Rollbar
       else
         send_payload(payload)
       end
+    rescue => e
+      log_error("[Rollbar] Error processing the payload: #{e.class}, #{e.message}. Payload: #{payload.inspect}")
+      raise e
+    end
+
+    def process_payload_safely(payload)
+      process_payload(payload)
+    rescue => e
+      report_internal_error(e)
     end
 
     private

data/lib/rollbar/delay/girl_friday.rb

@@ -16,7 +16,7 @@ module Rollbar
 
       def call(payload)
         self.class.queue = queue_class.new(nil, :size => 5) do |payload|
-          Rollbar.process_payload(payload)
+          Rollbar.process_payload_safely(payload)
         end
 
         self.class.queue.push(payload)

data/lib/rollbar/delay/resque.rb

@@ -23,7 +23,7 @@ module Rollbar
         end
 
         def perform(payload)
-          Rollbar.process_payload(payload)
+          Rollbar.process_payload_safely(payload)
         end
       end
     end

data/lib/rollbar/delay/sidekiq.rb

@@ -16,7 +16,7 @@ module Rollbar
       include ::Sidekiq::Worker
 
       def perform(*args)
-        Rollbar.process_payload(*args)
+        Rollbar.process_payload_safely(*args)
       end
     end
   end

data/lib/rollbar/delay/sucker_punch.rb

@@ -11,7 +11,7 @@ module Rollbar
       end
 
       def perform(*args)
-        Rollbar.process_payload(*args)
+        Rollbar.process_payload_safely(*args)
       end
     end
   end

data/lib/rollbar/delay/thread.rb

@@ -6,7 +6,7 @@ module Rollbar
       end
 
       def call(payload)
-        ::Thread.new { Rollbar.process_payload(payload) }
+        ::Thread.new { Rollbar.process_payload_safely(payload) }
       end
     end
   end

data/lib/rollbar/truncation/frames_strategy.rb

@@ -15,7 +15,7 @@ module Rollbar
 
         if body['trace_chain']
           truncate_trace_chain(body)
-        else
+        elsif body['trace']
           truncate_trace(body)
         end
 

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/spec/delay/sidekiq_spec.rb

@@ -17,7 +17,7 @@ describe Rollbar::Delay::Sidekiq, :if => RUBY_VERSION != '1.8.7' do
 
   describe "#perform" do
     it "performs payload" do
-      Rollbar.should_receive(:process_payload).with(payload)
+      Rollbar.should_receive(:process_payload_safely).with(payload)
       subject.perform payload
     end
   end
@@ -26,7 +26,7 @@ describe Rollbar::Delay::Sidekiq, :if => RUBY_VERSION != '1.8.7' do
     shared_examples "a Rollbar processor" do
 
       it "processes payload" do
-        Rollbar.should_receive(:process_payload).with(payload)
+        Rollbar.should_receive(:process_payload_safely).with(payload)
 
         subject.call payload
         described_class.drain

data/spec/delay/sucker_punch_spec.rb

@@ -17,7 +17,7 @@ describe Rollbar::Delay::SuckerPunch, :if => RUBY_VERSION != '1.8.7' do
     let(:payload) { "anything" }
 
     it "performs the task asynchronously" do
-      Rollbar.should_receive(:process_payload)
+      Rollbar.should_receive(:process_payload_safely)
 
       Rollbar::Delay::SuckerPunch.call payload
     end

data/spec/rollbar/delay/resque_spec.rb

@@ -14,7 +14,7 @@ describe Rollbar::Delay::Resque do
     it 'process the payload' do
       loaded_hash = MultiJson.load(MultiJson.dump(payload))
 
-      expect(Rollbar).to receive(:process_payload).with(loaded_hash)
+      expect(Rollbar).to receive(:process_payload_safely).with(loaded_hash)
       described_class.call(payload)
     end
   end

data/spec/rollbar/delay/thread_spec.rb

@@ -5,7 +5,7 @@ describe Rollbar::Delay::Thread do
     let(:payload) { { :key => 'value' } }
 
     it 'process the payload in a new thread' do
-      expect(Rollbar).to receive(:process_payload).with(payload)
+      expect(Rollbar).to receive(:process_payload_safely).with(payload)
 
       th = described_class.call(payload)
       th.join

data/spec/rollbar/truncation/frames_strategy_spec.rb

@@ -52,5 +52,19 @@ describe Rollbar::Truncation::FramesStrategy do
         expect(new_frames2.last).to be_eql(frames2.last)
       end
     end
+
+    context 'without trace or trace_chain', :fixture => :payload do
+      let(:payload_fixture) { 'payloads/sample.trace.json' }
+
+      before do
+        payload['data']['body'].delete('trace')
+      end
+
+      it 'returns the original payload' do
+        result = MultiJson.load(described_class.call(payload))
+
+        expect(result).to be_eql(payload)
+      end
+    end
   end
 end

data/spec/rollbar_spec.rb

@@ -1547,6 +1547,33 @@ describe Rollbar do
     end
   end
 
+  describe '.process_payload' do
+    context 'if there is an exception sending the payload' do
+      let(:exception) { StandardError.new('error message') }
+      let(:payload) { { :foo => :bar } }
+
+      it 'logs the error and the payload' do
+        allow(Rollbar.notifier).to receive(:send_payload).and_raise(exception)
+        expect(Rollbar.notifier).to receive(:log_error)
+
+        expect { Rollbar.notifier.process_payload(payload) }.to raise_error(exception)
+      end
+    end
+  end
+
+  describe '.process_payload_safely' do
+    context 'with errors' do
+      let(:exception) { StandardError.new('the error') }
+
+      it 'doesnt raise anything and sends internal error' do
+        allow(Rollbar.notifier).to receive(:process_payload).and_raise(exception)
+        expect(Rollbar.notifier).to receive(:report_internal_error).with(exception)
+
+        Rollbar.notifier.process_payload_safely({})
+      end
+    end
+  end
+
   # configure with some basic params
   def configure
     reconfigure_notifier

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -341,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Reports exceptions to Rollbar