rollbar 0.12.15 → 0.12.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bbaf8de3eae319898938c1c8a2f98c1b30250da
-  data.tar.gz: 09c007792c1a7f50ea1f6a397eb37b35e1eb9475
+  metadata.gz: 3130e2b2d1b3c726cbca30e0a4e8da37ee7dca3e
+  data.tar.gz: 8eebb4ee086cf014aeaac40b1ca1fc2077c32c05
 SHA512:
-  metadata.gz: 8f71aa48757390584c2570ddb9ab96f65dd7c15cde0ba29577c7259f882cec89df23adcfffbaed4a6a47c8962d3e752ac7626c82760649e2d1dc2295b7347057
-  data.tar.gz: 74279a5b7c505f722d7c6b865869f5ff98ed9bb0add957e35e53b06cbb35c04745a0e8b32e49ea3e7396b6438c8c635bb9c83e7f1530cd7a6caa1f535bf63b79
+  metadata.gz: 5a41834e01227318af18e5255d911af94388897c683c6d63a789937a8d57b747417d9a0305ed563d4de4c506b0b4348c1a15d7abf6ce6d389ad458191f9697a9
+  data.tar.gz: f5137b1973af0fb0766e91f11e741de5965697c67915335104e54f82d05da029964dcdabb46285dbf11c13beb88d70710747b01b146c18640864493984661419

data/.travis.yml

@@ -24,40 +24,57 @@ matrix:
   exclude:
     - rvm: 1.8.7
       gemfile: gemfiles/rails40.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails41.gemfile
     - rvm: 1.9.2
       gemfile: gemfiles/rails40.gemfile
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails41.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails41.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/rails30.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/rails31.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/rails40.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails41.gemfile
     - rvm: jruby-18mode
       gemfile: gemfiles/rails30.gemfile
     - rvm: jruby-18mode
       gemfile: gemfiles/rails31.gemfile
     - rvm: jruby-18mode
       gemfile: gemfiles/rails40.gemfile
+    - rvm: jruby-18mode
+      gemfile: gemfiles/rails41.gemfile
     - rvm: jruby-19mode
       gemfile: gemfiles/rails30.gemfile
     - rvm: jruby-19mode
       gemfile: gemfiles/rails31.gemfile
     - rvm: jruby-19mode
       gemfile: gemfiles/rails40.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/rails41.gemfile
     - rvm: jruby-head
       gemfile: gemfiles/rails30.gemfile
     - rvm: jruby-head
       gemfile: gemfiles/rails31.gemfile
     - rvm: jruby-head
       gemfile: gemfiles/rails40.gemfile
+    - rvm: jruby-head
+      gemfile: gemfiles/rails41.gemfile
     - rvm: rbx
       gemfile: gemfiles/rails30.gemfile
     - rvm: rbx
       gemfile: gemfiles/rails31.gemfile
     - rvm: rbx
       gemfile: gemfiles/rails40.gemfile
+    - rvm: rbx
+      gemfile: gemfiles/rails41.gemfile
 gemfile:
   - gemfiles/rails30.gemfile
   - gemfiles/rails31.gemfile
   - gemfiles/rails32.gemfile
   - gemfiles/rails40.gemfile
+  - gemfiles/rails41.gemfile

data/Appraisals

@@ -7,9 +7,13 @@ appraise "rails31" do
 end
 
 appraise "rails32" do
-  gem "rails", "3.2.12"
+  gem "rails", "3.2.17"
 end
 
 appraise "rails40" do
-  gem "rails", "4.0.0"
+  gem "rails", "4.0.4"
+end
+
+appraise "rails41" do
+  gem "rails", "4.1.0"
 end

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+**0.12.16**
+- Scrub fields are now converted to a regular expression for broader param name matching
+- Save ActionDispatch request_id in reports if present
+- Added proper Sidekiq 3 error handler
+- Removed usage of ActiveSupport's `Object#try` in different areas of the notifier
+- Added a configurable request timeout for reports (defaults to 3 seconds)
+- Fix circular json exception handling in Rails 4.1
+
 **0.12.15**
 - Send X-Rollbar-Access-Token http header along with payloads
 

data/README.md

@@ -216,7 +216,7 @@ Rollbar.silenced {
 
 ## Delayed::Job integration
 
-If `delayed_job` is defined, Rollbar will automatically install a handler that reports any uncaught exceptions that occur in jobs.
+If `delayed_job` is defined, Rollbar will automatically install a plugin that reports any uncaught exceptions that occur in jobs.
 
 By default, the job's data will be included in the report. If you want to disable this functionality to prevent sensitive data from possibly being sent, use the following configuration option:
 
@@ -230,6 +230,11 @@ You can also change the threshold of job retries that must occur before a job is
 config.dj_threshold = 2 # default is 0
 ```
 
+If you use [custom jobs](https://github.com/collectiveidea/delayed_job#custom-jobs) that define their own hooks to report exceptions, please consider disabling our plugin. Not doing so will result in duplicate exceptions being reported as well as lack of control when exceptions should be reported. To disable our Delayed::Job plugin, add the following line after the `Rollbar.configure` block.
+
+```ruby
+Delayed::Worker.plugins.delete(Delayed::Plugins::Rollbar)
+```
 
 
 ## Asynchronous reporting

data/THANKS.md

@@ -20,9 +20,11 @@ Huge thanks to the following contributors (by github username). For the most up-
 - [kavu](https://github.com/kavu)
 - [magnolia-fan](https://github.com/magnolia-fan)
 - [mauricio](https://github.com/mauricio)
+- [metaskills](https://github.com/metaskills)
 - [miloops](https://github.com/miloops)
 - [mipearson](https://github.com/mipearson)
 - [petergoldstein](https://github.com/petergoldstein)
+- [pmen](https://github.com/pmen)
 - [rogercampos](https://github.com/rogercampos)
 - [siong1987](https://github.com/siong1987)
 - [trisweb](https://github.com/trisweb)

data/gemfiles/rails30.gemfile

@@ -2,15 +2,15 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", :platform=>[:ruby, :mswin, :mingw]
-gem "jruby-openssl", :platform=>:jruby
-gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
+gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+gem "jruby-openssl", :platform => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
 gem "appraisal"
-gem "rubysl", "~> 2.0", :platform=>:rbx
-gem "racc", :platform=>:rbx
-gem "minitest", :platform=>:rbx
-gem "rubysl-test-unit", :platform=>:rbx
-gem "rubinius-developer_tools", :platform=>:rbx
+gem "rubysl", "~> 2.0", :platform => :rbx
+gem "racc", :platform => :rbx
+gem "minitest", :platform => :rbx
+gem "rubysl-test-unit", :platform => :rbx
+gem "rubinius-developer_tools", :platform => :rbx
 gem "rails", "3.0.20"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails31.gemfile

@@ -2,15 +2,15 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", :platform=>[:ruby, :mswin, :mingw]
-gem "jruby-openssl", :platform=>:jruby
-gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
+gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+gem "jruby-openssl", :platform => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
 gem "appraisal"
-gem "rubysl", "~> 2.0", :platform=>:rbx
-gem "racc", :platform=>:rbx
-gem "minitest", :platform=>:rbx
-gem "rubysl-test-unit", :platform=>:rbx
-gem "rubinius-developer_tools", :platform=>:rbx
+gem "rubysl", "~> 2.0", :platform => :rbx
+gem "racc", :platform => :rbx
+gem "minitest", :platform => :rbx
+gem "rubysl-test-unit", :platform => :rbx
+gem "rubinius-developer_tools", :platform => :rbx
 gem "rails", "3.1.12"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails32.gemfile

@@ -2,15 +2,15 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", :platform=>[:ruby, :mswin, :mingw]
-gem "jruby-openssl", :platform=>:jruby
-gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
+gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+gem "jruby-openssl", :platform => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
 gem "appraisal"
-gem "rubysl", "~> 2.0", :platform=>:rbx
-gem "racc", :platform=>:rbx
-gem "minitest", :platform=>:rbx
-gem "rubysl-test-unit", :platform=>:rbx
-gem "rubinius-developer_tools", :platform=>:rbx
-gem "rails", "3.2.12"
+gem "rubysl", "~> 2.0", :platform => :rbx
+gem "racc", :platform => :rbx
+gem "minitest", :platform => :rbx
+gem "rubysl-test-unit", :platform => :rbx
+gem "rubinius-developer_tools", :platform => :rbx
+gem "rails", "3.2.17"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails40.gemfile

@@ -2,15 +2,15 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", :platform=>[:ruby, :mswin, :mingw]
-gem "jruby-openssl", :platform=>:jruby
-gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
+gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+gem "jruby-openssl", :platform => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
 gem "appraisal"
-gem "rubysl", "~> 2.0", :platform=>:rbx
-gem "racc", :platform=>:rbx
-gem "minitest", :platform=>:rbx
-gem "rubysl-test-unit", :platform=>:rbx
-gem "rubinius-developer_tools", :platform=>:rbx
-gem "rails", "4.0.0"
+gem "rubysl", "~> 2.0", :platform => :rbx
+gem "racc", :platform => :rbx
+gem "minitest", :platform => :rbx
+gem "rubysl-test-unit", :platform => :rbx
+gem "rubinius-developer_tools", :platform => :rbx
+gem "rails", "4.0.4"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails41.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+gem "jruby-openssl", :platform => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
+gem "appraisal"
+gem "rubysl", "~> 2.0", :platform => :rbx
+gem "racc", :platform => :rbx
+gem "minitest", :platform => :rbx
+gem "rubinius-developer_tools", :platform => :rbx
+gem "rails", "4.1.0"
+
+gemspec :path => "../"

data/lib/rollbar.rb

@@ -96,7 +96,7 @@ module Rollbar
       schedule_payload(payload)
       log_instance_link(data)
       data
-    rescue => e
+    rescue Exception => e
       report_internal_error(e)
       'error'
     end
@@ -123,7 +123,7 @@ module Rollbar
       schedule_payload(payload)
       log_instance_link(data)
       data
-    rescue => e
+    rescue Exception => e
       report_internal_error(e)
       'error'
     end
@@ -349,6 +349,7 @@ module Rollbar
       end
       uri = URI.parse(configuration.endpoint)
       http = Net::HTTP.new(uri.host, uri.port)
+      http.read_timeout = configuration.request_timeout
 
       if uri.scheme == 'https'
         http.use_ssl = true

data/lib/rollbar/better_errors.rb

@@ -13,8 +13,8 @@ module BetterErrors
       exception_data = nil
       begin
         controller = env['action_controller.instance']
-        request_data = controller.try(:rollbar_request_data)
-        person_data = controller.try(:rollbar_person_data)
+        request_data = controller.rollbar_request_data rescue nil
+        person_data = controller.rollbar_person_data rescue nil
         exception_data = Rollbar.report_exception(exception, request_data, person_data)
       rescue => e
         # TODO use logger here?

data/lib/rollbar/configuration.rb

@@ -23,6 +23,7 @@ module Rollbar
     attr_accessor :person_username_method
     attr_accessor :person_email_method
     attr_accessor :report_dj_data
+    attr_accessor :request_timeout
     attr_accessor :root
     attr_accessor :scrub_fields
     attr_accessor :scrub_headers
@@ -58,6 +59,7 @@ module Rollbar
       @person_email_method = 'email'
       @project_gems = []
       @report_dj_data = true
+      @request_timeout = 3
       @scrub_fields = [:passwd, :password, :password_confirmation, :secret,
                        :confirm_password, :password_confirmation, :secret_token]
       @scrub_headers = ['Authorization']

data/lib/rollbar/exception_reporter.rb

@@ -3,7 +3,7 @@ module Rollbar
     include RequestDataExtractor
 
     def report_exception_to_rollbar(env, exception)
-      rollbar_debug "[Rollbar] Reporting exception: #{exception.try(:message)}", :error
+      rollbar_debug "[Rollbar] Reporting exception: #{exception.message}", :error
       request_data = extract_request_data_from_rack(env)
       person_data = extract_person_data_from_controller(env)
       exception_data = Rollbar.report_exception(exception, request_data, person_data)
@@ -17,7 +17,7 @@ module Rollbar
         rollbar_debug "[Rollbar] Exception not reported because it was ignored"
       end
     rescue => e
-      rollbar_debug "[Rollbar] Exception while reporting exception to Rollbar: #{e.try(:message)}"
+      rollbar_debug "[Rollbar] Exception while reporting exception to Rollbar: #{e.message}"
     end
 
     def rollbar_debug(message, level = :debug)

data/lib/rollbar/goalie.rb

@@ -8,8 +8,8 @@ module Goalie
       exception_data = nil
       begin
         controller = env['action_controller.instance']
-        request_data = controller.try(:rollbar_request_data)
-        person_data = controller.try(:rollbar_person_data)
+        request_data = controller.rollbar_request_data rescue nil
+        person_data = controller.rollbar_person_data rescue nil
         exception_data = Rollbar.report_exception(exception, request_data, person_data)
       rescue => e
         # TODO use logger here?

data/lib/rollbar/request_data_extractor.rb

@@ -10,7 +10,7 @@ module Rollbar
         person_data = env['rollbar.person_data'] || {}
       else
         controller = env['action_controller.instance']
-        person_data = controller ? controller.try(:rollbar_person_data) : {}
+        person_data = controller.rollbar_person_data rescue {}
       end
       
       person_data
@@ -29,7 +29,7 @@ module Rollbar
       
       params = request_params.merge(get_params).merge(post_params)
       
-      {
+      data = {
         :params => params,
         :url => rollbar_url(env),
         :user_ip => rollbar_user_ip(env),
@@ -37,8 +37,14 @@ module Rollbar
         :cookies => cookies,
         :session => session,
         :method => rollbar_request_method(env),
-        :route => route_params
+        :route => route_params,
       }
+      
+      if env["action_dispatch.request_id"]
+        data[:request_id] = env["action_dispatch.request_id"]
+      end
+      
+      data
     end
 
     private
@@ -119,14 +125,18 @@ module Rollbar
     end
 
     def rollbar_filtered_params(sensitive_params, params)
+      @sensitive_params_regexp ||= Regexp.new(sensitive_params.map{ |val| Regexp.escape(val.to_s).to_s }.join('|'), true)
+      
       if params.nil?
         {}
       else
         params.to_hash.inject({}) do |result, (key, value)|
-          if sensitive_params.include?(key.to_sym)
+          if @sensitive_params_regexp =~ key.to_s
             result[key] = rollbar_scrubbed(value)
           elsif value.is_a?(Hash)
             result[key] = rollbar_filtered_params(sensitive_params, value)
+          elsif value.is_a?(Array)
+            result[key] = value.map {|v| v.is_a?(Hash) ? rollbar_filtered_params(sensitive_params, v) : v}
           elsif ATTACHMENT_CLASSES.include?(value.class.name)
             result[key] = {
               :content_type => value.content_type,

data/lib/rollbar/sidekiq.rb

@@ -1,25 +1,38 @@
 # encoding: utf-8
 
-module Rollbar
-  class Sidekiq
-    def call(worker, msg, queue)
-      begin
-        yield
-      rescue Exception => e
-        msg.delete('backtrace')
-        msg.delete('error_backtrace')
-        msg.delete('error_message')
-        msg.delete('error_class')
+if Sidekiq::VERSION < '3'
+  module Rollbar
+    class Sidekiq
+      def call(worker, msg, queue)
+        begin
+          yield
+        rescue Exception => e
+          msg.delete('backtrace')
+          msg.delete('error_backtrace')
+          msg.delete('error_message')
+          msg.delete('error_class')
 
-        Rollbar.report_exception(e, :params => msg)
-        raise
+          Rollbar.report_exception(e, :params => msg)
+          raise
+        end
       end
     end
   end
-end
 
-Sidekiq.configure_server do |config|
-  config.server_middleware do |chain|
-    chain.add Rollbar::Sidekiq
+  Sidekiq.configure_server do |config|
+    config.server_middleware do |chain|
+      chain.add Rollbar::Sidekiq
+    end
+  end
+else
+  Sidekiq.configure_server do |config|
+    config.error_handlers << Proc.new do |e, context|
+      context.delete('backtrace')
+      context.delete('error_backtrace')
+      context.delete('error_message')
+      context.delete('error_class')
+
+      Rollbar.report_exception(e, :params => context)
+    end
   end
 end

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "0.12.15" 
+  VERSION = "0.12.16" 
 end

data/rollbar.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'multi_json', '~> 1.3'
 
   gem.add_development_dependency 'rails', '>= 3.0.0'
-  gem.add_development_dependency 'rspec-rails', '~> 2.12.0'
+  gem.add_development_dependency 'rspec-rails', '>= 2.14.0'
   gem.add_development_dependency 'database_cleaner', '~> 1.0.0'
   gem.add_development_dependency 'girl_friday', '>= 0.11.1'
   gem.add_development_dependency 'sucker_punch', '>= 1.0.0' if RUBY_VERSION != '1.8.7'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 0.12.15
+  version: 0.12.16
 platform: ruby
 authors:
 - Brian Rue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -42,16 +42,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +143,7 @@ files:
 - gemfiles/rails31.gemfile
 - gemfiles/rails32.gemfile
 - gemfiles/rails40.gemfile
+- gemfiles/rails41.gemfile
 - lib/generators/rollbar/rollbar_generator.rb
 - lib/generators/rollbar/templates/initializer.rb
 - lib/rollbar.rb