Merge pull request #194 from rollbar/improve-middleware-performance

Improve middleware performance

lib/rollbar.rb

@@ -220,6 +220,10 @@ def report(level, message, exception, extra)
         data[:person] = data[:person].call if is_proc
       end
 
+      data[:request] = data[:request].call if data[:request].respond_to?(:call)
+      data[:context] = data[:context].call if data[:context].respond_to?(:call)
+      data.delete(:context) unless data[:context]
+
       schedule_payload(payload)
 
       log_instance_link(data)

lib/rollbar/middleware/rack/builder.rb

@@ -22,9 +22,8 @@ def call_with_rollbar(env)
         end
 
         def fetch_scope(env)
-          request_data = extract_request_data_from_rack(env)
           {
-            :request => request_data,
+            :request => proc { extract_request_data_from_rack(env) },
             :person => person_data_proc(env)
           }
         rescue Exception => e

lib/rollbar/middleware/rails/rollbar.rb

@@ -13,6 +13,8 @@ def initialize(app)
         end
 
         def call(env)
+          self.request_data = nil
+
           Rollbar.reset_notifier!
 
           env['rollbar.scope'] = scope = fetch_scope(env)
@@ -34,17 +36,28 @@ def call(env)
         end
 
         def fetch_scope(env)
-          request_data = extract_request_data_from_rack(env)
-
           # Scope a new notifier with request data and a Proc for person data
           # for any reports that happen while a controller is handling a request
+
           {
-            :request => request_data,
+            :request => proc { request_data(env) },
             :person => person_data_proc(env),
-            :context => context(request_data)
+            :context => proc { context(request_data(env)) }
           }
         end
 
+        def request_data(env)
+          Thread.current[:'_rollbar.rails.request_data'] ||= extract_request_data(env)
+        end
+
+        def request_data=(value)
+          Thread.current[:'_rollbar.rails.request_data'] = value
+        end
+
+        def extract_request_data(env)
+          extract_request_data_from_rack(env)
+        end
+
         def person_data_proc(env)
           block = proc { extract_person_data_from_controller(env) }
           return block unless defined?(ActiveRecord::Base)

lib/rollbar/middleware/sinatra.rb

@@ -28,9 +28,8 @@ def call(env)
       end
 
       def fetch_scope(env)
-        request_data = extract_request_data_from_rack(env)
         {
-          :request => request_data,
+          :request => proc { extract_request_data_from_rack(env) },
           :person => person_data_proc(env)
         }
       rescue Exception => e

spec/rollbar/middleware/sinatra_spec.rb

@@ -31,7 +31,7 @@ def app
   let(:logger_mock) { double('logger').as_null_object }
 
   before do
-    Rollbar.reconfigure do |config|
+    Rollbar.configure do |config|
       config.logger = logger_mock
       config.framework = 'Sinatra'
     end