rollbar 2.22.1 → 2.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c56a90107593b66c2be899fd4f36abe3ad657abcd0e2d822964efbc8e47efdbb
-  data.tar.gz: cd95d87f45d3e65f3dc499c9be88c3c18b84ccd359eda34ed2ab88e941909754
+  metadata.gz: c1848033c2fc853846ba902fbe4dc6095ad17a6e27595a3937484a6036154b76
+  data.tar.gz: a42d4a1274624ea5991b66b0df1ce7031d699390c5dcf574b98d8fe03ea5519d
 SHA512:
-  metadata.gz: c6fe31a226014d67e1225234e408030b1e9bab112973e3a312607e26c71c98e6c64d56d7ea2163e0d1cfdd5af3755c384e15c6e11c3166f9478b384f4c0a512f
-  data.tar.gz: 12c63a9346dc60827b7b5765b6e63ce9d5c814fdb90c0e685952e4751669bb0f0770344830d625070cac6d656958f6bbd2862522cd7d51d1e0cae039bfd0efb5
+  metadata.gz: 5d71b0e452e917b566e48a292368a242404c2d26e91c011f641f1fb7bde2b05ee8bd88a9af6d595bf6581cea17d5d4a996af63104c4ea55a19de564760b4f7f3
+  data.tar.gz: b7ec97dfa2625823709eba27b5252706fce661877b9e4338595228c901e5766ab9752a5103a87f929d7af8ae9c687a978f7630d93d0aee5611ab58e5771ccd2c

data/.rubocop.yml

@@ -1,3 +1,5 @@
+require: rubocop-performance
+
 AllCops:
   Exclude:
     - 'vendor/**/*'
@@ -66,3 +68,137 @@ Style/FrozenStringLiteralComment:
   # If we do this, it will be in its own PR. It requires adding these magic comments
   # throughout the project, in order to prepare for a future Ruby 3.x.
   Enabled: false
+
+Style/SafeNavigation:
+  # Not available in Ruby < 2.3.
+  Enabled: false
+
+#
+# Performance cops are opt in, and `Enabled: true` is always required.
+# Full list is here: https://github.com/rubocop-hq/rubocop-performance/tree/master/lib/rubocop/cop/performance
+# For travis builds, Codacy will see and use these directives.
+#
+Performance/Caller:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/CaseWhenSplat:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/Casecmp:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/ChainArrayAllocation:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/CompareWithBlock:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/Count:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/Detect:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/DoubleStartEndWith:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/EndWith:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/FixedSize:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/FlatMap:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/InefficientHashSearch:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/OpenStruct:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/RangeInclude:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/RedundantBlockCall:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/RedundantMatch:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/RedundantMerge:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/RegexpMatch:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/ReverseEach:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/Size:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/StartWith:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/StringReplacement:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/TimesMap:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/UnfreezeString:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
+Performance/UriDefaultParser:
+  Enabled: true
+  Exclude:
+    - spec/**/*

data/.travis.yml

@@ -3,12 +3,6 @@ dist: trusty
 services:
   - redis-server
 language: ruby
-# Broken bundler on travis CI - https://github.com/bundler/bundler/issues/2784
-before_install:
-  - gem update --system 2.7.7
-  - gem --version
-  - gem install bundler -v 1.6.1
-  - bundle --version
 
 rvm:
   - 1.9.3
@@ -18,8 +12,8 @@ rvm:
   - 2.3.8
   - 2.4.5
   - 2.5.3
-  - 2.6.0
-  - 2.6.3
+  - 2.6.5
+  - 2.7.0
   - rbx
   # Travis's own rvm installer is failing on JRuby builds, TODO: reenable when fixed.
   # - jruby-9.1.9.0
@@ -73,9 +67,6 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-    # Ruby 2.6.x is still being eveluated and may have test failures
-    - rvm: 2.6.0
-    - rvm: 2.6.3
     # oraclejdk9 has a dependency issue that needs to be investigated
     - jdk: oraclejdk9
 
@@ -124,17 +115,17 @@ matrix:
       jdk: oraclejdk8
     - rvm: 2.5.3
       jdk: oraclejdk9
-    - rvm: 2.6.0
+    - rvm: 2.6.5
       jdk: openjdk8
-    - rvm: 2.6.0
+    - rvm: 2.6.5
       jdk: oraclejdk8
-    - rvm: 2.6.0
+    - rvm: 2.6.5
       jdk: oraclejdk9
-    - rvm: 2.6.3
+    - rvm: 2.7.0
       jdk: openjdk8
-    - rvm: 2.6.3
+    - rvm: 2.7.0
       jdk: oraclejdk8
-    - rvm: 2.6.3
+    - rvm: 2.7.0
       jdk: oraclejdk9
 
     - rvm: ruby-head
@@ -184,11 +175,14 @@ matrix:
       gemfile: gemfiles/rails52.gemfile
     - rvm: 2.1.0
       gemfile: gemfiles/rails60.gemfile
-    # MRI 2.2.2 supports Rails 3.2.x and higher
+    # MRI 2.2.2 supports Rails 3.2.x and higher, except Rails 5.2.4 and higher*
+    # * ActionDispatch 5.2.4 uses Ruby 3.x safe navigation operator.
     - rvm: 2.2.2
       gemfile: gemfiles/rails30.gemfile
     - rvm: 2.2.2
       gemfile: gemfiles/rails31.gemfile
+    - rvm: 2.2.2
+      gemfile: gemfiles/rails52.gemfile
     # MRI 2.3.x supports Rails 4.0.x and higher
     - rvm: 2.3.8
       gemfile: gemfiles/rails30.gemfile
@@ -222,30 +216,39 @@ matrix:
       gemfile: gemfiles/rails40.gemfile
     - rvm: 2.5.3
       gemfile: gemfiles/rails41.gemfile
-    - rvm: 2.6.0
+    - rvm: 2.6.5
       gemfile: gemfiles/rails30.gemfile
-    - rvm: 2.6.0
+    - rvm: 2.6.5
       gemfile: gemfiles/rails31.gemfile
-    - rvm: 2.6.0
+    - rvm: 2.6.5
       gemfile: gemfiles/rails32.gemfile
-    - rvm: 2.6.0
+    - rvm: 2.6.5
       gemfile: gemfiles/rails40.gemfile
-    - rvm: 2.6.0
+    - rvm: 2.6.5
       gemfile: gemfiles/rails41.gemfile
-    - rvm: 2.6.0
+    - rvm: 2.6.5
       gemfile: gemfiles/rails42.gemfile
-    - rvm: 2.6.3
+    # Rails 6.x tries to be compatible with Ruby 2.7, though
+    # it still throws a lot of warnings. No point testing earlier
+    # Rails with Ruby 2.7.
+    - rvm: 2.7.0
       gemfile: gemfiles/rails30.gemfile
-    - rvm: 2.6.3
+    - rvm: 2.7.0
       gemfile: gemfiles/rails31.gemfile
-    - rvm: 2.6.3
+    - rvm: 2.7.0
       gemfile: gemfiles/rails32.gemfile
-    - rvm: 2.6.3
+    - rvm: 2.7.0
       gemfile: gemfiles/rails40.gemfile
-    - rvm: 2.6.3
+    - rvm: 2.7.0
       gemfile: gemfiles/rails41.gemfile
-    - rvm: 2.6.3
+    - rvm: 2.7.0
       gemfile: gemfiles/rails42.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails50.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails51.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails52.gemfile
     # JRuby JDBC Adapter is only compatible with Rails >= 5.x
     - rvm: jruby-9.1.9.0
       gemfile: gemfiles/rails30.gemfile

data/Gemfile

@@ -46,6 +46,7 @@ end
 
 if RUBY_VERSION.start_with?('1.9')
   gem 'capistrano', '<= 3.4.1', :require => false
+  gem 'json', '1.8.6'
   gem 'shoryuken', '>= 4.0.0', '<= 4.0.2'
   gem 'sucker_punch', '~> 1.0'
 elsif RUBY_VERSION.start_with?('2')
@@ -73,6 +74,7 @@ gem 'girl_friday', '>= 0.11.1'
 gem 'redis'
 gem 'resque', '< 2.0.0'
 gem 'rubocop', :require => false
+gem 'rubocop-performance', :require => false
 gem 'sinatra'
 gem 'webmock', :require => false
 gemspec

data/docs/configuration.md

@@ -129,6 +129,7 @@ An array of backup handlers if the async handlers fails. Each should respond to
 
 For use with `write_to_file`. Indicates location of the rollbar log file being
 tracked by [rollbar-agent](https://github.com/rollbar/rollbar-agent).
+Enable `files_with_pid_name_enabled` if you want to have different files for each process(only works if extension `rollbar`)
 
 ### framework
 

data/gemfiles/rails42.gemfile

@@ -27,6 +27,10 @@ platforms :rbx do
   gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
 end
 
+if RUBY_VERSION < '2.0.0'
+  gem 'json', '1.8.6'
+end
+
 if RUBY_VERSION < '2.2.2'
   gem 'sidekiq', '~> 2.13.0'
 else

data/gemfiles/rails60.gemfile

@@ -15,7 +15,7 @@ is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_
 gem 'appraisal'
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'jruby-openssl', :platform => :jruby
-gem 'rails', '6.0.0.rc1'
+gem 'rails', '6.0.2.1'
 gem 'sqlite3', '~> 1.4', :platform => [:ruby, :mswin, :mingw]
 
 gem 'rspec-core', '~> 3.8.0'

data/lib/rails/rollbar_runner.rb

@@ -39,7 +39,7 @@ module Rails
     end
 
     def eval_runner
-      if Rails.version >= '5.1.0'
+      if Gem::Version.new(Rails.version) >= Gem::Version.new('5.1.0')
         rails5_runner
       else
         legacy_runner
@@ -55,6 +55,8 @@ module Rails
     end
 
     def rails5_runner
+      require 'rails/command'
+
       Rails::Command.invoke 'runner', ARGV
     end
 

data/lib/rollbar/configuration.rb

@@ -17,13 +17,13 @@ module Rollbar
     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 :enabled
     attr_accessor :endpoint
     attr_accessor :environment
     attr_accessor :exception_level_filters
     attr_accessor :failover_handlers
-    attr_accessor :filepath
     attr_accessor :framework
     attr_accessor :ignored_person_ids
     attr_accessor :host
@@ -57,15 +57,23 @@ module Rollbar
     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_accessor :write_to_file
     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_reader :project_gem_paths
     attr_accessor :configured_options
@@ -87,6 +95,7 @@ module Rollbar
       @disable_monkey_patch = false
       @disable_core_monkey_patch = false
       @disable_rack_monkey_patch = false
+      @enable_error_context = true
       @dj_threshold = 0
       @enabled = nil # set to true when configure is called
       @endpoint = DEFAULT_ENDPOINT
@@ -118,7 +127,7 @@ module Rollbar
                        :api_key, :access_token, :accessToken, :session_id]
       @scrub_user = true
       @scrub_password = true
-      @randomize_scrub_length = true
+      @randomize_scrub_length = false
       @scrub_whitelist = []
       @uncaught_exception_level = 'error'
       @scrub_headers = ['Authorization']
@@ -126,10 +135,10 @@ module Rollbar
       @safely = false
       @transform = []
       @use_async = false
+      @async_json_payload = false
       @use_eventmachine = false
       @verify_ssl_peer = true
       @web_base = DEFAULT_WEB_BASE
-      @write_to_file = false
       @send_extra_frame_data = :none
       @project_gem_paths = []
       @use_exception_level_filters_default = false
@@ -139,11 +148,18 @@ module Rollbar
       @log_payload = false
       @collect_user_ip = true
       @anonymize_user_ip = false
+      @backtrace_cleaner = nil
       @hooks = {
         :on_error_response => nil, # params: response
         :on_report_internal_error => nil # params: exception
       }
 
+      @write_to_file = false
+      @files_with_pid_name_enabled = false
+      @files_processed_enabled = false
+      @files_processed_duration = 60
+      @files_processed_size = 5 * 1000 * 1000
+
       @configured_options = ConfiguredOptions.new(self)
     end
 
@@ -232,9 +248,10 @@ module Rollbar
       value.is_a?(Hash) ? use_sidekiq(value) : use_sidekiq
     end
 
-    def use_thread
+    def use_thread(options = {})
       require 'rollbar/delay/thread'
       @use_async = true
+      Rollbar::Delay::Thread.options = options
       @async_handler = Rollbar::Delay::Thread
     end
 
@@ -261,7 +278,10 @@ module Rollbar
         found = Gem::Specification.each.select { |spec| name === spec.name }
         puts "[Rollbar] No gems found matching #{name.inspect}" if found.empty?
         found
-      end.flatten.uniq.map(&:gem_dir)
+      end
+      @project_gem_paths.flatten!
+      @project_gem_paths.uniq!
+      @project_gem_paths.map!(&:gem_dir)
     end
 
     def before_process=(*handler)

data/lib/rollbar/delay/girl_friday.rb

@@ -12,13 +12,9 @@ module Rollbar
 
         def queue
           @queue ||= queue_class.new(nil, :size => 5) do |payload|
-            begin
-              Rollbar.process_from_async_handler(payload)
-            rescue StandardError
-              # According to https://github.com/mperham/girl_friday/wiki#error-handling
-              # we reraise the exception so it can be handled some way
-              raise
-            end
+            Rollbar.process_from_async_handler(payload)
+
+            # Do not rescue. GirlFriday will call the error handler.
           end
         end
       end

data/lib/rollbar/delay/resque.rb

@@ -24,9 +24,8 @@ module Rollbar
 
         def perform(payload)
           Rollbar.process_from_async_handler(payload)
-        rescue StandardError
-          # Raise the exception so Resque can track the errored job
-          raise
+
+          # Do not rescue. Resque will call the error handler.
         end
       end
     end

data/lib/rollbar/delay/sidekiq.rb

@@ -17,10 +17,8 @@ module Rollbar
 
       def perform(*args)
         Rollbar.process_from_async_handler(*args)
-      rescue StandardError
-        # Raise the exception so Sidekiq can track the errored job
-        # and retry it
-        raise
+
+        # Do not rescue. Sidekiq will call the error handler.
       end
     end
   end

data/lib/rollbar/delay/sucker_punch.rb

@@ -33,7 +33,7 @@ module Rollbar
 
       def perform(*args)
         Rollbar.process_from_async_handler(*args)
-      rescue StandardError
+
         # SuckerPunch can configure an exception handler with:
         #
         # SuckerPunch.exception_handler { # do something here }
@@ -41,9 +41,8 @@ module Rollbar
         # This is just passed to Celluloid.exception_handler which will
         # push the reiceved block to an array of handlers, by default empty, [].
         #
-        # We reraise the exception here casue it's safe and users could have defined
-        # their own exception handler for SuckerPunch
-        raise
+
+        # Do not rescue. SuckerPunch will call the error handler.
       end
     end
   end

data/lib/rollbar/delay/thread.rb

@@ -9,7 +9,10 @@ module Rollbar
       Error        = Class.new(StandardError)
       TimeoutError = Class.new(Error)
 
+      DEFAULT_PRIORITY = 1
+
       class << self
+        attr_writer :options
         attr_reader :reaper
 
         def call(payload)
@@ -20,6 +23,10 @@ module Rollbar
           thread
         end
 
+        def options
+          @options || {}
+        end
+
         private
 
         def threads
@@ -61,9 +68,16 @@ module Rollbar
         end
       end # class << self
 
+      def priority
+        self.class.options[:priority] || DEFAULT_PRIORITY
+      end
+
       def call(payload)
+        priority = self.priority
+
         ::Thread.new do
           begin
+            ::Thread.current.priority = priority
             Rollbar.process_from_async_handler(payload)
           rescue StandardError
             # Here we swallow the exception:

data/lib/rollbar/encoding/encoder.rb

@@ -3,7 +3,6 @@ module Rollbar
     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
-      ENCODING_OPTIONS = { :invalid => :replace, :undef => :replace, :replace => '' }.freeze
       UTF8 = 'UTF-8'.freeze
       BINARY = 'binary'.freeze
 
@@ -21,7 +20,13 @@ module Rollbar
         encoded_value = if encoding == ::Encoding::UTF_8 && value.valid_encoding?
                           value
                         else
-                          force_encoding(value).encode(*encoding_args(value))
+                          force_encoding(value).encode(
+                            *encoding_args(value),
+                            # Ruby 2.7 requires this to look like keyword args,
+                            # and Ruby 1.9.3 doesn't understand keyword args, so
+                            # don't use hash rockets here and both will be happy.
+                            invalid: :replace, undef: :replace, replace: '' # rubocop:disable Style/HashSyntax
+                          )
                         end
 
         object.is_a?(Symbol) ? encoded_value.to_sym : encoded_value
@@ -54,7 +59,6 @@ module Rollbar
       def encoding_args(value)
         args = [UTF8]
         args << BINARY if ASCII_ENCODINGS.include?(value.encoding)
-        args << ENCODING_OPTIONS
 
         args
       end

data/lib/rollbar/item.rb

@@ -109,15 +109,11 @@ module Rollbar
         # the risk just to send this diagnostic object. In versions < 4.1, ActiveSupport hooks
         # Ruby's JSON.generate so deeply there's no workaround.
         'not serialized in ActiveSupport < 4.1'
-      elsif configuration.use_async
-        # Currently serialization is performed by each handler, and this invariably
-        # means it is actually performed by ActiveSupport.
-        #
-        # TODO: Since serialization must be done prior to scheduling the job,
-        # it should at least be done by rollbar-gem itself. Much work has been done
-        # to avoid the bugs in ActiveSupport JSON. The async handlers are currently
-        # still subject to all those knnown issues.
-        'not serialized for async/delayed handlers'
+      elsif configuration.use_async && !configuration.async_json_payload
+        # The setting allows serialization to be performed by each handler,
+        # and this usually means it is actually performed by ActiveSupport,
+        # which cannot safely serialize this key.
+        'not serialized when async_json_payload is not set'
       else
         scrub(configuration.configured_options.configured)
       end
@@ -187,13 +183,19 @@ module Rollbar
     end
 
     def build_extra
+      merged_extra = Util.deep_merge(scrub(extra), scrub(error_context))
+
       if custom_data_method? && !Rollbar::Util.method_in_stack(:custom_data, __FILE__)
-        Util.deep_merge(scrub(custom_data), scrub(extra) || {})
+        Util.deep_merge(scrub(custom_data), merged_extra)
       else
-        scrub(extra)
+        merged_extra.empty? ? nil : merged_extra # avoid putting an empty {} in the payload.
       end
     end
 
+    def error_context
+      exception.respond_to?(:rollbar_context) && exception.rollbar_context
+    end
+
     def scrub(data)
       return data unless data.is_a? Hash
 

data/lib/rollbar/item/backtrace.rb

@@ -55,7 +55,7 @@ module Rollbar
         current_exception = exception
 
         while current_exception.respond_to?(:cause) && (cause = current_exception.cause) && cause.is_a?(Exception) && !visited.include?(cause)
-          traces << trace_data(cause)
+          traces.unshift(trace_data(cause))
           visited << cause
           current_exception = cause
         end
@@ -74,10 +74,20 @@ module Rollbar
       end
 
       def map_frames(current_exception)
-        exception_backtrace(current_exception).map do |frame|
+        frames = cleaned_backtrace(current_exception).map do |frame|
           Rollbar::Item::Frame.new(self, frame,
                                    :configuration => configuration).to_h
-        end.reverse
+        end
+        frames.reverse!
+      end
+
+      def cleaned_backtrace(current_exception)
+        normalized_backtrace = exception_backtrace(current_exception)
+        if configuration.backtrace_cleaner
+          configuration.backtrace_cleaner.clean(normalized_backtrace)
+        else
+          normalized_backtrace
+        end
       end
 
       # Returns the backtrace to be sent to our API. There are 3 options:

data/lib/rollbar/item/frame.rb

@@ -97,6 +97,8 @@ module Rollbar
       end
 
       def locals_data(filename, lineno)
+        return unless configuration.locals[:enabled]
+
         ::Rollbar::Item::Locals.locals_for_location(filename, lineno)
       end
 

data/lib/rollbar/item/locals.rb

@@ -1,5 +1,6 @@
 require 'rollbar/notifier'
 require 'rollbar/scrubbers/params'
+require 'rollbar/util'
 
 module Rollbar
   class Item
@@ -39,8 +40,51 @@ module Rollbar
           end
         end
 
+        # Prepare objects to be handled by the payload serializer.
+        #
+        # Hashes and Arrays are traversed. Then all types execpt strings and
+        # immediates are exported using #inspect. Sending the object itself to the
+        # serializer can result in large recursive expansions, especially in Rails
+        # environments with ActiveRecord, ActiveSupport, etc. on the stack.
+        # Other export options could be #to_s, #to_h, and #as_json. Several of these
+        # will omit the class name, or are not implemented for many types.
+        #
+        # #inspect has the advantage that it is specifically intended for debugging
+        # output. If the user wants more or different information in the payload
+        # about a specific type, #inspect is the correct place to implement it.
+        # Likewise the default implementation should be oriented toward usefulness
+        # in debugging.
+        #
+        # Because #inspect outputs a string, it can be handled well by the string
+        # truncation strategy for large payloads.
+        #
         def prepare_value(value)
-          value.to_s
+          return simple_value?(value) ? value : value.inspect unless value.is_a?(Hash) || value.is_a?(Array)
+
+          cloned_value = ::Rollbar::Util.deep_copy(value)
+          ::Rollbar::Util.iterate_and_update_with_block(cloned_value) do |v|
+            simple_value?(v) ? v : v.inspect
+          end
+
+          cloned_value
+        end
+
+        def simple_classes
+          if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
+            [String, Symbol, Integer, Float, TrueClass, FalseClass, NilClass]
+          else
+            [String, Symbol, Fixnum, Bignum, Float, TrueClass, FalseClass, NilClass] # rubocop:disable Lint/UnifiedInteger
+          end
+        end
+
+        def simple_value?(value)
+          simple_classes.each do |klass|
+            # Use instance_of? so that subclasses and module containers will
+            # be treated like complex object types, not simple values.
+            return true if value.instance_of?(klass)
+          end
+
+          false
         end
 
         def scrub(hash)

data/lib/rollbar/middleware/js.rb

@@ -83,7 +83,12 @@ module Rollbar
         response = ::Rack::Response.new(response_string, app_result[0],
                                         app_result[1])
 
-        response.finish
+        finished = response.finish
+
+        # Rack < 2.x Response#finish returns self in array[2]. Rack >= 2.x returns self.body.
+        # Always return with the response object here regardless of rack version.
+        finished[2] = response
+        finished
       end
 
       def build_body_with_js(env, body, head_open_end)

data/lib/rollbar/notifier.rb

@@ -19,7 +19,8 @@ module Rollbar
     attr_accessor :last_report
     attr_accessor :scope_object
 
-    @file_semaphore = Mutex.new
+    MUTEX = Mutex.new
+    EXTENSION_REGEXP = /.rollbar\z/.freeze
 
     def initialize(parent_notifier = nil, payload_options = nil, scope = nil)
       if parent_notifier
@@ -200,18 +201,20 @@ module Rollbar
     def process_item(item)
       if configuration.write_to_file
         if configuration.use_async
-          @file_semaphore.synchronize do
-            write_item(item)
+          MUTEX.synchronize do
+            do_write_item(item)
           end
         else
-          write_item(item)
+          do_write_item(item)
         end
       else
         send_item(item)
       end
     rescue StandardError => e
       log_error("[Rollbar] Error processing the item: #{e.class}, #{e.message}. Item: #{item.payload.inspect}")
-      raise e
+      raise e unless via_failsafe?(item)
+
+      log_error('[Rollbar] Item has already failed. Not re-raising')
     end
 
     # We will reraise exceptions in this method so async queues
@@ -238,16 +241,19 @@ module Rollbar
     # Using Rollbar.silenced we avoid the above behavior but Sidekiq
     # will have a chance to retry the original job.
     def process_from_async_handler(payload)
-      payload = Rollbar::JSON.load(payload) if payload.is_a?(String)
-
-      item = Item.build_with(payload,
-                             :notifier => self,
-                             :configuration => configuration,
-                             :logger => logger)
-
       Rollbar.silenced do
         begin
-          process_item(item)
+          if payload.is_a?(String)
+            # The final payload has already been built.
+            send_body(payload)
+          else
+            item = Item.build_with(payload,
+                                   :notifier => self,
+                                   :configuration => configuration,
+                                   :logger => logger)
+
+            process_item(item)
+          end
         rescue StandardError => e
           report_internal_error(e)
 
@@ -509,14 +515,18 @@ module Rollbar
 
     ## Delivery functions
 
-    def send_item_using_eventmachine(item, uri)
-      body = item.dump
-      return unless body
+    def send_using_eventmachine(body)
+      uri = URI.parse(configuration.endpoint)
 
-      headers = { 'X-Rollbar-Access-Token' => item['access_token'] }
+      headers = { 'X-Rollbar-Access-Token' => configuration.access_token }
       options = http_proxy_for_em(uri)
       req = EventMachine::HttpRequest.new(uri.to_s, options).post(:body => body, :head => headers)
 
+      eventmachine_callback(req)
+      eventmachine_errback(req)
+    end
+
+    def eventmachine_callback(req)
       req.callback do
         if req.response_header.status == 200
           log_info '[Rollbar] Success'
@@ -525,7 +535,9 @@ module Rollbar
           log_info "[Rollbar] Response: #{req.response}"
         end
       end
+    end
 
+    def eventmachine_errback(req)
       req.errback do
         log_warning "[Rollbar] Call to API failed, status code: #{req.response_header.status}"
         log_info "[Rollbar] Error's response: #{req.response}"
@@ -538,14 +550,20 @@ module Rollbar
       body = item.dump
       return unless body
 
-      uri = URI.parse(configuration.endpoint)
-
       if configuration.use_eventmachine
-        send_item_using_eventmachine(item, uri)
+        send_using_eventmachine(body)
         return
       end
 
-      handle_response(do_post(uri, body, item['access_token']))
+      send_body(body)
+    end
+
+    def send_body(body)
+      log_info '[Rollbar] Sending json'
+
+      uri = URI.parse(configuration.endpoint)
+
+      handle_response(do_post(uri, body, configuration.access_token))
     end
 
     def do_post(uri, body, access_token)
@@ -658,27 +676,24 @@ module Rollbar
       end
     end
 
-    def write_item(item)
-      if configuration.use_async
-        @file_semaphore.synchronize do
-          do_write_item(item)
-        end
-      else
-        do_write_item(item)
-      end
-    end
-
     def do_write_item(item)
       log_info '[Rollbar] Writing item to file'
 
       body = item.dump
       return unless body
 
+      file_name = if configuration.files_with_pid_name_enabled
+                    configuration.filepath.gsub(EXTENSION_REGEXP, "_#{Process.pid}\\0")
+                  else
+                    configuration.filepath
+                  end
+
       begin
-        @file ||= File.open(configuration.filepath, 'a')
+        @file ||= File.open(file_name, 'a')
 
         @file.puts(body)
         @file.flush
+        update_file(@file, file_name)
 
         log_info '[Rollbar] Success'
       rescue IOError => e
@@ -686,6 +701,18 @@ module Rollbar
       end
     end
 
+    def update_file(file, file_name)
+      return unless configuration.files_processed_enabled
+
+      time_now = Time.now
+      return if configuration.files_processed_duration > time_now - file.birthtime && file.size < configuration.files_processed_size
+
+      new_file_name = file_name.gsub(EXTENSION_REGEXP, "_processed_#{time_now.to_i}\\0")
+      File.rename(file, new_file_name)
+      file.close
+      @file = File.open(file_name, 'a')
+    end
+
     def failsafe_reason(message, exception)
       body = ''
 
@@ -737,8 +764,11 @@ module Rollbar
     end
 
     def process_async_item(item)
+      # Send async payloads as JSON string when async_json_payload is set.
+      payload = configuration.async_json_payload ? item.dump : item.payload
+
       configuration.async_handler ||= default_async_handler
-      configuration.async_handler.call(item.payload)
+      configuration.async_handler.call(payload)
     rescue StandardError
       if configuration.failover_handlers.empty?
         log_error '[Rollbar] Async handler failed, and there are no failover handlers configured. See the docs for "failover_handlers"'
@@ -772,5 +802,9 @@ module Rollbar
       uuid_url = Util.uuid_rollbar_url(data, configuration)
       log_info "[Rollbar] Details: #{uuid_url} (only available if report was successful)"
     end
+
+    def via_failsafe?(item)
+      item.payload.fetch('data', {}).fetch(:failsafe, false)
+    end
   end
 end

data/lib/rollbar/plugins/active_job.rb

@@ -14,5 +14,9 @@ module Rollbar
   end
 end
 
-# Automatically add to ActionMailer::DeliveryJob
-ActionMailer::DeliveryJob.send(:include, Rollbar::ActiveJob) if defined?(ActionMailer::DeliveryJob)
+if defined?(ActiveSupport) && ActiveSupport.respond_to?(:on_load)
+  ActiveSupport.on_load(:action_mailer) do
+    # Automatically add to ActionMailer::DeliveryJob
+    ActionMailer::DeliveryJob.send(:include, Rollbar::ActiveJob) if defined?(ActionMailer::DeliveryJob)
+  end
+end

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

@@ -12,7 +12,13 @@ module Rollbar
         lifecycle.around(:invoke_job, &Delayed.invoke_job_callback)
         lifecycle.after(:failure) do |_, job, _, _|
           data = Rollbar::Delayed.build_job_data(job)
-          ::Rollbar.scope(:request => data).error("Job has failed and won't be retried anymore: " + job.last_error, :use_exception_level_filters => true) if job.last_error
+
+          # DelayedJob < 4.1 doesn't provide job#error
+          if job.class.method_defined? :error
+            ::Rollbar.scope(:request => data).error(job.error, :use_exception_level_filters => true) if job.error
+          elsif job.last_error
+            ::Rollbar.scope(:request => data).error("Job has failed and won't be retried anymore: " + job.last_error, :use_exception_level_filters => true)
+          end
         end
       end
     end

data/lib/rollbar/plugins/error_context.rb

@@ -0,0 +1,11 @@
+module RollbarErrorContext
+  attr_accessor :rollbar_context
+end
+
+Rollbar.plugins.define('error_context') do
+  dependency { configuration.enable_error_context }
+
+  execute! do
+    StandardError.send(:include, RollbarErrorContext)
+  end
+end

data/lib/rollbar/request_data_extractor.rb

@@ -247,7 +247,12 @@ module Rollbar
     end
 
     def sensitive_headers_list
-      Rollbar.configuration.scrub_headers || []
+      return [] unless Rollbar.configuration.scrub_headers && Rollbar.configuration.scrub_headers.is_a?(Array)
+
+      # Normalize into the expected matching format
+      Rollbar.configuration.scrub_headers.map do |header|
+        header.split(/[-_]/).map(&:capitalize).join('-').gsub(/^Http-/, '')
+      end
     end
   end
 end

data/lib/rollbar/scrubbers.rb

@@ -6,11 +6,7 @@ module Rollbar
       if Rollbar.configuration.randomize_scrub_length
         random_filtered_value
       else
-        '*' * (begin
-                 value.length
-               rescue StandardError
-                 8
-               end)
+        '*' * 6
       end
     end
 

data/lib/rollbar/truncation/frames_strategy.rb

@@ -11,7 +11,7 @@ module Rollbar
       end
 
       def call(payload)
-        new_payload = Rollbar::Util.deep_copy(payload)
+        new_payload = payload
         body = new_payload['data']['body']
 
         if body['trace_chain']

data/lib/rollbar/truncation/mixin.rb

@@ -9,7 +9,7 @@ module Rollbar
         result.bytesize > MAX_PAYLOAD_SIZE
       end
 
-      def select_frames(frames, range = 150)
+      def select_frames(frames, range = 50)
         return frames unless frames.count > range * 2
 
         frames[0, range] + frames[-range, range]

data/lib/rollbar/truncation/strings_strategy.rb

@@ -6,7 +6,7 @@ module Rollbar
     class StringsStrategy
       include ::Rollbar::Truncation::Mixin
 
-      STRING_THRESHOLDS = [1024, 512, 256].freeze
+      STRING_THRESHOLDS = [1024, 512, 256, 128].freeze
 
       def self.call(payload)
         new.call(payload)
@@ -29,7 +29,9 @@ module Rollbar
 
       def truncate_strings_proc(threshold)
         proc do |value|
-          if value.is_a?(String) && value.bytesize > threshold
+          # Rollbar::Util.truncate will operate on characters, not bytes,
+          # so use value.length, not bytesize.
+          if value.is_a?(String) && value.length > threshold
             Rollbar::Util.truncate(value, threshold)
           else
             value

data/lib/rollbar/util.rb

@@ -2,6 +2,10 @@ require 'rollbar/util/hash'
 
 module Rollbar
   module Util # :nodoc:
+    def self.iterate_and_update_with_block(obj, &block)
+      iterate_and_update(obj, block)
+    end
+
     def self.iterate_and_update(obj, block, seen = {})
       return if obj.frozen? || seen[obj.object_id]
 

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = '2.22.1'.freeze
+  VERSION = '2.24.0'.freeze
 end

data/rollbar.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://rollbar.com'
   gem.license       = 'MIT'
   gem.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  gem.files        += ['spec/support/rollbar_api.rb'] # useful helper for app spec/tests.
   gem.name          = 'rollbar'
   gem.require_paths = ['lib']
   gem.required_ruby_version = '>= 1.9.3'

data/spec/support/rollbar_api.rb

@@ -0,0 +1,67 @@
+require 'rack/request'
+
+class RollbarAPI
+  UNAUTHORIZED_ACCESS_TOKEN = 'unauthorized'.freeze
+
+  def call(env)
+    request = Rack::Request.new(env)
+    json = JSON.parse(request.body.read)
+
+    return unauthorized unless authorized?(json, request)
+
+    return bad_request(json) unless valid_data?(json, request)
+
+    success(json, request)
+  end
+
+  protected
+
+  def authorized?(json, _request)
+    json['access_token'] != UNAUTHORIZED_ACCESS_TOKEN
+  end
+
+  def response_headers
+    {
+      'Content-Type' => 'application/json'
+    }
+  end
+
+  def valid_data?(json, _request)
+    !!json['access_token']
+  end
+
+  def unauthorized
+    [401, response_headers, [unauthorized_body]]
+  end
+
+  def bad_request(_json)
+    [400, response_headers, [bad_request_body]]
+  end
+
+  def success(json, request)
+    [200, response_headers, [success_body(json, request)]]
+  end
+
+  def unauthorized_body
+    result(1, nil, 'invalid access token')
+  end
+
+  def bad_request_body
+    result(1, nil, 'bad request')
+  end
+
+  def success_body(json, _request)
+    result(0, {
+             :id => rand(1_000_000),
+             :uuid => json['data']['uuid']
+           }, nil)
+  end
+
+  def result(err, body, message)
+    {
+      :err => err,
+      :result => body,
+      :message => message
+    }.to_json
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 2.22.1
+  version: 2.24.0
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies: []
 description: Easy and powerful exception tracking for Ruby
 email:
@@ -95,6 +95,7 @@ files:
 - lib/rollbar/plugins/delayed_job.rb
 - lib/rollbar/plugins/delayed_job/job_data.rb
 - lib/rollbar/plugins/delayed_job/plugin.rb
+- lib/rollbar/plugins/error_context.rb
 - lib/rollbar/plugins/goalie.rb
 - lib/rollbar/plugins/rack.rb
 - lib/rollbar/plugins/rails.rb
@@ -133,6 +134,7 @@ files:
 - lib/tasks/benchmark.rake
 - lib/tasks/tasks.rake
 - rollbar.gemspec
+- spec/support/rollbar_api.rb
 homepage: https://rollbar.com
 licenses:
 - MIT