metriks-middleware 1.2.3 → 1.3.0

data/lib/metriks/middleware.rb

@@ -2,7 +2,7 @@ require 'metriks'
 
 module Metriks
   class Middleware
-    VERSION = '1.2.3'
+    VERSION = '1.3.0'
 
     def initialize(app)
       @app = app
@@ -10,7 +10,7 @@ module Metriks
 
     def call(env)
       time_response(env) do
-        record_heroku_queue_status env
+        record_heroku_status env
         record_error_rate env
         call_downstream env
       end
@@ -28,12 +28,14 @@ module Metriks
       end
     end
 
-    def record_heroku_queue_status(env)
+    def record_heroku_status(env)
       queue_wait   = env['HTTP_X_HEROKU_QUEUE_WAIT_TIME']
       queue_depth  = env['HTTP_X_HEROKU_QUEUE_DEPTH']
+      dynos_in_use = env['HTTP_X_HEROKU_DYNOS_IN_USE']
 
-      Metriks.histogram("queue.wait") .update(queue_wait.to_i)  if queue_wait
-      Metriks.histogram("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
+      Metriks.histogram("dynos.in_use").update(dynos_in_use.to_i) if dynos_in_use
     end
 
     def record_error_rate(env)

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.3'
-  s.date              = '2012-10-24'
+  s.version           = '1.3.0'
+  s.date              = '2012-12-11'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
   s.add_development_dependency 'mocha', '~> 0.11.4'
+  s.add_development_dependency 'rake', '>= 0.9'
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE

data/test/async_app_test.rb

@@ -153,21 +153,26 @@ class AsyncAppTest < Test::Unit::TestCase
 
     wait  = Metriks.histogram('queue.wait').mean
     depth = Metriks.histogram('queue.depth').mean
+    used  = Metriks.histogram('dynos.in_use').mean
 
     assert_equal 0, wait
     assert_equal 0, depth
+    assert_equal 0, used
   end
 
   def test_records_heroku_queue_metrics
     @env.merge! 'HTTP_X_HEROKU_QUEUE_WAIT_TIME' => '42',
-                'HTTP_X_HEROKU_QUEUE_DEPTH'     => '24'
+                'HTTP_X_HEROKU_QUEUE_DEPTH'     => '24',
+                'HTTP_X_HEROKU_DYNOS_IN_USE'    => '3'
     Metriks::Middleware.new(@downstream).call(@env)
     @async_close.call
 
     wait  = Metriks.histogram('queue.wait').mean
     depth = Metriks.histogram('queue.depth').mean
+    used  = Metriks.histogram('dynos.in_use').mean
 
     assert_equal 42, wait
     assert_equal 24, depth
+    assert_equal 3,  used
   end
 end

data/test/sync_app_test.rb

@@ -91,20 +91,25 @@ class SyncAppTest < Test::Unit::TestCase
 
     wait  = Metriks.histogram('queue.wait').mean
     depth = Metriks.histogram('queue.depth').mean
+    used  = Metriks.histogram('dynos.in_use').mean
 
     assert_equal 0, wait
     assert_equal 0, depth
+    assert_equal 0, used
   end
 
   def test_records_heroku_queue_metrics
     @env.merge! 'HTTP_X_HEROKU_QUEUE_WAIT_TIME' => '42',
-                'HTTP_X_HEROKU_QUEUE_DEPTH'     => '24'
+                'HTTP_X_HEROKU_QUEUE_DEPTH'     => '24',
+                'HTTP_X_HEROKU_DYNOS_IN_USE'    => '3'
     Metriks::Middleware.new(@downstream).call(@env)
 
     wait  = Metriks.histogram('queue.wait').mean
     depth = Metriks.histogram('queue.depth').mean
+    used  = Metriks.histogram('dynos.in_use').mean
 
     assert_equal 42, wait
     assert_equal 24, depth
+    assert_equal 3,  used
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metriks-middleware
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metriks
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.11.4
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: Rack middleware to track throughput and response time with metriks.
 email: larry@marburger.cc
 executables: []