formatted-metrics 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f61de2711adaea249e6fc4f6eb53d9899ed805ef
-  data.tar.gz: 5292dea3deae43f089de2eeb20d0512acbd3aebb
+  metadata.gz: 7d33ddd37a5151fefe56beb65c13bd3b9b503efd
+  data.tar.gz: 0c0eeaecbca51357625094b954838bd77eab512e
 SHA512:
-  metadata.gz: 7c34b9936b1ae2ea1c6504e85432c9c0a7a63384cb063799e1be98f94702c652dec05d993c432152f47f9132d19fc6cc0cb86e945041dc1d4ecc2650d395a931
-  data.tar.gz: 330e3349dbc4848df534f4a9d85bff0ca0a187897cda130500d9bf89f9dcf631cd595634a39c484ed0e46ac3dbe6869112af4ca7617fe78cf9909d2b830d7634
+  metadata.gz: 34abc4c6d556e752fdf55d975260d1892458ece7f17c1a3228b80c2a0c124ba69664bc3cba9bc11d4648d5b4f830871737df37f1ca92e9617abce8ddbff7923a
+  data.tar.gz: 6d921f8f040ff949c5b05334bddf7f149ec213b86f54d73b3d5fc43d130ca71861a8d0639612a878449e2cebb2c2f88db78d9c3e9ba45443599b675ef4cb9be0

data/lib/metrics/drivers/l2met.rb

@@ -37,9 +37,11 @@ module Metrics::Drivers
     end
 
     def measurement(instrumenter)
+      type = instrumenter.type
+      type = 'measure' if type == 'histogram' # histogram not supported.
       value = instrumenter.value
       value = value.round(PRECISION) if value.is_a?(Float)
-      "#{instrumenter.type}##{instrumenter.metric}=#{value}#{instrumenter.units}"
+      "#{type}##{instrumenter.metric}=#{value}#{instrumenter.units}"
     end
 
     def blank?(string)

data/lib/metrics/drivers/statsd.rb

@@ -20,6 +20,8 @@ module Metrics::Drivers
       value = instrumenter.value
 
       case instrumenter.type
+      when 'histogram'
+        client.histogram(name, value)
       when 'measure', 'sample'
         if instrumenter.units == 'ms'
           client.timing(name, value)

data/lib/metrics/grouping.rb

@@ -2,6 +2,8 @@ module Metrics
   # Public: Starts a new Grouping context, which allows for multiple
   # instruments to output on a single line.
   class Grouping
+    include StatsdApi
+
     attr_reader :namespace, :instrumenters, :options
 
     def self.instrument(namespace = nil, options = {}, &block)
@@ -16,7 +18,7 @@ module Metrics
     end
 
     def increment(metric)
-      instrument metric, 1, options.merge(type: 'count')
+      super(metric, options)
     end
 
     def instrument(metric, *args, &block)

data/lib/metrics/statsd_api.rb

@@ -0,0 +1,34 @@
+module Metrics
+  # This adds a statsd compatible api that delegates back to #instrument
+  module StatsdApi
+    def increment(stat, options = {})
+      instrument stat, 1, options.merge(type: 'count')
+    end
+
+    def decrement(stat, options = {})
+      instrument stat, -1, options.merge(type: 'count')
+    end
+
+    def count(stat, count, options = {})
+      instrument stat, count, options.merge(type: 'count')
+    end
+
+    def gauge(stat, value, options = {})
+      instrument stat, value, options.merge(type: 'measure')
+    end
+
+    def histogram(stat, value, options = {})
+      instrument stat, value, options.merge(type: 'histogram')
+    end
+
+    def timing(stat, ms, options = {})
+      instrument stat, ms, options.merge(type: 'measure', units: 'ms')
+    end
+
+    def time(stat, options = {})
+      instrument stat, options do
+        yield
+      end
+    end
+  end
+end

data/lib/metrics/version.rb

@@ -1,3 +1,3 @@
 module FormattedMetrics
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/lib/metrics.rb

@@ -9,6 +9,7 @@ module Metrics
   autoload :Instrumenter,      'metrics/instrumenter'
   autoload :Grouping,          'metrics/grouping'
   autoload :Handler,           'metrics/handler'
+  autoload :StatsdApi,         'metrics/statsd_api'
 
   module Drivers
     autoload :Base,            'metrics/drivers/base'
@@ -27,6 +28,7 @@ module Metrics
   end
 
   class << self
+    include StatsdApi
 
     # Public: Instrument a metric.
     #

data/spec/metrics/statsd_api_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+class StatsdApiTest
+  extend Metrics::StatsdApi
+end
+
+describe Metrics::StatsdApi do
+
+  describe '#increment' do
+    it 'delegates to instrument' do
+      StatsdApiTest.should_receive(:instrument).with('rack.request', 1, type: 'count')
+      StatsdApiTest.increment('rack.request')
+    end
+  end
+
+  describe '#decrement' do
+    it 'delegates to instrument' do
+      StatsdApiTest.should_receive(:instrument).with('rack.request', -1, type: 'count')
+      StatsdApiTest.decrement('rack.request')
+    end
+  end
+
+  describe '#count' do
+    it 'delegates to instrument' do
+      StatsdApiTest.should_receive(:instrument).with('rack.request', 10, type: 'count')
+      StatsdApiTest.count('rack.request', 10)
+    end
+  end
+
+  describe '#gauge' do
+    it 'delegates to instrument' do
+      StatsdApiTest.should_receive(:instrument).with('rack.request', 100, type: 'measure')
+      StatsdApiTest.gauge('rack.request', 100)
+    end
+  end
+
+  describe '#histogram' do
+    it 'delegates to instrument' do
+      StatsdApiTest.should_receive(:instrument).with('rack.request', 100, type: 'histogram')
+      StatsdApiTest.histogram('rack.request', 100)
+    end
+  end
+
+  describe '#timing' do
+    it 'delegates to instrument' do
+      StatsdApiTest.should_receive(:instrument).with('rack.request.latency', 1000, type: 'measure', units: 'ms')
+      StatsdApiTest.timing('rack.request.latency', 1000)
+    end
+  end
+
+  describe '#time' do
+    it 'delegates to instrument' do
+      StatsdApiTest.should_receive(:instrument).with('rack.request.latency', {}).and_yield
+      StatsdApiTest.time('rack.request.latency') { }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formatted-metrics
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Eric J. Holmes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,7 @@ files:
 - lib/metrics/instrumenter.rb
 - lib/metrics/middleware_helpers.rb
 - lib/metrics/railtie.rb
+- lib/metrics/statsd_api.rb
 - lib/metrics/version.rb
 - lib/rack/instrumentation.rb
 - lib/sidekiq/middleware/server/instrumentation.rb
@@ -103,6 +104,7 @@ files:
 - spec/metrics/grouping_spec.rb
 - spec/metrics/instrumentable_spec.rb
 - spec/metrics/instrumenter_spec.rb
+- spec/metrics/statsd_api_spec.rb
 - spec/metrics_spec.rb
 - spec/rack/instrumentation_spec.rb
 - spec/spec_helper.rb
@@ -137,7 +139,7 @@ test_files:
 - spec/metrics/grouping_spec.rb
 - spec/metrics/instrumentable_spec.rb
 - spec/metrics/instrumenter_spec.rb
+- spec/metrics/statsd_api_spec.rb
 - spec/metrics_spec.rb
 - spec/rack/instrumentation_spec.rb
 - spec/spec_helper.rb
-has_rdoc: