statsd-instrument 1.3.3 → 1.4.0

data/lib/statsd/instrument.rb

@@ -27,15 +27,15 @@ module StatsD
   end
 
   module Instrument
-    def statsd_measure(method, name)
+    def statsd_measure(method, name, sample_rate = StatsD.default_sample_rate)
       add_to_method(method, name, :measure) do |old_method, new_method, metric_name, *args|
         define_method(new_method) do |*args, &block|
-          StatsD.measure(metric_name) { send(old_method, *args, &block) }
+          StatsD.measure(metric_name, nil, sample_rate) { send(old_method, *args, &block) }
         end
       end
     end
 
-    def statsd_count_success(method, name)
+    def statsd_count_success(method, name, sample_rate = StatsD.default_sample_rate)
       add_to_method(method, name, :count_success) do |old_method, new_method, metric_name|
         define_method(new_method) do |*args, &block|
           begin
@@ -47,13 +47,13 @@ module StatsD
             truthiness = (yield(result) rescue false) if block_given?
             result
           ensure
-            StatsD.increment("#{metric_name}." + (truthiness == false ? 'failure' : 'success'))
+            StatsD.increment("#{metric_name}." + (truthiness == false ? 'failure' : 'success'), sample_rate)
           end
         end
       end
     end
 
-    def statsd_count_if(method, name)
+    def statsd_count_if(method, name, sample_rate = StatsD.default_sample_rate)
       add_to_method(method, name, :count_if) do |old_method, new_method, metric_name|
         define_method(new_method) do |*args, &block|
           begin
@@ -65,16 +65,16 @@ module StatsD
             truthiness = (yield(result) rescue false) if block_given?
             result
           ensure
-            StatsD.increment(metric_name) if truthiness
+            StatsD.increment(metric_name, sample_rate) if truthiness
           end
         end
       end
     end
 
-    def statsd_count(method, name)
+    def statsd_count(method, name, sample_rate = StatsD.default_sample_rate)
       add_to_method(method, name, :count) do |old_method, new_method, metric_name|
         define_method(new_method) do |*args, &block|
-          StatsD.increment(metric_name)
+          StatsD.increment(metric_name, sample_rate)
           send(old_method, *args, &block)
         end
       end
@@ -131,6 +131,8 @@ module StatsD
     return unless enabled
     return if sample_rate < 1 && rand > sample_rate
 
+    k =  k.gsub('::', '.')
+
     command = "#{self.prefix + '.' if self.prefix}#{k}:#{v}"
     case op
     when :incr

data/statsd-instrument.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "statsd-instrument"
-  s.version     = '1.3.3'
+  s.version     = '1.4.0'
   s.authors     = ["Jesse Storimer", "Tobias Lutke"]
   s.email       = ["jesse@shopify.com"]
   s.homepage    = "http://github.com/shopify/statsd-instrument"

data/test/statsd-instrument_test.rb

@@ -64,7 +64,7 @@ class StatsDTest < Test::Unit::TestCase
   def test_statsd_count_if
     ActiveMerchant::Gateway.statsd_count_if :ssl_post, 'ActiveMerchant.Gateway.if'
 
-    StatsD.expects(:increment).with(includes('if')).once
+    StatsD.expects(:increment).with(includes('if'), 1).once
     ActiveMerchant::Gateway.new.purchase(true)
     ActiveMerchant::Gateway.new.purchase(false)
   end
@@ -84,18 +84,18 @@ class StatsDTest < Test::Unit::TestCase
       result[:success]
     end
 
-    StatsD.expects(:increment).with(includes('block')).once
+    StatsD.expects(:increment).with(includes('block'), 1).once
     ActiveMerchant::UniqueGateway.new.purchase(true)
     ActiveMerchant::UniqueGateway.new.purchase(false)
   end
 
   def test_statsd_count_success
-    ActiveMerchant::Gateway.statsd_count_success :ssl_post, 'ActiveMerchant.Gateway'
+    ActiveMerchant::Gateway.statsd_count_success :ssl_post, 'ActiveMerchant.Gateway', 0.5
 
-    StatsD.expects(:increment).with(includes('success'))
+    StatsD.expects(:increment).with(includes('success'), 0.5)
     ActiveMerchant::Gateway.new.purchase(true)
 
-    StatsD.expects(:increment).with(includes('failure'))
+    StatsD.expects(:increment).with(includes('failure'), 0.5)
     ActiveMerchant::Gateway.new.purchase(false)
   end
 
@@ -114,17 +114,17 @@ class StatsDTest < Test::Unit::TestCase
       result[:success]
     end
 
-    StatsD.expects(:increment).with(includes('success'))
+    StatsD.expects(:increment).with(includes('success'), StatsD.default_sample_rate)
     ActiveMerchant::UniqueGateway.new.purchase(true)
 
-    StatsD.expects(:increment).with(includes('failure'))
+    StatsD.expects(:increment).with(includes('failure'), StatsD.default_sample_rate)
     ActiveMerchant::UniqueGateway.new.purchase(false)
   end
 
   def test_statsd_count
     ActiveMerchant::Gateway.statsd_count :ssl_post, 'ActiveMerchant.Gateway.ssl_post'
 
-    StatsD.expects(:increment).with(includes('ssl_post'))
+    StatsD.expects(:increment).with(includes('ssl_post'), 1)
     ActiveMerchant::Gateway.new.purchase(true)
   end
 
@@ -136,13 +136,23 @@ class StatsDTest < Test::Unit::TestCase
     assert_equal 'block called', return_value
   end
 
+  def test_statsd_measure_with_nested_modules
+    ActiveMerchant::UniqueGateway.statsd_measure :ssl_post, 'ActiveMerchant::Gateway.ssl_post'
+
+    StatsD.stubs(:mode).returns(:production)
+    UDPSocket.any_instance.expects(:send).with(regexp_matches(/ActiveMerchant\.Gateway\.ssl_post:\d\.\d{2,}\|ms/), 0, 'localhost', 123).at_least(1)
+
+    ActiveMerchant::UniqueGateway.new.purchase(true)
+  end
+
   def test_statsd_measure
-    ActiveMerchant::UniqueGateway.statsd_measure :ssl_post, 'ActiveMerchant.Gateway.ssl_post'
+    ActiveMerchant::UniqueGateway.statsd_measure :ssl_post, 'ActiveMerchant.Gateway.ssl_post', 0.3
 
-    StatsD.expects(:write).with('ActiveMerchant.Gateway.ssl_post', is_a(Float), :ms, is_a(Numeric)).returns({:success => true})
+    StatsD.expects(:write).with('ActiveMerchant.Gateway.ssl_post', is_a(Float), :ms, 0.3).returns({:success => true})
     ActiveMerchant::UniqueGateway.new.purchase(true)
   end
 
+
   def test_statsd_measure_with_method_receiving_block
     ActiveMerchant::Base.statsd_measure :post_with_block, 'ActiveMerchant.Base.post_with_block'
 
@@ -155,21 +165,21 @@ class StatsDTest < Test::Unit::TestCase
     ActiveMerchant::Gateway.singleton_class.extend StatsD::Instrument
     ActiveMerchant::Gateway.singleton_class.statsd_count :sync, 'ActiveMerchant.Gateway.sync'
 
-    StatsD.expects(:increment).with(includes('sync'))
+    StatsD.expects(:increment).with(includes('sync'), 1)
     ActiveMerchant::Gateway.sync
   end
 
   def test_count_with_sampling
     StatsD.unstub(:increment)
-    StatsD.stubs(:rand).returns(0.1)
+    StatsD.stubs(:rand).returns(0.6)
     StatsD.logger.expects(:info).never
 
-    StatsD.increment('sampling.foo.bar', 1, 0.6)
+    StatsD.increment('sampling.foo.bar', 1, 0.1)
   end
 
   def test_count_with_successful_sample
     StatsD.unstub(:increment)
-    StatsD.stubs(:rand).returns(0.2)
+    StatsD.stubs(:rand).returns(0.01)
     StatsD.logger.expects(:info).once.with do |string|
       string.include?('@0.1')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statsd-instrument
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha