dogstatsd-ruby 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 481edf1969341d5a0fcca585196f32b19a0290ee
-  data.tar.gz: 743744502b34fa5c2b53afe3e8ce0a924c1cd317
+  metadata.gz: c284304d148850b444a486ee039186569aae88fd
+  data.tar.gz: 9174ee71af5fbf618e441e8ec620333434ae35cd
 SHA512:
-  metadata.gz: d5d5f0f2f11c3f713d4907e0dc8b89978ad2dbcb21466705b31e630102f2a36f68eb6bafad1c66a2783f010c66ee1a7f7fffa13ee3a1ca03c85357fc63b8fb56
-  data.tar.gz: 5a746d3b48a5c31b5cbd40b06daa896c1faa7d1f8d4686cdcf69d6066bdf1fd5c81bcfaa1e08462df8b234e8a08b3bbde7f445b26819480717a0edc4bdb131be
+  metadata.gz: 330a64649311a33fa09bf9983ca77817ecf5413ba79318bdcc75712df0e3d0b4650a0fc714437490125e59f675144babb94fd846507bed3b51e06fe40cd45ee4
+  data.tar.gz: aede77d7cd0dd1b49d109016dbc405ff5ee408000689b00ae68fea2228ddd4beb4ec65fd27fcaf503249199984ac22296704d0082254589d977bfa93c3f31a2d

data/lib/datadog/statsd.rb

@@ -46,6 +46,12 @@ module Datadog
     CRITICAL  = 2
     UNKNOWN   = 3
 
+    COUNTER_TYPE = 'c'.freeze
+    GAUGE_TYPE = 'g'.freeze
+    HISTOGRAM_TYPE = 'h'.freeze
+    TIMING_TYPE = 'ms'.freeze
+    SET_TYPE = 's'.freeze
+
     # A namespace to prepend to all statsd calls. Defaults to no namespace.
     attr_reader :namespace
 
@@ -71,7 +77,7 @@ module Datadog
 
     # Return the current version of the library.
     def self.VERSION
-      "2.1.0"
+      "2.2.0"
     end
 
     # @param [String] host your statsd host
@@ -141,7 +147,7 @@ module Datadog
     # @option opts [Numeric] :sample_rate sample rate, 1 for always
     # @option opts [Array<String>] :tags An array of tags
     def count(stat, count, opts={})
-      send_stats stat, count, :c, opts
+      send_stats stat, count, COUNTER_TYPE, opts
     end
 
     # Sends an arbitary gauge value for the given stat to the statsd server.
@@ -158,7 +164,7 @@ module Datadog
     # @example Report the current user count:
     #   $statsd.gauge('user.count', User.count)
     def gauge(stat, value, opts={})
-      send_stats stat, value, :g, opts
+      send_stats stat, value, GAUGE_TYPE, opts
     end
 
     # Sends a value to be tracked as a histogram to the statsd server.
@@ -171,7 +177,7 @@ module Datadog
     # @example Report the current user count:
     #   $statsd.histogram('user.count', User.count)
     def histogram(stat, value, opts={})
-      send_stats stat, value, :h, opts
+      send_stats stat, value, HISTOGRAM_TYPE, opts
     end
 
     # Sends a timing (in ms) for the given stat to the statsd server. The
@@ -185,7 +191,7 @@ module Datadog
     # @option opts [Numeric] :sample_rate sample rate, 1 for always
     # @option opts [Array<String>] :tags An array of tags
     def timing(stat, ms, opts={})
-      send_stats stat, ms, :ms, opts
+      send_stats stat, ms, TIMING_TYPE, opts
     end
 
     # Reports execution time of the provided block using {#timing}.
@@ -217,7 +223,7 @@ module Datadog
     # @example Record a unique visitory by id:
     #   $statsd.set('visitors.uniques', User.id)
     def set(stat, value, opts={})
-      send_stats stat, value, :s, opts
+      send_stats stat, value, SET_TYPE, opts
     end
 
 
@@ -345,6 +351,12 @@ module Datadog
       remove_pipes(tag).gsub COMMA, BLANK
     end
 
+    def escape_tag_content!(tag)
+      tag.gsub!(PIPE, BLANK)
+      tag.gsub!(COMMA, BLANK)
+      tag
+    end
+
     def remove_pipes(msg)
       msg.gsub PIPE, BLANK
     end
@@ -357,15 +369,47 @@ module Datadog
       timing(stat, ((Time.now - start) * 1000).round, opts)
     end
 
+    def join_array_to_str(str, array, joiner)
+      array.each_with_index do |item, i|
+        str << joiner unless i == 0
+        str << item
+      end
+    end
+
     def send_stats(stat, delta, type, opts={})
       sample_rate = opts[:sample_rate] || 1
       if sample_rate == 1 or rand < sample_rate
+        full_stat = ''
+        full_stat << @prefix if @prefix
+
+        stat = stat.is_a?(String) ? stat.dup : stat.to_s
         # Replace Ruby module scoping with '.' and reserved chars (: | @) with underscores.
-        stat = stat.to_s.gsub(DOUBLE_COLON, DOT).tr(':|@'.freeze, UNDERSCORE)
-        rate = "|@#{sample_rate}" unless sample_rate == 1
-        ts = (tags || []) + (opts[:tags] || []).map {|tag| escape_tag_content(tag)}
-        tags = "|##{ts.join(COMMA)}" unless ts.empty?
-        send_stat "#{@prefix}#{stat}:#{delta}|#{type}#{rate}#{tags}"
+        stat.gsub!(DOUBLE_COLON, DOT)
+        stat.tr!(':|@'.freeze, UNDERSCORE)
+        full_stat << stat
+
+        full_stat << ':'.freeze
+        full_stat << delta.to_s
+        full_stat << PIPE
+        full_stat << type
+
+        unless sample_rate == 1
+          full_stat << PIPE
+          full_stat << '@'.freeze
+          full_stat << sample_rate.to_s
+        end
+
+
+        tag_arr = opts[:tags].to_a
+        tag_arr.map! { |tag| t = tag.dup; escape_tag_content!(t); t }
+        ts = tags.to_a + tag_arr
+        unless ts.empty?
+          full_stat << PIPE
+          full_stat << '#'.freeze
+          join_array_to_str(full_stat, ts, COMMA)
+        end
+
+        send_stat(full_stat)
       end
     end
 

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: dogstatsd-ruby
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Rein Henrichs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-27 00:00:00.000000000 Z
+date: 2017-01-12 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,19 +87,18 @@ 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.4.3
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: A Ruby DogStatsd client
 test_files: []
-has_rdoc: