rack_timer 0.0.2 → 0.0.3

data/lib/rack_timer/stack.rb

@@ -5,6 +5,7 @@ module ActionDispatch
     # each middleware takes to execute
     class RackTimer
 
+      # modify this environment variable to see more or less output
       LogThreshold = ENV.has_key?('RACK_TIMER_LOG_THRESHOLD') ? ENV['RACK_TIMER_LOG_THRESHOLD'].to_f : 1.0 # millisecond
 
       def initialize(app)
@@ -12,10 +13,17 @@ module ActionDispatch
       end
 
       def call(env)
+        env = incoming_timestamp(env)
+        status, headers, body = @app.call env
+        env = outgoing_timestamp(env)
+        [status, headers, body]
+      end
+
+      def incoming_timestamp(env)
         if env.has_key?("MIDDLEWARE_TIMESTAMP") # skip over the first middleware
           elapsed_time = (Time.now.to_f - env["MIDDLEWARE_TIMESTAMP"][1].to_f) * 1000 
           if elapsed_time > LogThreshold # only log if took greater than LogThreshold
-            Rails.logger.info "Rack Timer -- #{env["MIDDLEWARE_TIMESTAMP"][0]}: #{elapsed_time} ms"
+            Rails.logger.info "Rack Timer (incoming) -- #{env["MIDDLEWARE_TIMESTAMP"][0]}: #{elapsed_time} ms"
           end
         elsif env.has_key?("HTTP_X_REQUEST_START") or env.has_key?("HTTP_X_QUEUE_START")
           # if we are tracking request queuing time via New Relic's suggested header(s),
@@ -26,7 +34,24 @@ module ActionDispatch
           Rails.logger.info "Rack Timer -- Queuing time: #{(Time.now.to_f * 1000000).to_i - queue_start_time} microseconds"
         end
         env["MIDDLEWARE_TIMESTAMP"] = [@app.class.to_s, Time.now]
-        @app.call env
+        env
+      end
+
+      def outgoing_timestamp(env)
+        if env.has_key?("MIDDLEWARE_TIMESTAMP")
+          elapsed_time = (Time.now.to_f - env["MIDDLEWARE_TIMESTAMP"][1].to_f) * 1000
+          if elapsed_time > LogThreshold # only log if took greater than LogThreshold
+            if env["MIDDLEWARE_TIMESTAMP"][0] and env["MIDDLEWARE_TIMESTAMP"][0] == @app.class.to_s
+              # this is the actual elapsed time of the final piece of Middleware (typically routing) AND the actual
+              # application's action
+              Rails.logger.info "Rack Timer (Application Action) -- #{@app.class.to_s}: #{elapsed_time} ms"              
+            else
+              Rails.logger.info "Rack Timer (outgoing) -- #{@app.class.to_s}: #{elapsed_time} ms"
+            end
+          end
+        end
+        env["MIDDLEWARE_TIMESTAMP"] = [nil, Time.now]
+        env
       end
 
     end
@@ -39,6 +64,14 @@ module ActionDispatch
       end    
 
     end
-    
+
+    # overriding this in order to wrap the incoming app in a RackTimer, which gives us timing on the final
+    # piece of Middleware, which for Rails is the routing plus the actual Application action
+    def build(app = nil, &block)
+      app ||= block
+      raise "MiddlewareStack#build requires an app" unless app
+      reverse.inject(RackTimer.new(app)) { |a, e| e.build(a) }
+    end
+
   end
 end

data/lib/rack_timer/version.rb

@@ -1,3 +1,3 @@
 module RackTimer
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack_timer
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - lukeludwig
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-07 00:00:00 Z
+date: 2012-03-13 00:00:00 Z
 dependencies: []
 
 description: Provides timing output around each of your Rails rack-based middleware classes.