metriks-middleware 1.1.0 → 1.2.0

data/example/Gemfile

@@ -0,0 +1,6 @@
+source :rubygems
+
+gem 'metriks-middleware'
+gem 'thin'
+
+gem 'foreman', group: 'development'

data/{Gemfile.lock → example/Gemfile.lock}

@@ -1,26 +1,30 @@
-PATH
-  remote: .
-  specs:
-    metriks-middleware (1.1.0)
-      metriks (~> 0.9.9)
-
 GEM
   remote: http://rubygems.org/
   specs:
     atomic (1.0.1)
     avl_tree (1.1.3)
+    daemons (1.1.8)
+    eventmachine (0.12.10)
+    foreman (0.49.0)
+      thor (>= 0.13.6)
     hitimes (1.1.1)
-    metaclass (0.0.1)
     metriks (0.9.9.1)
       atomic (~> 1.0)
       avl_tree (~> 1.1.2)
       hitimes (~> 1.1)
-    mocha (0.11.4)
-      metaclass (~> 0.0.1)
+    metriks-middleware (1.1.0)
+      metriks (~> 0.9.9)
+    rack (1.4.1)
+    thin (1.3.1)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
+    thor (0.15.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  metriks-middleware!
-  mocha (~> 0.11.4)
+  foreman
+  metriks-middleware
+  thin

data/example/Procfile

@@ -0,0 +1 @@
+web: bundle exec thin start -p $PORT

data/example/config.ru

@@ -0,0 +1,40 @@
+$: << 'lib'
+require 'metriks/middleware'
+require 'metriks/reporter/logger'
+require 'pp'
+
+$stdout.sync = true
+Thread.abort_on_exception = true
+
+Metriks::Reporter::Logger.new(logger: Logger.new($stdout), interval: 5).start
+use Metriks::Middleware
+
+run(->(env) do
+  case env['PATH_INFO']
+  when '/sync'
+    [200, {'Content-Type' => 'text/plain'}, ['sync!']]
+
+  when '/sync-error'
+    [500, {'Content-Type' => 'text/plain'}, ['sync error!']]
+
+  when '/async'
+    Thread.new do
+      sleep 1
+      env['async.callback'].call([200, {'Content-Type' => 'text/plain'}, ['async!']])
+    end
+    [-1, {}, []]
+
+  when '/async-error'
+    Thread.new do
+      sleep 1
+      env['async.callback'].call([500, {'Content-Type' => 'text/plain'}, ['async error!']])
+    end
+    [-1, {}, []]
+
+  else
+    world = env.keys.sort.each_with_object({}) {|key, world|
+      world[key] = env[key]
+    }
+    [200, {'Content-Type' => 'text/plain'}, [world.pretty_inspect]]
+  end
+end)

data/lib/metriks/middleware.rb

@@ -2,7 +2,7 @@ require 'metriks'
 
 module Metriks
   class Middleware
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
 
     def initialize(app, options = {})
       @app  = app
@@ -52,7 +52,11 @@ module Metriks
     end
 
     def record_error(status)
-      Metriks.meter("#{ @name }.errors").mark if status >= 500
+      if status >= 500
+        Metriks.meter("#{ @name }.responses.error").mark
+      elsif status == 404
+        Metriks.meter("#{ @name }.responses.not_found").mark
+      end
     end
 
     def response_timer

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.1.0'
-  s.date              = '2012-07-11'
+  s.version           = '1.2.0'
+  s.date              = '2012-07-16'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -51,10 +51,13 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     Gemfile
-    Gemfile.lock
     LICENSE
     README.md
     Rakefile
+    example/Gemfile
+    example/Gemfile.lock
+    example/Procfile
+    example/config.ru
     lib/metriks/middleware.rb
     metriks-middleware.gemspec
     test/async_app_test.rb

data/test/async_app_test.rb

@@ -61,7 +61,7 @@ class AsyncAppTest < Test::Unit::TestCase
     assert_in_delta 0.1, time, 0.01
   end
 
-  def test_records_errors
+  def test_records_error_responses
     error_sync_app  = lambda do |env| [500, {}, ['']] end
     error_async_app = lambda do |env|
       env['async.callback'].call [500, {}, ['']]
@@ -79,11 +79,34 @@ class AsyncAppTest < Test::Unit::TestCase
     Metriks::Middleware.new(success_sync_app).call(@env.dup)
     Metriks::Middleware.new(success_async_app).call(@env.dup)
 
-    errors = Metriks.meter('app.errors').count
+    errors = Metriks.meter('app.responses.error').count
 
     assert_equal 2, errors
   end
 
+  def test_records_not_found_responses
+    not_found_sync_app  = lambda do |env| [404, {}, ['']] end
+    not_found_async_app = lambda do |env|
+      env['async.callback'].call [404, {}, ['']]
+      [-1, {}, ['']]
+    end
+
+    success_sync_app  = lambda do |env| [200, {}, ['']] end
+    success_async_app = lambda do |env|
+      env['async.callback'].call [200, {}, ['']]
+      [-1, {}, ['']]
+    end
+
+    Metriks::Middleware.new(not_found_sync_app).call(@env.dup)
+    Metriks::Middleware.new(not_found_async_app).call(@env.dup)
+    Metriks::Middleware.new(success_sync_app).call(@env.dup)
+    Metriks::Middleware.new(success_async_app).call(@env.dup)
+
+    not_founds = Metriks.meter('app.responses.not_found').count
+
+    assert_equal 2, not_founds
+  end
+
   def test_omits_queue_metrics
     Metriks::Middleware.new(@downstream).call(@env)
     @async_close.call

data/test/sync_app_test.rb

@@ -45,16 +45,26 @@ class SyncAppTest < Test::Unit::TestCase
     assert_in_delta 0.1, time, 0.01
   end
 
-  def test_records_errors
+  def test_records_error_responses
     error_app = lambda do |env| [500, {}, ['']] end
     2.times { Metriks::Middleware.new(error_app).call(@env) }
     Metriks::Middleware.new(@downstream).call(@env)
 
-    errors = Metriks.meter('app.errors').count
+    errors = Metriks.meter('app.responses.error').count
 
     assert_equal 2, errors
   end
 
+  def test_records_not_found_responses
+    not_found_app = lambda do |env| [404, {}, ['']] end
+    2.times { Metriks::Middleware.new(not_found_app).call(@env) }
+    Metriks::Middleware.new(@downstream).call(@env)
+
+    not_founds = Metriks.meter('app.responses.not_found').count
+
+    assert_equal 2, not_founds
+  end
+
   def test_omits_queue_metrics
     Metriks::Middleware.new(@downstream).call(@env)
 
@@ -78,18 +88,22 @@ class SyncAppTest < Test::Unit::TestCase
   end
 
   def test_name_merics
-    error_app = lambda do |env| [500, {}, ['']] end
+    error_app     = lambda do |env| [500, {}, ['']] end
+    not_found_app = lambda do |env| [404, {}, ['']] end
     @env.merge! 'HTTP_X_HEROKU_QUEUE_WAIT_TIME' => '42',
                 'HTTP_X_HEROKU_QUEUE_DEPTH'     => '24'
     Metriks::Middleware.new(error_app, name: 'metric-name').call(@env)
+    Metriks::Middleware.new(not_found_app, name: 'metric-name').call(@env)
 
-    count  = Metriks.timer('metric-name').count
-    errors = Metriks.meter('metric-name.errors').count
-    wait   = Metriks.histogram('metric-name.queue.wait').mean
-    depth  = Metriks.histogram('metric-name.queue.depth').mean
+    count      = Metriks.timer('metric-name').count
+    errors     = Metriks.meter('metric-name.responses.error').count
+    not_founds = Metriks.meter('metric-name.responses.not_found').count
+    wait       = Metriks.histogram('metric-name.queue.wait').mean
+    depth      = Metriks.histogram('metric-name.queue.depth').mean
 
     assert_operator count,  :>, 0
     assert_operator errors, :>, 0
+    assert_operator not_founds, :>, 0
     assert_operator wait,   :>, 0
     assert_operator depth,  :>, 0
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metriks-middleware
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000 Z
+date: 2012-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metriks
@@ -52,10 +52,13 @@ extra_rdoc_files:
 - LICENSE
 files:
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- example/Gemfile
+- example/Gemfile.lock
+- example/Procfile
+- example/config.ru
 - lib/metriks/middleware.rb
 - metriks-middleware.gemspec
 - test/async_app_test.rb