ruby-metrics 0.5.0 → 0.6.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-metrics (0.5.0)
+    ruby-metrics (0.6.0)
       json
       ruby-units
 

data/README.md

@@ -15,10 +15,10 @@ Right now, I have:
 * Meters
 * Gauges
 * Histograms w/ uniform sampling
+* Histograms w/ exponentially decaying sampling
  
 Upcoming:
 
-* Histograms w/ exponentially decaying sampling
 * Timers 
 
 ## Getting Started
@@ -32,7 +32,7 @@ The goal of ruby-metrics is to get up and running quickly. You start an agent, r
     counter.incr
     counter.incr
 
-Then, hitting localhost:8081/status would yield:
+Then, hitting localhost:8001/status would yield:
 
     {"my_counter":"2"}
 

data/examples/histogram.rb

@@ -4,10 +4,13 @@ require '../lib/ruby-metrics'
 @metrics = Metrics::Agent.new
 @metrics.start
 
-histogram = @metrics.histogram :my_histogram
+exponential_histogram = @metrics.exponential_histogram :exponential_histogram
+uniform_histogram = @metrics.uniform_histogram :uniform_histogram 
+
 data = %w(3.600 1.800 3.333 2.283 4.533 2.883 4.700 3.600 1.950 4.350 1.833 3.917 4.200 1.750 4.700 2.167 1.750 4.800 1.600 4.250 1.800 1.750 3.450 3.067 4.533 3.600 1.967 4.083 3.850 4.433 4.300 4.467 3.367 4.033 3.833 2.017 1.867 4.833 1.833 4.783 4.350 1.883 4.567 1.750 4.533 3.317 3.833 2.100 4.633 2.000 4.800 4.716 1.833 4.833 1.733 4.883 3.717 1.667 4.567 4.317 2.233 4.500 1.750 4.800 1.817 4.400 4.167 4.700 2.067 4.700 4.033 1.967 4.500 4.000 1.983 5.067 2.017 4.567 3.883 3.600 4.133 4.333 4.100 2.633 4.067 4.933 3.950 4.517 2.167 4.000 2.200 4.333 1.867 4.817 1.833 4.300 4.667 3.750 1.867 4.900 2.483 4.367 2.100 4.500 4.050 1.867 4.700 1.783 4.850 3.683 4.733 2.300 4.900 4.417 1.700 4.633 2.317 4.600 1.817 4.417 2.617 4.067 4.250 1.967 4.600 3.767 1.917 4.500 2.267 4.650 1.867 4.167 2.800 4.333 1.833 4.383 1.883 4.933 2.033 3.733 4.233 2.233 4.533 4.817 4.333 1.983 4.633 2.017 5.100 1.800 5.033 4.000 2.400 4.600 3.567 4.000 4.500 4.083 1.800 3.967 2.200 4.150 2.000 3.833 3.500 4.583 2.367 5.000 1.933 4.617 1.917 2.083 4.583 3.333 4.167 4.333 4.500 2.417 4.000 4.167 1.883 4.583 4.250 3.767 2.033 4.433 4.083 1.833 4.417 2.183 4.800 1.833 4.800 4.100 3.966 4.233 3.500 4.366 2.250 4.667 2.100 4.350 4.133 1.867 4.600 1.783 4.367 3.850 1.933 4.500 2.383 4.700 1.867 3.833 3.417 4.233 2.400 4.800 2.000 4.150 1.867 4.267 1.750 4.483 4.000 4.117 4.083 4.267 3.917 4.550 4.083 2.417 4.183 2.217 4.450 1.883 1.850 4.283 3.950 2.333 4.150 2.350 4.933 2.900 4.583 3.833 2.083 4.367 2.133 4.350 2.200 4.450 3.567 4.500 4.150 3.817 3.917 4.450 2.000 4.283 4.767 4.533 1.850 4.250 1.983 2.250 4.750 4.117 2.150 4.417 1.817 4.467)
 data.each do |point|
-  histogram.update(point.to_f)
+  exponential_histogram.update(point.to_f)
+  uniform_histogram.update(point.to_f)
 end
 
 step = 0
@@ -24,5 +27,6 @@ loop do
     modifier *= -1
   end
   
-  histogram.update((2  + modifier).to_f)
+  uniform_histogram.update((2  + modifier).to_f)
+  exponential_histogram.update((2 + modifier).to_f)
 end

data/examples/meter.rb

@@ -1,7 +1,8 @@
 require 'rubygems'
 require '../lib/ruby-metrics'
 
-@metrics = Metrics::Agent.new
+# Specify a port for the agent
+@metrics = Metrics::Agent.new(8081)
 @metrics.start
 
 timer = @metrics.meter :my_meter
@@ -10,7 +11,7 @@ timer.mark(500)
 step = 0
 
 # This is here so that we will run indefinitely so you can hit the 
-# status page on localhost:8001/status
+# status page on localhost:8081/status
 loop do
   sleep 1
   

data/lib/ruby-metrics/agent.rb

@@ -29,9 +29,10 @@ module Metrics
     
     attr_reader :instruments
     
-    def initialize
+    def initialize(port = 8001)
       logger.debug "Initializing Metrics..."
       @instruments = Metrics::Instruments
+      @port = port
     end
     
     def start
@@ -43,7 +44,7 @@ module Metrics
       logger.debug "Creating Metrics daemon thread."
       @daemon_thread = Thread.new do
         begin
-          server = WEBrick::HTTPServer.new ({:Port => 8001})
+          server = WEBrick::HTTPServer.new ({:Port => @port})
           server.mount "/status", Status, @instruments
           server.start
         rescue Exception => e

data/lib/ruby-metrics/instruments.rb

@@ -1,5 +1,6 @@
 require File.join(File.dirname(__FILE__), 'statistics', 'sample')
 require File.join(File.dirname(__FILE__), 'statistics', 'uniform_sample')
+require File.join(File.dirname(__FILE__), 'statistics', 'exponential_sample')
 
 require File.join(File.dirname(__FILE__), 'instruments', 'base')
 require File.join(File.dirname(__FILE__), 'instruments', 'counter')
@@ -15,10 +16,11 @@ module Metrics
     @instruments = {}
     
     @types = {
-      :counter   => Counter,
-      :meter     => Meter,
-      :gauge     => Gauge,
-      :histogram => Histogram
+      :counter                => Counter,
+      :meter                  => Meter,
+      :gauge                  => Gauge,
+      :exponential_histogram  => ExponentialHistogram,
+      :uniform_histogram      => UniformHistogram
     }
     
     def self.register(type, name, &block)
@@ -55,8 +57,15 @@ module Metrics
         register(:gauge, name, &block)
       end
       
-      def histogram(name)
-        register(:histogram, name)
+      def uniform_histogram(name)
+        register(:uniform_histogram, name)
+      end
+      
+      # For backwards compatibility
+      alias_method :histogram, :uniform_histogram
+      
+      def exponential_histogram(name)
+        register(:exponential_histogram, name)
       end
     end
     

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

@@ -2,9 +2,14 @@ module Metrics
   module Instruments
     class Histogram < Base
       
-      def initialize
+      def initialize(type = :uniform)
         @count = 0
-        @sample = Metrics::Statistics::UniformSample.new
+        case type
+        when :uniform
+          @sample = Metrics::Statistics::UniformSample.new
+        when :exponential
+          @sample = Metrics::Statistics::ExponentialSample.new
+        end
         @min = nil
         @max = nil
         @sum = 0
@@ -151,5 +156,19 @@ module Metrics
       end
       
     end
+  
+    class ExponentialHistogram < Histogram
+      def initialize
+        super(:exponential)
+      end
+    end
+  
+    class UniformHistogram < Histogram
+      def initialize
+        super(:uniform)
+      end
+    end
+    
   end
+  
 end

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

@@ -0,0 +1,92 @@
+module Metrics
+  module Statistics
+    class ExponentialSample < Sample
+      
+      def initialize(size = 1028, alpha = 0.015)
+        @values = Hash.new
+        @count  = 0
+        @size   = size
+        @alpha  = alpha
+        @rescale_window = "1 hour".to("seconds").scalar
+        self.clear
+      end
+      
+      def clear
+        @values           = Hash.new
+        @start_time       = tick
+        @next_scale_time  = Time.now.to_f + @rescale_window
+        @count            = 0
+      end
+      
+      def size
+        [@values.keys.length, @count].min
+      end
+      
+      def tick
+        return Time.now.to_f
+      end
+      
+      def update(value)
+        update_with_timestamp(value, tick)
+      end
+      
+      def update_with_timestamp(value, timestamp)
+        priority = weight(timestamp.to_f - @start_time.to_f) / rand
+        @count += 1
+        newcount = @count
+        if (newcount <= @size)
+          @values[priority] = value
+        else
+          firstkey = @values.keys[0]
+          if (firstkey < priority)
+            @values[priority] = value
+            
+            while(@values.delete(firstkey) == nil)
+              firstkey = @values.keys[0]
+            end
+          end
+        end
+        
+        now = Time.now.to_f
+        next_scale_time = @next_scale_time
+        
+        if (now >= next_scale_time)
+          self.rescale(now, next_scale_time)
+        end
+      end
+      
+      
+      def rescale(now, next_scale_time)
+        if @next_scale_time == next_scale_time
+          # writelock
+          @next_scale_time = now + @rescale_window
+          old_start_time = @start_time
+          @start_time = tick
+          time_delta = @start_time - old_start_time
+          keys = @values.keys
+          keys.each do |key|
+            value = @values.delete(key)
+            new_key = (key * Math.exp(-@alpha * time_delta))
+            @values[new_key] = value
+          end
+          # unlock
+        end  
+      end
+      
+      def weight(factor)
+        return @alpha.to_f * factor.to_f
+      end
+      
+      def values
+        # read-lock?
+        result = Array.new
+        keys = @values.keys.sort
+        keys.each do |key|
+          result << @values[key]
+        end
+        
+        return result
+      end
+    end
+  end
+end

data/lib/ruby-metrics/version.rb

@@ -1,3 +1,3 @@
 module Metrics
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/agent_spec.rb

@@ -20,6 +20,24 @@ describe Metrics::Agent do
     end
   end
   
+  it "should add a Histogram instrument using uniform sampling" do
+    histogram = Metrics::Instruments::UniformHistogram.new
+    Metrics::Instruments::UniformHistogram.stub!(:new).and_return histogram
+    @agent.uniform_histogram(:test_histogram).should == histogram
+  end
+
+  it "should allow for registering a Histogram instrument using exponentially decaying sampling" do
+    histogram = Metrics::Instruments::ExponentialHistogram.new
+    Metrics::Instruments::ExponentialHistogram.stub!(:new).and_return histogram
+    @agent.exponential_histogram(:test_histogram).should == histogram
+  end  
+
+  it "should set up a histogram using uniform distribution if just a histogram is registered" do
+    histogram = Metrics::Instruments::UniformHistogram.new
+    Metrics::Instruments::UniformHistogram.stub!(:new).and_return histogram
+    @agent.histogram(:test_histogram).should == histogram
+  end
+  
   it "should add a meter instrument correctly" do
     @meter = Metrics::Instruments::Meter.new
     Metrics::Instruments::Meter.stub!(:new).and_return @meter

data/spec/instruments/histogram_spec.rb

@@ -4,86 +4,96 @@ require 'spec_helper'
 
 describe Metrics::Instruments::Histogram do
 
-  before(:each) do
-    @histogram = Metrics::Instruments::Histogram.new
-    data = %w(3.600 1.800 3.333 2.283 4.533 2.883 4.700 3.600 1.950 4.350 1.833 3.917 4.200 1.750 4.700 2.167 1.750 4.800 1.600 4.250 1.800 1.750 3.450 3.067 4.533 3.600 1.967 4.083 3.850 4.433 4.300 4.467 3.367 4.033 3.833 2.017 1.867 4.833 1.833 4.783 4.350 1.883 4.567 1.750 4.533 3.317 3.833 2.100 4.633 2.000 4.800 4.716 1.833 4.833 1.733 4.883 3.717 1.667 4.567 4.317 2.233 4.500 1.750 4.800 1.817 4.400 4.167 4.700 2.067 4.700 4.033 1.967 4.500 4.000 1.983 5.067 2.017 4.567 3.883 3.600 4.133 4.333 4.100 2.633 4.067 4.933 3.950 4.517 2.167 4.000 2.200 4.333 1.867 4.817 1.833 4.300 4.667 3.750 1.867 4.900 2.483 4.367 2.100 4.500 4.050 1.867 4.700 1.783 4.850 3.683 4.733 2.300 4.900 4.417 1.700 4.633 2.317 4.600 1.817 4.417 2.617 4.067 4.250 1.967 4.600 3.767 1.917 4.500 2.267 4.650 1.867 4.167 2.800 4.333 1.833 4.383 1.883 4.933 2.033 3.733 4.233 2.233 4.533 4.817 4.333 1.983 4.633 2.017 5.100 1.800 5.033 4.000 2.400 4.600 3.567 4.000 4.500 4.083 1.800 3.967 2.200 4.150 2.000 3.833 3.500 4.583 2.367 5.000 1.933 4.617 1.917 2.083 4.583 3.333 4.167 4.333 4.500 2.417 4.000 4.167 1.883 4.583 4.250 3.767 2.033 4.433 4.083 1.833 4.417 2.183 4.800 1.833 4.800 4.100 3.966 4.233 3.500 4.366 2.250 4.667 2.100 4.350 4.133 1.867 4.600 1.783 4.367 3.850 1.933 4.500 2.383 4.700 1.867 3.833 3.417 4.233 2.400 4.800 2.000 4.150 1.867 4.267 1.750 4.483 4.000 4.117 4.083 4.267 3.917 4.550 4.083 2.417 4.183 2.217 4.450 1.883 1.850 4.283 3.950 2.333 4.150 2.350 4.933 2.900 4.583 3.833 2.083 4.367 2.133 4.350 2.200 4.450 3.567 4.500 4.150 3.817 3.917 4.450 2.000 4.283 4.767 4.533 1.850 4.250 1.983 2.250 4.750 4.117 2.150 4.417 1.817 4.467)
-    data.each do |point|
-      @histogram.update(point.to_f)
+  context "using a uniform sample" do
+    before(:each) do
+      @histogram = Metrics::Instruments::Histogram.new
+      data = %w(3.600 1.800 3.333 2.283 4.533 2.883 4.700 3.600 1.950 4.350 1.833 3.917 4.200 1.750 4.700 2.167 1.750 4.800 1.600 4.250 1.800 1.750 3.450 3.067 4.533 3.600 1.967 4.083 3.850 4.433 4.300 4.467 3.367 4.033 3.833 2.017 1.867 4.833 1.833 4.783 4.350 1.883 4.567 1.750 4.533 3.317 3.833 2.100 4.633 2.000 4.800 4.716 1.833 4.833 1.733 4.883 3.717 1.667 4.567 4.317 2.233 4.500 1.750 4.800 1.817 4.400 4.167 4.700 2.067 4.700 4.033 1.967 4.500 4.000 1.983 5.067 2.017 4.567 3.883 3.600 4.133 4.333 4.100 2.633 4.067 4.933 3.950 4.517 2.167 4.000 2.200 4.333 1.867 4.817 1.833 4.300 4.667 3.750 1.867 4.900 2.483 4.367 2.100 4.500 4.050 1.867 4.700 1.783 4.850 3.683 4.733 2.300 4.900 4.417 1.700 4.633 2.317 4.600 1.817 4.417 2.617 4.067 4.250 1.967 4.600 3.767 1.917 4.500 2.267 4.650 1.867 4.167 2.800 4.333 1.833 4.383 1.883 4.933 2.033 3.733 4.233 2.233 4.533 4.817 4.333 1.983 4.633 2.017 5.100 1.800 5.033 4.000 2.400 4.600 3.567 4.000 4.500 4.083 1.800 3.967 2.200 4.150 2.000 3.833 3.500 4.583 2.367 5.000 1.933 4.617 1.917 2.083 4.583 3.333 4.167 4.333 4.500 2.417 4.000 4.167 1.883 4.583 4.250 3.767 2.033 4.433 4.083 1.833 4.417 2.183 4.800 1.833 4.800 4.100 3.966 4.233 3.500 4.366 2.250 4.667 2.100 4.350 4.133 1.867 4.600 1.783 4.367 3.850 1.933 4.500 2.383 4.700 1.867 3.833 3.417 4.233 2.400 4.800 2.000 4.150 1.867 4.267 1.750 4.483 4.000 4.117 4.083 4.267 3.917 4.550 4.083 2.417 4.183 2.217 4.450 1.883 1.850 4.283 3.950 2.333 4.150 2.350 4.933 2.900 4.583 3.833 2.083 4.367 2.133 4.350 2.200 4.450 3.567 4.500 4.150 3.817 3.917 4.450 2.000 4.283 4.767 4.533 1.850 4.250 1.983 2.250 4.750 4.117 2.150 4.417 1.817 4.467)
+      data.each do |point|
+        @histogram.update(point.to_f)
+      end
+      @histogram.count.should == 272
     end
-    @histogram.count.should == 272
-  end
   
-  it "should update variance correctly" do
-    @histogram.variance.should == 1.3027283328494685
-  end
+    it "should update variance correctly" do
+      @histogram.variance.should == 1.3027283328494685
+    end
   
-  it "should calculate standard deviations properly" do
-    @histogram.std_dev.should == 1.1413712511052083
-  end
+    it "should calculate standard deviations properly" do
+      @histogram.std_dev.should == 1.1413712511052083
+    end
   
-  it "should accurately calculate quantiles" do
-    quantiles = @histogram.quantiles([0.99, 0.98, 0.95, 0.80, 0.57, 0.32])
-    quantiles.should == 
-      {
-        0.99 => 5.009570000000001, 
-        0.98 => 4.93300,
-        0.95 => 4.81700, 
-        0.80 => 4.53300, 
-        0.57 => 4.13300, 
-        0.32 => 2.39524
-      }
-  end
+    it "should accurately calculate quantiles" do
+      quantiles = @histogram.quantiles([0.99, 0.98, 0.95, 0.80, 0.57, 0.32])
+      quantiles.should == 
+        {
+          0.99 => 5.009570000000001, 
+          0.98 => 4.93300,
+          0.95 => 4.81700, 
+          0.80 => 4.53300, 
+          0.57 => 4.13300, 
+          0.32 => 2.39524
+        }
+    end
 
-  it "should accurately calculate the mean" do 
-    @histogram.mean.should == 3.4877830882352936
-  end
+    it "should accurately calculate the mean" do 
+      @histogram.mean.should == 3.4877830882352936
+    end
   
-  it "should accurately represent itself using JSON" do
-    @histogram.to_s.should == "{\"min\":1.6,\"max\":5.1,\"mean\":3.4877830882352936,\"variance\":1.3027283328494685,\"percentiles\":{\"0.25\":2.16275,\"0.5\":4.0,\"0.75\":4.45425,\"0.95\":4.817,\"0.97\":4.8977900000000005,\"0.98\":4.933,\"0.99\":5.009570000000001}}"
-  end
+    it "should accurately represent itself using JSON" do
+      @histogram.to_s.should == "{\"min\":1.6,\"max\":5.1,\"mean\":3.4877830882352936,\"variance\":1.3027283328494685,\"percentiles\":{\"0.25\":2.16275,\"0.5\":4.0,\"0.75\":4.45425,\"0.95\":4.817,\"0.97\":4.8977900000000005,\"0.98\":4.933,\"0.99\":5.009570000000001}}"
+    end
   
-  it "should return correct values for mean, std. deviation and variance when no elements are in the histogram" do
-    histogram = Metrics::Instruments::Histogram.new
-    histogram.variance.should == 0.0
-    histogram.mean.should == 0.0
-    histogram.std_dev.should == 0.0
-  end
+    it "should return correct values for mean, std. deviation and variance when no elements are in the histogram" do
+      histogram = Metrics::Instruments::Histogram.new
+      histogram.variance.should == 0.0
+      histogram.mean.should == 0.0
+      histogram.std_dev.should == 0.0
+    end
   
-  it "should return the first value as the quantile if only one value" do
-    histogram = Metrics::Instruments::Histogram.new
-    histogram.update(42)
-    histogram.quantiles([0.50]).should == {0.50 => 42}
-  end  
+    it "should return the first value as the quantile if only one value" do
+      histogram = Metrics::Instruments::Histogram.new
+      histogram.update(42)
+      histogram.quantiles([0.50]).should == {0.50 => 42}
+    end  
 
-  it "should return the last value as the 100%" do
-    histogram = Metrics::Instruments::Histogram.new
-    histogram.update(42)
-    histogram.update(64)
-    histogram.quantiles([1.00]).should == {1.00 => 64}
-  end  
+    it "should return the last value as the 100%" do
+      histogram = Metrics::Instruments::Histogram.new
+      histogram.update(42)
+      histogram.update(64)
+      histogram.quantiles([1.00]).should == {1.00 => 64}
+    end  
 
 
-  it "should return correct values for min and max" do
-    histogram = Metrics::Instruments::Histogram.new
-    histogram.update(42)
-    histogram.min.should == 42
-    histogram.max.should == 42
-  end
+    it "should return correct values for min and max" do
+      histogram = Metrics::Instruments::Histogram.new
+      histogram.update(42)
+      histogram.min.should == 42
+      histogram.max.should == 42
+    end
 
-  context "resetting the histogram" do
+    context "resetting the histogram" do
 
-    it "should clear data correctly" do
-      sample = Metrics::Statistics::UniformSample.new    
-      sample.should_receive(:clear)
-      Metrics::Statistics::UniformSample.should_receive(:new).and_return sample
+      it "should clear data correctly" do
+        sample = Metrics::Statistics::UniformSample.new    
+        sample.should_receive(:clear)
+        Metrics::Statistics::UniformSample.should_receive(:new).and_return sample
 
-      histogram = Metrics::Instruments::Histogram.new
-      histogram.clear
-      histogram.max.should == 0.0
-      histogram.min.should == 0.0
-    end
+        histogram = Metrics::Instruments::Histogram.new
+        histogram.clear
+        histogram.max.should == 0.0
+        histogram.min.should == 0.0
+      end
       
+    end
   end
   
+  context "using an exponentially weighted sample" do
+    it "should return correct values for mean, std. deviation and variance when no elements are in the histogram" do
+      histogram = Metrics::Instruments::Histogram.new(:exponential)
+      histogram.variance.should == 0.0
+      histogram.mean.should == 0.0
+      histogram.std_dev.should == 0.0
+    end
+  end
   
 end

data/spec/instruments_spec.rb

@@ -24,6 +24,21 @@ describe Metrics::Instruments do
     @instruments.register(:meter, :test_meter).should == @meter
     @instruments.registered.should == {:test_meter => @meter}
   end
+
+  it "should allow for registering a Histogram instrument using uniform sampling" do
+    histogram = Metrics::Instruments::UniformHistogram.new
+    Metrics::Instruments::UniformHistogram.stub!(:new).and_return histogram
+    @instruments.register(:uniform_histogram, :test_histogram).should == histogram
+    @instruments.registered.should == {:test_histogram => histogram}
+  end
+
+  it "should allow for registering a Histogram instrument using exponentially decaying sampling" do
+    histogram = Metrics::Instruments::ExponentialHistogram.new
+    Metrics::Instruments::ExponentialHistogram.stub!(:new).and_return histogram
+    @instruments.register(:exponential_histogram, :test_histogram).should == histogram
+    @instruments.registered.should == {:test_histogram => histogram}
+  end
+
   
   it "should generate JSON correctly" do 
     Metrics::Instruments::Meter.stub!(:new).and_return @meter

data/spec/spec_helper.rb

@@ -2,7 +2,8 @@ require 'simplecov'
 
 SimpleCov.start do
   add_filter "/spec/"
-  add_group "Instruments", "lib/metrics/instruments"
+  add_group "Instruments", "metrics/instruments"
+  add_group "Statistical Samples", "metrics/statistics"
   merge_timeout 3600
 end
 

data/spec/statistics/exponential_sample_spec.rb

@@ -0,0 +1,138 @@
+require 'spec_helper'
+
+describe Metrics::Statistics::ExponentialSample do
+  before(:each) do
+  end
+  
+  it "should have a size equal 0 intially no matter to the initialization parameter" do 
+    sample = Metrics::Statistics::ExponentialSample.new(100)
+    sample.size.should == 0
+    
+  end
+  
+  it "should have an empty backing hash initially" do
+    sample = Metrics::Statistics::ExponentialSample.new(100)
+    sample.values.length.should == 0
+  end
+  
+  
+  context "A sample of 100 out of 1000 elements" do
+    before(:each) do
+      @population = (0..99).to_a
+      @sample =  Metrics::Statistics::ExponentialSample.new(1000, 0.99)
+      @population.each do |datum|
+        @sample.update(datum)
+      end
+    end
+    
+    it "should have 100 elements" do
+      @sample.size.should == 100
+      @sample.values.length.should == 100
+    end
+
+    it "should only have elements from the population" do
+      values = @sample.values
+      @population.each do |datum|
+        values.should include datum
+      end
+    end
+  end
+
+  context "A heavily-biased sample of 100 out of 1000 elements" do
+    before(:each) do
+      @population = (0..99).to_a
+      @sample =  Metrics::Statistics::ExponentialSample.new(1000, 0.01)
+      @population.each do |datum| 
+        @sample.update(datum)
+      end
+    end
+
+    it "should have 100 elements" do
+      @sample.size.should == 100
+      @sample.values.length.should == 100
+    end
+
+    it "should only have elements from the population" do
+      values = @sample.values
+      @population.each do |datum|
+        values.should include datum
+      end
+    end
+    
+    it "should add another element when updating" do 
+      @sample.update(42)
+      @sample.size.should == 101
+      @sample.values.should include 42
+    end
+    
+    it "should rescale when the clock is one hour in the future or more" do 
+      future_time = Time.now + (60 * 60)
+      Time.stub(:now).and_return future_time
+      @sample.update(42)
+      @sample.size.should == 101
+      
+      values = @sample.values
+      
+      @population.each do |datum|
+        values.should include datum
+      end
+      
+      values.should include 42
+    end
+  end
+  
+  context "A heavily-biased sample of 1000 out of 1000 elements" do
+    before(:each) do
+      @population = (0..999).to_a
+      @sample =  Metrics::Statistics::ExponentialSample.new(1000, 0.01)
+      @population.each do |datum| 
+        @sample.update(datum)
+      end
+    end
+    
+    it "should have 1000 elements" do
+      @sample.size.should == 1000
+      @sample.values.length.should == 1000
+    end
+
+    it "should only have elements from the population" do
+      values = @sample.values
+      @population.each do |datum|
+        values.should include datum
+      end
+    end
+    
+    it "should replace an element when updating" do 
+      @sample.update(4242)
+      @sample.size.should == 1000
+      @sample.values.should include 4242
+    end
+    
+    it "should rescale so that newer events are higher in priority in the hash" do 
+      future_time = Time.now + (60 * 60)
+      Time.stub(:now).and_return future_time
+      
+      @sample.update(2121)
+      
+
+      @sample.size.should == 1000
+
+      future_time = Time.now + (60 * 60 * 2)
+      Time.stub(:now).and_return future_time
+      
+      @sample.update(4242)      
+      @sample.size.should == 1000
+      
+      values = @sample.values
+      
+      values.length.should == 1000
+      values.should include 4242
+      values.should include 2121
+      
+      # Most recently added values in time should be at the end with the highest priority
+      values[999].should == 4242
+      values[998].should == 2121
+    end
+  end
+  
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - John Ewart
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 -07:00
+date: 2011-04-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,6 +102,7 @@ files:
 - lib/ruby-metrics/instruments/histogram.rb
 - lib/ruby-metrics/instruments/meter.rb
 - lib/ruby-metrics/logging.rb
+- lib/ruby-metrics/statistics/exponential_sample.rb
 - lib/ruby-metrics/statistics/sample.rb
 - lib/ruby-metrics/statistics/uniform_sample.rb
 - lib/ruby-metrics/version.rb
@@ -114,6 +115,7 @@ files:
 - spec/instruments/meter_spec.rb
 - spec/instruments_spec.rb
 - spec/spec_helper.rb
+- spec/statistics/exponential_sample_spec.rb
 - spec/statistics/sample_spec.rb
 - spec/statistics/uniform_sample_spec.rb
 has_rdoc: true
@@ -130,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4356011955923517565
+      hash: 764509393290573048
       segments: 
       - 0
       version: "0"
@@ -139,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4356011955923517565
+      hash: 764509393290573048
       segments: 
       - 0
       version: "0"
@@ -159,5 +161,6 @@ test_files:
 - spec/instruments/meter_spec.rb
 - spec/instruments_spec.rb
 - spec/spec_helper.rb
+- spec/statistics/exponential_sample_spec.rb
 - spec/statistics/sample_spec.rb
 - spec/statistics/uniform_sample_spec.rb