rollbar 2.19.1 → 2.27.1

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/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