dogstatsd-ruby 2.0.0 → 2.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZGI3OTFiN2FiNmZkY2JlODliZTliMDYyMzY2MWRlNTY0ZTJmZDU3Ng==
-  data.tar.gz: !binary |-
-    NDgwM2VhNzdmYWUxYWZhMzNmZDI3MTJkMTBlNDBhNGY0MzdkYjVkYw==
+SHA1:
+  metadata.gz: 481edf1969341d5a0fcca585196f32b19a0290ee
+  data.tar.gz: 743744502b34fa5c2b53afe3e8ce0a924c1cd317
 SHA512:
-  metadata.gz: !binary |-
-    OTJhMWQ5OWQwYTEyNmJkODlkZGUwMmJkMDA1MGUzMGRmZTU3YjIyNjFjZDJk
-    ZTdmYTdhODdmMTJiYjlmOTUwYjVkYjFjN2RkMjU4YTY0MzZlZTgxMGU1ODEz
-    N2EwNmUzMmNmYWZlZjZjOTI2N2E3ZjliOWRiMzc1NTgxYmU3OWY=
-  data.tar.gz: !binary |-
-    ZWJlNzRjNDdkMDM1YzFjOGQzZGRjNGFjZDllMTc4MDdmNzUzZDJhNDc1Mjc2
-    M2M5MWE5ZjMyMDFiYjZlNWU4ZDAyZDA1ODMzNGZkYjg5YTAzMzg5NzhhMmRh
-    OTczN2UxYWE1ZGM0MGU0MTVkODgwYzVmYWJhNGIwMzU0NDEwYTY=
+  metadata.gz: d5d5f0f2f11c3f713d4907e0dc8b89978ad2dbcb21466705b31e630102f2a36f68eb6bafad1c66a2783f010c66ee1a7f7fffa13ee3a1ca03c85357fc63b8fb56
+  data.tar.gz: 5a746d3b48a5c31b5cbd40b06daa896c1faa7d1f8d4686cdcf69d6066bdf1fd5c81bcfaa1e08462df8b234e8a08b3bbde7f445b26819480717a0edc4bdb131be

data/lib/datadog/statsd.rb

@@ -24,22 +24,23 @@ module Datadog
 
     # Create a dictionary to assign a key to every parameter's name, except for tags (treated differently)
     # Goal: Simple and fast to add some other parameters
-    OPTS_KEYS = [
-          ['date_happened', 'd'],
-          ['hostname', 'h'],
-          ['aggregation_key', 'k'],
-          ['priority', 'p'],
-          ['source_type_name', 's'],
-          ['alert_type', 't']
-    ]
+    OPTS_KEYS = {
+      :date_happened     => :d,
+      :hostname          => :h,
+      :aggregation_key   => :k,
+      :priority          => :p,
+      :source_type_name  => :s,
+      :alert_type        => :t,
+    }
 
     # Service check options
-    SC_OPT_KEYS = [
-          ['timestamp', 'd:'],
-          ['hostname', 'h:'],
-          ['tags', '#'],
-          ['message', 'm:']
-    ]
+    SC_OPT_KEYS = {
+      :timestamp  => 'd:'.freeze,
+      :hostname   => 'h:'.freeze,
+      :tags       => '#'.freeze,
+      :message    => 'm:'.freeze,
+    }
+
     OK        = 0
     WARNING   = 1
     CRITICAL  = 2
@@ -70,7 +71,7 @@ module Datadog
 
     # Return the current version of the library.
     def self.VERSION
-      "2.0.0"
+      "2.1.0"
     end
 
     # @param [String] host your statsd host
@@ -90,15 +91,15 @@ module Datadog
 
     def namespace=(namespace) #:nodoc:
       @namespace = namespace
-      @prefix = namespace.nil? ? nil : "#{namespace}."
+      @prefix = namespace.nil? ? nil : "#{namespace}.".freeze
     end
 
     def host=(host) #:nodoc:
-      @host = host || '127.0.0.1'
+      @host = host || DEFAULT_HOST
     end
 
     def port=(port) #:nodoc:
-      @port = port || 8125
+      @port = port || DEFAULT_PORT
     end
 
     def tags=(tags) #:nodoc:
@@ -112,9 +113,11 @@ module Datadog
     # @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
+    # @option opts [Numeric] :by increment value, default 1
     # @see #count
     def increment(stat, opts={})
-      count stat, 1, opts
+      incr_value = opts.fetch(:by, 1)
+      count stat, incr_value, opts
     end
 
     # Sends a decrement (count = -1) for the given stat to the statsd server.
@@ -123,9 +126,11 @@ module Datadog
     # @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
+    # @option opts [Numeric] :by decrement value, default 1
     # @see #count
     def decrement(stat, opts={})
-      count stat, -1, opts
+      decr_value = - opts.fetch(:by, 1)
+      count stat, decr_value, opts
     end
 
     # Sends an arbitrary count for the given stat to the statsd server.
@@ -198,12 +203,9 @@ module Datadog
     #   $statsd.time('account.activate') { @account.activate! }
     def time(stat, opts={})
       start = Time.now
-      result = yield
-      time_since(stat, start, opts)
-      result
-    rescue
+      return yield
+    ensure
       time_since(stat, start, opts)
-      raise
     end
     # Sends a value to be tracked as a set to the statsd server.
     #
@@ -234,23 +236,24 @@ module Datadog
       service_check_string = format_service_check(name, status, opts)
       send_to_socket service_check_string
     end
+
     def format_service_check(name, status, opts={})
       sc_string = "_sc|#{name}|#{status}"
 
-      SC_OPT_KEYS.each do |name_key|
-        if opts[name_key[0].to_sym]
-          if name_key[0] == 'tags'
-            tags = opts[:tags].map {|tag| escape_tag_content(tag) }
-            tags = "#{tags.join(",")}" unless tags.empty?
-            sc_string << "|##{tags}"
-          elsif name_key[0] == 'message'
-            message = remove_pipes(opts[:message])
-            escaped_message = escape_service_check_message(message)
-            sc_string << "|m:#{escaped_message}"
-          else
-            value = remove_pipes(opts[name_key[0].to_sym])
-            sc_string << "|#{name_key[1]}#{value}"
-          end
+      SC_OPT_KEYS.each do |key, shorthand_key|
+        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}"
+        elsif key == :message
+          message = remove_pipes(opts[:message])
+          escaped_message = escape_service_check_message(message)
+          sc_string << "|m:#{escaped_message}"
+        else
+          value = remove_pipes(opts[key])
+          sc_string << "|#{shorthand_key}#{value}"
         end
       end
       return sc_string
@@ -303,38 +306,51 @@ module Datadog
 
       # We construct the string to be sent by adding '|key:value' parts to it when needed
       # All pipes ('|') in the metadata are removed. Title and Text can keep theirs
-      OPTS_KEYS.each do |name_key|
-        if name_key[0] != 'tags' && opts[name_key[0].to_sym]
-          value = remove_pipes(opts[name_key[0].to_sym])
-          event_string_data << "|#{name_key[1]}:#{value}"
+      OPTS_KEYS.each do |key, shorthand_key|
+        if key != :tags && opts[key]
+          value = remove_pipes(opts[key])
+          event_string_data << "|#{shorthand_key}:#{value}"
         end
       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(',')}"
+        event_string_data << "|##{full_tags.join(COMMA)}"
       end
 
-      raise "Event #{title} payload is too big (more that 8KB), event discarded" if event_string_data.length > 8 * 1024
+      raise "Event #{title} payload is too big (more that 8KB), event discarded" if event_string_data.length > 8192 # 8 * 1024 = 8192
       return event_string_data
     end
 
     private
 
+    NEW_LINE = "\n".freeze
+    ESC_NEW_LINE = "\\n".freeze
+    COMMA = ",".freeze
+    BLANK = "".freeze
+    PIPE = "|".freeze
+    DOT = ".".freeze
+    DOUBLE_COLON = "::".freeze
+    UNDERSCORE = "_".freeze
+
+    private_constant :NEW_LINE, :ESC_NEW_LINE, :COMMA, :BLANK, :PIPE, :DOT,
+      :DOUBLE_COLON, :UNDERSCORE
+
     def escape_event_content(msg)
-      msg.gsub "\n", "\\n"
+      msg.gsub NEW_LINE, ESC_NEW_LINE
     end
 
     def escape_tag_content(tag)
-      remove_pipes(tag).gsub ",", ""
+      remove_pipes(tag).gsub COMMA, BLANK
     end
 
     def remove_pipes(msg)
-      msg.gsub "|", ""
+      msg.gsub PIPE, BLANK
     end
 
     def escape_service_check_message(msg)
-      msg.gsub('m:', 'm\:').gsub "\n", "\\n"
+      escape_event_content(msg).gsub('m:'.freeze, 'm\:'.freeze)
     end
 
     def time_since(stat, start, opts)
@@ -345,10 +361,10 @@ module Datadog
       sample_rate = opts[:sample_rate] || 1
       if sample_rate == 1 or rand < sample_rate
         # Replace Ruby module scoping with '.' and reserved chars (: | @) with underscores.
-        stat = stat.to_s.gsub('::', '.').tr(':|@', '_')
+        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(",")}" unless ts.empty?
+        tags = "|##{ts.join(COMMA)}" unless ts.empty?
         send_stat "#{@prefix}#{stat}:#{delta}|#{type}#{rate}#{tags}"
       end
     end
@@ -361,7 +377,7 @@ module Datadog
     end
 
     def flush_buffer()
-      send_to_socket(@buffer.join("\n"))
+      send_to_socket(@buffer.join(NEW_LINE))
       @buffer = Array.new
     end
 

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: dogstatsd-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Rein Henrichs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-10-27 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,17 +87,17 @@ 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.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A Ruby DogStatsd client