rollbar 2.15.0 → 2.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75de87140e9fe6e01344c22ac625a2726a07cb6a
-  data.tar.gz: 4cd6d96381e2c0c6c3af63feb5192ce7cb6523c8
+  metadata.gz: 73754e6a1e6bf9d7914571a174c10265cd0d85fa
+  data.tar.gz: 8c1f3715b20d672299b4be4a1fdbd8cc7fd7a602
 SHA512:
-  metadata.gz: d913f6a9faf35b2386509f13b5d9bda82e6c9a5e09782cb2623b193ecc3e95fb7e985577e46f4a612b6f2a159c030f48f07f382ff12aeae0a5065d0416a6a251
-  data.tar.gz: 32b6fe0ea92ec3e5462f8556fff7c21dc87e7fc058368bee7f3fe6aa40edd9c955dcaae6c0305343048170b307fcc8c8f5d9db9413fe35d6fe50038da85cc578
+  metadata.gz: 702e9699419e0877522940dc1b6fe782c8d73dbb118f38b80dfb566e9f3db070fa3f8ccb244313d90c0d3e813c032fbc06d5f4cc9815be1fe47710725fc07b46
+  data.tar.gz: a077c1f297ea59b496ad9f172e8aafc900fe91971f44fd4f42ddb23675e1554352dbf563f99a5b8c2f0fa1e36a5599cbc9a591f36f6fe2400a92ad7ca0e303d0

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 2.15.1
+
+- Update rollbar.js to v2.2.3 [#630](https://github.com/rollbar/rollbar-gem/pull/630)
+- allow csp opt out [#629](https://github.com/rollbar/rollbar-gem/pull/629)
+- Fix: [#472](https://github.com/rollbar/rollbar-gem/issues/472)
+- Ignore empty ROLLBAR_ENV [#604](https://github.com/rollbar/rollbar-gem/pull/604)
+- Shoryuken gem support [#576](https://github.com/rollbar/rollbar-gem/pull/576)
+- support new sidekiq context structure [#598](https://github.com/rollbar/rollbar-gem/pull/598)
+
 ## 2.15.0
 
 Features:

data/Gemfile

@@ -39,6 +39,7 @@ gem 'generator_spec'
 gem 'girl_friday', '>= 0.11.1'
 gem 'redis'
 gem 'resque'
+gem 'shoryuken'
 gem 'sinatra'
 
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-# Rollbar [![Build Status](https://api.travis-ci.org/rollbar/rollbar-gem.svg?branch=v2.15.0)](https://travis-ci.org/rollbar/rollbar-gem/branches)
+# Rollbar [![Build Status](https://api.travis-ci.org/rollbar/rollbar-gem.svg?branch=v2.15.1)](https://travis-ci.org/rollbar/rollbar-gem/branches)
 
 <!-- RemoveNext -->
 [Rollbar](https://rollbar.com) is an error tracking service for Ruby and other languages. The Rollbar service will alert you of problems with your code and help you understand them in a ways never possible before. We love it and we hope you will too.
@@ -763,6 +763,27 @@ For every errored job a new report will be sent to Rollbar API, also for errored
 config.sidekiq_threshold = 3 # Start reporting from 3 retries jobs
 ```
 
+### Shoryuken
+
+Add the following in ```config/initializers/rollbar.rb```
+
+```ruby
+config.environment = Rails.env # necessary for building proper SQS name.
+config.use_shoryuken
+```
+
+You also need to have the configuration for shoryuken in you project `shoryuken.yml` and AWS settings, or, at least:
+```ruby
+ENV['AWS_ACCESS_KEY_ID'] = 'xxx'
+ENV['AWS_SECRET_ACCESS_KEY'] = 'xxx'
+ENV['AWS_REGION'] = 'xxx'
+```
+Read more about [Shoryuken configuration]https://github.com/phstc/shoryuken/wiki/Shoryuken-options
+
+Also create the SQS channels equals to your environments, as follows:
+The queues to report will be equal to ```rollbar_{CURRENT_ENVIRONMENT}``` ex: if the project runs in staging environment the SQS to throw messages to will be equal to ```rollbar_staging```
+At this stage, you are unable to set custom SQS name to use.
+
 ### Resque
 
 Add the following in ```config/initializers/rollbar.rb```:

data/data/rollbar.snippet.js

@@ -1 +1 @@
-!function(r){function o(e){if(n[e])return n[e].exports;var t=n[e]={exports:{},id:e,loaded:!1};return r[e].call(t.exports,t,t.exports,o),t.loaded=!0,t.exports}var n={};return o.m=r,o.c=n,o.p="",o(0)}([function(r,o,n){"use strict";var e=n(1),t=n(4);_rollbarConfig=_rollbarConfig||{},_rollbarConfig.rollbarJsUrl=_rollbarConfig.rollbarJsUrl||"https://cdnjs.cloudflare.com/ajax/libs/rollbar.js/2.0.4/rollbar.min.js",_rollbarConfig.async=void 0===_rollbarConfig.async||_rollbarConfig.async;var a=e.setupShim(window,_rollbarConfig),l=t(_rollbarConfig);window.rollbar=e.Rollbar,a.loadFull(window,document,!_rollbarConfig.async,_rollbarConfig,l)},function(r,o,n){"use strict";function e(r){return function(){try{return r.apply(this,arguments)}catch(r){try{console.error("[Rollbar]: Internal error",r)}catch(r){}}}}function t(r,o){this.options=r,this._rollbarOldOnError=null;var n=s++;this.shimId=function(){return n},window&&window._rollbarShims&&(window._rollbarShims[n]={handler:o,messages:[]})}function a(r,o){var n=o.globalAlias||"Rollbar";if("object"==typeof r[n])return r[n];r._rollbarShims={},r._rollbarWrappedError=null;var t=new d(o);return e(function(){return o.captureUncaught&&(t._rollbarOldOnError=r.onerror,i.captureUncaughtExceptions(r,t,!0),i.wrapGlobals(r,t,!0)),o.captureUnhandledRejections&&i.captureUnhandledRejections(r,t,!0),r[n]=t,t})()}function l(r){return e(function(){var o=this,n=Array.prototype.slice.call(arguments,0),e={shim:o,method:r,args:n,ts:new Date};window._rollbarShims[this.shimId()].messages.push(e)})}var i=n(2),s=0,c=n(3),p=function(r,o){return new t(r,o)},d=c.bind(null,p);t.prototype.loadFull=function(r,o,n,t,a){var l=function(){var o;if(void 0===r._rollbarDidLoad){o=new Error("rollbar.js did not load");for(var n,e,t,l,i=0;n=r._rollbarShims[i++];)for(n=n.messages||[];e=n.shift();)for(t=e.args||[],i=0;i<t.length;++i)if(l=t[i],"function"==typeof l){l(o);break}}"function"==typeof a&&a(o)},i=!1,s=o.createElement("script"),c=o.getElementsByTagName("script")[0],p=c.parentNode;s.crossOrigin="",s.src=t.rollbarJsUrl,n||(s.async=!0),s.onload=s.onreadystatechange=e(function(){if(!(i||this.readyState&&"loaded"!==this.readyState&&"complete"!==this.readyState)){s.onload=s.onreadystatechange=null;try{p.removeChild(s)}catch(r){}i=!0,l()}}),p.insertBefore(s,c)},t.prototype.wrap=function(r,o){try{var n;if(n="function"==typeof o?o:function(){return o||{}},"function"!=typeof r)return r;if(r._isWrap)return r;if(!r._wrapped&&(r._wrapped=function(){try{return r.apply(this,arguments)}catch(e){var o=e;throw"string"==typeof o&&(o=new String(o)),o._rollbarContext=n()||{},o._rollbarContext._wrappedSource=r.toString(),window._rollbarWrappedError=o,o}},r._wrapped._isWrap=!0,r.hasOwnProperty))for(var e in r)r.hasOwnProperty(e)&&(r._wrapped[e]=r[e]);return r._wrapped}catch(o){return r}};for(var u="log,debug,info,warn,warning,error,critical,global,configure,handleUncaughtException,handleUnhandledRejection".split(","),f=0;f<u.length;++f)t.prototype[u[f]]=l(u[f]);r.exports={setupShim:a,Rollbar:d}},function(r,o){"use strict";function n(r,o,n){if(r){var t;"function"==typeof o._rollbarOldOnError?t=o._rollbarOldOnError:r.onerror&&!r.onerror.belongsToShim&&(t=r.onerror,o._rollbarOldOnError=t);var a=function(){var n=Array.prototype.slice.call(arguments,0);e(r,o,t,n)};a.belongsToShim=n,r.onerror=a}}function e(r,o,n,e){r._rollbarWrappedError&&(e[4]||(e[4]=r._rollbarWrappedError),e[5]||(e[5]=r._rollbarWrappedError._rollbarContext),r._rollbarWrappedError=null),o.handleUncaughtException.apply(o,e),n&&n.apply(r,e)}function t(r,o,n){if(r){"function"==typeof r._rollbarURH&&r._rollbarURH.belongsToShim&&r.removeEventListener("unhandledrejection",r._rollbarURH);var e=function(r){var n=r.reason,e=r.promise,t=r.detail;!n&&t&&(n=t.reason,e=t.promise),o&&o.handleUnhandledRejection&&o.handleUnhandledRejection(n,e)};e.belongsToShim=n,r._rollbarURH=e,r.addEventListener("unhandledrejection",e)}}function a(r,o,n){if(r){var e,t,a="EventTarget,Window,Node,ApplicationCache,AudioTrackList,ChannelMergerNode,CryptoOperation,EventSource,FileReader,HTMLUnknownElement,IDBDatabase,IDBRequest,IDBTransaction,KeyOperation,MediaController,MessagePort,ModalWindow,Notification,SVGElementInstance,Screen,TextTrack,TextTrackCue,TextTrackList,WebSocket,WebSocketWorker,Worker,XMLHttpRequest,XMLHttpRequestEventTarget,XMLHttpRequestUpload".split(",");for(e=0;e<a.length;++e)t=a[e],r[t]&&r[t].prototype&&l(o,r[t].prototype,n)}}function l(r,o,n){if(o.hasOwnProperty&&o.hasOwnProperty("addEventListener")){for(var e=o.addEventListener;e._rollbarOldAdd&&e.belongsToShim;)e=e._rollbarOldAdd;var t=function(o,n,t){e.call(this,o,r.wrap(n),t)};t._rollbarOldAdd=e,t.belongsToShim=n,o.addEventListener=t;for(var a=o.removeEventListener;a._rollbarOldRemove&&a.belongsToShim;)a=a._rollbarOldRemove;var l=function(r,o,n){a.call(this,r,o&&o._wrapped||o,n)};l._rollbarOldRemove=a,l.belongsToShim=n,o.removeEventListener=l}}r.exports={captureUncaughtExceptions:n,captureUnhandledRejections:t,wrapGlobals:a}},function(r,o){"use strict";function n(r,o){this.impl=r(o,this),this.options=o,e(n.prototype)}function e(r){for(var o=function(r){return function(){var o=Array.prototype.slice.call(arguments,0);if(this.impl[r])return this.impl[r].apply(this.impl,o)}},n="log,debug,info,warn,warning,error,critical,global,configure,handleUncaughtException,handleUnhandledRejection,_createItem,wrap,loadFull,shimId".split(","),e=0;e<n.length;e++)r[n[e]]=o(n[e])}n.prototype._swapAndProcessMessages=function(r,o){this.impl=r(this.options);for(var n,e,t;n=o.shift();)e=n.method,t=n.args,this[e]&&"function"==typeof this[e]&&this[e].apply(this,t);return this},r.exports=n},function(r,o){"use strict";r.exports=function(r){return function(o){if(!o&&!window._rollbarInitialized){r=r||{};for(var n,e,t=r.globalAlias||"Rollbar",a=window.rollbar,l=function(r){return new a(r)},i=0;n=window._rollbarShims[i++];)e||(e=n.handler),n.handler._swapAndProcessMessages(l,n.messages);window[t]=e,window._rollbarInitialized=!0}}}}]);
+!function(r){function o(n){if(e[n])return e[n].exports;var t=e[n]={exports:{},id:n,loaded:!1};return r[n].call(t.exports,t,t.exports,o),t.loaded=!0,t.exports}var e={};return o.m=r,o.c=e,o.p="",o(0)}([function(r,o,e){"use strict";var n=e(1),t=e(4);_rollbarConfig=_rollbarConfig||{},_rollbarConfig.rollbarJsUrl=_rollbarConfig.rollbarJsUrl||"https://cdnjs.cloudflare.com/ajax/libs/rollbar.js/2.2.3/rollbar.min.js",_rollbarConfig.async=void 0===_rollbarConfig.async||_rollbarConfig.async;var a=n.setupShim(window,_rollbarConfig),l=t(_rollbarConfig);window.rollbar=n.Rollbar,a.loadFull(window,document,!_rollbarConfig.async,_rollbarConfig,l)},function(r,o,e){"use strict";function n(r){return function(){try{return r.apply(this,arguments)}catch(r){try{console.error("[Rollbar]: Internal error",r)}catch(r){}}}}function t(r,o){this.options=r,this._rollbarOldOnError=null;var e=s++;this.shimId=function(){return e},window&&window._rollbarShims&&(window._rollbarShims[e]={handler:o,messages:[]})}function a(r,o){var e=o.globalAlias||"Rollbar";if("object"==typeof r[e])return r[e];r._rollbarShims={},r._rollbarWrappedError=null;var t=new p(o);return n(function(){o.captureUncaught&&(t._rollbarOldOnError=r.onerror,i.captureUncaughtExceptions(r,t,!0),i.wrapGlobals(r,t,!0)),o.captureUnhandledRejections&&i.captureUnhandledRejections(r,t,!0);var n=o.autoInstrument;return(void 0===n||n===!0||"object"==typeof n&&n.network)&&r.addEventListener&&(r.addEventListener("load",t.captureLoad.bind(t)),r.addEventListener("DOMContentLoaded",t.captureDomContentLoaded.bind(t))),r[e]=t,t})()}function l(r){return n(function(){var o=this,e=Array.prototype.slice.call(arguments,0),n={shim:o,method:r,args:e,ts:new Date};window._rollbarShims[this.shimId()].messages.push(n)})}var i=e(2),s=0,d=e(3),c=function(r,o){return new t(r,o)},p=d.bind(null,c);t.prototype.loadFull=function(r,o,e,t,a){var l=function(){var o;if(void 0===r._rollbarDidLoad){o=new Error("rollbar.js did not load");for(var e,n,t,l,i=0;e=r._rollbarShims[i++];)for(e=e.messages||[];n=e.shift();)for(t=n.args||[],i=0;i<t.length;++i)if(l=t[i],"function"==typeof l){l(o);break}}"function"==typeof a&&a(o)},i=!1,s=o.createElement("script"),d=o.getElementsByTagName("script")[0],c=d.parentNode;s.crossOrigin="",s.src=t.rollbarJsUrl,e||(s.async=!0),s.onload=s.onreadystatechange=n(function(){if(!(i||this.readyState&&"loaded"!==this.readyState&&"complete"!==this.readyState)){s.onload=s.onreadystatechange=null;try{c.removeChild(s)}catch(r){}i=!0,l()}}),c.insertBefore(s,d)},t.prototype.wrap=function(r,o,e){try{var n;if(n="function"==typeof o?o:function(){return o||{}},"function"!=typeof r)return r;if(r._isWrap)return r;if(!r._rollbar_wrapped&&(r._rollbar_wrapped=function(){e&&"function"==typeof e&&e.apply(this,arguments);try{return r.apply(this,arguments)}catch(e){var o=e;throw"string"==typeof o&&(o=new String(o)),o._rollbarContext=n()||{},o._rollbarContext._wrappedSource=r.toString(),window._rollbarWrappedError=o,o}},r._rollbar_wrapped._isWrap=!0,r.hasOwnProperty))for(var t in r)r.hasOwnProperty(t)&&(r._rollbar_wrapped[t]=r[t]);return r._rollbar_wrapped}catch(o){return r}};for(var u="log,debug,info,warn,warning,error,critical,global,configure,handleUncaughtException,handleUnhandledRejection,captureDomContentLoaded,captureLoad".split(","),f=0;f<u.length;++f)t.prototype[u[f]]=l(u[f]);r.exports={setupShim:a,Rollbar:p}},function(r,o){"use strict";function e(r,o,e){if(r){var t;"function"==typeof o._rollbarOldOnError?t=o._rollbarOldOnError:r.onerror&&!r.onerror.belongsToShim&&(t=r.onerror,o._rollbarOldOnError=t);var a=function(){var e=Array.prototype.slice.call(arguments,0);n(r,o,t,e)};a.belongsToShim=e,r.onerror=a}}function n(r,o,e,n){r._rollbarWrappedError&&(n[4]||(n[4]=r._rollbarWrappedError),n[5]||(n[5]=r._rollbarWrappedError._rollbarContext),r._rollbarWrappedError=null),o.handleUncaughtException.apply(o,n),e&&e.apply(r,n)}function t(r,o,e){if(r){"function"==typeof r._rollbarURH&&r._rollbarURH.belongsToShim&&r.removeEventListener("unhandledrejection",r._rollbarURH);var n=function(r){var e=r.reason,n=r.promise,t=r.detail;!e&&t&&(e=t.reason,n=t.promise),o&&o.handleUnhandledRejection&&o.handleUnhandledRejection(e,n)};n.belongsToShim=e,r._rollbarURH=n,r.addEventListener("unhandledrejection",n)}}function a(r,o,e){if(r){var n,t,a="EventTarget,Window,Node,ApplicationCache,AudioTrackList,ChannelMergerNode,CryptoOperation,EventSource,FileReader,HTMLUnknownElement,IDBDatabase,IDBRequest,IDBTransaction,KeyOperation,MediaController,MessagePort,ModalWindow,Notification,SVGElementInstance,Screen,TextTrack,TextTrackCue,TextTrackList,WebSocket,WebSocketWorker,Worker,XMLHttpRequest,XMLHttpRequestEventTarget,XMLHttpRequestUpload".split(",");for(n=0;n<a.length;++n)t=a[n],r[t]&&r[t].prototype&&l(o,r[t].prototype,e)}}function l(r,o,e){if(o.hasOwnProperty&&o.hasOwnProperty("addEventListener")){for(var n=o.addEventListener;n._rollbarOldAdd&&n.belongsToShim;)n=n._rollbarOldAdd;var t=function(o,e,t){n.call(this,o,r.wrap(e),t)};t._rollbarOldAdd=n,t.belongsToShim=e,o.addEventListener=t;for(var a=o.removeEventListener;a._rollbarOldRemove&&a.belongsToShim;)a=a._rollbarOldRemove;var l=function(r,o,e){a.call(this,r,o&&o._rollbar_wrapped||o,e)};l._rollbarOldRemove=a,l.belongsToShim=e,o.removeEventListener=l}}r.exports={captureUncaughtExceptions:e,captureUnhandledRejections:t,wrapGlobals:a}},function(r,o){"use strict";function e(r,o){this.impl=r(o,this),this.options=o,n(e.prototype)}function n(r){for(var o=function(r){return function(){var o=Array.prototype.slice.call(arguments,0);if(this.impl[r])return this.impl[r].apply(this.impl,o)}},e="log,debug,info,warn,warning,error,critical,global,configure,handleUncaughtException,handleUnhandledRejection,_createItem,wrap,loadFull,shimId,captureDomContentLoaded,captureLoad".split(","),n=0;n<e.length;n++)r[e[n]]=o(e[n])}e.prototype._swapAndProcessMessages=function(r,o){this.impl=r(this.options);for(var e,n,t;e=o.shift();)n=e.method,t=e.args,this[n]&&"function"==typeof this[n]&&("captureDomContentLoaded"===n||"captureLoad"===n?this[n].apply(this,[t[0],e.ts]):this[n].apply(this,t));return this},r.exports=e},function(r,o){"use strict";r.exports=function(r){return function(o){if(!o&&!window._rollbarInitialized){r=r||{};for(var e,n,t=r.globalAlias||"Rollbar",a=window.rollbar,l=function(r){return new a(r)},i=0;e=window._rollbarShims[i++];)n||(n=e.handler),e.handler._swapAndProcessMessages(l,e.messages);window[t]=n,window._rollbarInitialized=!0}}}}]);

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

@@ -62,5 +62,5 @@ Rollbar.configure do |config|
   # environment variable like this: `ROLLBAR_ENV=staging`. This is a recommended
   # setup for Heroku. See:
   # https://devcenter.heroku.com/articles/deploying-to-a-custom-rails-environment
-  config.environment = ENV['ROLLBAR_ENV'] || Rails.env
+  config.environment = ENV['ROLLBAR_ENV'].presence || Rails.env
 end

data/lib/rollbar/configuration.rb

@@ -171,6 +171,12 @@ module Rollbar
       @async_handler  = Rollbar::Delay::Resque
     end
 
+    def use_shoryuken
+      require 'rollbar/delay/shoryuken' if defined?(Shoryuken)
+      @use_async      = true
+      @async_handler  = Rollbar::Delay::Shoryuken
+    end
+
     def use_sidekiq=(value)
       deprecation_message = '#use_sidekiq=(value) has been deprecated in favor of #use_sidekiq(options = {}). Please update your rollbar configuration.'
       defined?(ActiveSupport) ? ActiveSupport::Deprecation.warn(deprecation_message) : puts(deprecation_message)

data/lib/rollbar/delay/shoryuken.rb

@@ -0,0 +1,29 @@
+require 'shoryuken'
+
+module Rollbar
+  module Delay
+    # Following class allows to send rollbars using Sho-ryu-ken as a background jobs processor.
+    # see the queue_name method which states that your queues needs to be names as "rollbar_ENVIRONMENT".
+    # retry intervals will be used to retry sending the same message again if failed before.
+    class Shoryuken
+      include ::Shoryuken::Worker
+
+      # not allowing bulk, to not double-report rollbars if one of them failed in bunch.
+      shoryuken_options :queue => queue_name, :auto_delete => true, :body_parser => :json, :retry_intervals => [60, 180, 360, 120_0, 360_0, 186_00]
+
+      def self.queue_name
+        "rollbar_#{Rollbar.configuration.environment}"
+      end
+
+      ## responsible for performing job. - payload is a json parsed body of the message.
+      def perform(_sqs_message, payload)
+        Rollbar.process_from_async_handler(payload)
+      end
+
+      ## to push the job !
+      def call(payload)
+        self.class.perform_async(payload)
+      end
+    end
+  end
+end

data/lib/rollbar/middleware/js.rb

@@ -150,6 +150,7 @@ module Rollbar
       def append_nonce?
         defined?(::SecureHeaders) && ::SecureHeaders.respond_to?(:content_security_policy_script_nonce) &&
           defined?(::SecureHeaders::Configuration) &&
+          !::SecureHeaders::Configuration.get.csp.opt_out? &&
           !::SecureHeaders::Configuration.get.current_csp[:script_src].to_a.include?("'unsafe-inline'")
       end
     end

data/lib/rollbar/plugins/delayed_job/job_data.rb

@@ -32,6 +32,8 @@ module Rollbar
         return payload_object unless payload_object.respond_to?(:object)
 
         object_data(payload_object.object)
+      rescue
+        {}
       end
 
       def object_data(object)

data/lib/rollbar/plugins/delayed_job/plugin.rb

@@ -10,6 +10,9 @@ module Rollbar
     class RollbarPlugin < ::Delayed::Plugin
       callbacks do |lifecycle|
         lifecycle.around(:invoke_job, &Delayed::invoke_job_callback)
+        lifecycle.after(:failure) do |_, job, _, _|
+          Delayed.report(job.last_error, job)
+        end
       end
     end
 

data/lib/rollbar/plugins/sidekiq/plugin.rb

@@ -12,16 +12,16 @@ module Rollbar
       end
     end
 
-    def self.handle_exception(msg_or_context, e)
-      return if skip_report?(msg_or_context, e)
+    def self.handle_exception(ctx_hash, e)
+      job_hash = ctx_hash && (ctx_hash[:job] || ctx_hash)
+      return if skip_report?(job_hash, e)
 
-      params = msg_or_context.reject{ |k| PARAM_BLACKLIST.include?(k) }
-      scrubbed_params = scrub_params(params)
       scope = {
-        :request => { :params => scrubbed_params },
         :framework => "Sidekiq: #{::Sidekiq::VERSION}"
       }
-      if params.is_a?(Hash)
+      unless job_hash.nil?
+        params = job_hash.reject { |k| PARAM_BLACKLIST.include?(k) }
+        scope[:request] = { :params => scrub_params(params) }
         scope[:context] = params['class']
         scope[:queue] = params['queue']
       end
@@ -38,9 +38,9 @@ module Rollbar
       Rollbar::Scrubbers::Params.call(options)
     end
 
-    def self.skip_report?(msg_or_context, e)
-      msg_or_context.is_a?(Hash) && msg_or_context['retry'] &&
-        msg_or_context['retry_count'] && msg_or_context['retry_count'] < ::Rollbar.configuration.sidekiq_threshold
+    def self.skip_report?(job_hash, e)
+      !job_hash.nil? && (job_hash['retry'] && job_hash['retry_count'] &&
+        job_hash['retry_count'] < ::Rollbar.configuration.sidekiq_threshold)
     end
 
     def call(worker, msg, queue)

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = '2.15.0'
+  VERSION = '2.15.1'
 end

data/spec/rollbar/middleware/js_spec.rb

@@ -119,7 +119,7 @@ END
         end
 
         it 'renders the snippet and config in the response with nonce in script tag when SecureHeaders installed' do
-          secure_headers_config = double(:configuration, :current_csp => {})
+          secure_headers_config = double(:configuration, :current_csp => {}, :csp => double(:opt_out? => false))
           allow(SecureHeaders::Configuration).to receive(:get).and_return(secure_headers_config)
           res_status, res_headers, response = subject.call(env)
 
@@ -131,9 +131,25 @@ END
         end
 
         it 'renders the snippet in the response without nonce if SecureHeaders script_src includes \'unsafe-inline\'' do
-          secure_headers_config = double(:configuration, :current_csp => {
+          secure_headers_config = double(:configuration,
+                                         :current_csp => {
                                            :script_src => %w('unsafe-inline')
-                                         })
+                                         },
+                                         :csp => double(:opt_out? => false))
+          allow(SecureHeaders::Configuration).to receive(:get).and_return(secure_headers_config)
+
+          res_status, res_headers, response = subject.call(env)
+          new_body = response.body.join
+
+          expect(new_body).to include('<script type="text/javascript">')
+          expect(new_body).to include("var _rollbarConfig = #{config[:options].to_json};")
+          expect(new_body).to include(snippet)
+
+          SecureHeaders.send(:remove_const, 'Configuration')
+        end
+
+        it 'renders the snippet in the response without nonce if SecureHeaders CSP is OptOut' do
+          secure_headers_config = double(:configuration, :csp => double(:opt_out? => true))
           allow(SecureHeaders::Configuration).to receive(:get).and_return(secure_headers_config)
 
           res_status, res_headers, response = subject.call(env)

data/spec/rollbar/plugins/delayed_job_spec.rb

@@ -34,6 +34,19 @@ describe Rollbar::Delayed, :reconfigure_notifier => true do
     end
   end
 
+  context 'with failed deserialization' do
+    let(:expected_args) do
+      [/Delayed::DeserializationError/, {:use_exception_level_filters=>true}]
+    end
+
+    it 'sends the exception' do
+      expect(Rollbar).to receive(:scope).with(kind_of(Hash)).and_call_original
+      allow_any_instance_of(Delayed::Backend::Base).to receive(:payload_object).and_raise(Delayed::DeserializationError)
+      expect_any_instance_of(Rollbar::Notifier).to receive(:error).with(*expected_args)
+
+      FailingJob.new.delay.do_job_please!(:foo, :bar)
+    end
+  end
 
   describe '.build_job_data' do
     let(:job) { double(:payload_object => {}) }

data/spec/rollbar/plugins/sidekiq_spec.rb

@@ -1,83 +1,111 @@
 require 'spec_helper'
 
-unless RUBY_VERSION == '1.8.7'
-  require 'sidekiq'
-end
+require 'sidekiq' unless RUBY_VERSION == '1.8.7'
 
 Rollbar.plugins.load!
 
 describe Rollbar::Sidekiq, :reconfigure_notifier => false do
   describe '.handle_exception' do
-    let(:msg_or_context) { ['hello', 'error_backtrace', 'backtrace', 'goodbye'] }
     let(:exception) { StandardError.new('oh noes') }
     let(:rollbar) { double }
-    let(:expected_args) do
+
+    let(:job_hash) do
       {
-        :request => { :params => ['hello', 'goodbye'] },
-        :framework => "Sidekiq: #{Sidekiq::VERSION}"
+        'class' => 'FooWorker',
+        'args' => %w(foo bar),
+        'queue' => 'default',
+        'jid' => '96aa59723946616dff537e97',
+        'enqueued_at' => Time.now.to_f,
+        'error_message' => exception.message,
+        'error_class' => exception.class,
+        'created_at' => Time.now.to_f,
+        'failed_at' => Time.now.to_f,
+        'retry' => 3,
+        'retry_count' => 0
       }
     end
 
-    subject { described_class }
+    let(:ctx_hash) do
+      { :context => 'Job raised exception', :job => job_hash }
+    end
+
+    let(:expected_scope) do
+      {
+        :request => {
+          :params => job_hash.reject { |k| described_class::PARAM_BLACKLIST.include?(k) }
+        },
+        :framework => "Sidekiq: #{Sidekiq::VERSION}",
+        :context => job_hash['class'],
+        :queue => job_hash['queue']
+      }
+    end
 
-    it 'constructs scope from filtered params' do
+    it 'constructs scope from ctx hash' do
       allow(rollbar).to receive(:error)
-      expect(Rollbar).to receive(:scope).with(expected_args) { rollbar }
+      expect(Rollbar).to receive(:scope).with(expected_scope) { rollbar }
+
+      described_class.handle_exception(ctx_hash, exception)
+    end
+
+    context 'sidekiq < 4.2.3 ctx hash' do
+      let(:ctx_hash) { job_hash }
+
+      it 'constructs scope from ctx hash' do
+        allow(rollbar).to receive(:error)
+        expect(Rollbar).to receive(:scope).with(expected_scope) { rollbar }
+
+        described_class.handle_exception(ctx_hash, exception)
+      end
+    end
+
+    context 'sidekiq < 4.0.0 nil ctx hash from Launcher#actor_died' do
+      let(:ctx_hash) { nil }
+
+      it 'constructs scope from ctx hash' do
+        allow(rollbar).to receive(:error)
+        expect(Rollbar).to receive(:scope).with(
+          :framework => "Sidekiq: #{Sidekiq::VERSION}"
+        ) { rollbar }
 
-      described_class.handle_exception(msg_or_context, exception)
+        described_class.handle_exception(ctx_hash, exception)
+      end
     end
 
     it 'sends the passed-in error to rollbar' do
       allow(Rollbar).to receive(:scope).and_return(rollbar)
       expect(rollbar).to receive(:error).with(exception, :use_exception_level_filters => true)
 
-      described_class.handle_exception(msg_or_context, exception)
+      described_class.handle_exception(ctx_hash, exception)
     end
 
-    context 'with fields in params to be scrubbed' do
-      let(:msg_or_context) do
-        {
-          :foo => 'bar',
-          :secret => 'foo',
-          :password => 'foo',
-          :password_confirmation => 'foo'
-        }
-      end
-      let(:expected_params) do
+    context 'with fields in job hash to be scrubbed' do
+      let(:ctx_hash) do
         {
-          :foo => 'bar',
-          :secret => /\*+/,
-          :password => /\*+/,
-          :password_confirmation => /\*+/
+          :context => 'Job raised exception',
+          :job => job_hash.merge(
+            'foo' => 'bar',
+            'secret' => 'foo',
+            'password' => 'foo',
+            'password_confirmation' => 'foo'
+          )
         }
       end
 
       before { reconfigure_notifier }
 
       it 'sends a report with the scrubbed fields' do
-        described_class.handle_exception(msg_or_context, exception)
-
-        expect(Rollbar.last_report[:request][:params]).to be_eql_hash_with_regexes(expected_params)
-      end
-    end
-
-    context 'when a sidekiq worker class is set' do
-      it 'adds the sidekiq#queue-name to the error report context' do
-        msg_or_context = {"retry" => true, "retry_count" => 1, 'queue' => 'default', 'class' => 'MyWorkerClass'}
-        expected_args = {
-          :request => { :params => msg_or_context },
-          :framework => "Sidekiq: #{Sidekiq::VERSION}",
-          :context => 'MyWorkerClass',
-          :queue => 'default'
-        }
-
-        allow(rollbar).to receive(:error)
-        allow(Rollbar).to receive(:scope).with(expected_args).and_return(rollbar)
-        described_class.handle_exception(msg_or_context, exception)
+        described_class.handle_exception(ctx_hash, exception)
+
+        expect(Rollbar.last_report[:request][:params]).to be_eql_hash_with_regexes(
+          'foo' => 'bar',
+          'secret' => /\*+/,
+          'password' => /\*+/,
+          'password_confirmation' => /\*+/
+        )
       end
     end
 
-    context 'when set a sidekiq_threshold' do
+    context 'with a sidekiq_threshold set' do
       before do
         Rollbar.configuration.sidekiq_threshold = 2
       end
@@ -86,38 +114,42 @@ describe Rollbar::Sidekiq, :reconfigure_notifier => false do
         allow(Rollbar).to receive(:scope).and_return(rollbar)
         expect(rollbar).to receive(:error).never
 
-        msg_or_context = {"retry" => true, "retry_count" => 1}
-
-        described_class.handle_exception(msg_or_context, exception)
+        described_class.handle_exception(
+          { :job => { 'retry' => true, 'retry_count' => 1 } },
+          exception
+        )
       end
 
       it 'sends the error to rollbar above the threshold' do
         allow(Rollbar).to receive(:scope).and_return(rollbar)
         expect(rollbar).to receive(:error)
 
-        msg_or_context = {"retry" => true, "retry_count" => 2}
-
-        described_class.handle_exception(msg_or_context, exception)
+        described_class.handle_exception(
+          { :job => { 'retry' => true, 'retry_count' => 2 } },
+          exception
+        )
       end
 
       it 'sends the error to rollbar if not retry' do
         allow(Rollbar).to receive(:scope).and_return(rollbar)
         expect(rollbar).to receive(:error)
 
-        msg_or_context = {"retry" => false}
-
-        described_class.handle_exception(msg_or_context, exception)
+        described_class.handle_exception(
+          { :job => { 'retry' => false } },
+          exception
+        )
       end
 
       it 'does not blow up and sends the error to rollbar if retry is true but there is no retry count' do
         allow(Rollbar).to receive(:scope).and_return(rollbar)
         expect(rollbar).to receive(:error)
 
-        msg_or_context = {"retry" => true}
-
-        expect {
-          described_class.handle_exception(msg_or_context, exception)
-        }.to_not raise_error
+        expect do
+          described_class.handle_exception(
+            { :job => { 'retry' => true } },
+            exception
+          )
+        end.to_not raise_error
       end
     end
   end

data/spec/rollbar_spec.rb

@@ -20,6 +20,11 @@ begin
 rescue LoadError
 end
 
+begin
+  require 'rollbar/delay/shoryuken'
+rescue LoadError
+end
+
 require 'spec_helper'
 
 describe Rollbar do
@@ -1173,6 +1178,16 @@ describe Rollbar do
       end
     end
 
+    describe "#use_shoryuken", :if => defined?(Shoryuken) do
+      it "should send the payload to shoryuken delayer" do
+        logger_mock.should_receive(:info).with('[Rollbar] Scheduling item')
+        expect(Rollbar::Delay::Shoryuken).to receive(:call)
+
+        Rollbar.configure(&:use_shoryuken)
+        Rollbar.error(exception)
+      end
+    end
+
     describe "#use_sidekiq", :if => defined?(Sidekiq) do
       it "should instanciate sidekiq delayer with custom values" do
         Rollbar::Delay::Sidekiq.should_receive(:new).with('queue' => 'test_queue')

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.15.1
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-16 00:00:00.000000000 Z
+date: 2017-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Easy and powerful exception tracking for Ruby
@@ -32,11 +32,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
-- ".gitignore"
-- ".gitmodules"
-- ".rubocop.yml"
-- ".travis.yml"
+- .codeclimate.yml
+- .gitignore
+- .gitmodules
+- .rubocop.yml
+- .travis.yml
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -68,6 +68,7 @@ files:
 - lib/rollbar/delay/delayed_job.rb
 - lib/rollbar/delay/girl_friday.rb
 - lib/rollbar/delay/resque.rb
+- lib/rollbar/delay/shoryuken.rb
 - lib/rollbar/delay/sidekiq.rb
 - lib/rollbar/delay/sucker_punch.rb
 - lib/rollbar/delay/thread.rb
@@ -270,17 +271,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Reports exceptions to Rollbar