dogstatsd-ruby 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c284304d148850b444a486ee039186569aae88fd
-  data.tar.gz: 9174ee71af5fbf618e441e8ec620333434ae35cd
+  metadata.gz: 58a9207adf16ba8265e91fd56b6315b35ecc9b58
+  data.tar.gz: 9fc64d84a4b0277752bad6a5b523f1ab1ac989c2
 SHA512:
-  metadata.gz: 330a64649311a33fa09bf9983ca77817ecf5413ba79318bdcc75712df0e3d0b4650a0fc714437490125e59f675144babb94fd846507bed3b51e06fe40cd45ee4
-  data.tar.gz: aede77d7cd0dd1b49d109016dbc405ff5ee408000689b00ae68fea2228ddd4beb4ec65fd27fcaf503249199984ac22296704d0082254589d977bfa93c3f31a2d
+  metadata.gz: 89574d06e8d66f00a203d6d84b9e20f70b1d64e90fd2dfa644bdab8993a0420065b2e426d574fc0c0239fc69f49a65b0d215359c50ec2fd00dd9b9214f8c9f13
+  data.tar.gz: d97dc13266fe51bc7d49ebb8e56235aef70a6773e89d890ffe4774e0406489f6a7fadb43818f1000fc70f7520d6baec19d05b395c732cce9ea22ef9107597de9

data/lib/datadog/statsd.rb

@@ -64,6 +64,10 @@ module Datadog
     # Global tags to be added to every statsd call. Defaults to no tags.
     attr_reader :tags
 
+    # True if we should batch up data before sending it, or false if we
+    # want to send data immediately.
+    attr_reader :should_batch
+
     # Buffer containing the statsd message before they are sent in batch
     attr_reader :buffer
 
@@ -77,7 +81,7 @@ module Datadog
 
     # Return the current version of the library.
     def self.VERSION
-      "2.2.0"
+      "3.0.0"
     end
 
     # @param [String] host your statsd host
@@ -87,12 +91,12 @@ module Datadog
     def initialize(host = DEFAULT_HOST, port = DEFAULT_PORT, opts = {}, max_buffer_size=50)
       self.host, self.port = host, port
       @prefix = nil
-      @socket = UDPSocket.new
+      @socket = connect_to_socket(host, port)
       self.namespace = opts[:namespace]
       self.tags = opts[:tags]
       @buffer = Array.new
       self.max_buffer_size = max_buffer_size
-      alias :send_stat :send_to_socket
+      @should_batch = false
     end
 
     def namespace=(namespace) #:nodoc:
@@ -299,10 +303,11 @@ module Datadog
     #      s.increment('page.views')
     #    end
     def batch()
-      alias :send_stat :send_to_buffer
+      @should_batch = true
       yield self
       flush_buffer
-      alias :send_stat :send_to_socket
+    ensure
+      @should_batch = false
     end
 
     def format_event(title, text, opts={})
@@ -329,6 +334,11 @@ module Datadog
       return event_string_data
     end
 
+    # Close the underlying socket
+    def close()
+      @socket.close
+    end
+
     private
 
     NEW_LINE = "\n".freeze
@@ -413,10 +423,12 @@ module Datadog
       end
     end
 
-    def send_to_buffer(message)
-      @buffer << message
-      if @buffer.length >= @max_buffer_size
-        flush_buffer
+    def send_stat(message)
+      if @should_batch
+        @buffer << message
+        flush_buffer if @buffer.length >= @max_buffer_size
+      else
+        send_to_socket(message)
       end
     end
 
@@ -425,17 +437,30 @@ module Datadog
       @buffer = Array.new
     end
 
+    def connect_to_socket(host, port)
+      socket = UDPSocket.new
+      socket.connect(host, port)
+      socket
+    end
+
     def send_to_socket(message)
       self.class.logger.debug { "Statsd: #{message}" } if self.class.logger
-      @socket.send(message, 0, @host, @port)
+      @socket.send(message, 0)
     rescue => boom
+      # Try once to reconnect if the socket has been closed
+      retries ||= 1
+      if retries <= 1 && boom.is_a?(IOError) && boom.message =~ /closed stream/i
+        retries += 1
+        begin
+          @socket = connect_to_socket(host, port)
+          retry
+        rescue => e
+          boom = e
+        end
+      end
+
       self.class.logger.error { "Statsd: #{boom.class} #{boom}" } if self.class.logger
       nil
     end
-
-    # Close the underlying socket
-    def close()
-      @socket.close
-    end
   end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: dogstatsd-ruby
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Rein Henrichs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Ruby DogStastd client
@@ -87,18 +87,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A Ruby DogStatsd client
 test_files: []
+has_rdoc: