statsd-instrument 1.4.0 → 1.5.0

data/README.md

@@ -136,6 +136,17 @@ AWS::S3::Base.singleton_class.extend StatsD::Instrument
 AWS::S3::Base.singleton_class.statsd_measure :request, 'S3.request'
 ```
 
+### Dynamic Metric Names
+
+You can use a lambda function instead of a string dynamically set
+the name of the metric. The lambda function must accept two arguments:
+the object the function is being called on and the array of arguments
+passed.
+
+```ruby
+GoogleBase.statsd_count :insert, lamdba{|object, args| object.class.to_s.downcase + "." + args.first.to_s + ".insert" }
+```
+
 ## Reliance on DNS
 Out of the box StatsD is set up to be unidirectional fire-and-forget over UDP. Configuring the StatsD host to be a non-ip will trigger a DNS lookup (ie synchronous round trip network call) for each metric sent. This can be particularly problematic in clouds that have a shared DNS infrastructure such as AWS.
 

data/lib/statsd/instrument.rb

@@ -30,7 +30,7 @@ module StatsD
     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, nil, sample_rate) { send(old_method, *args, &block) }
+          StatsD.measure(metric_name.respond_to?(:call) ? metric_name.call(self, args) : metric_name, nil, sample_rate) { send(old_method, *args, &block) }
         end
       end
     end
@@ -47,7 +47,10 @@ module StatsD
             truthiness = (yield(result) rescue false) if block_given?
             result
           ensure
-            StatsD.increment("#{metric_name}." + (truthiness == false ? 'failure' : 'success'), sample_rate)
+            result = truthiness == false ? 'failure' : 'success'
+            key = metric_name.respond_to?(:call) ? metric_name.call(self, args) : metric_name
+
+            StatsD.increment("#{key}.#{result}", sample_rate)
           end
         end
       end
@@ -65,7 +68,7 @@ module StatsD
             truthiness = (yield(result) rescue false) if block_given?
             result
           ensure
-            StatsD.increment(metric_name, sample_rate) if truthiness
+            StatsD.increment(metric_name.respond_to?(:call) ? metric_name.call(self, args) : metric_name, sample_rate) if truthiness
           end
         end
       end
@@ -74,7 +77,7 @@ module StatsD
     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, sample_rate)
+          StatsD.increment(metric_name.respond_to?(:call) ? metric_name.call(self, args) : metric_name, sample_rate)
           send(old_method, *args, &block)
         end
       end

data/statsd-instrument.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "statsd-instrument"
-  s.version     = '1.4.0'
+  s.version     = '1.5.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

@@ -53,6 +53,9 @@ class ActiveMerchant::UniqueGateway < ActiveMerchant::Base
   end
 end
 
+class GatewaySubClass < ActiveMerchant::Gateway
+end
+
 ActiveMerchant::Base.extend StatsD::Instrument
 
 class StatsDTest < Test::Unit::TestCase
@@ -128,6 +131,13 @@ class StatsDTest < Test::Unit::TestCase
     ActiveMerchant::Gateway.new.purchase(true)
   end
 
+  def test_statsd_count_with_name_as_lambda
+    ActiveMerchant::Gateway.statsd_count(:ssl_post, lambda {|object, args| object.class.to_s.downcase + ".insert." + args.first.to_s})
+
+    StatsD.expects(:increment).with('gatewaysubclass.insert.true', 1)
+    GatewaySubClass.new.purchase(true)
+  end
+
   def test_statsd_count_with_method_receiving_block
     ActiveMerchant::Base.statsd_count :post_with_block, 'ActiveMerchant.Base.post_with_block'
 

metadata

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