rollbar 3.1.0 → 3.3.0

data/lib/rollbar/configuration.rb

@@ -4,81 +4,82 @@ module Rollbar
   class Configuration
     SEND_EXTRA_FRAME_DATA_OPTIONS = [:none, :app, :all].freeze
 
-    attr_accessor :access_token
-    attr_accessor :async_handler
-    attr_accessor :branch
-    attr_reader :before_process
-    attr_accessor :capture_uncaught
-    attr_accessor :code_version
-    attr_accessor :custom_data_method
-    attr_accessor :delayed_job_enabled
-    attr_accessor :default_logger
-    attr_reader :logger_level
-    attr_accessor :disable_monkey_patch
-    attr_accessor :disable_rack_monkey_patch
-    attr_accessor :disable_core_monkey_patch
-    attr_accessor :enable_error_context
-    attr_accessor :dj_threshold
-    attr_accessor :async_skip_report_handler
-    attr_accessor :enabled
-    attr_accessor :endpoint
-    attr_accessor :environment
-    attr_accessor :exception_level_filters
-    attr_accessor :failover_handlers
-    attr_accessor :framework
-    attr_accessor :ignored_person_ids
-    attr_accessor :host
-    attr_accessor :locals
-    attr_writer :logger
-    attr_accessor :payload_options
-    attr_accessor :person_method
-    attr_accessor :person_id_method
-    attr_accessor :person_username_method
-    attr_accessor :person_email_method
-    attr_accessor :populate_empty_backtraces
-    attr_accessor :report_dj_data
-    attr_accessor :open_timeout
-    attr_accessor :request_timeout
-    attr_accessor :net_retries
-    attr_accessor :root
-    attr_accessor :js_options
-    attr_accessor :js_enabled
-    attr_accessor :safely
-    attr_accessor :scrub_fields
-    attr_accessor :scrub_user
-    attr_accessor :scrub_password
-    attr_accessor :scrub_whitelist
-    attr_accessor :collect_user_ip
-    attr_accessor :anonymize_user_ip
-    attr_accessor :user_ip_obfuscator_secret
-    attr_accessor :randomize_scrub_length
-    attr_accessor :uncaught_exception_level
-    attr_accessor :scrub_headers
-    attr_accessor :sidekiq_threshold
-    attr_reader :transform
-    attr_accessor :verify_ssl_peer
-    attr_accessor :use_async
-    attr_accessor :async_json_payload
-    attr_reader :use_eventmachine
-    attr_accessor :web_base
-    attr_reader :send_extra_frame_data
-    attr_accessor :use_exception_level_filters_default
-    attr_accessor :proxy
-    attr_accessor :raise_on_error
-    attr_accessor :transmit
-    attr_accessor :log_payload
-    attr_accessor :backtrace_cleaner
-
-    attr_accessor :write_to_file
-    attr_accessor :filepath
-    attr_accessor :files_with_pid_name_enabled
-    attr_accessor :files_processed_enabled
-    attr_accessor :files_processed_duration # seconds
-    attr_accessor :files_processed_size # bytes
-    attr_accessor :use_payload_access_token
-
-    attr_reader :project_gem_paths
-    attr_accessor :configured_options
+    attr_accessor :access_token,
+                  :anonymize_user_ip,
+                  :async_handler,
+                  :async_json_payload,
+                  :async_skip_report_handler,
+                  :backtrace_cleaner,
+                  :branch,
+                  :capture_uncaught,
+                  :code_version,
+                  :collect_user_ip,
+                  :configured_options,
+                  :custom_data_method,
+                  :default_logger,
+                  :delayed_job_enabled,
+                  :disable_core_monkey_patch,
+                  :disable_monkey_patch,
+                  :disable_rack_monkey_patch,
+                  :dj_threshold,
+                  :enable_error_context,
+                  :enabled,
+                  :endpoint,
+                  :environment,
+                  :exception_level_filters,
+                  :failover_handlers,
+                  :filepath,
+                  :files_processed_duration,
+                  :files_processed_enabled,
+                  :files_processed_size,
+                  :files_with_pid_name_enabled,
+                  :framework,
+                  :ignore_internal_errors,
+                  :ignored_person_ids,
+                  :js_enabled,
+                  :js_options,
+                  :host,
+                  :locals,
+                  :log_payload,
+                  :net_retries,
+                  :open_timeout,
+                  :payload_options,
+                  :person_email_method,
+                  :person_id_method,
+                  :person_method,
+                  :person_username_method,
+                  :populate_empty_backtraces,
+                  :proxy,
+                  :raise_on_error,
+                  :randomize_scrub_length,
+                  :report_dj_data,
+                  :request_timeout,
+                  :root,
+                  :safely,
+                  :scrub_fields,
+                  :scrub_password,
+                  :scrub_user,
+                  :scrub_whitelist,
+                  :transmit,
+                  :uncaught_exception_level,
+                  :user_ip_obfuscator_secret,
+                  :user_ip_rack_env_key,
+                  :scrub_headers,
+                  :sidekiq_threshold,
+                  :sidekiq_use_scoped_block,
+                  :use_async,
+                  :use_exception_level_filters_default,
+                  :use_payload_access_token,
+                  :verify_ssl_peer,
+                  :web_base,
+                  :write_to_file
+    attr_reader :before_process,
+                :logger_level,
+                :project_gem_paths,
+                :send_extra_frame_data,
+                :transform,
+                :use_eventmachine
+    attr_writer :logger # seconds # bytes
 
     alias safely? safely
 
@@ -93,7 +94,7 @@ module Rollbar
       @capture_uncaught = nil
       @code_version = nil
       @custom_data_method = nil
-      @default_logger = lambda { ::Logger.new(STDERR) }
+      @default_logger = lambda { ::Logger.new($stderr) }
       @logger_level = :info
       @delayed_job_enabled = true
       @disable_monkey_patch = false
@@ -112,6 +113,11 @@ module Rollbar
       }
       @failover_handlers = []
       @framework = 'Plain'
+      @ignore_internal_errors = [
+        'Net::ReadTimeout',
+        'Net::OpenTimeout',
+        'SocketError'
+      ]
       @ignored_person_ids = []
       @host = nil
       @payload_options = {}
@@ -139,6 +145,7 @@ module Rollbar
       @uncaught_exception_level = 'error'
       @scrub_headers = ['Authorization']
       @sidekiq_threshold = 0
+      @sidekiq_use_scoped_block = false
       @safely = false
       @transform = []
       @use_async = false
@@ -156,6 +163,7 @@ module Rollbar
       @collect_user_ip = true
       @anonymize_user_ip = false
       @user_ip_obfuscator_secret = nil
+      @user_ip_rack_env_key = nil
       @backtrace_cleaner = nil
       @hooks = {
         :on_error_response => nil, # params: response
@@ -212,7 +220,8 @@ module Rollbar
     def use_active_job(options = {})
       require 'rollbar/delay/active_job'
 
-      Rollbar::Delay::ActiveJob.queue_as(options[:queue] || Rollbar::Delay::ActiveJob.default_queue_name)
+      Rollbar::Delay::ActiveJob.queue_as(options[:queue] ||
+      Rollbar::Delay::ActiveJob.default_queue_name)
 
       @use_async      = true
       @async_handler  = Rollbar::Delay::ActiveJob
@@ -252,8 +261,13 @@ module Rollbar
     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)
+      deprecation_message = '#use_sidekiq=(value) has been deprecated in favor ' \
+        'of #use_sidekiq(options = {}). Please update your rollbar configuration.'
+      if defined?(ActiveSupport)
+        ActiveSupport::Deprecation.warn(deprecation_message)
+      else
+        puts(deprecation_message)
+      end
 
       value.is_a?(Hash) ? use_sidekiq(value) : use_sidekiq
     end
@@ -272,8 +286,13 @@ module Rollbar
     end
 
     def use_sucker_punch=(_value)
-      deprecation_message = '#use_sucker_punch=(value) has been deprecated in favor of #use_sucker_punch. Please update your rollbar configuration.'
-      defined?(ActiveSupport) ? ActiveSupport::Deprecation.warn(deprecation_message) : puts(deprecation_message)
+      deprecation_message = '#use_sucker_punch=(value) has been deprecated in ' \
+        'favor of #use_sucker_punch. Please update your rollbar configuration.'
+      if defined?(ActiveSupport)
+        ActiveSupport::Deprecation.warn(deprecation_message)
+      else
+        puts(deprecation_message)
+      end
 
       use_sucker_punch
     end
@@ -304,7 +323,9 @@ module Rollbar
 
     def send_extra_frame_data=(value)
       unless SEND_EXTRA_FRAME_DATA_OPTIONS.include?(value)
-        logger.warning("Wrong 'send_extra_frame_data' value, :none, :app or :full is expected")
+        logger.warning(
+          "Wrong 'send_extra_frame_data' value, :none, :app or :full is expected"
+        )
 
         return
       end
@@ -330,14 +351,14 @@ module Rollbar
     end
 
     def hook(symbol, &block)
-      if @hooks.key?(symbol)
-        if block_given?
-          @hooks[symbol] = block
-        else
-          @hooks[symbol]
-        end
+      unless @hooks.key?(symbol)
+        raise StandardError, "Hook :#{symbol} is not supported by Rollbar SDK."
+      end
+
+      if block_given?
+        @hooks[symbol] = block
       else
-        raise StandardError, 'Hook :' + symbol.to_s + ' is not supported by Rollbar SDK.'
+        @hooks[symbol]
       end
     end
 
@@ -358,7 +379,10 @@ module Rollbar
       return super unless configuration.respond_to?(method)
 
       method_string = method.to_s
-      configured[method_string.chomp('=').to_sym] = args.first if method_string.end_with?('=')
+      if method_string.end_with?('=')
+        configured[method_string.chomp('=').to_sym] =
+          args.first
+      end
 
       configuration.send(method, *args, &block)
     end

data/lib/rollbar/delay/shoryuken.rb

@@ -2,9 +2,10 @@ 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.
+    # 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
 

data/lib/rollbar/delay/sidekiq.rb

@@ -10,7 +10,9 @@ module Rollbar
       end
 
       def call(payload)
-        raise StandardError, 'Unable to push the job to Sidekiq' if ::Sidekiq::Client.push(@options.merge('args' => [payload])).nil?
+        return unless ::Sidekiq::Client.push(@options.merge('args' => [payload])).nil?
+
+        raise(StandardError, 'Unable to push the job to Sidekiq')
       end
 
       include ::Sidekiq::Worker

data/lib/rollbar/delay/sucker_punch.rb

@@ -7,8 +7,7 @@ module Rollbar
       include ::SuckerPunch::Job
 
       class << self
-        attr_accessor :perform_proc
-        attr_accessor :ready
+        attr_accessor :perform_proc, :ready
       end
 
       self.ready = false

data/lib/rollbar/delay/thread.rb

@@ -62,11 +62,12 @@ module Rollbar
                 reaper.join
               end
             rescue Timeout::Error
-              raise TimeoutError, "unable to reap all threads within #{EXIT_TIMEOUT} seconds"
+              raise TimeoutError,
+                    "unable to reap all threads within #{EXIT_TIMEOUT} seconds"
             end
           end
         end
-      end # class << self
+      end
 
       def priority
         self.class.options[:priority] || DEFAULT_PRIORITY

data/lib/rollbar/deploy.rb

@@ -30,9 +30,7 @@ module Rollbar
       return {} unless access_token && !access_token.empty?
 
       uri = ::URI.parse(
-        ::Rollbar::Deploy::ENDPOINT +
-        deploy_id.to_s +
-        '?access_token=' + access_token
+        "#{::Rollbar::Deploy::ENDPOINT}#{deploy_id}?access_token=#{access_token}"
       )
 
       request = ::Net::HTTP::Patch.new(uri.request_uri)
@@ -74,17 +72,18 @@ module Rollbar
 
       def request_result(uri, request)
         {
-          :request_info => uri.inspect + ': ' + request.body,
+          :request_info => "#{uri.inspect}: #{request.body}",
           :request => request
         }
       end
 
       def response_result(response)
+        code = response.code
+        message = response.message
+        body = response.body.delete("\n")
         {
           :response => response,
-          :response_info => response.code + '; ' +
-            response.message + '; ' +
-            response.body.delete("\n")
+          :response_info => "#{code}; #{message}; #{body}"
         }.merge(::JSON.parse(response.body, :symbolize_names => true))
       end
     end

data/lib/rollbar/encoding/encoder.rb

@@ -1,8 +1,10 @@
 module Rollbar
   module Encoding
     class Encoder
-      ALL_ENCODINGS = [::Encoding::UTF_8, ::Encoding::ISO_8859_1, ::Encoding::ASCII_8BIT, ::Encoding::US_ASCII].freeze
-      ASCII_ENCODINGS = [::Encoding::US_ASCII, ::Encoding::ASCII_8BIT, ::Encoding::ISO_8859_1].freeze
+      ALL_ENCODINGS = [::Encoding::UTF_8, ::Encoding::ISO_8859_1, ::Encoding::ASCII_8BIT,
+                       ::Encoding::US_ASCII].freeze
+      ASCII_ENCODINGS = [::Encoding::US_ASCII, ::Encoding::ASCII_8BIT,
+                         ::Encoding::ISO_8859_1].freeze
       UTF8 = 'UTF-8'.freeze
       BINARY = 'binary'.freeze
 
@@ -40,7 +42,9 @@ module Rollbar
       def force_encoding(value)
         return value if value.frozen?
 
-        value.force_encoding(detect_encoding(value)) if value.encoding == ::Encoding::UTF_8
+        if value.encoding == ::Encoding::UTF_8
+          value.force_encoding(detect_encoding(value))
+        end
 
         value
       end

data/lib/rollbar/exception_reporter.rb

@@ -7,16 +7,23 @@ module Rollbar
 
       exception_data = exception_data(exception)
 
-      if exception_data.is_a?(Hash)
+      case exception_data
+      when Hash
         env['rollbar.exception_uuid'] = exception_data[:uuid]
-        Rollbar.log_debug "[Rollbar] Exception uuid saved in env: #{exception_data[:uuid]}"
-      elsif exception_data == 'disabled'
-        Rollbar.log_debug '[Rollbar] Exception not reported because Rollbar is disabled'
-      elsif exception_data == 'ignored'
+        Rollbar.log_debug(
+          "[Rollbar] Exception uuid saved in env: #{exception_data[:uuid]}"
+        )
+      when 'disabled'
+        Rollbar.log_debug(
+          '[Rollbar] Exception not reported because Rollbar is disabled'
+        )
+      when 'ignored'
         Rollbar.log_debug '[Rollbar] Exception not reported because it was ignored'
       end
     rescue StandardError => e
-      Rollbar.log_warning "[Rollbar] Exception while reporting exception to Rollbar: #{e.message}"
+      Rollbar.log_warning(
+        "[Rollbar] Exception while reporting exception to Rollbar: #{e.message}"
+      )
     end
 
     def capture_uncaught?
@@ -24,12 +31,14 @@ module Rollbar
     end
 
     def log_exception_message(exception)
-      exception_message = exception.respond_to?(:message) ? exception.message : 'No Exception Message'
+      exception_message = exception.message if exception.respond_to?(:message)
+      exception_message ||= 'No Exception Message'
       Rollbar.log_debug "[Rollbar] Reporting exception: #{exception_message}"
     end
 
     def exception_data(exception)
-      Rollbar.log(Rollbar.configuration.uncaught_exception_level, exception, :use_exception_level_filters => true)
+      Rollbar.log(Rollbar.configuration.uncaught_exception_level, exception,
+                  :use_exception_level_filters => true)
     end
   end
 end

data/lib/rollbar/item/backtrace.rb

@@ -3,11 +3,7 @@ require 'rollbar/item/frame'
 module Rollbar
   class Item
     class Backtrace
-      attr_reader :exception
-      attr_reader :message
-      attr_reader :extra
-      attr_reader :configuration
-      attr_reader :files
+      attr_reader :exception, :message, :extra, :configuration, :files
 
       private :files
 
@@ -54,7 +50,10 @@ module Rollbar
 
         current_exception = exception
 
-        while current_exception.respond_to?(:cause) && (cause = current_exception.cause) && cause.is_a?(Exception) && !visited.include?(cause)
+        while current_exception.respond_to?(:cause) &&
+              (cause = current_exception.cause) &&
+              cause.is_a?(Exception) &&
+              !visited.include?(cause)
           traces << trace_data(cause)
           visited << cause
           current_exception = cause
@@ -100,7 +99,9 @@ module Rollbar
       # are those from the user's Rollbar.error line until this method. We want
       # to remove those lines.
       def exception_backtrace(current_exception)
-        return current_exception.backtrace if current_exception.backtrace.respond_to?(:map)
+        if current_exception.backtrace.respond_to?(:map)
+          return current_exception.backtrace
+        end
         return [] unless configuration.populate_empty_backtraces
 
         caller_backtrace = caller
@@ -109,7 +110,8 @@ module Rollbar
       end
 
       def rollbar_lib_gem_dir
-        Gem::Specification.find_by_name('rollbar').gem_dir + '/lib'
+        gem_dir = Gem::Specification.find_by_name('rollbar').gem_dir
+        "#{gem_dir}/lib"
       end
     end
   end

data/lib/rollbar/item/frame.rb

@@ -6,9 +6,7 @@ module Rollbar
   class Item
     # Representation of the trace data per frame in the payload
     class Frame
-      attr_reader :backtrace
-      attr_reader :frame
-      attr_reader :configuration
+      attr_reader :backtrace, :frame, :configuration
 
       MAX_CONTEXT_LENGTH = 4
 
@@ -104,7 +102,8 @@ module Rollbar
 
       def post_data(file_lines, lineno)
         from_line = lineno
-        number_of_lines = [from_line + MAX_CONTEXT_LENGTH, file_lines.size].min - from_line
+        number_of_lines = [from_line + MAX_CONTEXT_LENGTH,
+                           file_lines.size].min - from_line
 
         file_lines[from_line, number_of_lines]
       end
@@ -113,7 +112,9 @@ module Rollbar
         to_line = lineno - 2
         from_line = [to_line - MAX_CONTEXT_LENGTH + 1, 0].max
 
-        file_lines[from_line, (to_line - from_line + 1)].select { |line| line && !line.empty? }
+        file_lines[from_line, (to_line - from_line + 1)].select do |line|
+          line && !line.empty?
+        end
       end
     end
   end

data/lib/rollbar/item/locals.rb

@@ -1,4 +1,3 @@
-require 'rollbar/notifier'
 require 'rollbar/scrubbers/params'
 require 'rollbar/util'
 
@@ -59,7 +58,9 @@ module Rollbar
         # truncation strategy for large payloads.
         #
         def prepare_value(value)
-          return simple_value?(value) ? value : value.inspect unless value.is_a?(Hash) || value.is_a?(Array)
+          unless value.is_a?(Hash) || value.is_a?(Array)
+            return simple_value?(value) ? value : value.inspect
+          end
 
           cloned_value = ::Rollbar::Util.deep_copy(value)
           ::Rollbar::Util.iterate_and_update_with_block(cloned_value) do |v|