metriks-middleware 1.2.0 → 1.2.1

data/lib/metriks/middleware.rb

@@ -2,11 +2,10 @@ require 'metriks'
 
 module Metriks
   class Middleware
-    VERSION = '1.2.0'
+    VERSION = '1.2.1'
 
-    def initialize(app, options = {})
-      @app  = app
-      @name = options.fetch :name, 'app'
+    def initialize(app)
+      @app = app
     end
 
     def call(env)
@@ -33,8 +32,8 @@ module Metriks
       queue_wait   = env['HTTP_X_HEROKU_QUEUE_WAIT_TIME']
       queue_depth  = env['HTTP_X_HEROKU_QUEUE_DEPTH']
 
-      Metriks.histogram("#{ @name }.queue.wait") .update(queue_wait.to_i)  if queue_wait
-      Metriks.histogram("#{ @name }.queue.depth").update(queue_depth.to_i) if queue_depth
+      Metriks.histogram("queue.wait") .update(queue_wait.to_i)  if queue_wait
+      Metriks.histogram("queue.depth").update(queue_depth.to_i) if queue_depth
     end
 
     def record_error_rate(env)
@@ -53,14 +52,14 @@ module Metriks
 
     def record_error(status)
       if status >= 500
-        Metriks.meter("#{ @name }.responses.error").mark
+        Metriks.meter("responses.error").mark
       elsif status == 404
-        Metriks.meter("#{ @name }.responses.not_found").mark
+        Metriks.meter("responses.not_found").mark
       end
     end
 
     def response_timer
-      Metriks.timer(@name)
+      Metriks.timer('app')
     end
   end
 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.0'
-  s.date              = '2012-07-16'
+  s.version           = '1.2.1'
+  s.date              = '2012-09-25'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.

data/test/async_app_test.rb

@@ -79,7 +79,7 @@ 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.responses.error').count
+    errors = Metriks.meter('responses.error').count
 
     assert_equal 2, errors
   end
@@ -102,7 +102,7 @@ class AsyncAppTest < Test::Unit::TestCase
     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
+    not_founds = Metriks.meter('responses.not_found').count
 
     assert_equal 2, not_founds
   end
@@ -111,8 +111,8 @@ class AsyncAppTest < Test::Unit::TestCase
     Metriks::Middleware.new(@downstream).call(@env)
     @async_close.call
 
-    wait  = Metriks.histogram('app.queue.wait').mean
-    depth = Metriks.histogram('app.queue.depth').mean
+    wait  = Metriks.histogram('queue.wait').mean
+    depth = Metriks.histogram('queue.depth').mean
 
     assert_equal 0, wait
     assert_equal 0, depth
@@ -124,25 +124,10 @@ class AsyncAppTest < Test::Unit::TestCase
     Metriks::Middleware.new(@downstream).call(@env)
     @async_close.call
 
-    wait  = Metriks.histogram('app.queue.wait').mean
-    depth = Metriks.histogram('app.queue.depth').mean
+    wait  = Metriks.histogram('queue.wait').mean
+    depth = Metriks.histogram('queue.depth').mean
 
     assert_equal 42, wait
     assert_equal 24, depth
   end
-
-  def test_name_merics
-    @env.merge! 'HTTP_X_HEROKU_QUEUE_WAIT_TIME' => '42',
-                'HTTP_X_HEROKU_QUEUE_DEPTH'     => '24'
-    Metriks::Middleware.new(@downstream, name: 'metric-name').call(@env)
-    @async_close.call
-
-    count = Metriks.timer('metric-name').count
-    wait  = Metriks.histogram('metric-name.queue.wait').mean
-    depth = Metriks.histogram('metric-name.queue.depth').mean
-
-    assert_operator count, :>, 0
-    assert_operator wait,  :>, 0
-    assert_operator depth, :>, 0
-  end
 end

data/test/sync_app_test.rb

@@ -50,7 +50,7 @@ class SyncAppTest < Test::Unit::TestCase
     2.times { Metriks::Middleware.new(error_app).call(@env) }
     Metriks::Middleware.new(@downstream).call(@env)
 
-    errors = Metriks.meter('app.responses.error').count
+    errors = Metriks.meter('responses.error').count
 
     assert_equal 2, errors
   end
@@ -60,7 +60,7 @@ class SyncAppTest < Test::Unit::TestCase
     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
+    not_founds = Metriks.meter('responses.not_found').count
 
     assert_equal 2, not_founds
   end
@@ -68,8 +68,8 @@ class SyncAppTest < Test::Unit::TestCase
   def test_omits_queue_metrics
     Metriks::Middleware.new(@downstream).call(@env)
 
-    wait  = Metriks.histogram('app.queue.wait').mean
-    depth = Metriks.histogram('app.queue.depth').mean
+    wait  = Metriks.histogram('queue.wait').mean
+    depth = Metriks.histogram('queue.depth').mean
 
     assert_equal 0, wait
     assert_equal 0, depth
@@ -80,31 +80,10 @@ class SyncAppTest < Test::Unit::TestCase
                 'HTTP_X_HEROKU_QUEUE_DEPTH'     => '24'
     Metriks::Middleware.new(@downstream).call(@env)
 
-    wait  = Metriks.histogram('app.queue.wait').mean
-    depth = Metriks.histogram('app.queue.depth').mean
+    wait  = Metriks.histogram('queue.wait').mean
+    depth = Metriks.histogram('queue.depth').mean
 
     assert_equal 42, wait
     assert_equal 24, depth
   end
-
-  def test_name_merics
-    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.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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metriks-middleware
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-16 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metriks