metriks 0.9.3 → 0.9.4

data/Gemfile

@@ -5,4 +5,5 @@ gemspec
 group :test do
   gem 'turn', '0.8.2', :require => false
   gem 'rake', '0.8.7'
+  gem 'riemann-client', :platform => :mri_19
 end

data/lib/metriks.rb

@@ -1,6 +1,6 @@
 
 module Metriks
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 
   def self.get(name)
     Metriks::Registry.default.get(name)

data/lib/metriks/reporter/riemann.rb

@@ -0,0 +1,109 @@
+module Metriks::Reporter
+  class Riemann
+    require 'riemann/client'
+
+    attr_accessor :client
+    def initialize(options = {})
+      @client = ::Riemann::Client.new(
+        :host => options[:host],
+        :port => options[:port]
+      )
+      @registry = options[:registry] || Metrics::Registry.default
+      @interval = options[:interval] || 60
+      @on_error = options[:on_error] || proc { |ex| }
+      
+      @default_event = options[:default_event] || {}
+      @default_event[:ttl] ||= @interval * 1.5
+    end
+
+    def start
+      @thread ||= Thread.new do
+        loop do
+          sleep @interval
+          
+          Thread.new do
+            begin
+              write
+            rescue Exception => ex
+              @on_error[ex] rescue nil
+            end
+          end
+        end
+      end
+    end
+
+    def stop
+      @thread.kill if @thread
+      @thread = nil
+    end
+
+    def restart
+      stop
+      start
+    end
+
+    def flush
+      # Is this supposed to take interval into account? --aphyr
+      if !@last_write || @last_write.min != Time.now.min
+        write
+      end
+    end
+
+    def write
+      @last_write = Time.now
+
+      @registry.each do |name, metric|
+        case metric
+        when Metriks::Meter
+          send_metric name, 'meter', metric, [
+            :count, :one_minute_rate, :five_minute_rate,
+            :fifteen_minute_rate, :mean_rate
+          ]
+        when Metriks::Counter
+          send_metric name, 'counter', metric, [
+            :count
+          ]
+        when Metriks::UtilizationTimer
+          send_metric name, 'utilization_timer', metric, [
+            :count, :one_minute_rate, :five_minute_rate,
+            :fifteen_minute_rate, :mean_rate,
+            :min, :max, :mean, :stddev,
+            :one_minute_utilization, :five_minute_utilization,
+            :fifteen_minute_utilization, :mean_utilization,
+          ], [
+            :median, :get_95th_percentile
+          ]
+        when Metriks::Timer
+          send_metric name, 'timer', metric, [
+            :count, :one_minute_rate, :five_minute_rate,
+            :fifteen_minute_rate, :mean_rate,
+            :min, :max, :mean, :stddev
+          ], [
+            :median, :get_95th_percentile
+          ]
+        end
+      end
+    end
+
+    def send_metric(name, type, metric, keys, snapshot_keys = [])
+      keys.each do |key|
+        @client << @default_event.merge(
+          :service => "#{name} #{key}",
+          :metric => metric.send(key),
+          :tags => [type]
+        )
+      end
+
+      unless snapshot_keys.empty?
+        snapshot = metric.snapshot
+        snapshot_keys.each do |key|
+          @client << @default_event.merge(
+            :service => "#{name} #{key}",
+            :metric => snapshot.send(key),
+            :tags => [type]
+          )
+        end
+      end
+    end
+  end
+end

data/metriks.gemspec

@@ -13,7 +13,7 @@ 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              = 'metriks'
-  s.version           = '0.9.3'
+  s.version           = '0.9.4'
   s.date              = '2012-03-12'
 
   ## Make sure your summary is short. The description may be as long
@@ -69,6 +69,7 @@ Gem::Specification.new do |s|
     lib/metriks/reporter/librato_metrics.rb
     lib/metriks/reporter/logger.rb
     lib/metriks/reporter/proc_title.rb
+    lib/metriks/reporter/riemann.rb
     lib/metriks/simple_moving_average.rb
     lib/metriks/snapshot.rb
     lib/metriks/timer.rb
@@ -84,6 +85,7 @@ Gem::Specification.new do |s|
     test/metriks_test.rb
     test/proc_title_reporter_test.rb
     test/registry_test.rb
+    test/riemann_reporter_test.rb
     test/test_helper.rb
     test/timer_test.rb
     test/utilization_timer_test.rb

data/test/riemann_reporter_test.rb

@@ -0,0 +1,69 @@
+require 'test_helper'
+
+# riemann only works in 1.9
+if RUBY_VERSION > '1.9'
+
+require 'metriks/reporter/riemann'
+
+class RiemannReporterTest < Test::Unit::TestCase
+  def setup
+    @registry = Metriks::Registry.new
+    @reporter = Metriks::Reporter::Riemann.new(
+      :host => "foo",
+      :port => 1234,
+      :registry => @registry,
+      :default_event => {:host => "h"}
+    )
+  end
+
+  def teardown
+    @reporter.stop
+    @registry.stop
+  end
+
+  def test_init
+    assert_equal @reporter.client.host, "foo"
+    assert_equal @reporter.client.port, 1234
+  end
+
+  def test_write
+    @registry.meter('meter.testing').mark
+    @registry.counter('counter.testing').increment
+    @registry.timer('timer.testing').update(1.5)
+    @registry.utilization_timer('utilization_timer.testing').update(1.5)
+
+    @reporter.client.expects(:<<).at_least_once
+    @reporter.client.expects(:<<).with(
+      :host => "h",
+      :service => "meter.testing count",
+      :metric => 1,
+      :tags => ["meter"],
+      :ttl => 90
+    )
+    @reporter.client.expects(:<<).with(
+      :host => "h",
+      :service => "counter.testing count",
+      :metric => 1,
+      :tags => ["counter"],
+      :ttl => 90
+    )
+    @reporter.client.expects(:<<).with(
+      :host => "h",
+      :service => "timer.testing max",
+      :metric => 1.5,
+      :tags => ["timer"],
+      :ttl => 90
+    )
+    @reporter.client.expects(:<<).with(
+      :host => "h",
+      :service => "utilization_timer.testing mean",
+      :metric => 1.5,
+      :tags => ["utilization_timer"],
+      :ttl => 90
+    )
+
+    @reporter.write
+  end
+end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Eric Lindvall
@@ -108,6 +108,7 @@ files:
 - lib/metriks/reporter/librato_metrics.rb
 - lib/metriks/reporter/logger.rb
 - lib/metriks/reporter/proc_title.rb
+- lib/metriks/reporter/riemann.rb
 - lib/metriks/simple_moving_average.rb
 - lib/metriks/snapshot.rb
 - lib/metriks/timer.rb
@@ -123,6 +124,7 @@ files:
 - test/metriks_test.rb
 - test/proc_title_reporter_test.rb
 - test/registry_test.rb
+- test/riemann_reporter_test.rb
 - test/test_helper.rb
 - test/timer_test.rb
 - test/utilization_timer_test.rb
@@ -166,5 +168,6 @@ test_files:
 - test/metriks_test.rb
 - test/proc_title_reporter_test.rb
 - test/registry_test.rb
+- test/riemann_reporter_test.rb
 - test/timer_test.rb
 - test/utilization_timer_test.rb