statsdserver 0.8 → 0.11

data/bin/statsd

@@ -30,7 +30,7 @@ end
 
 config = {}
 %w(daemonize inputs flush_interval outputs prefix percentile
-   suffix preserve_counters).each do |key|
+   suffix preserve_counters timer_names_before_suffix).each do |key|
   config[key.to_sym] = config_file[key] if config_file[key]
 end
 

data/lib/statsdserver.rb

@@ -29,6 +29,7 @@ class StatsdServer
       :flush_interval => 30,
       :prefix => "stats",
       :preserve_counters => "true",
+      :timer_names_before_suffix => "true",
     }.merge(opts)
     @input_config = input_config
     @output_config = output_config
@@ -165,11 +166,18 @@ class StatsdServer
     now = Time.now.to_i
 
     timers = {}
+    gauges = {}
+    counters = {}
+
     @stats.timers.keys.each do |k|
       timers[k] = @stats.timers.delete(k)
     end
 
-    counters = {}
+    @stats.gauges.keys.each do |k|
+      #gauges[k] = @stats.gauges.delete(k)
+      gauges[k] = stats.gauges[k]
+    end
+
     @stats.counters.keys.each do |k|
       counters[k] = @stats.counters.delete(k)
     end
@@ -184,17 +192,29 @@ class StatsdServer
     timers.each do |key, values|
       next if values.length == 0
       summary = ::StatsdServer::Math.summarize(values, @opts)
-
-      updates << [metric_name("timers.#{key}.mean"),
-                  summary[:mean], now].join(" ")
-      updates << [metric_name("timers.#{key}.upper"),
-                  summary[:max], now].join(" ")
-      updates << [metric_name("timers.#{key}.lower"),
-                  summary[:min], now].join(" ")
-      updates << [metric_name("timers.#{key}.count"),
-                  values.length, now].join(" ")
-      updates << [metric_name("timers.#{key}.upper_#{@opts[:percentile].to_i}"),
-                  summary[:max_at_threshold], now].join(" ")
+      if @opts[:timer_names_before_suffix] == "true"
+        updates << [metric_name("timers.#{key}.mean"),
+                    summary[:mean], now].join(" ")
+        updates << [metric_name("timers.#{key}.upper"),
+                    summary[:max], now].join(" ")
+        updates << [metric_name("timers.#{key}.lower"),
+                    summary[:min], now].join(" ")
+        updates << [metric_name("timers.#{key}.count"),
+                    values.length, now].join(" ")
+        updates << [metric_name("timers.#{key}.upper_#{@opts[:percentile].to_i}"),
+                    summary[:max_at_threshold], now].join(" ")
+      else
+        updates << [metric_name("timers.#{key}") + ".mean",
+                    summary[:mean], now].join(" ")
+        updates << [metric_name("timers.#{key}") + ".upper",
+                    summary[:max], now].join(" ")
+        updates << [metric_name("timers.#{key}") + ".lower",
+                    summary[:min], now].join(" ")
+        updates << [metric_name("timers.#{key}") + ".count",
+                    values.length, now].join(" ")
+        updates << [metric_name("timers.#{key}") + ".upper_#{@opts[:percentile].to_i}",
+                    summary[:max_at_threshold], now].join(" ")
+      end
     end # timers.each
 
     counters.each do |key, value|
@@ -203,6 +223,12 @@ class StatsdServer
                   now].join(" ")
     end # counters.each
 
+    gauges.each do |key, value|
+      updates << [metric_name(key),
+                  value,
+                  now].join(" ")
+    end # gauges.each
+
     return updates.length == 0 ? nil : updates.join("\n") + "\n"
   end # def carbon_update_str
 

data/lib/statsdserver/proto/v1.rb

@@ -25,23 +25,25 @@ class StatsdServer
           if fields[1] == "ms" or fields[1] == "t" # timer update
             if fields[0].index(",")
               fields[0].split(",").each do |value_str|
-                value = Integer(value_str) rescue nil
+                value = Float(value_str) rescue nil
                 stats.timers[key] << value if value
               end
             else
-              value = Integer(fields[0]) rescue nil
+              value = Float(fields[0]) rescue nil
               if value.nil?
-                raise ParseError, "invalid timer value: #{fields[0]}"
+                raise ParseError, "invalid timer value for #{key}: #{fields[0]}"
               end
-              stats.timers[key] << fields[0].to_i
+              stats.timers[key] << value
             end
+
           elsif fields[1] == "c" # counter update
             count_str, sample_rate_str = fields[0].split("@", 2)
 
             if sample_rate_str
               sample_rate = Float(sample_rate_str) rescue nil
               if sample_rate.nil?
-                raise ParseError, "invalid sample_rate: #{sample_rate_str}"
+                raise ParseError, "invalid sample_rate for #{key}: " +
+                                  "#{sample_rate_str}"
               end
             else
               sample_rate = 1
@@ -49,10 +51,19 @@ class StatsdServer
 
             count = Integer(count_str) rescue nil
             if count.nil?
-              raise ParseError, "invalid count: #{count_str}"
+              raise ParseError, "invalid count for #{key}: #{count_str}"
             end
 
             stats.counters[key] += count.to_i * (1 / sample_rate.to_f)
+
+          elsif fields[1] == "g" # gauge update
+            value = Float(fields[0]) rescue nil
+            if value.nil?
+              raise ParseError, "invalid gauge value for #{key}: #{fields[0]}"
+            end
+
+            stats.gauges[key] = value
+
           else
             raise ParseError,
                   "invalid update: #{update}: unknown type #{fields[1]}"

data/lib/statsdserver/stats.rb

@@ -4,12 +4,14 @@ class StatsdServer
   class Stats
     attr_accessor :counters,
                   :timers,
+                  :gauges,
                   :logger
 
     public
     def initialize
       @timers = Hash.new { |h, k| h[k] = Array.new }
       @counters = Hash.new { |h, k| h[k] = 0 }
+      @gauges = Hash.new { |h, k| h[k] = 0 }
       @logger = Logger.new(STDERR)
     end
   end # class Stats

metadata

@@ -1,186 +1,146 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: statsdserver
-version: !ruby/object:Gem::Version
-  version: '0.8'
+version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
+  segments: 
+  - 0
+  - 11
+  version: "0.11"
 platform: ruby
-authors:
+authors: 
 - Pete Fritchman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-02-25 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: daemons
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: daemons
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: parseconfig
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: parseconfig
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sysexits
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: sysexits
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bunny
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: em-zeromq
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
 description: collect and aggregate stats, flush to graphite
 email: petef@databits.net
-executables:
+executables: 
 - statsd
 extensions: []
+
 extra_rdoc_files: []
-files:
-- lib/statsdserver/math.rb
-- lib/statsdserver/input/udp.rb
+
+files: 
+- lib/statsdserver.rb
 - lib/statsdserver/input/zeromq.rb
-- lib/statsdserver/output/stdout.rb
-- lib/statsdserver/output/tcp.rb
-- lib/statsdserver/output/amqp.rb
-- lib/statsdserver/stats.rb
+- lib/statsdserver/input/udp.rb
 - lib/statsdserver/proto/parseerror.rb
 - lib/statsdserver/proto/v1.rb
-- lib/statsdserver.rb
+- lib/statsdserver/stats.rb
+- lib/statsdserver/math.rb
+- lib/statsdserver/output/amqp.rb
+- lib/statsdserver/output/stdout.rb
+- lib/statsdserver/output/tcp.rb
 - bin/statsd
-homepage: https://github.com/fetep/ruby-statsd
-licenses:
+has_rdoc: true
+homepage: https://github.com/fetep/ruby-statsdserver
+licenses: 
 - Apache License 2.0
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: statsd (server) -- stat collector/aggregator
 test_files: []
+