dogstatsd-ruby 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f51c36199676261f46887363359562998810d87558ee38604dda36313f1a877f
-  data.tar.gz: 8294b24d8021e02a2b0ac4e1e85cdd2f0c7ad78ca0b3b61fe7f38302baf1b2ae
+  metadata.gz: 046a0af9f230451c91fdeb9ae128c550b1c20623fa017d326e63a2f053f7cc9a
+  data.tar.gz: e2ba838497de521e89d386645a0228f819fdd03c28acc05a4789aa7f8d979de8
 SHA512:
-  metadata.gz: a3e82c961fca507847dabb5ca1cd19044dccd23a60aead380d9a7ce6c0b77537b85b0219a9a4a6d1b25242ac63321acb002d5ca88618c0656d706d33ffb5ffe3
-  data.tar.gz: ec927e7597a0008cc689fb1d7bdef737cc2c7a0dcf6166b9c39bd1df4e455fbde525cd4269408e800e2ac56fd8563604d27b1015512af69223971f1d23033ad2
+  metadata.gz: f2048376477bd1af31a63b75d17638df999c9f6341f967b2c826177add2a13831a54a72729e2a5c62aa09fa4aca6dccbaba308c79d9adcd470808d3bb80cde59
+  data.tar.gz: 2e0ac5fc90f8a2359f35a754034bb6474c1169ac8c8f3301257555553e1aca4f708cecd4d9245ff835cbe4396561a89d3bd3700ef6cea6c92c343a1e41ca2055

data/lib/datadog/statsd.rb

@@ -49,8 +49,10 @@ module Datadog
     COUNTER_TYPE = 'c'.freeze
     GAUGE_TYPE = 'g'.freeze
     HISTOGRAM_TYPE = 'h'.freeze
+    DISTRIBUTION_TYPE = 'd'.freeze
     TIMING_TYPE = 'ms'.freeze
     SET_TYPE = 's'.freeze
+    VERSION = "3.3.0".freeze
 
     # A namespace to prepend to all statsd calls. Defaults to no namespace.
     attr_reader :namespace
@@ -79,8 +81,9 @@ module Datadog
     end
 
     # Return the current version of the library.
+    # deprecated, but cannot be removed since uses might use it to check the version against older releases
     def self.VERSION
-      "3.2.0"
+      VERSION
     end
 
     # @param [String] host your statsd host
@@ -188,6 +191,22 @@ module Datadog
       send_stats stat, value, HISTOGRAM_TYPE, opts
     end
 
+    # Sends a value to be tracked as a distribution to the statsd server.
+    # Note: Distributions are a beta feature of Datadog and not generally
+    # available. Distributions must be specifically enabled for your
+    # organization.
+    #
+    # @param [String] stat stat name.
+    # @param [Numeric] value distribution value.
+    # @param [Hash] opts the options to create the metric with
+    # @option opts [Numeric] :sample_rate sample rate, 1 for always
+    # @option opts [Array<String>] :tags An array of tags
+    # @example Report the current user count:
+    #   $statsd.distribution('user.count', User.count)
+    def distribution(stat, value, opts={})
+      send_stats stat, value, DISTRIBUTION_TYPE, opts
+    end
+
     # Sends a timing (in ms) for the given stat to the statsd server. The
     # sample_rate determines what percentage of the time this report is sent. The
     # statsd server then uses the sample_rate to correctly track the average
@@ -218,10 +237,11 @@ module Datadog
     #   $statsd.time('account.activate') { @account.activate! }
     def time(stat, opts={})
       opts = {:sample_rate => opts} if opts.is_a? Numeric
-      start = Time.now
+      start = (PROCESS_TIME_SUPPORTED ? Process.clock_gettime(Process::CLOCK_MONOTONIC) : Time.now.to_f)
       return yield
     ensure
-      time_since(stat, start, opts)
+      finished = (PROCESS_TIME_SUPPORTED ? Process.clock_gettime(Process::CLOCK_MONOTONIC) : Time.now.to_f)
+      timing(stat, ((finished - start) * 1000).round, opts)
     end
     # Sends a value to be tracked as a set to the statsd server.
     #
@@ -237,7 +257,6 @@ module Datadog
       send_stats stat, value, SET_TYPE, opts
     end
 
-
     # This method allows you to send custom service check statuses.
     #
     # @param [String] name Service check name
@@ -261,9 +280,9 @@ module Datadog
         next unless opts[key]
 
         if key == :tags
-          tags = opts[:tags].map {|tag| escape_tag_content(tag) }
-          tags = "#{tags.join(COMMA)}" unless tags.empty?
-          sc_string << "|##{tags}"
+          if tags_string = tags_as_string(opts)
+            sc_string << "|##{tags_string}"
+          end
         elsif key == :message
           message = remove_pipes(opts[:message])
           escaped_message = escape_service_check_message(message)
@@ -332,9 +351,8 @@ module Datadog
       end
 
       # Tags are joined and added as last part to the string to be sent
-      full_tags = (tags + (opts[:tags] || [])).map {|tag| escape_tag_content(tag) }
-      unless full_tags.empty?
-        event_string_data << "|##{full_tags.join(COMMA)}"
+      if tags_string = tags_as_string(opts)
+        event_string_data << "|##{tags_string}"
       end
 
       raise "Event #{title} payload is too big (more that 8KB), event discarded" if event_string_data.length > 8192 # 8 * 1024 = 8192
@@ -351,49 +369,40 @@ module Datadog
     NEW_LINE = "\n".freeze
     ESC_NEW_LINE = "\\n".freeze
     COMMA = ",".freeze
-    BLANK = "".freeze
     PIPE = "|".freeze
     DOT = ".".freeze
     DOUBLE_COLON = "::".freeze
     UNDERSCORE = "_".freeze
+    PROCESS_TIME_SUPPORTED = (RUBY_VERSION >= "2.1.0")
 
-    private_constant :NEW_LINE, :ESC_NEW_LINE, :COMMA, :BLANK, :PIPE, :DOT,
+    private_constant :NEW_LINE, :ESC_NEW_LINE, :COMMA, :PIPE, :DOT,
       :DOUBLE_COLON, :UNDERSCORE
 
+    def tags_as_string(opts)
+      tag_arr = opts[:tags] || []
+      tag_arr = tag_arr.map { |tag| escape_tag_content(tag) }
+      tag_arr = tags + tag_arr # @tags are normalized when set, so not need to normalize them again
+      tag_arr.join(COMMA) unless tag_arr.empty?
+    end
+
     def escape_event_content(msg)
       msg.gsub NEW_LINE, ESC_NEW_LINE
     end
 
     def escape_tag_content(tag)
-      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 = remove_pipes(tag.to_s)
+      tag.delete! COMMA
       tag
     end
 
     def remove_pipes(msg)
-      msg.gsub PIPE, BLANK
+      msg.delete PIPE
     end
 
     def escape_service_check_message(msg)
       escape_event_content(msg).gsub('m:'.freeze, 'm\:'.freeze)
     end
 
-    def time_since(stat, start, opts)
-      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
@@ -417,14 +426,10 @@ module Datadog
           full_stat << sample_rate.to_s
         end
 
-
-        tag_arr = opts[:tags].to_a
-        tag_arr.map! { |tag| t = tag.to_s.dup; escape_tag_content!(t); t }
-        ts = tags.to_a + tag_arr
-        unless ts.empty?
+        if tags_string = tags_as_string(opts)
           full_stat << PIPE
           full_stat << '#'.freeze
-          join_array_to_str(full_stat, ts, COMMA)
+          full_stat << tags_string
         end
 
         send_stat(full_stat)

metadata

@@ -1,71 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dogstatsd-ruby
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Rein Henrichs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 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'
+date: 2018-02-04 00:00:00.000000000 Z
+dependencies: []
 description: A Ruby DogStastd client
 email: code@datadoghq.com
 executables: []