rollbar 2.20.0 → 2.22.1

data/lib/rollbar/configuration.rb

@@ -68,6 +68,7 @@ module Rollbar
     attr_accessor :log_payload
 
     attr_reader :project_gem_paths
+    attr_accessor :configured_options
 
     alias safely? safely
 
@@ -114,7 +115,7 @@ module Rollbar
       @locals = {}
       @scrub_fields = [:passwd, :password, :password_confirmation, :secret,
                        :confirm_password, :password_confirmation, :secret_token,
-                       :api_key, :access_token, :session_id]
+                       :api_key, :access_token, :accessToken, :session_id]
       @scrub_user = true
       @scrub_password = true
       @randomize_scrub_length = true
@@ -142,6 +143,8 @@ module Rollbar
         :on_error_response => nil, # params: response
         :on_report_internal_error => nil # params: exception
       }
+
+      @configured_options = ConfiguredOptions.new(self)
     end
 
     def initialize_copy(orig)
@@ -153,6 +156,15 @@ module Rollbar
       end
     end
 
+    def wrapped_clone
+      original_clone.tap do |new_config|
+        new_config.configured_options = ConfiguredOptions.new(new_config)
+        new_config.configured_options.configured = configured_options.configured
+      end
+    end
+    alias original_clone clone
+    alias clone wrapped_clone
+
     def merge(options)
       new_configuration = clone
       new_configuration.merge!(options)
@@ -303,4 +315,26 @@ module Rollbar
       hook(symbol).call(*args) if hook(symbol).is_a?(Proc)
     end
   end
+
+  class ConfiguredOptions
+    attr_accessor :configuration, :configured
+
+    def initialize(configuration)
+      @configuration = configuration
+      @configured = {}
+    end
+
+    def method_missing(method, *args, &block)
+      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?('=')
+
+      configuration.send(method, *args, &block)
+    end
+
+    def respond_to_missing?(method)
+      configuration.respond_to?(method) || super
+    end
+  end
 end

data/lib/rollbar/item.rb

@@ -84,7 +84,8 @@ module Rollbar
         :server => server_data,
         :notifier => {
           :name => 'rollbar-gem',
-          :version => VERSION
+          :version => VERSION,
+          :configured_options => configured_options
         },
         :body => build_body
       }
@@ -102,6 +103,26 @@ module Rollbar
       data
     end
 
+    def configured_options
+      if Gem.loaded_specs['activesupport'] && Gem.loaded_specs['activesupport'].version < Gem::Version.new('4.1')
+        # There are too many types that crash ActiveSupport JSON serialization, and not worth
+        # 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'
+      else
+        scrub(configuration.configured_options.configured)
+      end
+    end
+
     def dump
       # Ensure all keys are strings since we can receive the payload inline or
       # from an async handler job, which can be serialized.
@@ -121,7 +142,7 @@ module Rollbar
       host = stringified_payload['data'].fetch('server', {})['host']
 
       notifier.send_failsafe(
-        too_large_payload_string(stringified_payload, final_payload, attempts),
+        too_large_payload_string(attempts),
         nil,
         uuid,
         host
@@ -129,12 +150,9 @@ module Rollbar
       logger.error("[Rollbar] Payload too large to be sent for UUID #{uuid}: #{Rollbar::JSON.dump(payload)}")
     end
 
-    def too_large_payload_string(stringified_payload, final_payload, attempts)
-      original_size = Rollbar::JSON.dump(stringified_payload).bytesize
-      final_size = final_payload.bytesize
-
+    def too_large_payload_string(attempts)
       'Could not send payload due to it being too large after truncating attempts. ' \
-        "Original size: #{original_size} Attempts: #{attempts.join(', ')} Final size: #{final_size}"
+        "Original size: #{attempts.first} Attempts: #{attempts.join(', ')} Final size: #{attempts.last}"
     end
 
     def ignored?

data/lib/rollbar/json.rb

@@ -1,13 +1,5 @@
-require 'multi_json'
-require 'rollbar/json/oj'
-require 'rollbar/json/default'
 require 'rollbar/language_support'
 
-begin
-  require 'oj'
-rescue LoadError
-end
-
 module Rollbar
   module JSON # :nodoc:
     extend self
@@ -15,54 +7,13 @@ module Rollbar
     attr_writer :options_module
 
     def dump(object)
-      # `basic_socket` plugin addresses the following issue: https://github.com/rollbar/rollbar-gem/issues/845
       Rollbar.plugins.get('basic_socket').load_scoped!(true) do
-        with_adapter { MultiJson.dump(object, adapter_options) }
+        ::JSON.generate(object)
       end
     end
 
     def load(string)
-      with_adapter { MultiJson.load(string, adapter_options) }
-    end
-
-    def with_adapter(&block)
-      MultiJson.with_adapter(detect_multi_json_adapter, &block)
-    end
-
-    def detect_multi_json_adapter
-      options = {}
-      options[:adapter] = :oj if defined?(::Oj)
-
-      MultiJson.current_adapter(options)
-    end
-
-    def adapter_options
-      options_module.options
-    end
-
-    def options_module
-      @options_module ||= find_options_module
-    end
-
-    def find_options_module
-      module_name = multi_json_adapter_module_name
-
-      if LanguageSupport.const_defined?(Rollbar::JSON, module_name, false)
-        LanguageSupport.const_get(Rollbar::JSON, module_name, false)
-      else
-        Default
-      end
-    end
-
-    # MultiJson adapters have this name structure:
-    # "MultiJson::Adapters::{AdapterModule}"
-    #
-    # Ex: MultiJson::Adapters::Oj
-    # Ex: MultiJson::Adapters::JsonGem
-    #
-    # In this method we just get the last module name.
-    def multi_json_adapter_module_name
-      detect_multi_json_adapter.name[/^MultiJson::Adapters::(.*)$/, 1]
+      ::JSON.parse(string)
     end
   end
 end

data/lib/rollbar/language_support.rb

@@ -3,27 +3,11 @@ module Rollbar
     module_function
 
     def const_defined?(mod, target, inherit = true)
-      if ruby_18?
-        mod.const_defined?(target)
-      else
-        mod.const_defined?(target, inherit)
-      end
+      mod.const_defined?(target, inherit)
     end
 
     def const_get(mod, target, inherit = true)
-      if ruby_18?
-        mod.const_get(target)
-      else
-        mod.const_get(target, inherit)
-      end
-    end
-
-    def can_scrub_url?
-      !version?('1.8')
-    end
-
-    def ruby_18?
-      version?('1.8')
+      mod.const_get(target, inherit)
     end
 
     def ruby_19?
@@ -37,7 +21,7 @@ module Rollbar
     end
 
     def timeout_exceptions
-      return [] if ruby_18? || ruby_19?
+      return [] if ruby_19?
 
       [Net::ReadTimeout, Net::OpenTimeout]
     end

data/lib/rollbar/notifier.rb

@@ -42,21 +42,21 @@ module Rollbar
     # 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)
+      yield(configuration.configured_options)
     end
 
     # Configures the notifier instance
     def configure
       configuration.enabled = true if configuration.enabled.nil?
 
-      yield(configuration)
+      yield(configuration.configured_options)
     end
 
     def reconfigure
       self.configuration = Configuration.new
       configuration.enabled = true
 
-      yield(configuration)
+      yield(configuration.configured_options)
     end
 
     def unconfigure
@@ -557,8 +557,6 @@ module Rollbar
 
       if uri.scheme == 'https'
         http.use_ssl = true
-        # This is needed to have 1.8.7 passing tests
-        http.ca_file = ENV['ROLLBAR_SSL_CERT_FILE'] if ENV.key?('ROLLBAR_SSL_CERT_FILE')
         http.verify_mode = ssl_verify_mode
       end
 
@@ -639,7 +637,7 @@ module Rollbar
     end
 
     def skip_retries?
-      Rollbar::LanguageSupport.ruby_18? || Rollbar::LanguageSupport.ruby_19?
+      Rollbar::LanguageSupport.ruby_19?
     end
 
     def handle_response(response)

data/lib/rollbar/plugins/basic_socket.rb

@@ -6,7 +6,7 @@ Rollbar.plugins.define('basic_socket') do
   # Needed to avoid active_support (< 4.1.0) bug serializing JSONs
   dependency do
     defined?(ActiveSupport::VERSION::STRING) &&
-      Gem::Version.new(ActiveSupport::VERSION::STRING) < Gem::Version.new('5.2.0')
+      Gem::Version.new(ActiveSupport::VERSION::STRING) < Gem::Version.new('4.1.0')
   end
 
   execute do

data/lib/rollbar/rake_tasks.rb

@@ -1,154 +1,10 @@
-require 'rollbar'
-begin
-  require 'rack/mock'
-rescue LoadError
-  puts 'Cannot load rack/mock'
-end
-require 'logger'
 
 namespace :rollbar do
   desc 'Verify your gem installation by sending a test exception to Rollbar'
   task :test => [:environment] do
-    RollbarTest.run
-  end
-end
-
-# Module to inject into the Rails controllers or rack apps
-module RollbarTest # :nodoc:
-  def test_rollbar
-    puts 'Raising RollbarTestingException to simulate app failure.'
-
-    raise RollbarTestingException.new, ::RollbarTest.success_message
-  end
-
-  def self.run
-    return unless confirmed_token?
-
-    configure_rails if defined?(Rails)
-
-    puts 'Testing manual report...'
-    Rollbar.error('Test error from rollbar:test')
-
-    return unless defined?(Rack::MockRequest)
-
-    protocol, app = setup_app
-
-    puts 'Processing...'
-    env = Rack::MockRequest.env_for("#{protocol}://www.example.com/verify", 'REMOTE_ADDR' => '127.0.0.1')
-    status, = app.call(env)
-
-    puts error_message unless status.to_i == 500
-  end
-
-  def self.configure_rails
-    Rails.logger = if defined?(ActiveSupport::TaggedLogging)
-                     ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
-                   else
-                     Logger.new(STDOUT)
-                   end
-
-    Rails.logger.level = Logger::DEBUG
-    Rollbar.preconfigure do |config|
-      config.logger = Rails.logger
-    end
-  end
-
-  def self.confirmed_token?
-    return true if Rollbar.configuration.access_token
-
-    puts token_error_message
-
-    false
-  end
-
-  def self.authlogic_config
-    # from http://stackoverflow.com/questions/5270835/authlogic-activation-problems
-    return unless defined?(Authlogic)
-
-    Authlogic::Session::Base.controller = Authlogic::ControllerAdapters::RailsAdapter.new(self)
-  end
-
-  def self.setup_app
-    puts 'Setting up the test app.'
-
-    if defined?(Rails)
-      app = rails_app
+    rollbar_dir = Gem.loaded_specs['rollbar'].full_gem_path
+    require "#{rollbar_dir}/lib/rollbar/rollbar_test"
 
-      draw_rails_route(app)
-
-      authlogic_config
-
-      [rails_protocol(app), app]
-    else
-      ['http', rack_app]
-    end
-  end
-
-  def self.rails_app
-    # The setup below is needed for Rails 5.x, but not for Rails 4.x and below.
-    # (And fails on Rails 4.x in various ways depending on the exact version.)
-    return Rails.application if Rails.version < '5.0.0'
-
-    # Spring now runs by default in development on all new Rails installs. This causes
-    # the new `/verify` route to not get picked up if `config.cache_classes == false`
-    # which is also a default in development env.
-    #
-    # `config.cache_classes` needs to be set, but the only possible time is at app load,
-    # so here we clone the default app with an updated config.
-    #
-    config = Rails.application.config
-    config.cache_classes = true
-
-    # Make a copy of the app, so the config can be updated.
-    Rails.application.class.name.constantize.new(:config => config)
-  end
-
-  def self.draw_rails_route(app)
-    app.routes_reloader.execute_if_updated
-    app.routes.draw do
-      get 'verify' => 'rollbar_test#verify', :as => 'verify'
-    end
-  end
-
-  def self.rails_protocol(app)
-    defined?(app.config.force_ssl && app.config.force_ssl) ? 'https' : 'http'
-  end
-
-  def self.rack_app
-    Class.new do
-      include RollbarTest
-
-      def self.call(_env)
-        new.test_rollbar
-      end
-    end
-  end
-
-  def self.token_error_message
-    'Rollbar needs an access token configured. Check the README for instructions.'
-  end
-
-  def self.error_message
-    'Test failed! You may have a configuration issue, or you could be using a gem that\'s blocking the test. Contact support@rollbar.com if you need help troubleshooting.'
-  end
-
-  def self.success_message
-    'Testing rollbar with "rake rollbar:test". If you can see this, it works.'
-  end
-end
-
-class RollbarTestingException < RuntimeError; end
-
-if defined?(Rails)
-  class RollbarTestController < ActionController::Base # :nodoc:
-    include RollbarTest
-
-    def verify
-      test_rollbar
-    end
-
-    def logger
-      nil
-    end
+    RollbarTest.run
   end
 end