statsd-ruby 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 91ca6f8d710ca7a0a0fadccd48293a804e652c0d
-  data.tar.gz: 24f9b37eb4a6fa239d1e80073ef3879f09f85909
+SHA256:
+  metadata.gz: 0edd467226454eea7a63a7ed08e3468ac48a2d7438fdf8d291ab266a781c128b
+  data.tar.gz: 82f88de7bf7738e974a8d9f2d70f57f039d31d7f69f9b98c359b7d5c7970f93c
 SHA512:
-  metadata.gz: 505b5f1250aeb05e0c23a8b6d9822d4ca331db53504f906ce19c9d2802bb8d5d48f8bdc1fc0aa1170ef9b9b6f31d9eb838161db17271a84325a503adbaa03bda
-  data.tar.gz: ac00437d8f1e752db7989e7adecf174db970f27181312a19ad47216504f38a2cb0af4f51830a130454fa6bc3ad82e052ba7c495a9dc709b1878a82b762bd0ff0
+  metadata.gz: 3520cc824d180d7304fa883fefa945d3f785d560f313c328fed8f28e4d799728c6ab61cd6b9a855d8023f644f2d328f7f6626e0af7770d8e83d99b2bb0e7a2f8
+  data.tar.gz: f0bc2ade747bee51cca11128a6d6ce21491b13354f519f582f90c94cd09ce1ee26372b52945c8d369dfc5160194cfd967644254350b0dd1567ff28cd64de8206

data/.github/workflows/ci.yml

@@ -0,0 +1,34 @@
+name: Ruby
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os:
+          - ubuntu
+          - macos
+        ruby:
+          - 2.4
+          - 2.5
+          - 2.6
+          # TODO: - 2.7
+          # TODO: jruby, rbx
+
+    runs-on: ${{ matrix.os }}-latest
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Set up Ruby
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        architecture: x64
+
+    - name: Build and test with Rake
+      run: |
+        gem install bundler
+        bundle install
+        bundle exec rake

data/README.rdoc

@@ -1,4 +1,4 @@
-= statsd-ruby {<img src="https://secure.travis-ci.org/reinh/statsd.png" />}[http://travis-ci.org/reinh/statsd]
+= statsd-ruby Travis: {<img src="https://secure.travis-ci.org/reinh/statsd.svg" />}[http://travis-ci.org/reinh/statsd] CI: {<img src="https://github.com/reinh/statsd/workflows/Ruby/badge.svg" />}[https://github.com/reinh/statsd/actions?query=workflow%3ARuby]
 
 A Ruby client for {StatsD}[https://github.com/etsy/statsd]
 
@@ -33,7 +33,7 @@ Run the specs with <tt>rake spec</tt>
 
 = Performance
 
-* A short note about DNS: If you use a dns name for the host option, then you will want to use a local caching dns service for optimial performance (e.g. nscd).
+* A short note about DNS: If you use a dns name for the host option, then you will want to use a local caching dns service for optimal performance (e.g. nscd).
 
 = Extensions / Libraries / Extra Docs
 

data/lib/statsd.rb

@@ -2,6 +2,8 @@ require 'socket'
 require 'forwardable'
 require 'json'
 
+require 'statsd/monotonic_time'
+
 # = Statsd: A Statsd client (https://github.com/etsy/statsd)
 #
 # @example Set up a global Statsd client for a server on localhost:8125
@@ -53,18 +55,20 @@ class Statsd
       :postfix,
       :delimiter, :delimiter=
 
-    attr_accessor :batch_size, :batch_byte_size
+    attr_accessor :batch_size, :batch_byte_size, :flush_interval
 
-    # @param [Statsd] requires a configured Statsd instance
+    # @param [Statsd] statsd requires a configured Statsd instance
     def initialize(statsd)
       @statsd = statsd
       @batch_size = statsd.batch_size
       @batch_byte_size = statsd.batch_byte_size
+      @flush_interval = statsd.flush_interval
       @backlog = []
       @backlog_bytesize = 0
+      @last_flush = Time.now
     end
 
-    # @yields [Batch] yields itself
+    # @yield [Batch] yields itself
     #
     # A convenience method to ensure that data is not lost in the event of an
     # exception being thrown. Batches will be transmitted on the parent socket
@@ -80,6 +84,7 @@ class Statsd
         @statsd.send_to_socket @backlog.join("\n")
         @backlog.clear
         @backlog_bytesize = 0
+        @last_flush = Time.now
       end
     end
 
@@ -89,7 +94,8 @@ class Statsd
       # 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)
+      if (@batch_byte_size && @backlog_bytesize + message.bytesize + 1 > @batch_byte_size) ||
+          (@flush_interval && last_flush_seconds_ago >= @flush_interval)
         flush
       end
       @backlog << message
@@ -103,6 +109,10 @@ class Statsd
       end
     end
 
+    def last_flush_seconds_ago
+      Time.now - @last_flush
+    end
+
   end
 
   class Admin
@@ -264,6 +274,9 @@ class Statsd
   # The default batch size, in bytes, for new batches (default: default nil; use batch_size)
   attr_accessor :batch_byte_size
 
+  # The flush interval, in seconds, for new batches (default: nil)
+  attr_accessor :flush_interval
+
   # a postfix to append to all metrics
   attr_reader :postfix
 
@@ -277,7 +290,7 @@ class Statsd
 
   # @param [String] host your statsd host
   # @param [Integer] port your statsd port
-  # @param [Symbol] :tcp for TCP, :udp or any other value for UDP
+  # @param [Symbol] protocol :tcp for TCP, :udp or any other value for UDP
   def initialize(host = '127.0.0.1', port = 8125, protocol = :udp)
     @host = host || '127.0.0.1'
     @port = port || 8125
@@ -285,6 +298,7 @@ class Statsd
     @prefix = nil
     @batch_size = 10
     @batch_byte_size = nil
+    @flush_interval = nil
     @postfix = nil
     @socket = nil
     @protocol = protocol || :udp
@@ -408,10 +422,10 @@ class Statsd
   # @example Report the time (in ms) taken to activate an account
   #   $statsd.time('account.activate') { @account.activate! }
   def time(stat, sample_rate=1)
-    start = Time.now
+    start = MonotonicTime.time_in_ms
     result = yield
   ensure
-    timing(stat, ((Time.now - start) * 1000).round, sample_rate)
+    timing(stat, (MonotonicTime.time_in_ms - start).round, sample_rate)
     result
   end
 
@@ -462,15 +476,15 @@ class Statsd
       # send(2) is atomic, however, in stream cases (TCP) the socket is left
       # in an inconsistent state if a partial message is written. If that case
       # occurs, the socket is closed down and we retry on a new socket.
-      n = socket.write(message)
-
+      message = @protocol == :tcp ? message + "\n" : message
+      n = socket.write(message) rescue (err = $!; 0)
       if n == message.length
         break
       end
 
       connect
       retries += 1
-      raise "statsd: Failed to send after #{retries} attempts" if retries >= 5
+      raise (err || "statsd: Failed to send after #{retries} attempts") if retries >= 5
     end
     n
   rescue => boom

data/lib/statsd/monotonic_time.rb

@@ -0,0 +1,35 @@
+class Statsd
+  # = MonotonicTime: a helper for getting monotonic time
+  #
+  # @example
+  #   MonotonicTime.time_in_ms #=> 287138801.144576
+
+  # MonotonicTime guarantees that the time is strictly linearly
+  # increasing (unlike realtime).
+  # @see http://pubs.opengroup.org/onlinepubs/9699919799/functions/clock_getres.html
+  module MonotonicTime
+    class << self
+      # @return [Integer] current monotonic time in milliseconds
+      def time_in_ms
+        time_in_nanoseconds / (10.0 ** 6)
+      end
+
+      private
+
+      if defined?(Process::CLOCK_MONOTONIC)
+        def time_in_nanoseconds
+          Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
+        end
+      elsif RUBY_ENGINE == 'jruby'
+        def time_in_nanoseconds
+          java.lang.System.nanoTime
+        end
+      else
+        def time_in_nanoseconds
+          t = Time.now
+          t.to_i * (10 ** 9) + t.nsec
+        end
+      end
+    end
+  end
+end

data/spec/statsd_admin_spec.rb

@@ -26,14 +26,14 @@ describe Statsd::Admin do
 
   describe "#initialize" do
     it "should set the host and port" do
-      @admin.host.must_equal 'localhost'
-      @admin.port.must_equal 1234
+      _(@admin.host).must_equal 'localhost'
+      _(@admin.port).must_equal 1234
     end
 
     it "should default the host to 127.0.0.1 and port to 8126" do
       statsd = Statsd::Admin.new
-      statsd.host.must_equal '127.0.0.1'
-      statsd.port.must_equal 8126
+      _(statsd.host).must_equal '127.0.0.1'
+      _(statsd.port).must_equal 8126
     end
   end
 
@@ -41,23 +41,23 @@ describe Statsd::Admin do
     it "should set host and port" do
       @admin.host = '1.2.3.4'
       @admin.port = 5678
-      @admin.host.must_equal '1.2.3.4'
-      @admin.port.must_equal 5678
+      _(@admin.host).must_equal '1.2.3.4'
+      _(@admin.port).must_equal 5678
     end
 
     it "should not resolve hostnames to IPs" do
       @admin.host = 'localhost'
-      @admin.host.must_equal 'localhost'
+      _(@admin.host).must_equal 'localhost'
     end
 
     it "should set nil host to default" do
       @admin.host = nil
-      @admin.host.must_equal '127.0.0.1'
+      _(@admin.host).must_equal '127.0.0.1'
     end
 
     it "should set nil port to default" do
       @admin.port = nil
-      @admin.port.must_equal 8126
+      _(@admin.port).must_equal 8126
     end
   end
 
@@ -71,9 +71,9 @@ describe Statsd::Admin do
           @socket.write line
         end
         result = @admin.send action.to_sym
-        result.must_be_kind_of Hash
-        result.size.must_equal 3
-        @socket.readline.must_equal "#{action}\n"
+        _(result).must_be_kind_of Hash
+        _(result.size).must_equal 3
+        _(@socket.readline).must_equal "#{action}\n"
       end
     end
 
@@ -86,9 +86,9 @@ describe Statsd::Admin do
           @socket.write line
         end
         result = @admin.send "del#{action}", "foo.*"
-        result.must_be_kind_of Array
-        result.size.must_equal 3
-        @socket.readline.must_equal "del#{action} foo.*\n"
+        _(result).must_be_kind_of Array
+        _(result.size).must_equal 3
+        _(@socket.readline).must_equal "del#{action} foo.*\n"
       end
     end
   end
@@ -99,9 +99,9 @@ describe Statsd::Admin do
         @socket.write line
       end
       result = @admin.stats
-      result.must_be_kind_of Hash
-      result["whatever"].must_equal 0
-      @socket.readline.must_equal "stats\n"
+      _(result).must_be_kind_of Hash
+      _(result["whatever"]).must_equal 0
+      _(@socket.readline).must_equal "stats\n"
     end
   end
 
@@ -109,7 +109,7 @@ describe Statsd::Admin do
     it "should reconnect" do
       c = $connect_count
       @admin.connect
-      ($connect_count - c).must_equal 1
+      _(($connect_count - c)).must_equal 1
     end
   end
 end

data/spec/statsd_spec.rb

@@ -26,18 +26,18 @@ describe Statsd do
 
   describe "#initialize" do
     it "should set the host and port" do
-      @statsd.host.must_equal 'localhost'
-      @statsd.port.must_equal 1234
+      _(@statsd.host).must_equal 'localhost'
+      _(@statsd.port).must_equal 1234
     end
 
     it "should default the host to 127.0.0.1 and port to 8125" do
       statsd = Statsd.new
-      statsd.host.must_equal '127.0.0.1'
-      statsd.port.must_equal 8125
+      _(statsd.host).must_equal '127.0.0.1'
+      _(statsd.port).must_equal 8125
     end
 
     it "should set delimiter to period by default" do
-      @statsd.delimiter.must_equal "."
+      _(@statsd.delimiter).must_equal "."
     end
   end
 
@@ -45,54 +45,54 @@ describe Statsd do
     it "should set host and port" do
       @statsd.host = '1.2.3.4'
       @statsd.port = 5678
-      @statsd.host.must_equal '1.2.3.4'
-      @statsd.port.must_equal 5678
+      _(@statsd.host).must_equal '1.2.3.4'
+      _(@statsd.port).must_equal 5678
     end
 
     it "should not resolve hostnames to IPs" do
       @statsd.host = 'localhost'
-      @statsd.host.must_equal 'localhost'
+      _(@statsd.host).must_equal 'localhost'
     end
 
     it "should set nil host to default" do
       @statsd.host = nil
-      @statsd.host.must_equal '127.0.0.1'
+      _(@statsd.host).must_equal '127.0.0.1'
     end
 
     it "should set nil port to default" do
       @statsd.port = nil
-      @statsd.port.must_equal 8125
+      _(@statsd.port).must_equal 8125
     end
 
     it "should allow an IPv6 address" do
       @statsd.host = '::1'
-      @statsd.host.must_equal '::1'
+      _(@statsd.host).must_equal '::1'
     end
   end
 
-  describe "#delimiter" do 
+  describe "#delimiter" do
     it "should set delimiter" do
       @statsd.delimiter = "-"
-      @statsd.delimiter.must_equal "-"
+      _(@statsd.delimiter).must_equal "-"
     end
-    
+
     it "should set default to period if not given a value" do
       @statsd.delimiter = nil
-      @statsd.delimiter.must_equal "."
+      _(@statsd.delimiter).must_equal "."
     end
   end
 
   describe "#increment" do
     it "should format the message according to the statsd spec" do
       @statsd.increment('foobar')
-      @socket.recv.must_equal ['foobar:1|c']
+      _(@socket.recv).must_equal ['foobar:1|c']
     end
 
     describe "with a sample rate" do
       before { class << @statsd; def rand; 0; end; end } # ensure delivery
       it "should format the message according to the statsd spec" do
         @statsd.increment('foobar', 0.5)
-        @socket.recv.must_equal ['foobar:1|c|@0.5']
+        _(@socket.recv).must_equal ['foobar:1|c|@0.5']
       end
     end
   end
@@ -100,14 +100,14 @@ describe Statsd do
   describe "#decrement" do
     it "should format the message according to the statsd spec" do
       @statsd.decrement('foobar')
-      @socket.recv.must_equal ['foobar:-1|c']
+      _(@socket.recv).must_equal ['foobar:-1|c']
     end
 
     describe "with a sample rate" do
       before { class << @statsd; def rand; 0; end; end } # ensure delivery
       it "should format the message according to the statsd spec" do
         @statsd.decrement('foobar', 0.5)
-        @socket.recv.must_equal ['foobar:-1|c|@0.5']
+        _(@socket.recv).must_equal ['foobar:-1|c|@0.5']
       end
     end
   end
@@ -115,16 +115,16 @@ describe Statsd do
   describe "#gauge" do
     it "should send a message with a 'g' type, per the nearbuy fork" do
       @statsd.gauge('begrutten-suffusion', 536)
-      @socket.recv.must_equal ['begrutten-suffusion:536|g']
+      _(@socket.recv).must_equal ['begrutten-suffusion:536|g']
       @statsd.gauge('begrutten-suffusion', -107.3)
-      @socket.recv.must_equal ['begrutten-suffusion:-107.3|g']
+      _(@socket.recv).must_equal ['begrutten-suffusion:-107.3|g']
     end
 
     describe "with a sample rate" do
       before { class << @statsd; def rand; 0; end; end } # ensure delivery
       it "should format the message according to the statsd spec" do
         @statsd.gauge('begrutten-suffusion', 536, 0.1)
-        @socket.recv.must_equal ['begrutten-suffusion:536|g|@0.1']
+        _(@socket.recv).must_equal ['begrutten-suffusion:536|g|@0.1']
       end
     end
   end
@@ -132,14 +132,14 @@ describe Statsd do
   describe "#timing" do
     it "should format the message according to the statsd spec" do
       @statsd.timing('foobar', 500)
-      @socket.recv.must_equal ['foobar:500|ms']
+      _(@socket.recv).must_equal ['foobar:500|ms']
     end
 
     describe "with a sample rate" do
       before { class << @statsd; def rand; 0; end; end } # ensure delivery
       it "should format the message according to the statsd spec" do
         @statsd.timing('foobar', 500, 0.5)
-        @socket.recv.must_equal ['foobar:500|ms|@0.5']
+        _(@socket.recv).must_equal ['foobar:500|ms|@0.5']
       end
     end
   end
@@ -147,14 +147,14 @@ describe Statsd do
   describe "#set" do
     it "should format the message according to the statsd spec" do
       @statsd.set('foobar', 765)
-      @socket.recv.must_equal ['foobar:765|s']
+      _(@socket.recv).must_equal ['foobar:765|s']
     end
 
     describe "with a sample rate" do
       before { class << @statsd; def rand; 0; end; end } # ensure delivery
       it "should format the message according to the statsd spec" do
         @statsd.set('foobar', 500, 0.5)
-        @socket.recv.must_equal ['foobar:500|s|@0.5']
+        _(@socket.recv).must_equal ['foobar:500|s|@0.5']
       end
     end
   end
@@ -162,23 +162,23 @@ describe Statsd do
   describe "#time" do
     it "should format the message according to the statsd spec" do
       @statsd.time('foobar') { 'test' }
-      @socket.recv.must_equal ['foobar:0|ms']
+      _(@socket.recv).must_equal ['foobar:0|ms']
     end
 
     it "should return the result of the block" do
       result = @statsd.time('foobar') { 'test' }
-      result.must_equal 'test'
+      _(result).must_equal 'test'
     end
 
     describe "when given a block with an explicit return" do
       it "should format the message according to the statsd spec" do
         lambda { @statsd.time('foobar') { return 'test' } }.call
-        @socket.recv.must_equal ['foobar:0|ms']
+        _(@socket.recv).must_equal ['foobar:0|ms']
       end
 
       it "should return the result of the block" do
         result = lambda { @statsd.time('foobar') { return 'test' } }.call
-        result.must_equal 'test'
+        _(result).must_equal 'test'
       end
     end
 
@@ -187,7 +187,7 @@ describe Statsd do
 
       it "should format the message according to the statsd spec" do
         @statsd.time('foobar', 0.5) { 'test' }
-        @socket.recv.must_equal ['foobar:0|ms|@0.5']
+        _(@socket.recv).must_equal ['foobar:0|ms|@0.5']
       end
     end
   end
@@ -197,7 +197,7 @@ describe Statsd do
       before { class << @statsd; def rand; raise end; end }
       it "should send" do
         @statsd.timing('foobar', 500, 1)
-        @socket.recv.must_equal ['foobar:500|ms']
+        _(@socket.recv).must_equal ['foobar:500|ms']
       end
     end
 
@@ -205,7 +205,7 @@ describe Statsd do
       before { class << @statsd; def rand; 0; end; end } # ensure delivery
       it "should send" do
         @statsd.timing('foobar', 500, 0.5)
-        @socket.recv.must_equal ['foobar:500|ms|@0.5']
+        _(@socket.recv).must_equal ['foobar:500|ms|@0.5']
       end
     end
 
@@ -220,7 +220,7 @@ describe Statsd do
       before { class << @statsd; def rand; 0; end; end } # ensure delivery
       it "should send" do
         @statsd.timing('foobar', 500, 0.5)
-        @socket.recv.must_equal ['foobar:500|ms|@0.5']
+        _(@socket.recv).must_equal ['foobar:500|ms|@0.5']
       end
     end
   end
@@ -230,22 +230,22 @@ describe Statsd do
 
     it "should add namespace to increment" do
       @statsd.increment('foobar')
-      @socket.recv.must_equal ['service.foobar:1|c']
+      _(@socket.recv).must_equal ['service.foobar:1|c']
     end
 
     it "should add namespace to decrement" do
       @statsd.decrement('foobar')
-      @socket.recv.must_equal ['service.foobar:-1|c']
+      _(@socket.recv).must_equal ['service.foobar:-1|c']
     end
 
     it "should add namespace to timing" do
       @statsd.timing('foobar', 500)
-      @socket.recv.must_equal ['service.foobar:500|ms']
+      _(@socket.recv).must_equal ['service.foobar:500|ms']
     end
 
     it "should add namespace to gauge" do
       @statsd.gauge('foobar', 500)
-      @socket.recv.must_equal ['service.foobar:500|g']
+      _(@socket.recv).must_equal ['service.foobar:500|g']
     end
   end
 
@@ -254,22 +254,22 @@ describe Statsd do
 
     it "should add postfix to increment" do
       @statsd.increment('foobar')
-      @socket.recv.must_equal ['foobar.ip-23-45-56-78:1|c']
+      _(@socket.recv).must_equal ['foobar.ip-23-45-56-78:1|c']
     end
 
     it "should add postfix to decrement" do
       @statsd.decrement('foobar')
-      @socket.recv.must_equal ['foobar.ip-23-45-56-78:-1|c']
+      _(@socket.recv).must_equal ['foobar.ip-23-45-56-78:-1|c']
     end
 
     it "should add namespace to timing" do
       @statsd.timing('foobar', 500)
-      @socket.recv.must_equal ['foobar.ip-23-45-56-78:500|ms']
+      _(@socket.recv).must_equal ['foobar.ip-23-45-56-78:500|ms']
     end
 
     it "should add namespace to gauge" do
       @statsd.gauge('foobar', 500)
-      @socket.recv.must_equal ['foobar.ip-23-45-56-78:500|g']
+      _(@socket.recv).must_equal ['foobar.ip-23-45-56-78:500|g']
     end
   end
 
@@ -294,7 +294,7 @@ describe Statsd do
 
       @statsd.increment('foobar')
 
-      @log.string.must_match "Statsd: foobar:1|c"
+      _(@log.string).must_match "Statsd: foobar:1|c"
     end
 
     it "should not write to the log unless debug" do
@@ -302,7 +302,7 @@ describe Statsd do
 
       @statsd.increment('foobar')
 
-      @log.string.must_be_empty
+      _(@log.string).must_be_empty
     end
   end
 
@@ -315,7 +315,7 @@ describe Statsd do
       class Statsd::SomeClass; end
       @statsd.increment(Statsd::SomeClass, 1)
 
-      @socket.recv.must_equal ['Statsd.SomeClass:1|c']
+      _(@socket.recv).must_equal ['Statsd.SomeClass:1|c']
     end
 
     describe "custom delimiter" do
@@ -327,13 +327,13 @@ describe Statsd do
         class Statsd::SomeOtherClass; end
         @statsd.increment(Statsd::SomeOtherClass, 1)
 
-        @socket.recv.must_equal ['Statsd-SomeOtherClass:1|c']
+        _(@socket.recv).must_equal ['Statsd-SomeOtherClass:1|c']
       end
     end
 
     it "should replace statsd reserved chars in the stat name" do
       @statsd.increment('ray@hostname.blah|blah.blah:blah', 1)
-      @socket.recv.must_equal ['ray_hostname.blah_blah.blah_blah:1|c']
+      _(@socket.recv).must_equal ['ray_hostname.blah_blah.blah_blah:1|c']
     end
   end
 
@@ -341,7 +341,8 @@ describe Statsd do
     before do
       require 'stringio'
       Statsd.logger = Logger.new(@log = StringIO.new)
-      @socket.instance_eval { def write(*) raise SocketError end }
+      @socket.instance_variable_set(:@err_count, 0)
+      @socket.instance_eval { def write(*) @err_count+=1; raise SocketError end }
     end
 
     it "should ignore socket errors" do
@@ -350,35 +351,54 @@ describe Statsd do
 
     it "should log socket errors" do
       @statsd.increment('foobar')
-      @log.string.must_match 'Statsd: SocketError'
+      _(@log.string).must_match 'Statsd: SocketError'
+    end
+
+    it "should retry and reconnect on socket errors" do
+      $connect_count = 0
+      @statsd.increment('foobar')
+      _(@socket.instance_variable_get(:@err_count)).must_equal 5
+      _($connect_count).must_equal 5
     end
   end
 
   describe "batching" do
     it "should have a default batch size of 10" do
-      @statsd.batch_size.must_equal 10
+      _(@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 default flush interval of nil" do
+      assert_nil @statsd.flush_interval
+    end
+
     it "should have a modifiable batch size" do
       @statsd.batch_size = 7
-      @statsd.batch_size.must_equal 7
+      _(@statsd.batch_size).must_equal 7
       @statsd.batch do |b|
-        b.batch_size.must_equal 7
+        _(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
+        _(b.batch_byte_size).must_equal 1472
       end
 
     end
 
+    it 'should have a modifiable flush interval' do
+      @statsd.flush_interval = 1
+      _(@statsd.flush_interval).must_equal 1
+      @statsd.batch do |b|
+        _(b.flush_interval).must_equal 1
+      end
+    end
+
     it "should flush the batch at the batch size or at the end of the block" do
       @statsd.batch do |b|
         b.batch_size = 3
@@ -387,10 +407,10 @@ describe Statsd do
         # block is done.
         5.times { b.increment('foobar') }
 
-        @socket.recv.must_equal [(["foobar:1|c"] * 3).join("\n")]
+        _(@socket.recv).must_equal [(["foobar:1|c"] * 3).join("\n")]
       end
 
-      @socket.recv.must_equal [(["foobar:1|c"] * 2).join("\n")]
+      _(@socket.recv).must_equal [(["foobar:1|c"] * 2).join("\n")]
     end
 
     it "should flush based on batch byte size" do
@@ -402,10 +422,10 @@ describe Statsd do
         # block is done.
         3.times { b.increment('foobar') }
 
-        @socket.recv.must_equal [(["foobar:1|c"] * 2).join("\n")]
+        _(@socket.recv).must_equal [(["foobar:1|c"] * 2).join("\n")]
       end
 
-      @socket.recv.must_equal ["foobar:1|c"]
+      _(@socket.recv).must_equal ["foobar:1|c"]
     end
 
     it "should flush immediately when the queue is exactly a batch size" do
@@ -413,40 +433,56 @@ describe Statsd do
         b.batch_size = nil
         b.batch_byte_size = 21
 
+        # The first two should flush together
+        2.times { b.increment('foobar') }
+
+        _(@socket.recv).must_equal [(["foobar:1|c"] * 2).join("\n")]
+      end
+    end
+
+    it "should flush when the interval has passed" do
+      @statsd.batch do |b|
+        b.batch_size = nil
+        b.flush_interval = 0.01
+
         # The first two should flush, the last will be flushed when the
         # block is done.
         2.times { b.increment('foobar') }
+        sleep(0.03)
+        b.increment('foobar')
 
-        @socket.recv.must_equal [(["foobar:1|c"] * 2).join("\n")]
+        _(@socket.recv).must_equal [(["foobar:1|c"] * 2).join("\n")]
       end
+
+      _(@socket.recv).must_equal ["foobar:1|c"]
     end
 
     it "should not flush to the socket if the backlog is empty" do
       batch = Statsd::Batch.new(@statsd)
       batch.flush
-      @socket.recv.must_be :nil?
+      _(@socket.recv).must_be :nil?
 
       batch.increment 'foobar'
       batch.flush
-      @socket.recv.must_equal %w[foobar:1|c]
+      _(@socket.recv).must_equal %w[foobar:1|c]
     end
 
     it "should support setting namespace for the underlying instance" do
       batch = Statsd::Batch.new(@statsd)
       batch.namespace = 'ns'
-      @statsd.namespace.must_equal 'ns'
+      _(@statsd.namespace).must_equal 'ns'
     end
 
     it "should support setting host for the underlying instance" do
       batch = Statsd::Batch.new(@statsd)
       batch.host = '1.2.3.4'
-      @statsd.host.must_equal '1.2.3.4'
+      _(@statsd.host).must_equal '1.2.3.4'
     end
 
     it "should support setting port for the underlying instance" do
       batch = Statsd::Batch.new(@statsd)
       batch.port = 42
-      @statsd.port.must_equal 42
+      _(@statsd.port).must_equal 42
     end
 
   end
@@ -455,7 +491,7 @@ describe Statsd do
     it "should reconnect" do
       c = $connect_count
       @statsd.connect
-      ($connect_count - c).must_equal 1
+      _(($connect_count - c)).must_equal 1
     end
   end
 
@@ -474,7 +510,7 @@ describe Statsd do
         statsd = Statsd.new(host, port)
         statsd.increment('foobar')
         message = socket.recvfrom(16).first
-        message.must_equal 'foobar:1|c'
+        _(message).must_equal 'foobar:1|c'
       ensure
         socket.close
       end
@@ -490,7 +526,7 @@ describe Statsd do
         statsd = Statsd.new(host, port)
         statsd.increment('foobar')
         message = socket.recvfrom(16).first
-        message.must_equal 'foobar:1|c'
+        _(message).must_equal 'foobar:1|c'
       ensure
         socket.close
       end
@@ -506,7 +542,7 @@ describe Statsd do
         statsd = Statsd.new(host, port)
         statsd.increment('foobar')
         message = socket.recvfrom(16).first
-        message.must_equal 'foobar:1|c'
+        _(message).must_equal 'foobar:1|c'
       ensure
         socket.close
       end
@@ -531,7 +567,7 @@ describe Statsd do
         end
 
         message = socket.recvfrom(16).first
-        message.must_equal 'foobar:1|c'
+        _(message).must_equal "foobar:1|c\n"
       ensure
         socket.close if socket
         server.close
@@ -555,7 +591,7 @@ describe Statsd do
         end
 
         message = socket.recvfrom(16).first
-        message.must_equal 'foobar:1|c'
+        _(message).must_equal "foobar:1|c\n"
       ensure
         socket.close if socket
         server.close

data/statsd-ruby.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new("statsd-ruby", "1.4.0") do |s|
+Gem::Specification.new("statsd-ruby", "1.5.0") do |s|
   s.authors =  `git log --format='%aN' | sort -u`.split("\n")
   s.email = "reinh@reinh.com"
 
@@ -17,7 +17,7 @@ Gem::Specification.new("statsd-ruby", "1.4.0") do |s|
     s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   end
 
-  s.add_development_dependency "minitest", ">= 3.2.0"
+  s.add_development_dependency "minitest", ">= 5.6.0"
   s.add_development_dependency "yard"
   s.add_development_dependency "simplecov", ">= 0.6.4"
   s.add_development_dependency "rake"

metadata

@@ -1,15 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: statsd-ruby
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
+- Agis Anastasopoulos
 - Alex Williams
 - Andrew Meyer
+- Bill Franklin
 - Chris Gaffney
 - Cody Cutrer
 - Corey Donohoe
 - Dotan Nahum
+- Elyahou Ittah
 - Erez Rabih
 - Eric Chapweske
 - Gabriel Burt
@@ -17,12 +20,14 @@ authors:
 - James Tucker
 - Jeremy Kemper
 - John Nunemaker
+- Kyrylo Silin
 - Lann Martin
 - Mahesh Murthy
 - Manu J
 - Matt Sanford
 - Nate Bird
 - Noah Lorang
+- Olle Jonsson
 - Oscar Del Ben
 - Peter Mounce
 - Ray Krueger
@@ -36,7 +41,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -44,14 +49,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 5.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 5.6.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -103,14 +108,15 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - ".document"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - lib/statsd-ruby.rb
 - lib/statsd.rb
+- lib/statsd/monotonic_time.rb
 - spec/helper.rb
 - spec/statsd_admin_spec.rb
 - spec/statsd_spec.rb
@@ -134,8 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A Ruby StatsD client

data/.travis.yml

@@ -1,21 +0,0 @@
----
-language: ruby
-
-rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2
-  - 2.3.0
-  - 2.4.0
-  - rbx-2
-  - jruby
-  - ruby-head
-
-sudo: false
-
-matrix:
-  allow_failures:
-    - rvm: rbx-2
-    - rvm: ruby-head
-    - rvm: jruby
-    - rvm: jruby-head