metriks-middleware 1.2.2 → 1.2.3

data/lib/metriks/middleware.rb

@@ -2,7 +2,7 @@ require 'metriks'
 
 module Metriks
   class Middleware
-    VERSION = '1.2.2'
+    VERSION = '1.2.3'
 
     def initialize(app)
       @app = app
@@ -38,16 +38,19 @@ module Metriks
 
     def record_error_rate(env)
       original_callback = env['async.callback']
-      env['async.callback'] = lambda do |env|
-        record_error env.first
-        original_callback.call env
+      env['async.callback'] = lambda do |(status, headers, body)|
+        record_error status
+        record_content_length headers
+        original_callback.call [status, headers, body]
       end
     end
 
     def call_downstream(env)
-      response = @app.call env
-      record_error response.first
-      response
+      status, headers, body = @app.call env
+      record_error status
+      record_content_length headers
+
+      [status, headers, body]
     end
 
     def record_error(status)
@@ -60,6 +63,12 @@ module Metriks
       end
     end
 
+    def record_content_length(headers)
+      content_length = headers.fetch('Content-Length', 0).to_i
+      return unless content_length > 0
+      Metriks.histogram('responses.content_length').update(content_length)
+    end
+
     def response_timer
       Metriks.timer('app')
     end

data/metriks-middleware.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'metriks-middleware'
-  s.version           = '1.2.2'
-  s.date              = '2012-10-05'
+  s.version           = '1.2.3'
+  s.date              = '2012-10-24'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.

data/test/async_app_test.rb

@@ -23,8 +23,8 @@ class AsyncAppTest < Test::Unit::TestCase
   end
 
   def test_calls_downstream
+    response   = [200, { 'Header' => 'value' }, ['body']]
     downstream = mock
-    response   = stub first: 42
     downstream.expects(:call).with(@env).returns(response)
 
     actual_response = Metriks::Middleware.new(downstream).call(@env)
@@ -61,6 +61,23 @@ class AsyncAppTest < Test::Unit::TestCase
     assert_in_delta 0.1, time, 0.01
   end
 
+  def test_records_content_length
+    length_sync_app  = lambda do |env| [200, {'Content-Length' => 42}, ['']] end
+    length_async_app = lambda do |env|
+      env['async.callback'].call [200, {'Content-Length' => 42}, ['']]
+      [-1, {}, ['']]
+    end
+
+    Metriks::Middleware.new(length_sync_app).call(@env.dup)
+    Metriks::Middleware.new(length_async_app).call(@env.dup)
+
+    count = Metriks.histogram('responses.content_length').count
+    size  = Metriks.histogram('responses.content_length').mean
+
+    assert_equal 2,  count
+    assert_equal 42, size
+  end
+
   def test_records_error_responses
     error_sync_app  = lambda do |env| [500, {}, ['']] end
     error_async_app = lambda do |env|

data/test/sync_app_test.rb

@@ -20,8 +20,8 @@ class SyncAppTest < Test::Unit::TestCase
   end
 
   def test_calls_downstream
+    response   = [200, {}, ['']]
     downstream = mock
-    response   = stub first: 200
     downstream.expects(:call).with(@env).returns(response)
 
     actual_response = Metriks::Middleware.new(downstream).call(@env)
@@ -45,6 +45,17 @@ class SyncAppTest < Test::Unit::TestCase
     assert_in_delta 0.1, time, 0.01
   end
 
+  def test_records_content_length
+    length_app = lambda do |env| [200, { 'Content-Length' => 42 }, ['']] end
+    Metriks::Middleware.new(length_app).call(@env)
+
+    count = Metriks.histogram('responses.content_length').count
+    size  = Metriks.histogram('responses.content_length').mean
+
+    assert_equal 1,  count
+    assert_equal 42, size
+  end
+
   def test_records_error_responses
     error_app = lambda do |env| [500, {}, ['']] end
     2.times { Metriks::Middleware.new(error_app).call(@env) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metriks-middleware
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metriks