statsd-ruby 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4f5fc1d6357476dfd6402b233f22f43907c9fd7
-  data.tar.gz: 6210b9a5fc2b4221d0cf4cb3a1b11a4e9b6fdb14
+  metadata.gz: 91ca6f8d710ca7a0a0fadccd48293a804e652c0d
+  data.tar.gz: 24f9b37eb4a6fa239d1e80073ef3879f09f85909
 SHA512:
-  metadata.gz: a71f111d63ae9d67eb355aa8f692bffa86336632a83e4f3947e148c208169ad379f2ef614498f9c89dec926dab79c5766c623b53fea38cb7a58976ad4c8b75c0
-  data.tar.gz: d4cb7379bf93758dec529e682f30724ff68a3d2f02c1acc3b6393256bebf0dcd04d988db05c3c346dae21901e63f6aa4092f47b6c98831e791a491acb3c59a97
+  metadata.gz: 505b5f1250aeb05e0c23a8b6d9822d4ca331db53504f906ce19c9d2802bb8d5d48f8bdc1fc0aa1170ef9b9b6f31d9eb838161db17271a84325a503adbaa03bda
+  data.tar.gz: ac00437d8f1e752db7989e7adecf174db970f27181312a19ad47216504f38a2cb0af4f51830a130454fa6bc3ad82e052ba7c495a9dc709b1878a82b762bd0ff0

data/.travis.yml

@@ -2,14 +2,13 @@
 language: ruby
 
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1
   - 2.2
   - 2.3.0
+  - 2.4.0
   - rbx-2
   - jruby
-  - jruby-head
   - ruby-head
 
 sudo: false
@@ -19,3 +18,4 @@ matrix:
     - rvm: rbx-2
     - rvm: ruby-head
     - rvm: jruby
+    - rvm: jruby-head

data/README.rdoc

@@ -52,18 +52,20 @@ Run the specs with <tt>rake spec</tt>
 == Contributors
 
 * Rein Henrichs
-* Ray Krueger
-* Jeremy Kemper
-* Ryan Tomayko
-* Gabriel Burt
-* Rick Olson
-* Trae Robrock
+* Alex Williams
+* Andrew Meyer
+* Chris Gaffney
+* Cody Cutrer
 * Corey Donohoe
-* James Tucker
 * Dotan Nahum
+* Erez Rabih
 * Eric Chapweske
+* Gabriel Burt
 * Hannes Georg
+* James Tucker
+* Jeremy Kemper
 * John Nunemaker
+* Lann Martin
 * Mahesh Murthy
 * Manu J
 * Matt Sanford
@@ -73,7 +75,11 @@ Run the specs with <tt>rake spec</tt>
 * Peter Mounce
 * Ray Krueger
 * Reed Lipman
+* rick
+* Ryan Tomayko
+* Schuyler Erle
 * Thomas Whaples
+* Trae Robrock
 
 == Copyright
 

data/lib/statsd.rb

@@ -53,13 +53,15 @@ class Statsd
       :postfix,
       :delimiter, :delimiter=
 
-    attr_accessor :batch_size
+    attr_accessor :batch_size, :batch_byte_size
 
     # @param [Statsd] requires a configured Statsd instance
     def initialize(statsd)
       @statsd = statsd
       @batch_size = statsd.batch_size
+      @batch_byte_size = statsd.batch_byte_size
       @backlog = []
+      @backlog_bytesize = 0
     end
 
     # @yields [Batch] yields itself
@@ -77,14 +79,26 @@ class Statsd
       unless @backlog.empty?
         @statsd.send_to_socket @backlog.join("\n")
         @backlog.clear
+        @backlog_bytesize = 0
       end
     end
 
     protected
 
     def send_to_socket(message)
+      # this message wouldn't fit; flush the queue. note that we don't have
+      # to do this for message based flushing, because we're incrementing by
+      # one, so the post-queue check will always catch it
+      if (@batch_byte_size && @backlog_bytesize + message.bytesize + 1 > @batch_byte_size)
+        flush
+      end
       @backlog << message
-      if @backlog.size >= @batch_size
+      @backlog_bytesize += message.bytesize
+      # skip the interleaved newline for the first item
+      @backlog_bytesize += 1 if @backlog.length != 1
+      # if we're precisely full now, flush
+      if (@batch_size && @backlog.size == @batch_size) ||
+          (@batch_byte_size && @backlog_bytesize == @batch_byte_size)
         flush
       end
     end
@@ -244,9 +258,12 @@ class Statsd
   # StatsD namespace prefix, generated from #namespace
   attr_reader :prefix
 
-  # The default batch size for new batches (default: 10)
+  # The default batch size for new batches. Set to nil to use batch_byte_size (default: 10)
   attr_accessor :batch_size
 
+  # The default batch size, in bytes, for new batches (default: default nil; use batch_size)
+  attr_accessor :batch_byte_size
+
   # a postfix to append to all metrics
   attr_reader :postfix
 
@@ -267,6 +284,7 @@ class Statsd
     self.delimiter = "."
     @prefix = nil
     @batch_size = 10
+    @batch_byte_size = nil
     @postfix = nil
     @socket = nil
     @protocol = protocol || :udp

data/spec/helper.rb

@@ -6,6 +6,7 @@ SimpleCov.start
 require 'minitest/autorun'
 require 'statsd'
 require 'logger'
+require 'timeout'
 
 class FakeUDPSocket
   def initialize

data/spec/statsd_spec.rb

@@ -212,7 +212,7 @@ describe Statsd do
     describe "when the sample rate is less than a random value [0,1]" do
       before { class << @statsd; def rand; 1; end; end } # ensure no delivery
       it "should not send" do
-        @statsd.timing('foobar', 500, 0.5).must_equal nil
+        assert_nil @statsd.timing('foobar', 500, 0.5)
       end
     end
 
@@ -279,7 +279,7 @@ describe Statsd do
         [nil, false, ''].each do |value|
           @statsd.postfix = 'a postfix'
           @statsd.postfix = value
-          @statsd.postfix.must_equal nil
+          assert_nil @statsd.postfix
         end
       end
     end
@@ -345,7 +345,7 @@ describe Statsd do
     end
 
     it "should ignore socket errors" do
-      @statsd.increment('foobar').must_equal nil
+      assert_nil @statsd.increment('foobar')
     end
 
     it "should log socket errors" do
@@ -359,12 +359,24 @@ describe Statsd do
       @statsd.batch_size.must_equal 10
     end
 
+    it "should have a default batch byte size of nil" do
+      assert_nil @statsd.batch_byte_size
+    end
+
     it "should have a modifiable batch size" do
       @statsd.batch_size = 7
       @statsd.batch_size.must_equal 7
       @statsd.batch do |b|
         b.batch_size.must_equal 7
       end
+
+      @statsd.batch_size = nil
+      @statsd.batch_byte_size = 1472
+      @statsd.batch do |b|
+        assert_nil b.batch_size
+        b.batch_byte_size.must_equal 1472
+      end
+
     end
 
     it "should flush the batch at the batch size or at the end of the block" do
@@ -381,6 +393,34 @@ describe Statsd do
       @socket.recv.must_equal [(["foobar:1|c"] * 2).join("\n")]
     end
 
+    it "should flush based on batch byte size" do
+      @statsd.batch do |b|
+        b.batch_size = nil
+        b.batch_byte_size = 22
+
+        # The first two should flush, the last will be flushed when the
+        # block is done.
+        3.times { b.increment('foobar') }
+
+        @socket.recv.must_equal [(["foobar:1|c"] * 2).join("\n")]
+      end
+
+      @socket.recv.must_equal ["foobar:1|c"]
+    end
+
+    it "should flush immediately when the queue is exactly a batch size" do
+      @statsd.batch do |b|
+        b.batch_size = nil
+        b.batch_byte_size = 21
+
+        # The first two should flush, the last will be flushed when the
+        # block is done.
+        2.times { b.increment('foobar') }
+
+        @socket.recv.must_equal [(["foobar:1|c"] * 2).join("\n")]
+      end
+    end
+
     it "should not flush to the socket if the backlog is empty" do
       batch = Statsd::Batch.new(@statsd)
       batch.flush

data/statsd-ruby.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new("statsd-ruby", "1.3.0") do |s|
-  s.authors = ["Rein Henrichs"]
+Gem::Specification.new("statsd-ruby", "1.4.0") do |s|
+  s.authors =  `git log --format='%aN' | sort -u`.split("\n")
   s.email = "reinh@reinh.com"
 
   s.summary = "A Ruby StatsD client"

metadata

@@ -1,14 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: statsd-ruby
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
+- Alex Williams
+- Andrew Meyer
+- Chris Gaffney
+- Cody Cutrer
+- Corey Donohoe
+- Dotan Nahum
+- Erez Rabih
+- Eric Chapweske
+- Gabriel Burt
+- Hannes Georg
+- James Tucker
+- Jeremy Kemper
+- John Nunemaker
+- Lann Martin
+- Mahesh Murthy
+- Manu J
+- Matt Sanford
+- Nate Bird
+- Noah Lorang
+- Oscar Del Ben
+- Peter Mounce
+- Ray Krueger
+- Reed Lipman
 - Rein Henrichs
+- rick
+- Ryan Tomayko
+- Schuyler Erle
+- Thomas Whaples
+- Trae Robrock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-17 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -115,4 +143,3 @@ test_files:
 - spec/helper.rb
 - spec/statsd_admin_spec.rb
 - spec/statsd_spec.rb
-has_rdoc: