metriksd 0.5.0 → 0.5.1

data/Gemfile

@@ -4,4 +4,4 @@ gemspec
 
 gem 'rake', '0.8.7'
 
-gem 'metriksd_reporter', :path => '../metriksd_reporter'
+#gem 'metriksd_reporter', :path => '../metriksd_reporter'

data/lib/metriksd/librato_metrics_reporter/timeslice_rollup.rb

@@ -80,6 +80,8 @@ module Metriksd
           add_utilization_timer(data)
         when 'meter'
           add_meter(data)
+        when 'histogram'
+          add_histogram(data)
         else
           raise "Unknown data type: #{data[:type].inspect}"
         end
@@ -99,7 +101,8 @@ module Metriksd
     end
 
     def add_timer(data)
-      average_gauge(data.name + '.mean', data[:source], data[:mean])
+      # average_gauge(data.name + '.mean', data[:source], data[:mean])
+
       sum_gauge(data.name + '.one_minute_rate', data[:source], data[:one_minute_rate])
 
       if data[:median]
@@ -112,7 +115,8 @@ module Metriksd
     end
 
     def add_utilization_timer(data)
-      average_gauge(data.name + '.mean', data[:source], data[:mean])
+      # average_gauge(data.name + '.mean', data[:source], data[:mean])
+
       sum_gauge(data.name + '.one_minute_rate', data[:source], data[:one_minute_rate])
       average_gauge(data.name + '.one_minute_utilization', data[:source], data[:one_minute_utilization])
 
@@ -129,6 +133,18 @@ module Metriksd
       sum_gauge(data.name, data[:source], data[:one_minute_rate])
     end
 
+    def add_histogram(data)
+      # average_gauge(data.name + '.mean', data[:source], data[:mean])
+
+      if data[:median]
+        average_gauge(data.name + '.median', data[:source], data[:median])
+      end
+
+      if data["95th_percentile"]
+        average_gauge(data.name + '.95th_percentile', data[:source], data["95th_percentile"])
+      end
+    end
+
     def average_gauge(name, source, value)
       key = [ name, source ].join('/')
       @gauges[key] ||= AverageGauge.new(name, source)

data/lib/metriksd.rb

@@ -1,6 +1,6 @@
 
 module Metriksd
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end
 
 require 'metriksd/cli'

data/metriksd.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'metriksd'
-  s.version           = '0.5.0'
-  s.date              = '2012-07-29'
+  s.version           = '0.5.1'
+  s.date              = '2012-10-02'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.

data/test/metriksd_reporter_test.rb

@@ -36,7 +36,8 @@ class MetriksdReporterTest < Test::Unit::TestCase
       :registry => @client_registry, :extras => { :source => Socket.gethostname })
 
     @client_reporter.start
-    @client_registry.timer('client.test.metric').update(5.3)
+    @client_registry.timer('test.timer').update(5.3)
+    @client_registry.histogram('test.histogram').update(5.3)
 
     @client_reporter.flush
     @client_reporter.stop

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Eric Lindvall
@@ -14,12 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-29 00:00:00 -07:00
+date: 2012-10-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: librato-metrics
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -27,12 +28,12 @@ dependencies:
         - 0
         - 7
         version: "0.7"
-  name: librato-metrics
-  requirement: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: msgpack
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -40,36 +41,36 @@ dependencies:
         - 0
         - 4
         version: "0.4"
-  name: msgpack
-  requirement: *id002
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: snappy
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  name: snappy
-  requirement: *id003
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  name: activesupport
-  requirement: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -80,21 +81,20 @@ dependencies:
         - rc
         - 4
         version: 1.0.0.rc.4
-  name: eventmachine
-  requirement: *id005
-  prerelease: false
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: metriksd_reporter
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  name: metriksd_reporter
-  requirement: *id006
-  prerelease: false
+  type: :development
+  version_requirements: *id006
 description: ""
 email: eric@sevenscale.com
 executables: