yam-ruby-metrics 0.8.8 → 0.8.9

data/lib/ruby-metrics/agent.rb

@@ -4,9 +4,11 @@ require 'ruby-metrics/time_units'
 
 require 'ruby-metrics/instruments/counter'
 require 'ruby-metrics/instruments/meter'
+require 'ruby-metrics/instruments/post_process_meter'
 require 'ruby-metrics/instruments/gauge'
 require 'ruby-metrics/instruments/histogram'
 require 'ruby-metrics/instruments/timer'
+require 'ruby-metrics/instruments/post_process_timer'
 
 require 'ruby-metrics/integration'
 
@@ -28,8 +30,8 @@ module Metrics
       @instruments[name] ||= Instruments::Counter.new
     end
 
-    def meter(name)
-      @instruments[name] ||= Instruments::Meter.new
+    def meter(name, options = {})
+      @instruments[name] ||= options[:post_process] ? Instruments::PostProcessMeter.new(options) : Instruments::Meter.new(options)
     end
 
     def gauge(name, &block)
@@ -37,7 +39,7 @@ module Metrics
     end
 
     def timer(name, options = {})
-      @instruments[name] ||= Instruments::Timer.new(options)
+      @instruments[name] ||= options[:post_process] ? Instruments::PostProcessTimer.new(options) : Instruments::Timer.new(options)
     end
 
     def uniform_histogram(name)

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

@@ -21,16 +21,18 @@ module Metrics
         @initialized = false
         @start_time = Time.now.to_f
 
-        @timer_thread = Thread.new do
-          begin
-            loop do
-              self.tick
-              sleep(INTERVAL)
-            end
-          rescue Exception => e
-            logger.error "Error in timer thread: #{e.class.name}: #{e}\n  #{e.backtrace.join("\n  ")}"
-          end # begin
-        end # thread new
+        if !options[:no_thread]
+          @timer_thread = Thread.new do
+            begin
+              loop do
+                self.tick
+                sleep(INTERVAL)
+              end
+            rescue Exception => e
+              logger.error "Error in timer thread: #{e.class.name}: #{e}\n  #{e.backtrace.join("\n  ")}"
+            end # begin
+          end # thread new
+        end
 
       end
 

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

@@ -0,0 +1,29 @@
+require 'ruby-metrics/time_units'
+
+module Metrics
+  module Instruments
+    class PostProcessMeter < Meter
+      def initialize
+        super(:no_thread => true)
+      end
+
+      def mark(timestamp, count = 1)
+        ticks = interval_difference(timestamp)
+        if ticks > 0
+          ticks.times { self.tick }
+          @interval_start = @interval_start + INTERVAL * ticks
+        end
+        @count += count
+      end
+
+      def interval_difference(timestamp)
+        if @interval_start
+          ((timestamp - @interval_start) % INTERVAL).to_i
+        else
+          @interval_start = timestamp
+          0
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+require File.join(File.dirname(__FILE__), '..', 'time_units')
+
+module Metrics
+  module Instruments
+    class PostProcessTimer < Timer
+      def initialize(options = {})
+        @meter          = PostProcessMeter.new
+        @histogram      = ExponentialHistogram.new
+
+        @duration_unit  = options[:duration_unit] || :seconds
+        @rate_unit      = options[:rate_unit] || :seconds
+
+        clear
+      end
+
+      def update(timestamp, duration, unit)
+        mult = convert_to_ns(1, unit)
+        self.update_timer(timestamp, duration * mult)
+      end
+
+      def update_timer(timestamp, duration)
+        if duration >= 0
+          @histogram.update(duration)
+          @meter.mark timestamp
+        end
+      end
+    end
+  end
+end
+

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

@@ -102,7 +102,7 @@ module Metrics
         percentiles = self.quantiles([0.5, 0.75, 0.95, 0.98, 0.99, 0.999])
         {
           :type => 'timer',
-          :rates => {
+          :rate => {
             :count => count,
             :m1 => one_minute_rate,
             :m5 => five_minute_rate,

data/lib/ruby-metrics/version.rb

@@ -1,3 +1,3 @@
 module Metrics
-  VERSION = "0.8.8"
+  VERSION = "0.8.9"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yam-ruby-metrics
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 0
   - 8
-  - 8
-  version: 0.8.8
+  - 9
+  version: 0.8.9
 platform: ruby
 authors: 
 - John Ewart
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 -08:00
+date: 2011-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,6 +110,8 @@ files:
 - lib/ruby-metrics/instruments/gauge.rb
 - lib/ruby-metrics/instruments/histogram.rb
 - lib/ruby-metrics/instruments/meter.rb
+- lib/ruby-metrics/instruments/post_process_meter.rb
+- lib/ruby-metrics/instruments/post_process_timer.rb
 - lib/ruby-metrics/instruments/timer.rb
 - lib/ruby-metrics/integration.rb
 - lib/ruby-metrics/integration/rack_endpoint.rb