librato-rails 0.4.1 → 0.5.0

data/test/dummy/test_env.sh

@@ -0,0 +1,2 @@
+export LIBRATO_METRICS_USER='matt@librato.com'
+export LIBRATO_METRICS_TOKEN='02673bee476e872a5c40d4529d98c2cfd2d741882c302c1b7f10ccb1ee9eb45e'

data/test/fixtures/config/librato.yml

@@ -4,6 +4,7 @@ test:
   prefix: 'rails-test'
   flush_interval: 30
   source: 'custom-1'
+  source_pids: false
   
 production:
   user: 'live@bar.com'

data/test/integration/mail_test.rb

@@ -5,11 +5,9 @@ class MailTest < ActiveSupport::IntegrationCase
   # Query tests - the numbers specified assume running against SQLite
   
   test 'mail sent' do
-    prefix = Librato::Rails.prefix
-    
     user = User.create!(:email => 'foo@foo.com', :password => 'wow')
     UserMailer.welcome_email(user).deliver
-    assert_equal 1, counters["#{prefix}.mail.sent"]
+    assert_equal 1, counters["rails.mail.sent"]
   end
   
 end

data/test/integration/request_test.rb

@@ -5,49 +5,45 @@ class RequestTest < ActiveSupport::IntegrationCase
   # Each request
   
   test 'increment total and status' do
-    prefix = Librato::Rails.prefix
     visit root_path
     
-    assert_equal 1, counters["#{prefix}.request.total"]
-    assert_equal 1, counters["#{prefix}.request.status.200"]
-    assert_equal 1, counters["#{prefix}.request.status.2xx"]
+    assert_equal 1, counters["rails.request.total"]
+    assert_equal 1, counters["rails.request.status.200"]
+    assert_equal 1, counters["rails.request.status.2xx"]
     
     visit '/status/204'
     
-    assert_equal 2, counters["#{prefix}.request.total"]
-    assert_equal 1, counters["#{prefix}.request.status.200"]
-    assert_equal 1, counters["#{prefix}.request.status.204"]
-    assert_equal 2, counters["#{prefix}.request.status.2xx"]
+    assert_equal 2, counters["rails.request.total"]
+    assert_equal 1, counters["rails.request.status.200"]
+    assert_equal 1, counters["rails.request.status.204"]
+    assert_equal 2, counters["rails.request.status.2xx"]
   end
   
   test 'request times' do
-    prefix = Librato::Rails.prefix
     visit root_path
     
     # common for all paths
-    assert_equal 1, aggregate["#{prefix}.request.time"][:count], 'should record total time'
-    assert_equal 1, aggregate["#{prefix}.request.time.db"][:count], 'should record db time'
-    assert_equal 1, aggregate["#{prefix}.request.time.view"][:count], 'should record view time'
+    assert_equal 1, aggregate["rails.request.time"][:count], 'should record total time'
+    assert_equal 1, aggregate["rails.request.time.db"][:count], 'should record db time'
+    assert_equal 1, aggregate["rails.request.time.view"][:count], 'should record view time'
     
     # status specific
-    assert_equal 1, aggregate["#{prefix}.request.status.200.time"][:count]
-    assert_equal 1, aggregate["#{prefix}.request.status.2xx.time"][:count]
+    assert_equal 1, aggregate["rails.request.status.200.time"][:count]
+    assert_equal 1, aggregate["rails.request.status.2xx.time"][:count]
   end
   
   test 'track exceptions' do
-    prefix = Librato::Rails.prefix
     begin
       visit exception_path #rescue nil
     rescue RuntimeError => e
       raise unless e.message == 'test exception!'
     end
-    assert_equal 1, counters["#{prefix}.request.exceptions"]
+    assert_equal 1, counters["rails.request.exceptions"]
   end
   
   test 'track slow requests' do
-    prefix = Librato::Rails.prefix
     visit slow_path
-    assert_equal 1, counters["#{prefix}.request.slow"]
+    assert_equal 1, counters["rails.request.slow"]
   end
   
 end

data/test/integration/sql_test.rb

@@ -5,26 +5,24 @@ class SQLTest < ActiveSupport::IntegrationCase
   # Query tests - the numbers specified assume running against SQLite
   
   test 'total queries and query types' do
-    prefix = Librato::Rails.prefix
-    
     # note that modifying queries are wrapped in a transaction which
     # adds 2 to total queries per operation.
     user = User.create!(:email => 'foo@foo.com', :password => 'wow')
-    assert_equal 3, counters["#{prefix}.sql.queries"]
-    assert_equal 1, counters["#{prefix}.sql.inserts"]
+    assert_equal 3, counters["rails.sql.queries"]
+    assert_equal 1, counters["rails.sql.inserts"]
     
     foo = User.find_by_email('foo@foo.com')
-    assert_equal 4, counters["#{prefix}.sql.queries"]
-    assert_equal 1, counters["#{prefix}.sql.selects"]
+    assert_equal 4, counters["rails.sql.queries"]
+    assert_equal 1, counters["rails.sql.selects"]
     
     foo.password = 'new password'
     foo.save
-    assert_equal 7, counters["#{prefix}.sql.queries"]
-    assert_equal 1, counters["#{prefix}.sql.updates"]
+    assert_equal 7, counters["rails.sql.queries"]
+    assert_equal 1, counters["rails.sql.updates"]
     
     foo.destroy
-    assert_equal 10, counters["#{prefix}.sql.queries"]
-    assert_equal 1, counters["#{prefix}.sql.deletes"]
+    assert_equal 10, counters["rails.sql.queries"]
+    assert_equal 1, counters["rails.sql.deletes"]
   end
   
 end

data/test/metrics-rails_test.rb

@@ -36,4 +36,9 @@ class LibratoRailsTest < ActiveSupport::TestCase
     assert_match /\.\d{2,6}$/, Librato::Rails.qualified_source
   end
   
+  test 'qualified source does not include pid when disabled' do
+    Librato::Rails.source_pids = false
+    assert_match Librato::Rails.source, Librato::Rails.qualified_source
+    Librato::Rails.source_pids = true
+  end
 end

data/test/unit/aggregator_test.rb

@@ -2,15 +2,38 @@ require 'test_helper'
 
 class LibratoRailsAggregatorTest < MiniTest::Unit::TestCase
   
+  def setup
+    @agg = Librato::Rails::Aggregator.new
+  end
+  
   def test_adding_timings
-    agg = Librato::Rails::Aggregator.new
+    @agg.timing 'request.time.total', 23.7
+    @agg.timing 'request.time.db', 5.3
+    @agg.timing 'request.time.total', 64.3
     
-    agg.timing 'request.time.total', 23.7
-    agg.timing 'request.time.db', 5.3
-    agg.timing 'request.time.total', 64.3
+    assert_equal 2, @agg['request.time.total'][:count]
+    assert_equal 88.0, @agg['request.time.total'][:sum]
+  end
+  
+  def test_block_timing
+    @agg.timing 'my.task' do
+      sleep 0.2
+    end
+    assert_in_delta @agg['my.task'][:sum], 200, 50
+    
+    @agg.timing('another.task') { sleep 0.1 }
+    assert_in_delta @agg['another.task'][:sum], 100, 50
+  end
+  
+  def test_return_values
+    simple = @agg.timing 'simple', 20
+    assert_equal nil, simple
     
-    assert_equal 2, agg['request.time.total'][:count]
-    assert_equal 88.0, agg['request.time.total'][:sum]
+    timing = @agg.timing 'foo' do
+      sleep 0.1
+      'bar'
+    end
+    assert_equal 'bar', timing
   end
   
 end

data/test/unit/configuration_test.rb

@@ -7,16 +7,17 @@ class LibratoRailsAggregatorTest < MiniTest::Unit::TestCase
     ENV.delete('LIBRATO_METRICS_TOKEN')
     ENV.delete('LIBRATO_METRICS_SOURCE')
     Librato::Rails.check_config
+    Librato::Rails.prefix = nil
   end
 
   def test_environmental_variable_config
     ENV['LIBRATO_METRICS_USER'] = 'foo@bar.com'
     ENV['LIBRATO_METRICS_TOKEN'] = 'api_key'
-    ENV['LIBRATO_METRICS_SOURCE'] = 'appname'
+    ENV['LIBRATO_METRICS_SOURCE'] = 'source'
     Librato::Rails.check_config
     assert_equal 'foo@bar.com', Librato::Rails.user
     assert_equal 'api_key', Librato::Rails.token
-    assert_equal 'appname', Librato::Rails.prefix
+    assert_equal 'source', Librato::Rails.source
   end
 
   def test_config_file_config
@@ -26,13 +27,14 @@ class LibratoRailsAggregatorTest < MiniTest::Unit::TestCase
       assert_equal 'rails-test', Librato::Rails.prefix
       assert_equal 30, Librato::Rails.flush_interval
       assert_equal 'custom-1', Librato::Rails.source
+      assert_equal false, Librato::Rails.source_pids
     end
   end
 
   def test_environmental_and_config_file_config
     ENV['LIBRATO_METRICS_USER'] = 'foo@bar.com'
     ENV['LIBRATO_METRICS_TOKEN'] = 'api_key'
-    ENV['LIBRATO_METRICS_SOURCE'] = 'appname'
+    ENV['LIBRATO_METRICS_SOURCE'] = 'source'
     with_fixture_config do
       assert_equal 'test@bar.com', Librato::Rails.user # from config file
       assert_equal 'test api key', Librato::Rails.token # from config file