librato-rails 0.5.2 → 0.6.0

data/test/remote/rails_remote_test.rb

@@ -31,6 +31,7 @@ class LibratoRailsRemoteTest < ActiveSupport::TestCase
       Librato::Rails.increment :foo
       Librato::Rails.increment :bar, 2
       Librato::Rails.increment :foo
+      Librato::Rails.increment :foo, :source => 'baz', :by => 3
       Librato::Rails.flush
     
       client = Librato::Rails.client
@@ -41,6 +42,10 @@ class LibratoRailsRemoteTest < ActiveSupport::TestCase
       foo = client.fetch 'foo', :count => 10
       assert_equal 1, foo[source].length
       assert_equal 2, foo[source][0]['value']
+      
+      # custom source
+      assert_equal 1, foo['baz'].length
+      assert_equal 3, foo['baz'][0]['value']  
     
       bar = client.fetch 'bar', :count => 10
       assert_equal 1, bar[source].length
@@ -49,9 +54,13 @@ class LibratoRailsRemoteTest < ActiveSupport::TestCase
   
     test 'counters should persist through flush' do
       Librato::Rails.increment 'knightrider'
+      Librato::Rails.increment 'badguys', :sporadic => true
       assert_equal 1, Librato::Rails.counters['knightrider']
+      assert_equal 1, Librato::Rails.counters['badguys']
+      
       Librato::Rails.flush
       assert_equal 0, Librato::Rails.counters['knightrider']
+      assert_equal nil, Librato::Rails.counters['badguys']
     end
   
     test 'flush sends measures/timings' do
@@ -61,6 +70,7 @@ class LibratoRailsRemoteTest < ActiveSupport::TestCase
       Librato::Rails.timing  'request.time.total', 122.1
       Librato::Rails.measure 'items_bought', 20
       Librato::Rails.timing  'request.time.total', 81.3
+      Librato::Rails.timing  'jobs.queued', 5, :source => 'worker.3'
       Librato::Rails.flush
     
       client = Librato::Rails.client
@@ -75,6 +85,10 @@ class LibratoRailsRemoteTest < ActiveSupport::TestCase
       items = client.fetch 'items_bought', :count => 10
       assert_equal 1, items[source][0]['count']
       assert_in_delta 20, items[source][0]['sum'], 0.1
+      
+      jobs = client.fetch 'jobs.queued', :count => 10
+      assert_equal 1, jobs['worker.3'][0]['count']
+      assert_in_delta 5, jobs['worker.3'][0]['sum'], 0.1
     end
   
     test 'flush should purge measures/timings' do

data/test/unit/aggregator_test.rb

@@ -36,4 +36,18 @@ class LibratoRailsAggregatorTest < MiniTest::Unit::TestCase
     assert_equal 'bar', timing
   end
   
+  def test_custom_source
+    # sources are kept separate
+    @agg.measure 'meaning.of.life', 1
+    @agg.measure 'meaning.of.life', 42, :source => 'douglas_adams'
+    assert_equal 1.0, @agg.fetch('meaning.of.life')[:sum]
+    assert_equal 42.0, @agg.fetch('meaning.of.life', :source => 'douglas_adams')[:sum]
+    
+    # sources work with time blocks
+    @agg.timing 'mytiming', :source => 'mine' do
+      sleep 0.02
+    end
+    assert_in_delta @agg.fetch('mytiming', :source => 'mine')[:sum], 20, 10
+  end
+  
 end

data/test/unit/counter_cache_test.rb

@@ -8,12 +8,83 @@ class LibratoRailsCounterCacheTest < MiniTest::Unit::TestCase
     assert_equal 1, cc[:foo]
     
     # accepts optional argument
-    cc.increment :foo, 5
+    cc.increment :foo, :by => 5
     assert_equal 6, cc[:foo]
     
+    # legacy style
+    cc.increment :foo, 2
+    assert_equal 8, cc[:foo]
+    
     # strings or symbols work
     cc.increment 'foo'
-    assert_equal 7, cc['foo']
+    assert_equal 9, cc['foo']
+  end
+  
+  def test_custom_sources
+    cc = Librato::Rails::CounterCache.new
+    
+    cc.increment :foo, :source => 'bar'
+    assert_equal 1, cc.fetch(:foo, :source => 'bar')
+    
+    # symbols also work
+    cc.increment :foo, :source => :baz
+    assert_equal 1, cc.fetch(:foo, :source => :baz)
+    
+    # strings and symbols are interchangable
+    cc.increment :foo, :source => :bar
+    assert_equal 2, cc.fetch(:foo, :source => 'bar')
+     
+    # custom source and custom increment
+    cc.increment :foo, :source => 'boombah', :by => 10
+    assert_equal 10, cc.fetch(:foo, :source => 'boombah')
+  end
+  
+  def test_continuous
+    cc = Librato::Rails::CounterCache.new
+    
+    cc.increment :foo
+    cc.increment :foo, :source => 'bar'
+    
+    cc.increment :baz, :sporadic => true
+    cc.increment :baz, :source => 118, :sporadic => true
+    assert_equal 1, cc[:baz]
+    assert_equal 1, cc.fetch(:baz, :source => 118)
+    
+    cc.flush_to(Librato::Metrics::Queue.new) # persist values once
+    
+    # continous values persist
+    assert_equal 0, cc[:foo]
+    assert_equal 0, cc.fetch(:foo, :source => 'bar')
+    
+    # non-continous do not
+    assert_equal nil, cc[:baz]
+    assert_equal nil, cc.fetch(:baz, :source => 118)
+    
+    # add a different sporadic metric 
+    cc.increment :bazoom, :sporadic => true
+    assert_equal 1, cc[:bazoom]
+    
+    cc.flush_to(Librato::Metrics::Queue.new) # persist values again
+    assert_equal nil, cc[:bazoom]
+  end
+  
+  def test_flushing
+    cc = Librato::Rails::CounterCache.new
+    
+    cc.increment :foo
+    cc.increment :bar, :by => 2
+    cc.increment :foo, :source => 'foobar'
+    cc.increment :foo, :source => 'foobar', :by => 3
+    
+    q = Librato::Metrics::Queue.new
+    cc.flush_to(q)
+    
+    expected = Set.new [{:name=>"foo", :value=>1},
+                {:name=>"foo", :value=>4, :source=>"foobar"},
+                {:name=>"bar", :value=>2}]
+    queued = Set.new q.gauges
+    queued.each { |hash| hash.delete(:measure_time) } 
+    assert_equal queued, expected
   end
   
 end

data/test/unit/group_test.rb

@@ -5,8 +5,12 @@ class LibratoRailsGroupTest < MiniTest::Unit::TestCase
   def test_basic_grouping
     Librato::Rails.group 'fruit' do |g|
       g.increment 'bites'
+      g.increment 'nibbles', :by => 2
       g.increment 'nibbles', 5
       
+      g.increment 'chomps', :source => 'pacman'
+      g.increment 'chomps', :source => 'pacman', :by => 5
+      
       g.measure 'banana', 12
       g.measure 'banana', 10
       
@@ -15,7 +19,8 @@ class LibratoRailsGroupTest < MiniTest::Unit::TestCase
     end
     
     assert_equal 1, counters['fruit.bites']
-    assert_equal 5, counters['fruit.nibbles']
+    assert_equal 7, counters['fruit.nibbles']
+    assert_equal 6, counters.fetch('fruit.chomps', :source => 'pacman')
 
     assert_equal 2, aggregate['fruit.banana'][:count]
     assert_equal 22, aggregate['fruit.banana'][:sum]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librato-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +86,7 @@ files:
 - lib/librato/rack/middleware.rb
 - lib/librato/rack.rb
 - lib/librato/rails/aggregator.rb
+- lib/librato/rails/collector.rb
 - lib/librato/rails/counter_cache.rb
 - lib/librato/rails/group.rb
 - lib/librato/rails/railtie.rb
@@ -196,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1496276957323870941
+      hash: 2251758174729954387
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -205,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1496276957323870941
+      hash: 2251758174729954387
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24