ruby-metrics 0.8.6 → 0.9.0

data/lib/ruby-metrics/instruments/meter.rb

@@ -1,32 +1,33 @@
-require File.join(File.dirname(__FILE__), '..', 'time_units')
+require 'ruby-metrics/time_units'
 
 module Metrics
   module Instruments
-    class Meter < Base
-      include Metrics::TimeConversion 
-      
+    class Meter
+      include Metrics::TimeConversion
+
       # From http://www.teamquest.com/pdfs/whitepaper/ldavg2.pdf
       INTERVAL = 5.0
       INTERVAL_IN_NS = 5000000000.0
       ONE_MINUTE_FACTOR     = 1 - Math.exp(-INTERVAL / 60.0)
       FIVE_MINUTE_FACTOR    = 1 - Math.exp(-INTERVAL / (60.0 * 5.0))
       FIFTEEN_MINUTE_FACTOR = 1 - Math.exp(-INTERVAL / (60.0 * 15.0))
-      
+
       attr_reader :count
+      attr_reader :units
       alias_method :counted, :count
-      
+
       def initialize(options = {})
         @one_minute_rate = @five_minute_rate = @fifteen_minute_rate = 0.0
         @count  = 0
         @initialized = false
         @start_time = Time.now.to_f
-                        
+        @units = "#{options[:units]}"
+
         @timer_thread = Thread.new do
-          sleep_time = INTERVAL
           begin
             loop do
               self.tick
-              sleep(sleep_time)
+              sleep(INTERVAL)
             end
           rescue Exception => e
             logger.error "Error in timer thread: #{e.class.name}: #{e}\n  #{e.backtrace.join("\n  ")}"
@@ -34,19 +35,19 @@ module Metrics
         end # thread new
 
       end
-      
+
       def clear
       end
-      
+
       def mark(count = 1)
         @count += count
       end
-      
+
       def calc_rate(rate, factor, count)
         rate = rate.to_f + (factor.to_f * (count.to_f - rate.to_f))
         rate.to_f
       end
-      
+
       def tick
         count = @count.to_f  / Seconds.to_nsec(INTERVAL).to_f
 
@@ -58,42 +59,44 @@ module Metrics
           @one_minute_rate = @five_minute_rate = @fifteen_minute_rate  = (count)
           @initialized = true
         end
-        
+
         @count = 0
       end
-      
+
       def one_minute_rate(rate_unit = :seconds)
         convert_to_ns @one_minute_rate, rate_unit
       end
-      
+
       def five_minute_rate(rate_unit = :seconds)
         convert_to_ns @five_minute_rate, rate_unit
       end
-      
+
       def fifteen_minute_rate(rate_unit = :seconds)
         convert_to_ns @fifteen_minute_rate, rate_unit
       end
-      
+
       def mean_rate(rate_unit = :seconds)
         count = @count
         if count == 0
-          return 0.0;
+          return 0.0
         else
           elapsed = Time.now.to_f - @start_time.to_f
-          convert_to_ns (count.to_f / elapsed.to_f), rate_unit
+          mult = scale_time_units(:seconds, rate_unit)
+          count.to_f / (mult * elapsed.to_f)
         end
       end
-      
-      def to_json(*_)
+
+      def as_json(*_)
         {
           :one_minute_rate => self.one_minute_rate,
           :five_minute_rate => self.five_minute_rate,
           :fifteen_minute_rate => self.fifteen_minute_rate
-        }.to_json
+        }
       end
-      
-    end
 
-    register_instrument(:meter, Meter)
+      def to_json(*_)
+        as_json.to_json
+      end
+    end
   end
 end

data/lib/ruby-metrics/instruments/timer.rb

@@ -2,39 +2,40 @@ require File.join(File.dirname(__FILE__), '..', 'time_units')
 
 module Metrics
   module Instruments
-    class Timer < Base
-      include Metrics::TimeConversion 
-      
-      attr_reader :duration_unit, :rate_unit
-      
+    class Timer
+      include Metrics::TimeConversion
+
+      attr_reader :duration_unit, :rate_unit, :units
+
       def initialize(options = {})
         @meter          = Meter.new
         @histogram      = ExponentialHistogram.new
 
         @duration_unit  = options[:duration_unit] || :seconds
         @rate_unit      = options[:rate_unit] || :seconds
+        @units          = options[:units]
         
         clear
       end
-      
+
       def clear
         @histogram.clear
       end
 
       def update(duration, unit)
         mult = convert_to_ns(1, unit)
-        self.update_timer (duration * mult)
+        self.update_timer(duration * mult)
       end
 
-      def time(&block) 
+      def time(&block)
         start_time = Time.now.to_f
         result = block.call
         time_diff = Time.now.to_f - start_time
-        time_in_ns = convert_to_ns time_diff, :seconds        
+        time_in_ns = convert_to_ns time_diff, :seconds
         update_timer(time_in_ns)
         result
       end
-      
+
       def count
         @histogram.count
       end
@@ -50,7 +51,7 @@ module Metrics
       def one_minute_rate
         @meter.one_minute_rate(@rate_unit)
       end
-      
+
       def mean_rate
         @meter.mean_rate(@rate_unit)
       end
@@ -58,26 +59,26 @@ module Metrics
       def max
         scale_duration_to_ns @histogram.max, @duration_unit
       end
-      
+
       def min
         scale_duration_to_ns @histogram.min, @duration_unit
       end
-      
+
       def mean
         scale_duration_to_ns @histogram.mean, @duration_unit
       end
-      
+
       def std_dev
         scale_duration_to_ns @histogram.std_dev, @duration_unit
       end
-      
+
       def quantiles(percentiles = [0.99,0.97,0.95,0.75,0.5,0.25])
         result = {}
-        
+
         @histogram.quantiles(percentiles).each do |k,v|
           result[k] = scale_duration_to_ns v, @duration_unit
         end
-        
+
         result
       end
 
@@ -87,44 +88,44 @@ module Metrics
         @histogram.values.each do |value|
           result << (scale_duration_to_ns value, @duration_unit)
         end
-        
+
         result
       end
-      
+
       def update_timer(duration)
         if duration >= 0
           @histogram.update(duration)
           @meter.mark
         end
       end
-      
-      def to_json(*_)
+
+      def as_json(*_)
         {
-          :count => self.count,
+          :count => count,
           :rates => {
-            :one_minute_rate => self.one_minute_rate,
-            :five_minute_rate => self.five_minute_rate,
-            :fifteen_minute_rate => self.fifteen_minute_rate, 
+            :one_minute_rate => one_minute_rate,
+            :five_minute_rate => five_minute_rate,
+            :fifteen_minute_rate => fifteen_minute_rate,
             :unit => @rate_unit
           },
-          :durations => { 
-            :min => self.min,
-            :max => self.max,
-            :mean => self.mean,
-            :percentiles => self.quantiles([0.25, 0.50, 0.75, 0.95, 0.97, 0.98, 0.99]),
+          :durations => {
+            :min => min,
+            :max => max,
+            :mean => mean,
+            :percentiles => quantiles([0.25, 0.50, 0.75, 0.95, 0.97, 0.98, 0.99]),
             :unit => @duration_unit
           }
-        }.to_json
+        }
       end
-      
+
+      def to_json(*_)
+        as_json.to_json
+      end
+
       private
       def scale_duration_to_ns(value, unit)
         value.to_f / convert_to_ns(1, unit).to_f
       end
-      
     end
-
-    register_instrument(:timer, Timer)
   end
-end  
-      
+end

data/lib/ruby-metrics/integration.rb

@@ -1,12 +1,11 @@
 module Metrics
   module Integration
     
-    autoload :WEBrick, File.join(File.dirname(__FILE__), 'integration', 'webrick')
+    autoload :WEBrick, File.expand_path('../integration/webrick', __FILE__)
     
     module Rack
-      autoload :Middleware, File.join(File.dirname(__FILE__), 'integration', 'rack_middleware')
-      autoload :Endpoint,   File.join(File.dirname(__FILE__), 'integration', 'rack_endpoint')
+      autoload :Middleware, File.expand_path('../integration/rack_middleware', __FILE__)
+      autoload :Endpoint,   File.expand_path('../integration/rack_endpoint', __FILE__)
     end
-    
   end
 end

data/lib/ruby-metrics/logging.rb

@@ -1,5 +1,3 @@
-require 'logger'
-
 module Metrics
   module Logging
     

data/lib/ruby-metrics/reporter.rb

@@ -0,0 +1,28 @@
+module Metrics
+  class Reporter
+    # Default reporting delay is 60 seconds
+    DEFAULT_REPORTING_DELAY = 60
+
+    include Logging
+
+    def initialize(options = {})
+
+      if options[:agent] == nil
+        raise "Need an agent to report data from"
+      end
+
+      delay = options[:delay] || DEFAULT_REPORTING_DELAY
+      agent = options[:agent] 
+
+      Thread.new {
+        while(true)
+          agent.reporters.each do |name, service|
+            service.report(agent)
+          end
+          sleep delay
+        end
+      }.join
+    end
+
+  end
+end

data/lib/ruby-metrics/statistics/exponential_sample.rb

@@ -1,7 +1,6 @@
 module Metrics
   module Statistics
-    class ExponentialSample < Sample
-      
+    class ExponentialSample
       def initialize(size = 1028, alpha = 0.015)
         @values = Hash.new
         @count  = 0
@@ -23,7 +22,7 @@ module Metrics
       end
       
       def tick
-        return Time.now.to_f
+        Time.now.to_f
       end
       
       def update(value)
@@ -38,7 +37,7 @@ module Metrics
           @values[priority] = value
         else
           firstkey = @values.keys[0]
-          if (firstkey < priority)
+          if firstkey && (firstkey < priority)
             @values[priority] = value
             
             while(@values.delete(firstkey) == nil)
@@ -85,7 +84,7 @@ module Metrics
           result << @values[key]
         end
         
-        return result
+        result
       end
     end
   end

data/lib/ruby-metrics/statistics/uniform_sample.rb

@@ -1,7 +1,6 @@
 module Metrics
   module Statistics
-    class UniformSample < Sample
-      
+    class UniformSample
       def initialize(size = 1028)
         @values = Array.new(size)
         @count = 0

data/lib/ruby-metrics/time_units.rb

@@ -43,19 +43,21 @@ module Metrics
   end
   
   module TimeConversion
-   
+    UNITS = {
+        :nanoseconds            => Nanoseconds,
+        :microseconds           => Microseconds,
+        :milliseconds           => Milliseconds,
+        :seconds                => Seconds,
+        :minutes                => Minutes,
+        :hours                  => Hours
+    }
   
     def convert_to_ns(value, unit)
-      units = {
-          :nanoseconds            => Nanoseconds,
-          :microseconds           => Microseconds,
-          :milliseconds           => Milliseconds,
-          :seconds                => Seconds,
-          :minutes                => Minutes,
-          :hours                  => Hours
-      }
-      
-      return units[unit].to_nsec * value
+      (UNITS[unit].to_nsec.to_f * value.to_f)
+    end
+
+    def scale_time_units(source, dest)
+      (UNITS[source].to_nsec.to_f) / (UNITS[dest].to_nsec.to_f)
     end
   end
 end

data/lib/ruby-metrics/version.rb

@@ -1,3 +1,3 @@
 module Metrics
-  VERSION = "0.8.6"
+  VERSION = '0.9.0'
 end

data/ruby-metrics-ganglia.gemspec

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path('../lib', __FILE__)
+require 'ruby-metrics/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'ruby-metrics-ganglia'
+  s.version     = Metrics::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ['John Ewart']
+  s.email       = ['john@johnewart.net']
+  s.homepage    = 'https://github.com/johnewart/ruby-metrics'
+  s.summary     = %q{Ganglia reporter for ruby-metrics}
+  s.description = %q{A reporter that uses Ganglia's to stash metric data}
+  s.license     = 'MIT'
+
+  s.files         = ['lib/ruby-metrics/reporters/ganglia.rb']
+  s.require_paths = ['lib']
+
+  s.add_dependency 'gmetric', '0.1.3'
+  s.add_dependency 'ruby-metrics', Metrics::VERSION
+end

data/ruby-metrics-librato.gemspec

@@ -0,0 +1,20 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path('../lib', __FILE__)
+require 'ruby-metrics/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'ruby-metrics-librato'
+  s.version     = Metrics::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ['John Ewart']
+  s.email       = ['john@johnewart.net']
+  s.homepage    = 'https://github.com/johnewart/ruby-metrics'
+  s.summary     = %q{Librato reporter for ruby-metrics}
+  s.description = %q{A reporter that uses Librato to stash metric data}
+  s.license     = 'MIT'
+
+  s.files         = ['lib/ruby-metrics/reporters/librato.rb']
+  s.require_paths = ['lib']
+
+  s.add_dependency 'ruby-metrics', Metrics::VERSION
+end