dogstatsd-ruby 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 58a9207adf16ba8265e91fd56b6315b35ecc9b58
-  data.tar.gz: 9fc64d84a4b0277752bad6a5b523f1ab1ac989c2
+SHA256:
+  metadata.gz: a9743c7a429c0b5932a6f592d55a362582ec6de74fbdca658143e9248c45f2aa
+  data.tar.gz: 0cd22bc62deaf61fe5af0a26f607f92e347f2068ae5d12045248c5a3bcccc302
 SHA512:
-  metadata.gz: 89574d06e8d66f00a203d6d84b9e20f70b1d64e90fd2dfa644bdab8993a0420065b2e426d574fc0c0239fc69f49a65b0d215359c50ec2fd00dd9b9214f8c9f13
-  data.tar.gz: d97dc13266fe51bc7d49ebb8e56235aef70a6773e89d890ffe4774e0406489f6a7fadb43818f1000fc70f7520d6baec19d05b395c732cce9ea22ef9107597de9
+  metadata.gz: e7f35978f04e268613833a79464b827c71a3a0340840621e4b426fca0242a0a718be518ecc64936ed94e16b80a55e3bc40c11eeb21e365565380d9cbbb3d2ab4
+  data.tar.gz: 9c01c4abeac5f00a8f5eb8936a54c7e09cc903fcafa33115e10a3f9f8fd36e098d7c7d0b0ef5bb2c038eb527ca44011ea304beb8e960f71e3fbc81415db4e5a8

data/lib/datadog/statsd.rb

@@ -61,13 +61,12 @@ module Datadog
     # StatsD port. Defaults to 8125.
     attr_reader :port
 
+    # DogStatsd unix socket path. Not used by default.
+    attr_reader :socket_path
+
     # 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
 
@@ -81,7 +80,7 @@ module Datadog
 
     # Return the current version of the library.
     def self.VERSION
-      "3.0.0"
+      "3.1.0"
     end
 
     # @param [String] host your statsd host
@@ -90,13 +89,14 @@ module Datadog
     # @option opts [Array<String>] :tags tags to be added to every metric
     def initialize(host = DEFAULT_HOST, port = DEFAULT_PORT, opts = {}, max_buffer_size=50)
       self.host, self.port = host, port
+      @socket_path = opts[:socket_path]
       @prefix = nil
-      @socket = connect_to_socket(host, port)
+      @socket = connect_to_socket if @socket_path.nil?
       self.namespace = opts[:namespace]
       self.tags = opts[:tags]
       @buffer = Array.new
       self.max_buffer_size = max_buffer_size
-      @should_batch = false
+      @batch_nesting_depth = 0
     end
 
     def namespace=(namespace) #:nodoc:
@@ -114,7 +114,7 @@ module Datadog
 
     def tags=(tags) #:nodoc:
       raise ArgumentError, 'tags must be a Array<String>' unless tags.nil? or tags.is_a? Array
-      @tags = (tags || []).map {|tag| escape_tag_content(tag)}
+      @tags = (tags || []).compact.map! {|tag| escape_tag_content(tag)}
     end
 
     # Sends an increment (count = 1) for the given stat to the statsd server.
@@ -303,11 +303,11 @@ module Datadog
     #      s.increment('page.views')
     #    end
     def batch()
-      @should_batch = true
+      @batch_nesting_depth += 1
       yield self
-      flush_buffer
     ensure
-      @should_batch = false
+      @batch_nesting_depth -= 1
+      flush_buffer if @batch_nesting_depth == 0
     end
 
     def format_event(title, text, opts={})
@@ -358,10 +358,11 @@ module Datadog
     end
 
     def escape_tag_content(tag)
-      remove_pipes(tag).gsub COMMA, BLANK
+      remove_pipes(tag.to_s).gsub COMMA, BLANK
     end
 
     def escape_tag_content!(tag)
+      tag = tag.to_s
       tag.gsub!(PIPE, BLANK)
       tag.gsub!(COMMA, BLANK)
       tag
@@ -411,7 +412,7 @@ module Datadog
 
 
         tag_arr = opts[:tags].to_a
-        tag_arr.map! { |tag| t = tag.dup; escape_tag_content!(t); t }
+        tag_arr.map! { |tag| t = tag.to_s.dup; escape_tag_content!(t); t }
         ts = tags.to_a + tag_arr
         unless ts.empty?
           full_stat << PIPE
@@ -424,7 +425,7 @@ module Datadog
     end
 
     def send_stat(message)
-      if @should_batch
+      if @batch_nesting_depth > 0
         @buffer << message
         flush_buffer if @buffer.length >= @max_buffer_size
       else
@@ -432,27 +433,46 @@ module Datadog
       end
     end
 
-    def flush_buffer()
+    def flush_buffer
+      return @buffer if @buffer.empty?
       send_to_socket(@buffer.join(NEW_LINE))
       @buffer = Array.new
     end
 
-    def connect_to_socket(host, port)
-      socket = UDPSocket.new
-      socket.connect(host, port)
+    def connect_to_socket
+      if !@socket_path.nil?
+        socket = Socket.new(Socket::AF_UNIX, Socket::SOCK_DGRAM)
+        socket.connect(Socket.pack_sockaddr_un(@socket_path))
+      else
+        socket = UDPSocket.new
+        socket.connect(@host, @port)
+      end
       socket
     end
 
+    def sock
+      @socket ||= connect_to_socket
+    end
+
     def send_to_socket(message)
       self.class.logger.debug { "Statsd: #{message}" } if self.class.logger
-      @socket.send(message, 0)
+      if @socket_path.nil?
+        sock.send(message, 0)
+      else
+        sock.sendmsg_nonblock(message)
+      end
     rescue => boom
+      if @socket_path && (boom.is_a?(Errno::ECONNREFUSED) ||
+                          boom.is_a?(Errno::ECONNRESET) ||
+                          boom.is_a?(Errno::ENOENT))
+        return @socket = nil
+      end
       # 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)
+          @socket = connect_to_socket
           retry
         rescue => e
           boom = e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dogstatsd-ruby
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Rein Henrichs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -97,9 +97,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.1
 signing_key: 
 specification_version: 4
 summary: A Ruby DogStatsd client
 test_files: []
-has_rdoc: