rollbar 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07ce16a5ab6884c863b075b5577833c618d95331
-  data.tar.gz: 4179b7db73210d42a749530727e16a99851bc932
+  metadata.gz: 7601f7e94acde264cb7c32f5ab7360a8f1b60316
+  data.tar.gz: 54c7075daf5c090a9cf143f7795931f4744a5e2c
 SHA512:
-  metadata.gz: 5c660d4e522c250e09638d12a67c25e13e44bfa8bb3ca6175333ae0be0429432bf8bc3f7a4f5e3a0f502f5be44fde5ff7fe14c1b259bd09ea7b9ca11646f9c3b
-  data.tar.gz: 5709042d36222c875d3de163d53f073f1367db082c931829f75115624dfa5d4aa77b6a5ba7120277afa416494048be2bd568a70527fdc4b86430287249a936e7
+  metadata.gz: c9b0da8ae42a915de193b95d63f9e3e60325af0aa799c060dc0453258e602ee3b1330552a68429237bee75c5c6bf18b442623bb53a6efd74a394675d8c7cf7d2
+  data.tar.gz: 2d360c8176626f5a7fb15cfbf8d6ec48801b68970c4304afc898f6ea8fec785d128e347be2988814c481c4c57f65dc8b6f337322533ccd10b98a9afc87128a6a

data/.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 language: ruby
 # Broken bundler on travis CI - https://github.com/bundler/bundler/issues/2784
 before_install:

data/CHANGELOG.md

@@ -1,78 +1,151 @@
 # Change Log
 
-**1.2.7**
+## 1.2.8
+
+New features:
+
+- Add config option to not monkeypatch `Rack::Builder`. See [#169](https://github.com/rollbar/rollbar-gem/pull/169)
+- Track server PID. See [#171](https://github.com/rollbar/rollbar-gem/pull/171)
+
+
+Bug fixes:
+
+- Remove internal calls to deprecated methods. See [#166](https://github.com/rollbar/rollbar-gem/pull/166)
+- Fix an intermittently failing test. See [#167](https://github.com/rollbar/rollbar-gem/pull/167)
+- Fix configuration issue when an initializer calls `Thread.new` before Rollbar is initialized. See [#170](https://github.com/rollbar/rollbar-gem/pull/170) and [#168](https://github.com/rollbar/rollbar-gem/pull/168)
+- Fix infinite loop with cyclic inner exceptions. See [#172](https://github.com/rollbar/rollbar-gem/pull/172)
+
+
+## 1.2.7
+
+Bug fixes:
 - Restore `exception_level_filters` feature, which was inadvertently removed in 1.2.0. See [#160](https://github.com/rollbar/rollbar-gem/pull/160) 
 - Fix bug where rollbar_url incorrectly handled comma-separated X-Forwarded-Proto header values. See [#112](https://github.com/rollbar/rollbar-gem/issues/112)
 
-**1.2.6**
+
+## 1.2.6
+
+Bug fixes:
+
 - Fix bug in non-Rails environments. See [#155](https://github.com/rollbar/rollbar-gem/pull/155)
 - Fix intermittent test failures
 
-**1.2.5**
+
+## 1.2.5
+
+Bug fixes:
+
 - Fix issues handling hashes, arrays, and other values as the raw POST body. See [#153](https://github.com/rollbar/rollbar-gem/pull/153)
 
-**1.2.4**
+
+## 1.2.4
+
+Bug fixes:
+
 - Fix issue where requiring 'rack' unnecessarily broke things in non-rack apps. See [#150](https://github.com/rollbar/rollbar-gem/pull/150)
 
-**1.2.3**
+
+## 1.2.3
+
+Bug fixes:
+
 - Bring back `enforce_valid_utf8`, which got lost in the 1.2.0 upgrade. See [#148](https://github.com/rollbar/rollbar-gem/pull/148)
 - Fix bug with raw post extraction for application/json requests. See [#147](https://github.com/rollbar/rollbar-gem/pull/147)
 
-**1.2.2**
+
+## 1.2.2
+
+Bug fixes:
+
 - Fix issue with delayed_job and Rollbar.report_exception (bug introduced in 1.2.0). See [#145](https://github.com/rollbar/rollbar-gem/issues/145)
 - Explicitly require 'rack' in request_data_extractor. See [#144](https://github.com/rollbar/rollbar-gem/pull/144)
 
-**1.2.1**
+
+## 1.2.1
+
+Bug fixes:
+
 - Revert change made as part of 1.2.0 where all procs in the payload would be evaluated. See [#143](https://github.com/rollbar/rollbar-gem/pull/143).
 
-**1.2.0**
+
+## 1.2.0
+
+New features:
+
 - Added new, much nicer interface for sending exceptions and messages to Rollbar. This is a backwards-compatible release: the old interface (`report_message`, `report_exception`, `report_message_with_request`) is deprecated but will continue to work at least until 2.0.
   
   See the docs for [basic](https://github.com/rollbar/rollbar-gem#caught-exceptions-and-messages) and [advanced](https://github.com/rollbar/rollbar-gem#advanced-usage) usage for a guide to the new interface. If you've used [rollbar.js](https://github.com/rollbar/rollbar.js), it will be familiar.
 
-**1.1.0**
+---
+
+## 1.1.0
+
+New features:
+
 - Support nested exceptions for Ruby 2.1. See [#136](https://github.com/rollbar/rollbar-gem/pull/136). NOTE: for exceptions that have causes, this will change how they are grouped in Rollbar. If you have custom grouping rules, they will need to be updated to replace `body.trace.exception` with `body.trace_chain[0].exception` to maintain the same behavior for these exceptions.
 - New feature: `failover_handlers`. You can specify a list of async handlers, which will be tried in sequence upon failure. See [#135](https://github.com/rollbar/rollbar-gem/pull/135).
+
+Bug fixes:
+
 - Fix handling of utf8 sequences in payload symbols. See [#131](https://github.com/rollbar/rollbar-gem/pull/131). Thanks [@kroky](https://github.com/kroky) for the fix and [@jondeandres](https://github.com/jondeandres) for reviewing.
 - Fix logic bugs in assignments for `scrub_fields` and `scrub_headers`. See [#137](https://github.com/rollbar/rollbar-gem/pull/137)
 
-**1.0.1**
+---
+
+## 1.0.1
+
+Bug fixes:
+
 - Use the payload's access token for the X-Rollbar-Access-Token header, instead of the configured access token. Fixes an issue where payloads would be reported into the wrong project when sent via Resque. See [#128](https://github.com/rollbar/rollbar-gem/pull/128). Thanks to [@jondeandres](https://github.com/jondeandres) for the fix.
 
-**1.0.0**
-- Clean up some unused requires
+## 1.0.0
+
+Bug fixes:
+
 - Strip out invalid UTF-8 characters from payload keys/values, fixes [#85](https://github.com/rollbar/rollbar-gem/issues/85)
+
+
+Misc:
+
+- Clean up some unused requires
 - Bumping to 1.0 due to the suggestion in [#119](https://github.com/rollbar/rollbar-gem/issues/119)
 
-**0.13.2**
+---
+
+## 0.13.2
+
 - Sidekiq payload is no longer mutated when Rollbar reports a Sidekiq job exception
 - Fix sucker_punch async reporting when using a forking application server such as Unicorn (`preload_app true`). Jobs are now instantiated for every report instead of a reused global job instance
 
-**0.13.1**
+
+## 0.13.1
 - Silence warning when using project_gems= with regexp [#120](https://github.com/rollbar/rollbar-gem/pull/120)
 
-**0.13.0**
+
+## 0.13.0
+
 - Hook for delayed_job no longer a plugin, will now only ever be initialized once
 - New configuration option `delayed_job_enabled` that defaults to true
 - Potentially breaking change if using delayed_job: if you disabled the delayed_job plugin previously, please remove that code and instead set the new configuration option `delayed_job_enabled` to false
 
-**0.12.20**
+
+## 0.12.20
 - Fix asynchronous reports with sidekiq version < 2.3.2
 - Support for specifying multiple project_gems with regex [#114](https://github.com/rollbar/rollbar-gem/pull/114)
 
-**0.12.19**
+## 0.12.19
 - Fix rake test task in production
 - Report an additional simple error message in the rake test task
 
-**0.12.18**
+## 0.12.18
 - Insert RollbarRequestStore middleware at the end in case the ActiveRecord ConnectionManagement middleware isn't used
 - Scope Capistrano 3 task by server role [#110](https://github.com/rollbar/rollbar-gem/pull/110)
 
-**0.12.17**
+## 0.12.17
 - Replace usage of `puts` with a configurable logger in different areas of the notifier
 - Fix error in `RollbarRequestStore` when `rollbar_person_data` isn't defined for a controller
 
-**0.12.16**
+## 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
@@ -80,279 +153,279 @@
 - Added a configurable request timeout for reports (defaults to 3 seconds)
 - Fix circular json exception handling in Rails 4.1
 
-**0.12.15**
+## 0.12.15
 - Send X-Rollbar-Access-Token http header along with payloads
 
-**0.12.14**
+## 0.12.14
 - Added ability to scrub request headers
 - Added flag to disable reporting of Delayed::Job job data when handling uncaught exceptions that happen in jobs
 - New `report_message_with_request` that allows reporting request and person data, similar to `report_exception`
 - Changed various exception handlers to catch `Exception` subclasses instead of only `StandardError`s
 - Added Capistrano 3 support
 
-**0.12.13**
+## 0.12.13
 - Add a little more debugging information for 'payload too large' errors
 - Pushing new gem to fix errant 32kb size limit in the rubygems copy of 0.12.12
 
-**0.12.12**
+## 0.12.12
 - Changes to support Engine Yard add-on setup
 
-**0.12.11**
+## 0.12.11
 - Raise payload size limit to 128k
 
-**0.12.10**
+## 0.12.10
 - Log payloads that are too large to be sent to Rollbar
 - Don't record controller context if request route info isn't readily available (ex. non-Rails)
 
-**0.12.9**
+## 0.12.9
 - Fixed delayed job regression introduced in 0.12.5 by re-raising caught exceptions
 - Removed Active Support call introduced in 0.12.6 to remove rails dependency in `report_exception`
 
-**0.12.8**
+## 0.12.8
 - Added funcitonality to walk the payload and truncate strings to attempt to reduce size if the payload is too large (more than 32kb total)
 
-**0.12.7**
+## 0.12.7
 - Fix error reporting errors when route controller or action is nil (bug introduced in 0.12.4)
 
-**0.12.6**
+## 0.12.6
 - Added [#78](https://github.com/rollbar/rollbar-gem/pull/78), added configuration option to ignore specific person exceptions
 
-**0.12.5**
+## 0.12.5
 - Fixed SIGSEGV with the delayed_job plugin and Ruby 2.1.0
 
-**0.12.4**
+## 0.12.4
 - Record controller context (controller#action) in reported items
 
-**0.12.3**
+## 0.12.3
 - Change rollbar_request_store middleware to only grab required person data properties by using rollbar_person_data
 
-**0.12.2**
+## 0.12.2
 - Added ability to specify level for manually reported exceptions
 
-**0.12.1**
+## 0.12.1
 - Fix syntax error in `config.use_sidekiq` usage example
 
-**0.12.0**
+## 0.12.0
 - Added [#73](https://github.com/rollbar/rollbar-gem/pull/73), enhanced Sidekiq and SuckerPunch configuration. NOTE: The old `Rollbar::Configuration#use_sidekiq=` and `Rollbar::Configuration#use_sucker_punch=` methods are now deprecated, see the docs for updated usage information.
 
-**0.11.8**
+## 0.11.8
 - Make sure the person method exists for the controller before trying to extract person data
 
-**0.11.7**
+## 0.11.7
 - Remove ActiveRecord railtie requirement introduced in 0.11.6
 
-**0.11.6**
+## 0.11.6
 - Adding new middleware that grabs possible database-hitting person data before the rake connection pool cleanup middleware
 
-**0.11.5**
+## 0.11.5
 - Fix rake test task when Authlogic is present
 
-**0.11.4**
+## 0.11.4
 - Respect different proxy headers when building the request url
 
-**0.11.3**
+## 0.11.3
 - Make sure the environment is valid at item sending time so that it isn't set incorrectly during configuration
 
-**0.11.2**
+## 0.11.2
 - Test rake task now works properly if force_ssl is true
 
-**0.11.1**
+## 0.11.1
 - `config.exception_level_filters` can now take a callable instead of a string. The exception instance will be passed to the callable.
 
-**0.11.0**
+## 0.11.0
 - Changed default environment name from `'production'` to `'unspecified'`
 
-**0.10.14**
+## 0.10.14
 - Fixed compatability issue with better_errors 1.0
 
-**0.10.13**
+## 0.10.13
 - Added `code_version` configuration setting
 
-**0.10.12**
+## 0.10.12
 - Exclude HTTP_COOKIE header (since cookies are already included in parsed form)
 
-**0.10.11**
+## 0.10.11
 - Fix usage of custom Sidekiq options
 
-**0.10.10**
+## 0.10.10
 - Add support for sucker_punch asynchronous handling
 
-**0.10.9**
+## 0.10.9
 - Fix regression introduced in 0.10.7 when ActiveRecord is not present.
 
-**0.10.8**
+## 0.10.8
 - Better handling of internal errors. Internal errors (errors that occur while reporting something to Rollbar) are now themselves reported to Rollbar. If that fails, a failsafe message will be reported, and if that fails, the error will be logged as it is now.
 - Fix bug reporting exceptions with backtraces containing frames that don't match our regex.
 
-**0.10.7**
+## 0.10.7
 - Add ability to report form validation errors
 - Add MIT license to gemspec
 
-**0.10.6**
+## 0.10.6
 - Fix json dump when rack.errors is an IO stream
 
-**0.10.5**
+## 0.10.5
 - Add built-in support for Sidekiq as async handler
 
-**0.10.4**
+## 0.10.4
 - Fix exception in the exception catcher when Rollbar is disabled
 
-**0.10.3**
+## 0.10.3
 - Rework how request params are extracted so that json params are properly extracted in rails 4.0
 - Fix rollbar:test rake task
 
-**0.10.2**
+## 0.10.2
 - Require hooks at configuration time instead of gem load time
 
-**0.10.1**
+## 0.10.1
 - Fix regression in 0.10.0 reporting exceptions in development environments and rails < 3.2 apps.
 
-**0.10.0**
+## 0.10.0
 - Fixed bug causing duplicate reports when used inside Rails in production with the default error pages. Bumping version to 0.10.0 in case this turns out to be backwards-incompatible for some use cases (i.e. for applications that were relying on the duplicate report that has now been removed).
 
-**0.9.14**
+## 0.9.14
 - Added `custom_data_method` config option. If set, it should be a lambda that returns a hash.
 - Changed initializer template to disable reporting from the 'test' environment.
 
-**0.9.13**
+## 0.9.13
 - Add test for PUT params
 - Parse json params when content-type is application/json
 - Fix concurrency issue
 - Remove redundant `GET` and `POST` keys from request payload (they're already included in `params`)
 
-**0.9.12**
+## 0.9.12
 - Fix compatibility issue with Rails 4 / Ruby 2 (thanks [johnknott](https://github.com/johnknott))
 
-**0.9.11**
+## 0.9.11
 - Provide a default environment name when used outside of Rails and none is set
 
-**0.9.10**
+## 0.9.10
 - Add :secret_token to default scrub_fields list
 - Session params are now scrubbed
 
-**0.9.9**
+## 0.9.9
 - Fix capistrano recipe on 1.9.2 ([#36](https://github.com/rollbar/rollbar-gem/pull/36))
 - Add example of disable "test" env to initializer template
 
-**0.9.8**
+## 0.9.8
 - Fix bug introduced in 0.9.0 where setting `config.enabled = false` in `config/initializers/rollbar.rb` would be overwritten by subsequent calls to `Rollbar.configure` (as happens normally when using inside Rails).
 
-**0.9.7**
+## 0.9.7
 - Use `include?` instead of `in?` for filtering (see [#34](https://github.com/rollbar/rollbar-gem/pull/34))
 
-**0.9.6**
+## 0.9.6
 - Fix for Rails 4 support
 
-**0.9.5**
+## 0.9.5
 - Support for configuring the access token with an environment variable.
 
-**0.9.4**
+## 0.9.4
 - Fixed issue using rollbar-gem outside of Rails
 - Clarified the "details: " link log message
 
-**0.9.3**
+## 0.9.3
 - Added configuration setting to specify gems that should be considered part of the Rollbar project, making frames from these gems show up automatically uncollapsed in tracebacks appearing on the website.
 
-**0.9.2**
+## 0.9.2
 - Added [Capistrano integration](https://github.com/rollbar/rollbar-gem/pull/27)
 
-**0.9.1**
+## 0.9.1
 - Add support to play nicely with Better Errors.
 
-**0.9.0**
+## 0.9.0
 - Behavior change: start configuration as `@enabled = false`, and set to true when `configure` is called. This addresses an issue using Rollbar without the environment initialized. Such reports would always fail (since there would be no access token), but now they won't be attempted.
 
-**0.8.3**
+## 0.8.3
 - Relax multi_json dependency to 1.5.0
 
-**0.8.2**
+## 0.8.2
 - Adding back rake task exception reporting after fixing load order issue
 
-**0.8.1**
+## 0.8.1
 - Reverting rake task exception reporting until we can track down a load order issue reported by a few users
 
-**0.8.0**
+## 0.8.0
 - Rename to rollbar
 
-**0.7.1**
+## 0.7.1
 - Fix ratchetio:test rake task when project base controller is not called ApplicationController
 
-**0.7.0**
+## 0.7.0
 - Exceptions in Rake tasks are now automatically reported.
 
-**0.6.4**
+## 0.6.4
 - Bump multi_json dependency version to 1.6.0
 
-**0.6.3**
+## 0.6.3
 - Bump multi_json dependency version to 1.5.1
 
-**0.6.2**
+## 0.6.2
 - Added EventMachine support
 
-**0.6.1**
+## 0.6.1
 - Added a log message containing a link to the instance. Copy-paste the link into your browser to view its details in Ratchet.
 - Ratchetio.report_message now returns 'ignored' or 'error' instead of nil when a message is not reported for one of those reasons, for consistency with Ratchetio.report_exception.
 
-**0.6.0**
+## 0.6.0
 - POSSIBLE BREAKING CHANGE: Ratchetio.report_exception now returns 'ignored', 'disabled', or 'error' instead of nil when the exception is not reported for one of those reasons. It still returns the payload upon success.
 - Request data is now parsed from the rack environment instead of from within the controller, addressing issue #10.
 - Add Sidekiq middleware for catching workers' exceptions
 - Replaced activesupport dependency with multi_json
 
-**0.5.5**
+## 0.5.5
 - Added activesupport dependency for use without Rails
 
-**0.5.4**
+## 0.5.4
 - Added new default scrub params
 
-**0.5.3**
+## 0.5.3
 - Add `Ratchetio.silenced`; which allows disabling reporting for a given block. See README for usage.
 
-**0.5.2**
+## 0.5.2
 - Fix compat issue with delayed_job below version 3. Exceptions raised by delayed_job below version 3 will not be automatically caught; upgrade to v3 or catch and report by hand.
 
-**0.5.1**
+## 0.5.1
 - Save the exception uuid in `env['ratchetio.exception_uuid']` for display in user-facing error pages.
 
-**0.5.0**
+## 0.5.0
 - Add support to report exceptions raised in delayed_job.
 
-**0.4.11**
+## 0.4.11
 - Allow exceptions with no backtrace (e.g. StandardError subclasses)
 
-**0.4.10**
+## 0.4.10
 - Fix compatability issue with ruby 1.8
 
-**0.4.9**
+## 0.4.9
 - Start including a UUID in reported exceptions
 - Fix issue with scrub_fields, and add `:password_confirmation` to the default list
 
-**0.4.8**
+## 0.4.8
 - Add ability to send reports asynchronously, using girl_friday or Threading by default.
 - Add ability to save reports to a file (for use with ratchet-agent) instead of sending across to Ratchet servers.
 
-**0.4.7**
+## 0.4.7
 - Sensitive params now scrubbed out of requests. Param name list is customizable via the `scrub_fields` config option.
 
-**0.4.6**
+## 0.4.6
 - Add support to play nicely with Goalie.
 
-**0.4.5**
+## 0.4.5
 - Add `default_logger` config option. It should be a lambda that will return the logger to use if no other logger is configured (i.e. no logger is set by the Railtie hook). Default: `lambda { Logger.new(STDERR) }`
 
-**0.4.4**
+## 0.4.4
 - Add `enabled` runtime config flag. When `false`, no data (messages or exceptions) will be reported.
 
-**0.4.3**
+## 0.4.3
 - Add RSpec test suite. A few minor code changes.
 
-**0.4.2**
+## 0.4.2
 - Add "ignore" filter level to completely ignore exceptions by class.
 
-**0.4.1**
+## 0.4.1
 - Recursively filter files out of the params hash. Thanks to [trisweb](https://github.com/trisweb) for the pull request.
 
-**0.4.0**
+## 0.4.0
 
 - Breaking change to make the "person" more configurable. If you were previously relying on your `current_member` method being called to return the person object, you will need to add the following line to `config/initializers/ratchetio.rb`:
 

data/README.md

@@ -1,4 +1,4 @@
-# Rollbar notifier for Ruby [![Build Status](https://api.travis-ci.org/rollbar/rollbar-gem.svg?branch=v1.2.7)](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.2.8)](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.2.7'
+    gem 'rollbar', '~> 1.2.8'
 
 And then execute:
 
@@ -51,7 +51,7 @@ $ heroku config:add ROLLBAR_ACCESS_TOKEN=POST_SERVER_ITEM_ACCESS_TOKEN
 
 That's all you need to use Rollbar with Rails.
 
-### If not using Rails
+### If using Rack
 
 Be sure to initialize Rollbar with your access token somewhere during startup:
 
@@ -67,6 +67,28 @@ end
 <!-- RemoveNextIfProject -->
 Be sure to replace ```POST_SERVER_ITEM_ACCESS_TOKEN``` with your project's ```post_server_item``` access token, which you can find in the Rollbar.com interface.
 
+This monkey patches `Rack::Builder` to work with Rollbar automatically.
+
+For more control, disable the monkey patch in the rollbar configuration:
+
+```ruby
+Rollbar.configure do |config|
+  config.disable_monkey_patch = true
+  # other configuration settings
+  # ...
+end
+```
+
+Then mount the middleware in your app, like:
+
+```ruby
+class MyApp < Sinatra::Base
+  use Rollbar::Middleware::Sinatra
+  # other middleware/etc
+  # ...
+end
+```
+
 ## Test your installation
 
 To confirm that it worked, run:
@@ -499,6 +521,21 @@ Some users have reported problems with Zeus when ```rake``` was not explicitly i
 
 You can find upgrading notes in [UPGRADING.md](UPGRADING.md).
 
+## Issues
+
+We've received some issues from users having problems when they use [Oj](https://github.com/ohler55/oj) as the JSON serialization library with [MultiJson](https://github.com/intridea/multi_json). To avoid these problems, we recommend upgrading to Oj version 2.11.0:
+
+```ruby
+gem 'oj', '~> 2.11.0'
+```
+
+If you are using Oj but cannot upgrade, you can work around this with:
+
+```ruby
+require 'json'
+MultiJson.use(:json_common)
+```
+
 
 ## Help / Support
 

data/THANKS.md

@@ -15,6 +15,7 @@ Huge thanks to the following contributors (by github username). For the most up-
 - [fab](https://github.com/fab)
 - [firstbanco](https://github.com/firstbanco)
 - [Florent2](https://github.com/Florent2)
+- [gersmann](https://github.com/gersmann)
 - [grosser](https://github.com/grosser)
 - [ixti](https://github.com/ixti)
 - [jeremyvdw](https://github.com/jeremyvdw)
@@ -25,13 +26,16 @@ Huge thanks to the following contributors (by github username). For the most up-
 - [kavu](https://github.com/kavu)
 - [kroky](https://github.com/kroky)
 - [lanej](https://github.com/lanej)
+- [lesliev-figured](https://github.com/lesliev-figured)
 - [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)
 - [mrgordon](https://github.com/mrgordon)
+- [nikolai-b](https://github.com/nikolai-b)
 - [notahat](https://github.com/notahat)
+- [pedro](https://github.com/pedro)
 - [petergoldstein](https://github.com/petergoldstein)
 - [pmen](https://github.com/pmen)
 - [rogercampos](https://github.com/rogercampos)

data/lib/rollbar.rb

@@ -19,7 +19,6 @@ require 'rollbar/util'
 require 'rollbar/railtie' if defined?(Rails)
 require 'rollbar/delay/girl_friday'
 require 'rollbar/delay/thread'
-require 'rollbar/core_ext/thread'
 
 unless ''.respond_to? :encode
   require 'iconv'
@@ -349,9 +348,11 @@ module Rollbar
 
     def trace_chain(exception)
       traces = [trace_data(exception)]
+      visited = [exception]
 
-      while exception.respond_to?(:cause) && (cause = exception.cause)
+      while exception.respond_to?(:cause) && (cause = exception.cause) && !visited.include?(cause)
         traces << trace_data(cause)
+        visited << cause
         exception = cause
       end
 
@@ -371,6 +372,7 @@ module Rollbar
       }
       data[:root] = configuration.root.to_s if configuration.root
       data[:branch] = configuration.branch if configuration.branch
+      data[:pid] = Process.pid
 
       data
     end
@@ -662,6 +664,9 @@ module Rollbar
       yield(configuration)
 
       require_hooks
+      # This monkey patch is always needed in order
+      # to use Rollbar.scoped
+      require 'rollbar/core_ext/thread'
     end
 
     def reconfigure
@@ -679,6 +684,7 @@ module Rollbar
     end
 
     def require_hooks
+      return if configuration.disable_monkey_patch
       wrap_delayed_worker
 
       require 'rollbar/sidekiq' if defined?(Sidekiq)

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.report_exception(exception, request_data, person_data)
+        exception_data = Rollbar.scope(:request => request_data, :person => person_data).error(exception)
       rescue => e
         Rollbar.log_warning "[Rollbar] Exception while reporting exception to Rollbar: #{e}"
       end

data/lib/rollbar/configuration.rb

@@ -10,6 +10,7 @@ module Rollbar
     attr_accessor :custom_data_method
     attr_accessor :delayed_job_enabled
     attr_accessor :default_logger
+    attr_accessor :disable_monkey_patch
     attr_accessor :dj_threshold
     attr_accessor :enabled
     attr_accessor :endpoint
@@ -47,6 +48,7 @@ module Rollbar
       @custom_data_method = nil
       @default_logger = lambda { Logger.new(STDERR) }
       @delayed_job_enabled = true
+      @disable_monkey_patch = false
       @dj_threshold = 0
       @enabled = nil  # set to true when configure is called
       @endpoint = DEFAULT_ENDPOINT

data/lib/rollbar/delayed_job.rb

@@ -3,14 +3,14 @@ module Rollbar
     def self.wrap_worker
       return if @wrapped
       @wrapped = true
-      
+
       ::Delayed::Worker.lifecycle.around(:invoke_job) do |job, *args, &block|
         begin
           block.call(job, *args)
         rescue Exception => e
           if job.attempts >= ::Rollbar.configuration.dj_threshold
             data = ::Rollbar.configuration.report_dj_data ? job : nil
-            ::Rollbar.report_exception(e, data)
+            ::Rollbar.scope(:request => data).error(e)
           end
           raise e
         end

data/lib/rollbar/goalie.rb

@@ -10,11 +10,11 @@ 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.report_exception(exception, request_data, person_data)
+        exception_data = Rollbar.scope(:request => request_data, :person => person_data).error(exception)
       rescue => e
-        Rollbar.log_warning "[Rollbar] Exception while reporting exception to Rollbar: #{e}" 
+        Rollbar.log_warning "[Rollbar] Exception while reporting exception to Rollbar: #{e}"
       end
-      
+
       # if an exception was reported, save uuid in the env
       # so it can be displayed to the user on the error page
       if exception_data.is_a?(Hash)

data/lib/rollbar/rake.rb

@@ -3,8 +3,9 @@ require 'rake'
 module Rake
   class Application
     alias_method :orig_display_error_message, :display_error_message
+
     def display_error_message(ex)
-      Rollbar.report_exception(ex)
+      Rollbar.error(ex)
       orig_display_error_message(ex)
     end
   end

data/lib/rollbar/rake_tasks.rb

@@ -19,7 +19,7 @@ namespace :rollbar do
       exit
     end
 
-    Rollbar.report_message("Test error from rollbar:test", "error")
+    Rollbar.error('Test error from rollbar:test')
 
     begin
       require './app/controllers/application_controller'

data/lib/rollbar/sidekiq.rb

@@ -10,8 +10,9 @@ if Sidekiq::VERSION < '3'
           yield
         rescue Exception => e
           params = msg.reject{ |k| PARAM_BLACKLIST.include?(k) }
+          scope = { :request => { :params => params } }
 
-          Rollbar.report_exception(e, :params => params)
+          Rollbar.scope(scope).report_exception(e)
           raise
         end
       end
@@ -27,8 +28,9 @@ else
   Sidekiq.configure_server do |config|
     config.error_handlers << Proc.new do |e, context|
       params = context.reject{ |k| PARAM_BLACKLIST.include?(k) }
-      
-      Rollbar.report_exception(e, :params => params)
+      scope = { :request => { :params => params } }
+
+      Rollbar.scope(scope).error(e)
     end
   end
 end

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "1.2.7"
+  VERSION = "1.2.8"
 end

data/spec/dummyapp/app/controllers/home_controller.rb

@@ -19,7 +19,7 @@ class HomeController < ApplicationController
     begin
       foo = bar
     rescue => e
-      Rollbar.report_exception(e)
+      Rollbar.error(e)
     end
     render :json => {}
   end

data/spec/dummyapp/config/initializers/rollbar.rb

@@ -1,4 +1,5 @@
 require 'rollbar/rails'
+
 Rollbar.configure do |config|
   config.access_token = 'aaaabbbbccccddddeeeeffff00001111'
   config.request_timeout = 60
@@ -18,4 +19,4 @@ Rollbar.configure do |config|
   # Valid levels: 'critical', 'error', 'warning', 'info', 'debug', 'ignore'
   # 'ignore' will cause the exception to not be reported at all.
   # config.exception_level_filters.merge!('MyCriticalException' => 'critical')
-end
+end unless ENV['SKIP_DUMMY_ROLLBAR']

data/spec/rollbar/delayed_job_spec.rb

@@ -33,11 +33,10 @@ describe Rollbar::Delayed, :reconfigure_notifier => true do
   end
 
   it 'sends the exception' do
+    expect_any_instance_of(Rollbar::Notifier).to receive(:error).with(kind_of(FailingJob::TestException))
+
     expect do
       Delayed::Job.enqueue(FailingJob.new)
     end.to raise_error(FailingJob::TestException)
-
-    last_report = Rollbar.last_report
-    expect(last_report[:request]).to be_kind_of(DummyBackend::Job)
   end
 end

data/spec/rollbar_spec.rb

@@ -23,7 +23,24 @@ describe Rollbar do
         end
       end
 
-  let(:configuration) { Rollbar.configuration }
+      let(:configuration) { Rollbar.configuration }
+
+      context 'executing a Thread before Rollbar is configured', :skip_dummy_rollbar => true do
+        before do
+          Rollbar.reset_notifier!
+          Rollbar.unconfigure
+
+          Thread.new {}
+
+          Rollbar.configure do |config|
+            config.access_token = 'my-access-token'
+          end
+        end
+
+        it 'sets correct configuration for Rollbar.notifier' do
+          expect(Rollbar.notifier.configuration.enabled).to be_truthy
+        end
+      end
 
       it 'should report a simple message' do
         expect(notifier).to receive(:report).with('error', 'test message', nil, nil)
@@ -283,7 +300,7 @@ describe Rollbar do
         end
 
         it 'should have the correct server keys' do
-          payload['data'][:server].keys.should match_array([:host, :root])
+          payload['data'][:server].keys.should match_array([:host, :root, :pid])
         end
 
         it 'should have the correct level and message body' do
@@ -303,6 +320,8 @@ describe Rollbar do
       end
 
       it 'should overwrite existing keys from payload_options' do
+        reconfigure_notifier
+
         payload_options = {
           :notifier => 'bad notifier',
           :server => { :host => 'new host', :new_server_key => 'value' }
@@ -565,20 +584,38 @@ describe Rollbar do
             chain[1][:exception][:message].should match(/the cause/)
           end
 
-          context 'using ruby <= 2.1' do
-            next if Exception.instance_methods.include?(:cause)
+          context 'with cyclic nested exceptions' do
+            let(:exception1) { Exception.new('exception1') }
+            let(:exception2) { Exception.new('exception2') }
 
-            it 'sends only the last exception in the trace attribute' do
-              body = notifier.send(:build_payload_body_exception, message, rescued_exception, extra)
+            before do
+              allow(exception1).to receive(:cause).and_return(exception2)
+              allow(exception2).to receive(:cause).and_return(exception1)
+            end
 
-              body[:trace].should be_kind_of(Hash)
-              body[:trace_chain].should be_nil
+            it 'doesnt loop for ever' do
+              body = notifier.send(:build_payload_body_exception, message, exception1, extra)
+              chain = body[:trace_chain]
 
-              body[:trace][:exception][:class].should match(/StandardError/)
-              body[:trace][:exception][:message].should match(/the error/)
+              expect(chain[0][:exception][:message]).to be_eql('exception1')
+              expect(chain[1][:exception][:message]).to be_eql('exception2')
             end
           end
         end
+
+        context 'using ruby <= 2.1' do
+          next if Exception.instance_methods.include?(:cause)
+
+          it 'sends only the last exception in the trace attribute' do
+            body = notifier.send(:build_payload_body_exception, message, rescued_exception, extra)
+
+            body[:trace].should be_kind_of(Hash)
+            body[:trace_chain].should be_nil
+
+            body[:trace][:exception][:class].should match(/StandardError/)
+            body[:trace][:exception][:message].should match(/the error/)
+          end
+        end
       end
     end
 
@@ -909,7 +946,7 @@ describe Rollbar do
     it 'should report simple messages' do
       logger_mock.should_receive(:info).with('[Rollbar] Scheduling payload')
       logger_mock.should_receive(:info).with('[Rollbar] Success')
-      Rollbar.report_message("Test message")
+      Rollbar.error('Test message')
     end
 
     it 'should not report anything when disabled' do
@@ -918,7 +955,7 @@ describe Rollbar do
         config.enabled = false
       end
 
-      Rollbar.report_message("Test message that should be ignored")
+      Rollbar.error('Test message that should be ignored')
 
       Rollbar.configure do |config|
         config.enabled = true
@@ -927,8 +964,8 @@ describe Rollbar do
 
     it 'should report messages with extra data' do
       logger_mock.should_receive(:info).with('[Rollbar] Success')
-      Rollbar.report_message("Test message with extra data", 'debug', :foo => "bar",
-                               :hash => { :a => 123, :b => "xyz" })
+      Rollbar.debug('Test message with extra data', 'debug', :foo => "bar",
+                                                             :hash => { :a => 123, :b => "xyz" })
     end
 
     # END Backwards
@@ -1127,7 +1164,7 @@ describe Rollbar do
       it 'sends a payload generated as String, not as a Hash' do
         logger_mock.should_receive(:info).with('[Rollbar] Success')
 
-        Rollbar.report_exception(exception)
+        Rollbar.error(exception)
       end
 
       context 'with async failover handlers' do
@@ -1150,7 +1187,7 @@ describe Rollbar do
           it 'doesnt call any failover handler' do
             expect(handler).not_to receive(:call)
 
-            Rollbar.report_exception(exception)
+            Rollbar.error(exception)
           end
         end
 

data/spec/spec_helper.rb

@@ -37,6 +37,12 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
   config.backtrace_exclusion_patterns = [/gems\/rspec-.*/]
+
+  if ENV['SKIP_DUMMY_ROLLBAR']
+    config.filter_run(:skip_dummy_rollbar => true)
+  else
+    config.filter_run_excluding(:skip_dummy_rollbar => true)
+  end
 end
 
 def local?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json