rollbar 2.25.1 → 3.1.1

data/gemfiles/rails41.gemfile

@@ -2,18 +2,13 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
-# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
-# new process is created during tests. (Testing rake tasks, for example.)
-# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
-# We use the ||= assignment because Travis loads the gemfile twice, the second time
-# with the wrong gemfile path.
-ENV['CURRENT_GEMFILE'] ||= __FILE__
-
 is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
 
-gem 'appraisal'
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'jruby-openssl', :platform => :jruby
+gem 'mixlib-shellout', '<= 2.0.0'
+gem 'net-ssh', '<= 3.1.1'
+gem 'public_suffix', '<= 2.0.5'
 gem 'rails', '4.1.12'
 gem 'rake'
 gem 'rspec-rails', '~> 3.4'
@@ -32,20 +27,15 @@ platforms :rbx do
   gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
 end
 
-if RUBY_VERSION.start_with?('1.9')
-  gem 'capistrano', '<= 3.4.1', :require => false
-  gem 'sucker_punch', '~> 1.0'
-  gem 'shoryuken', '>= 4.0.0', '<= 4.0.2'
-elsif RUBY_VERSION.start_with?('2')
-  gem 'capistrano', :require => false
-  gem 'sucker_punch', '~> 2.0'
-  gem 'shoryuken'
-  gem 'codacy-coverage'
-  gem 'simplecov'
-end
+gem 'capistrano', :require => false
+gem 'sucker_punch', '~> 2.0'
+gem 'shoryuken'
+gem 'codacy-coverage'
+gem 'simplecov', '<= 0.17.1'
 
 gem 'delayed_job', :require => false
-gem 'redis'
+gem 'redis', '<= 3.3.5'
+gem 'redis-namespace', '<= 1.5.0'
 gem 'resque'
 gem 'sinatra'
 
@@ -54,13 +44,7 @@ gem 'generator_spec'
 gem 'girl_friday', '>= 0.11.1'
 gem 'rspec-command'
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
-  gem 'mime-types', '< 3.0'
-  gem 'public_suffix', '< 1.5'
-  gem 'webmock', '< 2.3.0', :require => false
-else
-  gem 'webmock', :require => false
-end
+gem 'webmock', :require => false
 
 gem 'resque'
 gem 'aws-sdk-sqs'

data/gemfiles/rails42.gemfile

@@ -2,19 +2,13 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
-# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
-# new process is created during tests. (Testing rake tasks, for example.)
-# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
-# We use the ||= assignment because Travis loads the gemfile twice, the second time
-# with the wrong gemfile path.
-ENV['CURRENT_GEMFILE'] ||= __FILE__
-
 is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
 is_not_jruby = !is_jruby
 
-gem 'appraisal'
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'jruby-openssl', :platform => :jruby
+gem 'net-ssh', '<= 3.1.1'
+gem 'public_suffix', '<= 2.0.5'
 gem 'rails', '4.2.8'
 gem 'rake'
 gem 'rspec-rails', '~> 3.4'
@@ -37,36 +31,24 @@ else
   gem 'sidekiq', '>= 2.13.0'
 end
 
-if RUBY_VERSION.start_with?('1.9')
-  gem 'capistrano', '<= 3.4.1', :require => false
-  gem 'shoryuken', '>= 4.0.0', '<= 4.0.2'
-elsif RUBY_VERSION.start_with?('2')
-  gem 'capistrano', :require => false
-  gem 'shoryuken'
-end
+gem 'capistrano', :require => false
+gem 'shoryuken'
 
 gem 'database_cleaner', '~> 1.0.0'
 gem 'delayed_job', :require => false
 gem 'generator_spec'
 gem 'girl_friday', '>= 0.11.1'
 gem 'rspec-command'
-gem 'redis'
+gem 'redis', '<= 3.3.5'
 gem 'resque'
 gem 'sinatra'
 
 gem 'nokogiri', '~> 1.6.0' if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.0')
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
-  gem 'mime-types', '< 3.0'
-  gem 'public_suffix', '< 1.5'
-  gem 'sucker_punch', '~> 1.0'
-  gem 'webmock', '< 2.3.0', :require => false
-else
-  gem 'sucker_punch', '~> 2.0'
-  gem 'webmock', :require => false
-  gem 'codacy-coverage'
-  gem 'simplecov'
-end
+gem 'sucker_punch', '~> 2.0'
+gem 'webmock', :require => false
+gem 'codacy-coverage'
+gem 'simplecov', '<= 0.17.1'
 
 gem 'aws-sdk-sqs'
 

data/gemfiles/rails50.gemfile

@@ -2,18 +2,12 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
-# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
-# new process is created during tests. (Testing rake tasks, for example.)
-# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
-# We use the ||= assignment because Travis loads the gemfile twice, the second time
-# with the wrong gemfile path.
-ENV['CURRENT_GEMFILE'] ||= __FILE__
-
 is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
 
-gem 'appraisal'
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'jruby-openssl', :platform => :jruby
+gem 'net-ssh', '<= 3.1.1'
+gem 'public_suffix', '<= 3.1.1'
 gem 'rails', '~> 5.0.7'
 gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
 
@@ -34,15 +28,10 @@ platforms :rbx do
   gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
 end
 
-if RUBY_VERSION.start_with?('1.9')
-  gem 'capistrano', '<= 3.4.1', :require => false
-  gem 'sucker_punch', '~> 1.0'
-elsif RUBY_VERSION.start_with?('2')
-  gem 'capistrano', :require => false
-  gem 'sucker_punch', '~> 2.0'
-  gem 'codacy-coverage'
-  gem 'simplecov'
-end
+gem 'capistrano', :require => false
+gem 'sucker_punch', '~> 2.0'
+gem 'codacy-coverage'
+gem 'simplecov', '<= 0.17.1'
 
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
   gem 'rack', '2.1.2'
@@ -54,7 +43,7 @@ gem 'database_cleaner'
 gem 'delayed_job', :require => false
 gem 'generator_spec'
 gem 'girl_friday', '>= 0.11.1'
-gem 'redis'
+gem 'redis', '<= 3.3.5'
 gem 'resque'
 
 unless is_jruby
@@ -62,10 +51,6 @@ unless is_jruby
   gem 'rspec-command'
 end
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
-  gem 'mime-types', '< 3.0'
-end
-
 gem 'webmock', :require => false
 
 gem 'aws-sdk-sqs'

data/gemfiles/rails51.gemfile

@@ -2,18 +2,12 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
-# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
-# new process is created during tests. (Testing rake tasks, for example.)
-# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
-# We use the ||= assignment because Travis loads the gemfile twice, the second time
-# with the wrong gemfile path.
-ENV['CURRENT_GEMFILE'] ||= __FILE__
-
 is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
 
-gem 'appraisal'
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'jruby-openssl', :platform => :jruby
+gem 'net-ssh', '<= 3.1.1'
+gem 'public_suffix', '<= 3.1.1'
 gem 'rails', '~> 5.1.7'
 gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
 
@@ -34,15 +28,10 @@ platforms :rbx do
   gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
 end
 
-if RUBY_VERSION.start_with?('1.9')
-  gem 'capistrano', '<= 3.4.1', :require => false
-  gem 'sucker_punch', '~> 1.0'
-elsif RUBY_VERSION.start_with?('2')
-  gem 'capistrano', :require => false
-  gem 'sucker_punch', '~> 2.0'
-  gem 'codacy-coverage'
-  gem 'simplecov'
-end
+gem 'capistrano', :require => false
+gem 'sucker_punch', '~> 2.0'
+gem 'codacy-coverage'
+gem 'simplecov', '<= 0.17.1'
 
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
   gem 'rack', '2.1.2'
@@ -55,7 +44,7 @@ gem 'database_cleaner'
 gem 'delayed_job', :require => false
 gem 'generator_spec'
 gem 'girl_friday', '>= 0.11.1'
-gem 'redis'
+gem 'redis', '<= 3.3.5'
 gem 'resque'
 
 unless is_jruby
@@ -63,10 +52,6 @@ unless is_jruby
   gem 'rspec-command'
 end
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
-  gem 'mime-types', '< 3.0'
-end
-
 gem 'webmock', :require => false
 
 gem 'aws-sdk-sqs'

data/gemfiles/rails52.gemfile

@@ -2,16 +2,8 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
-# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
-# new process is created during tests. (Testing rake tasks, for example.)
-# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
-# We use the ||= assignment because Travis loads the gemfile twice, the second time
-# with the wrong gemfile path.
-ENV['CURRENT_GEMFILE'] ||= __FILE__
-
 is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
 
-gem 'appraisal'
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'jruby-openssl', :platform => :jruby
 gem 'rails', '~> 5.2.3'
@@ -46,7 +38,7 @@ gem 'generator_spec'
 gem 'girl_friday', '>= 0.11.1'
 gem 'redis'
 gem 'resque'
-gem 'simplecov'
+gem 'simplecov', '<= 0.17.1'
 
 unless is_jruby
   # JRuby doesn't support fork, which is required for this test helper.

data/gemfiles/rails60.gemfile

@@ -3,16 +3,8 @@ require 'rubygems/version'
 
 source 'https://rubygems.org'
 
-# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a
-# new process is created during tests. (Testing rake tasks, for example.)
-# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis.
-# We use the ||= assignment because Travis loads the gemfile twice, the second time
-# with the wrong gemfile path.
-ENV['CURRENT_GEMFILE'] ||= __FILE__
-
 is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
 
-gem 'appraisal'
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'jruby-openssl', :platform => :jruby
 gem 'rails', '6.0.2.1'

data/lib/rollbar/capistrano.rb

@@ -35,7 +35,7 @@ module Rollbar
           _cset(:rollbar_user)  { ENV['USER'] || ENV['USERNAME'] }
           _cset(:rollbar_env)   { fetch(:rails_env, 'production') }
           _cset(:rollbar_token) { abort("Please specify the Rollbar access token, set :rollbar_token, 'your token'") }
-          _cset(:rollbar_revision) { current_revision }
+          _cset(:rollbar_revision) { real_revision }
           _cset(:rollbar_comment) { nil }
         end
       end

data/lib/rollbar/capistrano_tasks.rb

@@ -40,6 +40,9 @@ module Rollbar
         capistrano_300_warning(logger)
         logger.info opts[:desc] if opts[:desc]
         yield
+
+      rescue StandardError => e
+        logger.error "Error reporting to Rollbar: #{e.inspect}"
       end
 
       def deploy_update(capistrano, logger, dry_run, opts = {})
@@ -61,7 +64,11 @@ module Rollbar
       end
 
       def capistrano_300_warning(logger)
-        logger.warn("You need to upgrade capistrano to '>= 3.1' version in order to correctly report deploys to Rollbar. (On 3.0, the reported revision will be incorrect.)") if ::Capistrano::VERSION =~ /^3\.0/
+        return unless ::Capistrano.const_defined?('VERSION') && ::Capistrano::VERSION =~ /^3\.0/
+
+        logger.warn('You need to upgrade capistrano to >= 3.1 version in order'\
+          'to correctly report deploys to Rollbar. (On 3.0, the reported revision'\
+          'will be incorrect.)')
       end
 
       def report_deploy_started(capistrano, dry_run)
@@ -83,6 +90,7 @@ module Rollbar
       def report_deploy_succeeded(capistrano, dry_run)
         ::Rollbar::Deploy.update(
           {
+            :comment => capistrano.fetch(:rollbar_comment),
             :proxy => :ENV,
             :dry_run => dry_run
           },
@@ -95,6 +103,7 @@ module Rollbar
       def report_deploy_failed(capistrano, dry_run)
         ::Rollbar::Deploy.update(
           {
+            :comment => capistrano.fetch(:rollbar_comment),
             :proxy => :ENV,
             :dry_run => dry_run
           },

data/lib/rollbar/configuration.rb

@@ -19,6 +19,7 @@ module Rollbar
     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
@@ -74,6 +75,7 @@ module Rollbar
     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
@@ -84,8 +86,10 @@ module Rollbar
     DEFAULT_WEB_BASE = 'https://rollbar.com'.freeze
 
     def initialize
+      @access_token = nil
       @async_handler = nil
       @before_process = []
+      @branch = nil
       @capture_uncaught = nil
       @code_version = nil
       @custom_data_method = nil
@@ -97,6 +101,7 @@ module Rollbar
       @disable_rack_monkey_patch = false
       @enable_error_context = true
       @dj_threshold = 0
+      @async_skip_report_handler = nil
       @enabled = nil # set to true when configure is called
       @endpoint = DEFAULT_ENDPOINT
       @environment = nil
@@ -108,6 +113,7 @@ module Rollbar
       @failover_handlers = []
       @framework = 'Plain'
       @ignored_person_ids = []
+      @host = nil
       @payload_options = {}
       @person_method = 'current_user'
       @person_id_method = 'id'
@@ -119,6 +125,7 @@ module Rollbar
       @open_timeout = 3
       @request_timeout = 3
       @net_retries = 3
+      @root = nil
       @js_enabled = false
       @js_options = {}
       @locals = {}
@@ -148,6 +155,7 @@ module Rollbar
       @log_payload = false
       @collect_user_ip = true
       @anonymize_user_ip = false
+      @user_ip_obfuscator_secret = nil
       @backtrace_cleaner = nil
       @hooks = {
         :on_error_response => nil, # params: response
@@ -155,10 +163,12 @@ module Rollbar
       }
 
       @write_to_file = false
+      @filepath = nil
       @files_with_pid_name_enabled = false
       @files_processed_enabled = false
       @files_processed_duration = 60
       @files_processed_size = 5 * 1000 * 1000
+      @use_payload_access_token = false
 
       @configured_options = ConfiguredOptions.new(self)
     end

data/lib/rollbar/item.rb

@@ -40,7 +40,7 @@ module Rollbar
     class << self
       def build_with(payload, options = {})
         new(options).tap do |item|
-          item.payload = payload
+          item.payload = item.add_access_token_to_payload(payload)
         end
       end
     end
@@ -64,9 +64,7 @@ module Rollbar
 
     def build
       data = build_data
-      self.payload = {
-        'data' => data
-      }
+      self.payload = add_access_token_to_payload({'data' => data})
 
       enforce_valid_utf8
       transform
@@ -136,11 +134,18 @@ module Rollbar
       uuid = stringified_payload['data']['uuid']
       host = stringified_payload['data'].fetch('server', {})['host']
 
+      original_error = {
+        :message => message,
+        :exception => exception,
+        :configuration => configuration,
+        :uuid => uuid,
+        :host => host
+      }
+
       notifier.send_failsafe(
         too_large_payload_string(attempts),
         nil,
-        uuid,
-        host
+        original_error
       )
       logger.error("[Rollbar] Payload too large to be sent for UUID #{uuid}: #{Rollbar::JSON.dump(payload)}")
     end
@@ -159,6 +164,21 @@ module Rollbar
       configuration.ignored_person_ids.include?(person_id)
     end
 
+    def add_access_token_to_payload(payload)
+      # Some use cases remain where the token is needed in the payload. For example:
+      #
+      # When using async senders, if the access token is changed dynamically in
+      # the main process config, the sender process won't see that change.
+      #
+      # Until the delayed sender interface is changed to allow passing dynamic config options,
+      # this workaround allows the main process to set the token by adding it to the payload.
+      if (configuration && configuration.use_payload_access_token)
+        payload['access_token'] ||= configuration.access_token
+      end
+
+      payload
+    end
+
     private
 
     def build_environment