rollbar 0.12.20 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a174b1d884a3719e380c721e3f31176157b55895
-  data.tar.gz: 8a848c8705970c1ff53a45f763a89068b3f6f6c9
+  metadata.gz: edd3328a4f2609cd9fe7a75916ef566e36fa4a03
+  data.tar.gz: 971ed93611878985514906f336a290bb74cdb120
 SHA512:
-  metadata.gz: 4f00108d55e33e68bc513f6f7493b7707a3b87e8d4bbdeeb2190172829e091f410acd5bac8533232b6297311a98639e5c60ed58bc7076cafb23738fef74104f7
-  data.tar.gz: 59414c7223324364962285a981007b5a0934ea3aef2c3d68b435a7aacfc56d8d416ec05a55bbd096f031b80e0ffdd14c7564f60f653de4e85ab7f9e5552dc6c1
+  metadata.gz: 6b9ccd2085f183dd0d3074a8c42201daeb21eae07a06981f65aca8e18afdf9ab357525805921095fea71a07cb7c89ad292539f1873aabaadbec0741d7e546b75
+  data.tar.gz: 0176e82ff4510507d448b9db337a1b93e7623ca4c53e805bd4c8faaa30fd2c1cc9a43c88034342c6d14fc93bdac6482c6bc5666173929b6de7caad0d4fdb5e51

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+**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**
 - 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)

data/README.md

@@ -233,7 +233,7 @@ 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)
+config.delayed_job_enabled = false
 ```
 
 

data/THANKS.md

@@ -27,6 +27,7 @@ Huge thanks to the following contributors (by github username). For the most up-
 - [miloops](https://github.com/miloops)
 - [mipearson](https://github.com/mipearson)
 - [mrgordon](https://github.com/mrgordon)
+- [notahat](https://github.com/notahat)
 - [petergoldstein](https://github.com/petergoldstein)
 - [pmen](https://github.com/pmen)
 - [rogercampos](https://github.com/rogercampos)

data/lib/rollbar.rb

@@ -20,11 +20,17 @@ require 'rollbar/railtie' if defined?(Rails)
 
 module Rollbar
   MAX_PAYLOAD_SIZE = 128 * 1024 #128kb
-  
+
   class << self
     attr_writer :configuration
     attr_accessor :last_report
 
+    # Similar to configure below, but used only internally within the gem
+    # to configure it without initializing any of the third party hooks
+    def preconfigure
+      yield(configuration)
+    end
+    
     # Configures the gem.
     #
     # Call on app startup to set the `access_token` (required) and other config params.
@@ -36,13 +42,13 @@ module Rollbar
     #     config.access_token = 'abcdefg'
     #   end
     def configure
-      require_hooks
-
       # if configuration.enabled has not been set yet (is still 'nil'), set to true.
       if configuration.enabled.nil?
         configuration.enabled = true
       end
       yield(configuration)
+      
+      require_hooks
     end
 
     def reconfigure
@@ -81,12 +87,12 @@ module Rollbar
         person_id = person_data[Rollbar.configuration.person_id_method.to_sym]
         return 'ignored' if configuration.ignored_person_ids.include?(person_id)
       end
-      
+
       return 'disabled' unless configuration.enabled
       return 'ignored' if ignored?(exception)
 
       data = exception_data(exception, level ? level : filtered_level(exception))
-      
+
       attach_request_data(data, request_data) if request_data
       data[:person] = person_data if person_data
 
@@ -116,9 +122,9 @@ module Rollbar
       return 'disabled' unless configuration.enabled
 
       data = message_data(message, level, extra_data)
-      
+
       @last_report = data
-      
+
       payload = build_payload(data)
       schedule_payload(payload)
       log_instance_link(data)
@@ -147,12 +153,12 @@ module Rollbar
       return 'disabled' unless configuration.enabled
 
       data = message_data(message, level, extra_data)
-      
+
       attach_request_data(data, request_data) if request_data
       data[:person] = person_data if person_data
-      
+
       @last_report = data
-      
+
       payload = build_payload(data)
       schedule_payload(payload)
       log_instance_link(data)
@@ -226,23 +232,27 @@ module Rollbar
     end
 
     private
-    
+
     def attach_request_data(payload, request_data)
       if request_data[:route]
         route = request_data[:route]
-        
+
         # make sure route is a hash built by RequestDataExtractor in rails apps
         if route.is_a?(Hash) and not route.empty?
           payload[:context] = "#{request_data[:route][:controller]}" + '#' + "#{request_data[:route][:action]}"
         end
       end
-      
+
       request_data[:env].reject!{|k, v| v.is_a?(IO) } if request_data[:env]
       payload[:request] = request_data
     end
 
     def require_hooks()
-      require 'rollbar/delayed_job' if defined?(Delayed) && defined?(Delayed::Plugins)
+      if defined?(Delayed) && defined?(Delayed::Worker) && configuration.delayed_job_enabled
+        require 'rollbar/delayed_job'
+        Rollbar::Delayed::wrap_worker
+      end
+      
       require 'rollbar/sidekiq' if defined?(Sidekiq)
       require 'rollbar/goalie' if defined?(Goalie)
       require 'rollbar/rack' if defined?(Rack)
@@ -409,7 +419,7 @@ module Rollbar
       if payload.nil?
         return
       end
-      
+
       log_info '[Rollbar] Scheduling payload'
 
       if configuration.use_async
@@ -435,18 +445,18 @@ module Rollbar
         :data => data
       }
       result = MultiJson.dump(payload)
-      
+
       # Try to truncate strings in the payload a few times if the payload is too big
       original_size = result.bytesize
       if original_size > MAX_PAYLOAD_SIZE
         thresholds = [1024, 512, 256]
         thresholds.each_with_index do |threshold, i|
           new_payload = payload.clone
-          
+
           truncate_payload(new_payload, threshold)
-          
+
           result = MultiJson.dump(new_payload)
-          
+
           if result.bytesize <= MAX_PAYLOAD_SIZE
             break
           elsif i == thresholds.length - 1
@@ -457,7 +467,7 @@ module Rollbar
           end
         end
       end
-      
+
       result
     end
 
@@ -493,7 +503,7 @@ module Rollbar
       unless config.custom_data_method.nil?
         data[:custom] = config.custom_data_method.call
       end
-      
+
       data
     end
 
@@ -592,7 +602,7 @@ module Rollbar
         log_error "[Rollbar] Error sending failsafe : #{e}"
       end
     end
-    
+
     def truncate_payload(payload, byte_threshold)
       truncator = Proc.new do |value|
         if value.is_a?(String) and value.bytesize > byte_threshold
@@ -601,7 +611,7 @@ module Rollbar
           value
         end
       end
-      
+
       Rollbar::Util::iterate_and_update(payload, truncator)
     end
   end

data/lib/rollbar/configuration.rb

@@ -8,6 +8,7 @@ module Rollbar
     attr_accessor :branch
     attr_accessor :code_version
     attr_accessor :custom_data_method
+    attr_accessor :delayed_job_enabled
     attr_accessor :default_logger
     attr_accessor :dj_threshold
     attr_accessor :enabled
@@ -42,6 +43,7 @@ module Rollbar
       @code_version = nil
       @custom_data_method = nil
       @default_logger = lambda { Logger.new(STDERR) }
+      @delayed_job_enabled = true
       @dj_threshold = 0
       @enabled = nil  # set to true when configure is called
       @endpoint = DEFAULT_ENDPOINT

data/lib/rollbar/delayed_job.rb

@@ -1,23 +1,20 @@
-# based on http://bit.ly/VGdfVI
-
-module Delayed
-  module Plugins
-    class Rollbar < Plugin
-      callbacks do |lifecycle|
-        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)
-            end
-            raise e
+module Rollbar
+  module Delayed
+    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)
           end
+          raise e
         end
       end
     end
   end
 end
-
-Delayed::Worker.plugins << Delayed::Plugins::Rollbar

data/lib/rollbar/rails.rb

@@ -9,7 +9,7 @@ module Rollbar
                        RAILS_DEFAULT_LOGGER
                      end
 
-      Rollbar.configure do |config|
+      Rollbar.preconfigure do |config|
         config.logger = rails_logger
         config.environment = defined?(::Rails.env) && ::Rails.env || defined?(RAILS_ENV) && RAILS_ENV
         config.root = defined?(::Rails.root) && ::Rails.root || defined?(RAILS_ROOT) && RAILS_ROOT

data/lib/rollbar/railtie.rb

@@ -15,7 +15,7 @@ module Rollbar
     end
 
     config.after_initialize do
-      Rollbar.configure do |config|
+      Rollbar.preconfigure do |config|
         config.logger ||= ::Rails.logger
         config.environment ||= ::Rails.env
         config.root ||= ::Rails.root
@@ -41,4 +41,3 @@ module Rollbar
     end
   end
 end
-

data/lib/rollbar/rake_tasks.rb

@@ -8,7 +8,7 @@ namespace :rollbar do
       Logger.new(STDOUT)
 
     Rails.logger.level = Logger::DEBUG
-    Rollbar.configure do |config|
+    Rollbar.preconfigure do |config|
       config.logger = Rails.logger
     end
 

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "0.12.20"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 0.12.20
+  version: 0.13.0
 platform: ruby
 authors:
 - Brian Rue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json