lookout-statsd 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2baad881d1608d20884a5a33b855672ae0847d30
-  data.tar.gz: 7f3f990fd0e4937862df3a2d5b061f5b6c01e09a
+  metadata.gz: d1991db3ab55ae4ba74b693dfcb600b2d809cb96
+  data.tar.gz: 1718da7a874889f7c94eb18e20db2ae937b97b36
 SHA512:
-  metadata.gz: 4b4c0dbf5031e165463694bd94fb11ff6134f6a98648bd0d727764c6ac9f03717af29fdc635f81c77d834f0e48b1a46251898320209fd2c5661a0c6edbeaccb3
-  data.tar.gz: 775570d1c333c71c6500d1826d7194e7c28521d92a398d0fe7df7d55b7b3a9c42bcc554693582b025962111d04d31210741164fcd7ea2ed93b19278c6aede06d
+  metadata.gz: 793034d20062c3a9a3c5014191b7fdf3e118bd5271170ab35ff3e3aa66c7a2c23541669179820581700979e7441b6d1fe0137b451faca62501c8d0ab01bcf363
+  data.tar.gz: 57b8807ef73cafd8c6ce406d987500b8f6b118ad02ef23f8a2875650801f0e380045b92348fbe7226bdd7fecb5703693b290f3ff7d3f2903d7b1116ccd2d2423

data/lib/statsd.rb

@@ -97,7 +97,7 @@ module Statsd
     # @example Batch two instument operations:
     #   $statsd.batch do |batch|
     #     batch.increment 'sys.requests'
-    #     batch.gauge('user.count', User.count)
+    #     batch.gauge {'user.count' => User.count}
     #   end
     def batch(&block)
       Batch.new(self).easy(&block)
@@ -161,7 +161,7 @@ module Statsd
   #   batch = Statsd::Batch.new($statsd)
   #   batch.increment 'garets'
   #   batch.timing 'glork', 320
-  #   batch.gauge 'bork', 100
+  #   batch.gauge 'bork': 100
   #   batch.flush
   #
   # Batch is a subclass of Statsd, but with a constructor that proxies to a
@@ -172,14 +172,6 @@ module Statsd
   # troubles may occur and data will be lost.
   class Batch < Statsd::Client
 
-    extend Forwardable
-    def_delegators :@statsd,
-                   :host, :host=,
-                   :port, :port=,
-                   :prefix,
-                   :postfix,
-                   :delimiter, :delimiter=
-
     attr_accessor :batch_size
 
     # @param [Statsd] requires a configured Statsd instance
@@ -188,6 +180,9 @@ module Statsd
       @batch_size = statsd.batch_size
       @backlog = []
       @send_data = send_method
+      @host = statsd.host
+      @port = statsd.port
+      @prefix = statsd.prefix
     end
 
     # @yields [Batch] yields itself

data/spec/statsd_spec.rb

@@ -209,4 +209,113 @@ describe Statsd::Client do
       subject
     end
   end
+end
+
+describe Statsd::Batch do
+  let(:c) { Statsd::Client.new :host => 'foo.com', :prefix => 'my.app', :port => 1234, :batch_size => 20 }
+
+  it 'should delegate fields correctly' do
+    c.batch do |b|
+      expect(b.host).to eql 'foo.com'
+      expect(b.prefix).to eql 'my.app'
+      expect(b.port).to eql 1234
+      expect(b.batch_size).to eql 20
+    end
+  end
+
+  describe '#gauge' do
+    it 'should apply the prefix correctly' do
+      c.batch do |b|
+        b.should_receive(:send_stats).with(["my.app.an_incrementer:2|g"])
+        b.gauge({'an_incrementer' => 2})
+      end
+    end
+  end
+
+  describe '#timing' do
+
+    before :each do
+      c.prefix = nil
+    end
+
+    it 'should pass the sample rate along' do
+      sample = 10
+      c.batch do |b|
+        b.should_receive(:send_stats).with(anything(), sample)
+        b.timing('foo', 1, sample)
+      end
+    end
+
+    it 'should use the right stat name' do
+      c.batch do |b|
+        b.should_receive(:send_stats).with('foo:1|ms', anything())
+        b.timing('foo', 1)
+      end
+    end
+
+    it 'should prefix its stats if it has a prefix' do
+      c.prefix = 'dev'
+      c.batch do |b|
+        b.should_receive(:send_stats).with('dev.foo:1|ms', anything())
+        b.timing('foo', 1)
+      end
+    end
+
+    it 'should wrap a block correctly' do
+      # Pretend our block took one second
+      c.batch do |b|
+        b.should_receive(:send_stats).with('foo:1000|ms', anything())
+        Time.stub_chain(:now, :to_f).and_return(1, 2)
+
+        b.timing('foo') do
+          true.should be true
+        end
+      end
+    end
+
+    it 'should return the return value from the block' do
+      # Pretend our block took one second
+      c.batch do |b|
+        b.should_receive(:send_stats).with('foo:1000|ms', anything())
+        Time.stub_chain(:now, :to_f).and_return(1, 2)
+
+        value = b.timing('foo') { 1337 }
+        value.should == 1337
+      end
+    end
+  end
+
+  describe '#increment' do
+    it 'should update the counter by 1' do
+      c.should_receive(:update_counter).with('foo', 1, anything())
+      c.increment('foo')
+    end
+  end
+
+  describe '#decrement' do
+    it 'should update the counter by -1' do
+      c.batch do |b|
+        b.should_receive(:update_counter).with('foo', -1, anything())
+        b.decrement('foo')
+      end
+    end
+  end
+
+  describe '#update_counter' do
+    it 'should prepend the prefix if it has one' do
+      c.prefix = 'dev'
+      c.batch do |b|
+        b.should_receive(:send_stats).with(['dev.foo:123|c'], anything())
+        b.update_counter('foo', 123)
+      end
+    end
+
+    it 'should prepend multiple prefixes if it has one' do
+      c.prefix = 'dev'
+      c.batch do |b|
+        b.should_receive(:send_stats).with(['dev.foo:123|c', 'dev.bar:123|c'], anything())
+        b.update_counter(['foo', 'bar'], 123)
+      end
+    end
+  end
 end

data/statsd.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "lookout-statsd"
-  s.version     = "2.0.2"
+  s.version     = "2.0.3"
   s.platform    = Gem::Platform::RUBY
 
   s.authors     = ['R. Tyler Croy', 'Andrew Coldham', 'Ben VandenBos']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lookout-statsd
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - R. Tyler Croy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies: []
 description: A simple ruby statsd client.
 email: