drone 0.0.3 → 1.0.1

data/lib/drone/utils/exponentially_decaying_sample.rb

@@ -1,71 +1,81 @@
+require File.expand_path('../../core', __FILE__)
 
-class ExponentiallyDecayingSample
-  # 1 hour in ms
-  RESCALE_THRESHOLD = (1 * 60 * 60 * 1000).freeze
+module Drone
+  class ExponentiallyDecayingSample
+    # 1 hour in ms
+    RESCALE_THRESHOLD = (1 * 60 * 60 * 1000).freeze
   
-  def initialize(reservoir_size, alpha)
-    @values = {}
-    @alpha = alpha
-    @reservoir_size = reservoir_size
-    clear()
-  end
+    def initialize(id, reservoir_size, alpha)
+      @id = id
+      @values = Drone::request_hash("#{@id}:values")
+      @count = Drone::request_number("#{@id}:count", 0)
+      @start_time = Drone::request_number("#{@id}:start_time", current_time())
+      @next_scale_time = Drone::request_number("#{@id}:next_scale_time", current_time() + RESCALE_THRESHOLD)
+      
+      @alpha = alpha
+      @reservoir_size = reservoir_size
+    end
   
-  def clear
-    @values.clear()
-    @count = 0
-    @start_time = Time.now
-    @next_scale_time = current_time() + RESCALE_THRESHOLD
-  end
+    def clear
+      @values.clear()
+      @count.set(0)
+      @start_time.set(current_time())
+      @next_scale_time.set( current_time() + RESCALE_THRESHOLD )
+    end
   
-  def size
-    (@values.size < @count) ? @values.size : @count
-  end
+    def size
+      count =  @count.get
+      (@values.size < count) ? @values.size : count
+    end
   
   
-  def update(val, time = Time.now)
-    priority = weight(time - @start_time) / rand()
-    @count += 1
-    if @count <= @reservoir_size
-      @values[priority] = val
-    else
-      first = @values.keys.min
-      if first < priority
+    def update(val, time = current_time)
+      priority = weight(time - @start_time.get) / rand()
+      count = @count.inc
+      if count <= @reservoir_size
         @values[priority] = val
-        while @values.delete(first) == nil
-          first = @values.keys.min
+      else
+        first = @values.keys.min
+        if first < priority
+          @values[priority] = val
+          while @values.delete(first) == nil
+            first = @values.keys.min
+          end
         end
       end
-    end
     
-    now = current_time()
-    if now >= @next_scale_time
-      rescale(now)
+      now = current_time()
+      if now >= @next_scale_time.get
+        rescale(now)
+      end
     end
-  end
   
-  def values
-    @values.values
-  end
+    def values
+      @values.keys.sort.inject([]) do |buff, key|
+        buff << @values[key]
+      end
+    end
   
-  def rescale(now)
-    @next_scale_time = current_time() + RESCALE_THRESHOLD
-    old_start = @start_time
-    @start_time = Time.now
+    def rescale(now)
+      @next_scale_time.set( current_time() + RESCALE_THRESHOLD )
+      new_start = current_time()
+      old_start = @start_time.get_and_set(new_start)
     
-    @values = Hash[ @values.map{ |k,v|
-        [k * Math.exp(-@alpha * (@start_time - old_start)), v]
-      }]
+      @values = Hash[ @values.map{ |k,v|
+          [k * Math.exp(-@alpha * (new_start - old_start)), v]
+        }]
     
-  end
+    end
   
-private
+  private
   
-  def current_time
-    Time.now.to_f * 1000
-  end
+    def current_time
+      Time.now.to_f * 1000
+    end
   
-  def weight(n)
-    Math.exp(@alpha * n)
-  end
+    def weight(n)
+      Math.exp(@alpha * n)
+    end
   
+  end
 end

data/lib/drone/utils/uniform_sample.rb

@@ -1,37 +1,52 @@
-class UniformSample
+require File.expand_path('../../core', __FILE__)
+
+module Drone
+  class UniformSample
+    
+    ##
+    # Create a new instance.
+    # 
+    # @param [String] id A string which will be used by distributed
+    #   storage backend to use the same value for all instances with
+    #   the same id
+    # @param [Number] size The size of the requested array
+    # 
+    def initialize(id, size)
+      @id = id
+      @values = Drone::request_fixed_size_array("#{id}:values", size, 0)
+      @count = Drone::request_number("#{id}:count", 0)
+    end
   
-  def initialize(size)
-    @values = Array.new(size)
-    clear()
-  end
+    # def clear
+    #   @values.size.times do |n|
+    #     @values[n] = 0
+    #   end
+    # 
+    #   @count.set(0)
+    # end
   
-  def clear
-    @values.size.times do |n|
-      @values[n] = 0
+    def size
+      c = @count.get
+      (c > @values.size) ? @values.size : c
     end
-    
-    @count = 0
-  end
   
-  def size
-    (@count > @values.size) ? @values.size : @count
-  end
-  
-  def update(val)
-    @count += 1
-    if @count <= @values.size
-      @values[@count - 1] = val
-    else
-      r = rand(2**64 - 1) % @count
-      if r < @values.size
-        @values[r] = val
+    def update(val)
+      @count.inc
+      count = @count.get
+      if count <= @values.size
+        @values[count - 1] = val
+      else
+        r = rand(2**64 - 1) % count
+        if r < @values.size
+          @values[r] = val
+        end
       end
     end
-  end
   
-  def values
-    # only return @count elements
-    @values[0,@count]
-  end
+    def values
+      # only return @count elements
+      @values[0,@count.get]
+    end
   
+  end
 end

data/lib/drone/version.rb

@@ -1,3 +1,3 @@
 module Drone
-  VERSION = "0.0.3"
+  VERSION = "1.0.1"
 end

data/specs/metrics/counter_spec.rb

@@ -1,10 +1,12 @@
 require File.expand_path('../../common', __FILE__)
 
+require 'drone/core'
 require 'drone/metrics/counter'
 include Drone
 
 describe 'Counter Metrics' do
   before do
+    Drone::init_drone()
     @counter = Metrics::Counter.new('something')
   end
 

data/specs/metrics/timer_spec.rb

@@ -11,7 +11,7 @@ EM.describe 'Timer Metrics' do
   
   describe "A blank timer" do
     before do
-      @timer = Metrics::Timer.new()
+      @timer = Metrics::Timer.new('id')
     end
 
     should "have a max of zero" do
@@ -59,7 +59,7 @@ EM.describe 'Timer Metrics' do
   
   describe "Timing a series of events" do
     before do
-      @timer = Metrics::Timer.new()
+      @timer = Metrics::Timer.new('id')
       @timer.update(10)
       @timer.update(20)
       @timer.update(20)

data/specs/unit/ewma_spec.rb

@@ -3,10 +3,13 @@ require File.expand_path('../../common', __FILE__)
 require 'drone/utils/ewma'
 
 describe 'EWMA' do
+  before do
+    Drone::init_drone
+  end
   
   describe 'A 1min EWMA with a value of 3' do
     before do
-      @ewma = EWMA.one_minute_ewma
+      @ewma = Drone::EWMA.one_minute_ewma('id2')
       @ewma.update(3)
       @ewma.tick()
     end
@@ -52,7 +55,7 @@ describe 'EWMA' do
   
   describe 'A 5min EWMA with a value of 3' do
     before do
-      @ewma = EWMA.five_minutes_ewma
+      @ewma = Drone::EWMA.five_minutes_ewma('id1')
       @ewma.update(3)
       @ewma.tick()
     end
@@ -95,7 +98,7 @@ describe 'EWMA' do
   
   describe 'A 15min EWMA with a value of 3' do
     before do
-      @ewma = EWMA.fifteen_minutes_ewma
+      @ewma = Drone::EWMA.fifteen_minutes_ewma('id')
       @ewma.update(3)
       @ewma.tick()
     end

data/specs/unit/exponentially_decaying_sample_spec.rb

@@ -1,12 +1,15 @@
 require File.expand_path('../../common', __FILE__)
 
 require 'drone/utils/exponentially_decaying_sample'
+include Drone
 
 describe 'Exponentially Decaying Sample' do
   describe "A sample of 100 out of 1000 elements" do
     before do
+      Drone::init_drone(nil, Storage::Memory.new)
+      
       @population = (0...100)
-      @sample = ExponentiallyDecayingSample.new(1000, 0.99)
+      @sample = ExponentiallyDecayingSample.new('id1', 1000, 0.99)
       @population.step(1){|n| @sample.update(n) }
     end
     
@@ -27,7 +30,7 @@ describe 'Exponentially Decaying Sample' do
   describe "A sample of 100 out of 10 elements" do
     before do
       @population = (0...10)
-      @sample = ExponentiallyDecayingSample.new(100, 0.99)
+      @sample = ExponentiallyDecayingSample.new('id1', 100, 0.99)
       @population.step(1){|n| @sample.update(n) }
     end
 
@@ -47,7 +50,7 @@ describe 'Exponentially Decaying Sample' do
   describe "A heavily-biased sample of 100 out of 1000 elements" do
     before do
       @population = (0...100)
-      @sample = ExponentiallyDecayingSample.new(1000, 0.99)
+      @sample = ExponentiallyDecayingSample.new('id1', 1000, 0.99)
       @population.step(1){|n| @sample.update(n) }
     end
 

data/specs/unit/histogram_spec.rb

@@ -5,9 +5,13 @@ require 'drone/metrics/histogram'
 include Drone
 
 describe 'Histogram' do
+  before do
+    Drone::init_drone()
+  end
+  
   describe "A histogram with zero recorded valeus" do
     before do
-      @histogram = Histogram.new(UniformSample.new(100))
+      @histogram = Histogram.new("id1", UniformSample.new("id1:sample", 100))
     end
 
     should "have a count of 0" do
@@ -46,7 +50,7 @@ describe 'Histogram' do
   
   describe "A histogram of the numbers 1 through 10000" do
     before do
-      @histogram = Histogram.new( UniformSample.new(100000) )
+      @histogram = Histogram.new("id1", UniformSample.new("id1:sample", 100000) )
       (1..10000).each{|n| @histogram.update(n) }
     end
 

data/specs/unit/monitoring_spec.rb

@@ -93,7 +93,7 @@ EM.describe 'Monitoring' do
     
     should 'time call with no args' do
       Drone::Metrics::Timer.any_instance.expects(:update).with{|delay|
-          delay.should.be.close?(0, 0.001)
+          delay.should.be.close?(0, 0.1)
           true
         }
       
@@ -104,7 +104,7 @@ EM.describe 'Monitoring' do
     
     should 'time call with args' do
       Drone::Metrics::Timer.any_instance.expects(:update).with{|delay|
-          delay.should.be.close?(0, 0.001)
+          delay.should.be.close?(0, 0.1)
           true
         }
       
@@ -115,7 +115,7 @@ EM.describe 'Monitoring' do
     
     should 'time call with a block' do
       Drone::Metrics::Timer.any_instance.expects(:update).with{|delay|
-          delay.should.be.close?(0, 0.001)
+          delay.should.be.close?(0, 0.1)
           true
         }
       

data/specs/unit/uniform_sample_spec.rb

@@ -1,12 +1,15 @@
 require File.expand_path('../../common', __FILE__)
 
 require 'drone/utils/uniform_sample'
+include Drone
 
 describe 'EWMA' do
   describe "A sample of 100 out of 1000 elements" do
     before do
+      Drone::init_drone()
+      
       @population = (0...1000)
-      @sample = UniformSample.new(100)
+      @sample = UniformSample.new('id1', 100)
       @population.step(1){|n| @sample.update(n) }
     end
 
@@ -24,7 +27,7 @@ describe 'EWMA' do
   describe "A sample of 100 out of 10 elements" do
     before do
       @population = (0...10)
-      @sample = UniformSample.new(100)
+      @sample = UniformSample.new('id1', 100)
       @population.step(1){|n| @sample.update(n) }
     end
 

metadata

@@ -2,7 +2,7 @@
 name: drone
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 1.0.1
 platform: ruby
 authors: 
 - Julien Ammous
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 Z
+date: 2011-05-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rvmrc
 - .yardopts
 - Gemfile
 - LICENSE
@@ -104,9 +105,12 @@ files:
 - lib/drone/metrics/gauge.rb
 - lib/drone/metrics/histogram.rb
 - lib/drone/metrics/meter.rb
+- lib/drone/metrics/metric.rb
 - lib/drone/metrics/timer.rb
 - lib/drone/monitoring.rb
 - lib/drone/schedulers/eventmachine.rb
+- lib/drone/storage/base.rb
+- lib/drone/storage/memory.rb
 - lib/drone/utils/ewma.rb
 - lib/drone/utils/exponentially_decaying_sample.rb
 - lib/drone/utils/uniform_sample.rb