rollbar 2.19.2 → 2.19.3

data/lib/rollbar/json/oj.rb

@@ -1,7 +1,7 @@
 module Rollbar
   module JSON
     module Oj
-      extend self
+      module_function
 
       def options
         {

data/lib/rollbar/language_support.rb

@@ -1,6 +1,6 @@
 module Rollbar
   module LanguageSupport
-    extend self
+    module_function
 
     def const_defined?(mod, target, inherit = true)
       if ruby_18?

data/lib/rollbar/lazy_store.rb

@@ -21,11 +21,11 @@ module Rollbar
     end
 
     def ==(other)
-      if other.is_a?(self.class)
-        raw == other.raw
-      else
-        raw == other
-      end
+      raw == if other.is_a?(self.class)
+               other.raw
+             else
+               other
+             end
     end
 
     # With this version of clone we ensure that the loaded_data is empty

data/lib/rollbar/logger.rb

@@ -67,6 +67,7 @@ module Rollbar
 
     def blank?(message)
       return message.blank? if message.respond_to?(:blank?)
+
       message.respond_to?(:empty?) ? !!message.empty? : !message
     end
 

data/lib/rollbar/logger_proxy.rb

@@ -26,7 +26,7 @@ module Rollbar
       return unless Rollbar.configuration.enabled && acceptable_levels.include?(level.to_sym)
 
       @object.send(level, message)
-    rescue
+    rescue StandardError
       puts "[Rollbar] Error logging #{level}:"
       puts "[Rollbar] #{message}"
     end

data/lib/rollbar/middleware/js.rb

@@ -13,7 +13,7 @@ module Rollbar
       attr_reader :app
       attr_reader :config
 
-      JS_IS_INJECTED_KEY = 'rollbar.js_is_injected'
+      JS_IS_INJECTED_KEY = 'rollbar.js_is_injected'.freeze
       SNIPPET = File.read(File.expand_path('../../../../data/rollbar.snippet.js', __FILE__))
 
       def initialize(app, config)
@@ -29,7 +29,7 @@ module Rollbar
 
           response_string = add_js(env, app_result[2])
           build_response(env, app_result, response_string)
-        rescue => e
+        rescue StandardError => e
           Rollbar.log_error("[Rollbar] Rollbar.js could not be added because #{e} exception")
 
           app_result
@@ -71,7 +71,7 @@ module Rollbar
         return nil unless insert_after_idx
 
         build_body_with_js(env, body, insert_after_idx)
-      rescue => e
+      rescue StandardError => e
         Rollbar.log_error("[Rollbar] Rollbar.js could not be added because #{e} exception")
         nil
       end
@@ -189,17 +189,17 @@ module Rollbar
 
         secure_headers_cls = nil
 
-        if !::SecureHeaders::respond_to?(:content_security_policy_script_nonce)
-          secure_headers_cls = SecureHeadersFalse
-        elsif config.respond_to?(:get)
-          secure_headers_cls = SecureHeaders3To5
-        elsif config.dup.respond_to?(:csp)
-          secure_headers_cls = SecureHeaders6
-        else
-          secure_headers_cls = SecureHeadersFalse
-        end
-
-          secure_headers_cls.new
+        secure_headers_cls = if !::SecureHeaders.respond_to?(:content_security_policy_script_nonce)
+                               SecureHeadersFalse
+                             elsif config.respond_to?(:get)
+                               SecureHeaders3To5
+                             elsif config.dup.respond_to?(:csp)
+                               SecureHeaders6
+                             else
+                               SecureHeadersFalse
+                             end
+
+        secure_headers_cls.new
       end
 
       class SecureHeadersResolver
@@ -217,7 +217,7 @@ module Rollbar
           !opt_out?(csp) && !unsafe_inline?(csp)
         end
 
-        def opt_out?(csp)
+        def opt_out?(_csp)
           raise NotImplementedError
         end
 

data/lib/rollbar/middleware/rack.rb

@@ -17,12 +17,15 @@ module Rollbar
 
         Rollbar.scoped(fetch_scope(env)) do
           begin
+            Rollbar.notifier.enable_locals
             response = @app.call(env)
             report_exception_to_rollbar(env, framework_error(env)) if framework_error(env)
             response
           rescue Exception => e
             report_exception_to_rollbar(env, e)
             raise
+          ensure
+            Rollbar.notifier.disable_locals
           end
         end
       end
@@ -41,7 +44,7 @@ module Rollbar
         proc { extract_person_data_from_controller(env) }
       end
 
-      def framework_error(env)
+      def framework_error(_env)
         nil
       end
     end

data/lib/rollbar/middleware/rails/rollbar.rb

@@ -21,6 +21,7 @@ module Rollbar
 
           Rollbar.scoped(scope) do
             begin
+              Rollbar.notifier.enable_locals
               response = @app.call(env)
 
               if (framework_exception = env['action_dispatch.exception'])
@@ -31,6 +32,8 @@ module Rollbar
             rescue Exception => exception
               report_exception_to_rollbar(env, exception)
               raise
+            ensure
+              Rollbar.notifier.disable_locals
             end
           end
         end
@@ -62,7 +65,13 @@ module Rollbar
           block = proc { extract_person_data_from_controller(env) }
           return block unless defined?(ActiveRecord::Base) && ActiveRecord::Base.connected?
 
-          proc { ActiveRecord::Base.connection_pool.with_connection(&block) }
+          proc do
+            begin
+              ActiveRecord::Base.connection_pool.with_connection(&block)
+            rescue ActiveRecord::ConnectionTimeoutError
+              {}
+            end
+          end
         end
 
         def context(request_data)

data/lib/rollbar/notifier.rb

@@ -8,6 +8,7 @@ require 'rollbar/delay/girl_friday'
 require 'rollbar/delay/thread'
 require 'rollbar/logger_proxy'
 require 'rollbar/item'
+require 'rollbar/notifier/trace_with_bindings'
 require 'ostruct'
 
 module Rollbar
@@ -95,7 +96,7 @@ module Rollbar
     # @yield Block which exceptions won't be reported.
     def silenced
       yield
-    rescue => e
+    rescue StandardError => e
       e.instance_variable_set(:@_rollbar_do_not_report, true)
       raise
     end
@@ -202,7 +203,7 @@ module Rollbar
       else
         send_item(item)
       end
-    rescue => e
+    rescue StandardError => e
       log_error("[Rollbar] Error processing the item: #{e.class}, #{e.message}. Item: #{item.payload.inspect}")
       raise e
     end
@@ -241,7 +242,7 @@ module Rollbar
       Rollbar.silenced do
         begin
           process_item(item)
-        rescue => e
+        rescue StandardError => e
           report_internal_error(e)
 
           raise
@@ -287,7 +288,7 @@ module Rollbar
                                :configuration => configuration,
                                :logger => logger)
         schedule_item(item)
-      rescue => e
+      rescue StandardError => e
         log_error "[Rollbar] Error sending failsafe : #{e}"
       end
 
@@ -295,7 +296,7 @@ module Rollbar
     end
 
     ## Logging
-    %w(debug info warn error).each do |level|
+    %w[debug info warn error].each do |level|
       define_method(:"log_#{level}") do |message|
         logger.send(level, message)
       end
@@ -305,6 +306,30 @@ module Rollbar
       @logger ||= LoggerProxy.new(configuration.logger)
     end
 
+    def trace_with_bindings
+      @trace_with_bindings ||= TraceWithBindings.new
+    end
+
+    def exception_bindings
+      trace_with_bindings.exception_frames
+    end
+
+    def current_bindings
+      trace_with_bindings.frames
+    end
+
+    def enable_locals?
+      configuration.locals[:enabled] && [:app, :all].include?(configuration.send_extra_frame_data)
+    end
+
+    def enable_locals
+      trace_with_bindings.enable if enable_locals?
+    end
+
+    def disable_locals
+      trace_with_bindings.disable if enable_locals?
+    end
+
     private
 
     def use_exception_level_filters?(options)
@@ -331,7 +356,7 @@ module Rollbar
           return 'ignored' if status == 'ignored'
         rescue Rollbar::Ignore
           raise
-        rescue => e
+        rescue StandardError => e
           log_error("[Rollbar] Error calling the `before_process` hook: #{e}")
 
           break
@@ -423,7 +448,7 @@ module Rollbar
 
       begin
         item = build_item('error', nil, exception, { :internal => true }, nil)
-      rescue => e
+      rescue StandardError => e
         send_failsafe('build_item in exception_data', e)
         log_error "[Rollbar] Exception: #{exception}"
         return
@@ -431,7 +456,7 @@ module Rollbar
 
       begin
         process_item(item)
-      rescue => e
+      rescue StandardError => e
         send_failsafe('error in process_item', e)
         log_error "[Rollbar] Item: #{item}"
         return
@@ -439,7 +464,7 @@ module Rollbar
 
       begin
         log_instance_link(item['data'])
-      rescue => e
+      rescue StandardError => e
         send_failsafe('error logging instance link', e)
         log_error "[Rollbar] Item: #{item}"
         return
@@ -658,17 +683,17 @@ module Rollbar
 
           exception_info = exception.class.name
           # #to_s and #message defaults to class.to_s. Add message only if add valuable info.
-          exception_info += %(: "#{exception.message}") if exception.message != exception.class.to_s
+          exception_info += %[: "#{exception.message}"] if exception.message != exception.class.to_s
           exception_info += " in #{nearest_frame}" if nearest_frame
 
           body += "#{exception_info}: #{message}"
-        rescue
+        rescue StandardError
           log_error('[Rollbar] Error building failsafe exception message')
         end
       else
         begin
           body += message.to_s
-        rescue
+        rescue StandardError
           log_error('[Rollbar] Error building failsafe message')
         end
       end
@@ -701,7 +726,7 @@ module Rollbar
     def process_async_item(item)
       configuration.async_handler ||= default_async_handler
       configuration.async_handler.call(item.payload)
-    rescue
+    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"'
         return
@@ -718,7 +743,7 @@ module Rollbar
       failover_handlers.each do |handler|
         begin
           handler.call(item.payload)
-        rescue
+        rescue StandardError
           next unless handler == failover_handlers.last
 
           log_error "[Rollbar] All failover handlers failed while processing item: #{Rollbar::JSON.dump(item.payload)}"
@@ -726,7 +751,7 @@ module Rollbar
       end
     end
 
-    alias_method :log_warning, :log_warn
+    alias log_warning log_warn
 
     def log_instance_link(data)
       return unless data[:uuid]

data/lib/rollbar/notifier/trace_with_bindings.rb

@@ -0,0 +1,65 @@
+module Rollbar
+  class Notifier
+    class TraceWithBindings # :nodoc:
+      attr_reader :frames, :exception_frames
+
+      def initialize
+        reset
+      end
+
+      def reset
+        @frames = []
+        @exception_frames = []
+        @exception_signature = nil
+      end
+
+      def enable
+        reset
+        trace_point.enable if defined?(TracePoint)
+      end
+
+      def disable
+        trace_point.disable if defined?(TracePoint)
+      end
+
+      private
+
+      def exception_signature(trace)
+        # use the exception backtrace to detect reraised exception.
+        trace.raised_exception.backtrace.first
+      end
+
+      def detect_reraise(trace)
+        @exception_signature == exception_signature(trace)
+      end
+
+      def trace_point
+        return unless defined?(TracePoint)
+
+        @trace_point ||= TracePoint.new(:call, :return, :b_call, :b_return, :c_call, :c_return, :raise) do |tp|
+          case tp.event
+          when :call, :b_call, :c_call, :class
+            frames.push frame(tp)
+          when :return, :b_return, :c_return, :end
+            frames.pop
+          when :raise
+            unless detect_reraise(tp) # ignore reraised exceptions
+              @exception_frames = @frames.dup # may be possible to optimize better than #dup
+              @exception_signature = exception_signature(tp)
+            end
+          end
+        end
+      end
+
+      def frame(trace)
+        {
+          :binding => trace.binding,
+          :defined_class => trace.defined_class,
+          :method_id => trace.method_id,
+          :path => trace.path,
+          :lineno => trace.lineno
+        }
+      end
+    end
+  end
+end

data/lib/rollbar/plugin.rb

@@ -7,6 +7,8 @@ module Rollbar
     attr_reader :name
     attr_reader :dependencies
     attr_reader :callables
+    attr_reader :revert_callables
+    attr_accessor :on_demand
     attr_accessor :loaded
 
     private :loaded=
@@ -15,31 +17,73 @@ module Rollbar
       @name = name
       @dependencies = []
       @callables = []
+      @revert_callables = []
       @loaded = false
+      @on_demand = false
+    end
+
+    def load_on_demand
+      @on_demand = true
     end
 
     def configuration
       Rollbar.configuration
     end
 
+    def load_scoped!(transparent = false)
+      if transparent
+        load! if load?
+
+        result = yield
+
+        unload! if loaded
+      else
+        return unless load?
+
+        load!
+
+        result = yield
+
+        unload!
+      end
+
+      result
+    end
+
     def load!
       return unless load?
 
       begin
         callables.each(&:call)
-      rescue => e
+      rescue StandardError => e
         log_loading_error(e)
       ensure
         self.loaded = true
       end
     end
 
+    def unload!
+      return unless loaded
+
+      begin
+        revert_callables.each(&:call)
+      rescue StandardError => e
+        log_unloading_error(e)
+      ensure
+        self.loaded = false
+      end
+    end
+
     def execute(&block)
       callables << block
     end
 
-    def execute!(&block)
-      block.call if load?
+    def execute!
+      yield if load?
+    end
+
+    def revert(&block)
+      revert_callables << block
     end
 
     private
@@ -61,7 +105,7 @@ module Rollbar
 
     def load?
       !loaded && dependencies_satisfy?
-    rescue => e
+    rescue StandardError => e
       log_loading_error(e)
 
       false
@@ -71,8 +115,12 @@ module Rollbar
       dependencies.all?(&:call)
     end
 
-    def log_loading_error(e)
-      Rollbar.log_error("Error trying to load plugin '#{name}': #{e.class}, #{e.message}")
+    def log_loading_error(error)
+      Rollbar.log_error("Error trying to load plugin '#{name}': #{error.class}, #{error.message}")
+    end
+
+    def log_unloading_error(error)
+      Rollbar.log_error("Error trying to unload plugin '#{name}': #{error.class}, #{error.message}")
     end
   end
 end