formatted-metrics 0.2.3 → 0.2.4

data/lib/metrics/grouping.rb

@@ -14,9 +14,18 @@ module Metrics
       block.call(self)
     end
 
+    def increment(metric)
+      instrument metric, 1
+    end
+
     def instrument(metric, *args, &block)
       metric = "#{namespace}.#{metric}" if namespace
-      instrumenters << Instrumenter.instrument(metric, *args, &block)
+      instrumenters.push(Instrumenter.instrument(metric, *args, &block))
+    end
+
+    def group(nested_namespace = nil, &block)
+      ns = nested_namespace ? "#{namespace}.#{nested_namespace}" : namespace
+      instrumenters.push(*Grouping.instrument(ns, &block))
     end
   end
 end

data/lib/metrics/version.rb

@@ -1,3 +1,3 @@
 module FormattedMetrics
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/lib/metrics.rb

@@ -1,3 +1,4 @@
+require 'rack/instrumentation'
 require 'metrics/railtie' if defined?(Rails)
 
 module Metrics

data/lib/rack/instrumentation.rb

@@ -0,0 +1,55 @@
+module Rack
+  class Instrumentation
+    def initialize(app)
+      @app = app
+    end
+  
+    def call(env)
+      begin
+        header_metrics env
+
+        time     = Time.now
+        response = @app.call(env)
+        duration = (Time.now - time) * 1000.0
+
+        request_metrics response.first, duration
+
+        response
+      rescue Exception => raised
+        instrument 'exception', 1, source: 'rack'
+        raise
+      end
+    end
+
+  private
+
+    def header_metrics(env)
+      return unless env.keys.include?('HTTP_X_HEROKU_QUEUE_WAIT_TIME')
+
+      instrument 'rack.heroku.queue.wait_time', env['HTTP_X_HEROKU_QUEUE_WAIT_TIME'].to_f, units: 'ms'
+    end
+
+    def request_metrics(status, duration)
+      group 'rack.request' do |group|
+        group.instrument 'time', duration, units: 'ms'
+
+        group.group 'status' do |group|
+          group.increment status
+          group.increment "#{status.to_s[0]}xx"
+
+          group.instrument "#{status}.time", duration, units: 'ms'
+          group.instrument "#{status.to_s[0]}xx.time", duration, units: 'ms'
+        end
+      end
+    end
+
+    def instrument(*args, &block)
+      Metrics.instrument(*args, &block)
+    end
+
+    def group(*args, &block)
+      Metrics.group(*args, &block)
+    end
+  end
+end
+

data/spec/metrics/grouping_spec.rb

@@ -18,5 +18,25 @@ describe Metrics::Grouping do
 
       expect(group.instrumenters.first.metric).to eq 'rack.request.time'
     end
+
+    it 'allows for nested groups' do
+      group = described_class.new 'rack' do |group|
+        group.group do |g|
+          g.instrument 'request.time', 500, units: 'ms'
+        end
+      end
+
+      expect(group.instrumenters.first.metric).to eq 'rack.request.time'
+    end
+
+    it 'allows for nested groups with namespaces' do
+      group = described_class.new 'rack' do |group|
+        group.group 'request' do |g|
+          g.instrument 'time', 500, units: 'ms'
+        end
+      end
+
+      expect(group.instrumenters.first.metric).to eq 'rack.request.time'
+    end
   end
 end

data/spec/rack/instrumentation_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Rack::Instrumentation do
+  let(:app           ) { double 'app', call: response }
+  let(:env           ) { Hash.new }
+  let(:response      ) { [200, {}, []] }
+  subject(:middleware) { described_class.new app }
+
+  describe '.call' do
+    context 'when no error is raised' do
+      it 'calls the app' do
+        app.should_receive(:call).and_return(response)
+        expect(middleware.call(env)).to eq response
+      end
+
+      it 'reports heroku queue time' do
+        env['HTTP_X_HEROKU_QUEUE_WAIT_TIME'] = '36'
+        middleware.call(env)
+      end
+    end
+
+    context 'when an error is raised' do
+      it 'raises the error' do
+        app.should_receive(:call).and_raise
+        expect { middleware.call(env) }.to raise_error
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formatted-metrics
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -85,11 +85,13 @@ files:
 - lib/metrics/instrumenter.rb
 - lib/metrics/railtie.rb
 - lib/metrics/version.rb
+- lib/rack/instrumentation.rb
 - spec/metrics/formatters/l2met_spec.rb
 - spec/metrics/grouping_spec.rb
 - spec/metrics/instrumentable_spec.rb
 - spec/metrics/instrumenter_spec.rb
 - spec/metrics_spec.rb
+- spec/rack/instrumentation_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/remind101/formatted-metrics
 licenses:
@@ -106,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4334694595459848801
+      hash: 147122982979217444
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4334694595459848801
+      hash: 147122982979217444
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -128,4 +130,5 @@ test_files:
 - spec/metrics/instrumentable_spec.rb
 - spec/metrics/instrumenter_spec.rb
 - spec/metrics_spec.rb
+- spec/rack/instrumentation_spec.rb
 - spec/spec_helper.rb