metriks 0.9.2 → 0.9.3

data/Gemfile

@@ -2,10 +2,7 @@ source :rubygems
 
 gemspec
 
-group :development do
-  gem 'perftools.rb'
-end
-
 group :test do
-  gem 'turn'
-end
+  gem 'turn', '0.8.2', :require => false
+  gem 'rake', '0.8.7'
+end

data/lib/metriks/reporter/graphite.rb

@@ -1,6 +1,8 @@
 
 module Metriks::Reporter
   class Graphite
+    attr_reader :host, :port
+
     def initialize(host, port, options = {})
       @host = host
       @port = port
@@ -13,8 +15,8 @@ module Metriks::Reporter
     end
 
     def socket
-      @socket = nil if @socket.closed?
-      @socket ||= TCPSocket.new(host, port)
+      @socket = nil if @socket && @socket.closed?
+      @socket ||= TCPSocket.new(@host, @port)
     end
 
     def start

data/lib/metriks.rb

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

data/metriks.gemspec

@@ -13,8 +13,8 @@ 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.2'
-  s.date              = '2012-03-06'
+  s.version           = '0.9.3'
+  s.date              = '2012-03-12'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.

data/test/counter_test.rb

@@ -3,6 +3,8 @@ require 'test_helper'
 require 'metriks/counter'
 
 class CounterTest < Test::Unit::TestCase
+  include ThreadHelper
+
   def setup
     @counter = Metriks::Counter.new
   end
@@ -13,9 +15,25 @@ class CounterTest < Test::Unit::TestCase
     assert_equal 1, @counter.count
   end
 
+  def test_increment_threaded
+    thread 10, :n => 100 do
+      @counter.increment
+    end
+
+    assert_equal 1000, @counter.count
+  end
+
   def test_increment_by_more
     @counter.increment 10
 
     assert_equal 10, @counter.count
   end
-end
+  
+  def test_increment_by_more_threaded
+    thread 10, :n => 100 do
+      @counter.increment 10
+    end
+
+    assert_equal 10000, @counter.count
+  end
+end

data/test/histogram_test.rb

@@ -3,6 +3,8 @@ require 'test_helper'
 require 'metriks/histogram'
 
 class HistogramTest < Test::Unit::TestCase
+  include ThreadHelper
+
   def setup
   end
 
@@ -33,6 +35,17 @@ class HistogramTest < Test::Unit::TestCase
     assert_equal 7, @histogram.mean
   end
 
+  def test_uniform_sample_mean_threaded
+    @histogram = Metriks::Histogram.new(Metriks::UniformSample.new(Metriks::Histogram::DEFAULT_SAMPLE_SIZE))
+
+    thread 10, :n => 100 do
+      @histogram.update(5)
+      @histogram.update(10)
+    end
+
+    assert_equal 7, @histogram.mean
+  end
+  
   def test_uniform_sample_2000
     @histogram = Metriks::Histogram.new(Metriks::UniformSample.new(Metriks::Histogram::DEFAULT_SAMPLE_SIZE))
 
@@ -42,6 +55,21 @@ class HistogramTest < Test::Unit::TestCase
 
     assert_equal 1999, @histogram.max
   end
+  
+  def test_uniform_sample_2000_threaded
+    @histogram = Metriks::Histogram.new(Metriks::UniformSample.new(Metriks::Histogram::DEFAULT_SAMPLE_SIZE))
+
+    t = 10
+    thread t do |i|
+      2000.times do |x|
+        if (x % t) == i
+          @histogram.update x
+        end
+      end
+    end
+
+    assert_equal 1999, @histogram.max
+  end
 
   def test_uniform_sample_snashot
     @histogram = Metriks::Histogram.new(Metriks::UniformSample.new(Metriks::Histogram::DEFAULT_SAMPLE_SIZE))
@@ -55,6 +83,20 @@ class HistogramTest < Test::Unit::TestCase
     assert_equal 49.5, snapshot.median
   end
 
+  def test_uniform_sample_snapshot_threaded
+    @histogram = Metriks::Histogram.new(Metriks::UniformSample.new(Metriks::Histogram::DEFAULT_SAMPLE_SIZE))
+
+    thread 10 do
+      100.times do |idx|
+        @histogram.update(idx)
+      end
+    end
+
+    snapshot = @histogram.snapshot
+
+    assert_equal 49.5, snapshot.median
+  end
+
   def test_exponential_sample_min
     @histogram = Metriks::Histogram.new(Metriks::ExponentiallyDecayingSample.new(Metriks::Histogram::DEFAULT_SAMPLE_SIZE, Metriks::Histogram::DEFAULT_ALPHA))
 
@@ -63,7 +105,7 @@ class HistogramTest < Test::Unit::TestCase
 
     assert_equal 5, @histogram.min
   end
-
+  
   def test_exponential_sample_max
     @histogram = Metriks::Histogram.new(Metriks::ExponentiallyDecayingSample.new(Metriks::Histogram::DEFAULT_SAMPLE_SIZE, Metriks::Histogram::DEFAULT_ALPHA))
 
@@ -81,6 +123,17 @@ class HistogramTest < Test::Unit::TestCase
 
     assert_equal 7, @histogram.mean
   end
+  
+  def test_exponential_sample_mean_threaded
+    @histogram = Metriks::Histogram.new(Metriks::ExponentiallyDecayingSample.new(Metriks::Histogram::DEFAULT_SAMPLE_SIZE, Metriks::Histogram::DEFAULT_ALPHA))
+
+    thread 10, :n => 100 do
+      @histogram.update(5)
+      @histogram.update(10)
+    end
+
+    assert_equal 7, @histogram.mean
+  end
 
   def test_exponential_sample_2000
     @histogram = Metriks::Histogram.new(Metriks::ExponentiallyDecayingSample.new(Metriks::Histogram::DEFAULT_SAMPLE_SIZE, Metriks::Histogram::DEFAULT_ALPHA))
@@ -91,6 +144,21 @@ class HistogramTest < Test::Unit::TestCase
 
     assert_equal 1999, @histogram.max
   end
+  
+  def test_exponential_sample_2000_threaded
+    @histogram = Metriks::Histogram.new(Metriks::ExponentiallyDecayingSample.new(Metriks::Histogram::DEFAULT_SAMPLE_SIZE, Metriks::Histogram::DEFAULT_ALPHA))
+
+    t = 10
+    thread t do |i|
+      2000.times do |idx|
+        if (idx % t) == i
+          @histogram.update(idx)
+        end
+      end
+    end
+
+    assert_equal 1999, @histogram.max
+  end
 
   def test_exponential_sample_snashot
     @histogram = Metriks::Histogram.new(Metriks::ExponentiallyDecayingSample.new(Metriks::Histogram::DEFAULT_SAMPLE_SIZE, Metriks::Histogram::DEFAULT_ALPHA))
@@ -104,4 +172,17 @@ class HistogramTest < Test::Unit::TestCase
     assert_equal 49.5, snapshot.median
   end
 
-end
+  def test_exponential_sample_snapshot_threaded
+    @histogram = Metriks::Histogram.new(Metriks::ExponentiallyDecayingSample.new(Metriks::Histogram::DEFAULT_SAMPLE_SIZE, Metriks::Histogram::DEFAULT_ALPHA))
+
+    thread 10 do
+      100.times do |idx|
+        @histogram.update(idx)
+      end
+    end
+
+    snapshot = @histogram.snapshot
+
+    assert_equal 49.5, snapshot.median
+  end
+end

data/test/meter_test.rb

@@ -3,6 +3,8 @@ require 'test_helper'
 require 'metriks/meter'
 
 class MeterTest < Test::Unit::TestCase
+  include ThreadHelper
+
   def setup
     @meter = Metriks::Meter.new
   end
@@ -17,6 +19,14 @@ class MeterTest < Test::Unit::TestCase
     assert_equal 1, @meter.count
   end
 
+  def test_meter_threaded
+    thread 10, :n => 100 do
+      @meter.mark
+    end
+
+    assert_equal 1000, @meter.count
+  end
+
   def test_one_minute_rate
     @meter.mark 1000
 
@@ -25,4 +35,4 @@ class MeterTest < Test::Unit::TestCase
 
     assert_equal 200, @meter.one_minute_rate
   end
-end
+end

data/test/test_helper.rb

@@ -7,3 +7,28 @@ require 'mocha'
 require 'metriks'
 
 Thread.abort_on_exception = true
+
+module ThreadHelper
+  require 'thread'
+
+  # Run the given block on n threads in parallel. Returns an array of the
+  # return values of each thread's last invocation of block. Options:
+
+  # :n: call block n times per thread. Default 1.
+  def thread(threads = 2, opts = {})
+    n = opts[:n] || 1
+    results = []
+   
+    threads.times.map do |i|
+      Thread.new do
+        n.times do
+          results[i] = yield i
+        end
+      end
+    end.each do |thread|
+      thread.join
+    end
+    
+    results
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Eric Lindvall
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-06 00:00:00 -08:00
+date: 2012-03-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency