statsd-instrument 1.0.0 → 1.0.1

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Shopify
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -12,7 +12,7 @@ For Shopify, our retention periods are:
 2. 60 seconds of granularity for the last week
 3. 10 minutes of granularity for the last 5 years
 
-This is the same as what Etsy uses (mentioned in the README for [http://github.com/etsy/statd](http://github.com/etsy/statd])).
+This is the same as what Etsy uses (mentioned in the README for http://github.com/etsy/statsd).
 
 ## Configuration
 
@@ -99,7 +99,7 @@ So now, if GoogleBase#insert raises an exception or returns false (ie. result ==
 
 ``` ruby
 GoogleBase.statsd_count_if :insert, 'GoogleBase.insert' do |response|
-  result.code == 200
+  response.code == 200
 end
 ```
 
@@ -118,8 +118,8 @@ So if this method fails execution (raises or returns false) we'll increment the
 Again you can pass a block to define what success means.
 
 ``` ruby
-GoogleBase.statsd_count_if :insert, 'GoogleBase.insert' do |response|
-  result.code == 200
+GoogleBase.statsd_count_success :insert, 'GoogleBase.insert' do |response|
+  response.code == 200
 end
 ```
 

data/lib/statsd/instrument.rb

@@ -6,9 +6,6 @@ module StatsD
   end
   self.enabled = true
 
-  trap("TTOU") { self.enabled = false }
-  trap("TTIN") { self.enabled = true }
-
   # StatsD.server = 'localhost:1234'
   def self.server=(conn)
     self.host, port = conn.split(':')
@@ -19,7 +16,7 @@ module StatsD
     def statsd_measure(method, name)
       add_to_method(method, name, :measure) do |old_method, new_method, metric_name, *args|
         define_method(new_method) do |*args|
-          StatsD.measure(send(metric_name)) { send(old_method, *args) }
+          StatsD.measure(metric_name) { send(old_method, *args) }
         end
       end
     end
@@ -36,7 +33,7 @@ module StatsD
             truthiness = (yield(result) rescue false) if block_given?
             result
           ensure
-            StatsD.increment("#{send(metric_name)}." + (truthiness == false ? 'failure' : 'success'))
+            StatsD.increment("#{metric_name}." + (truthiness == false ? 'failure' : 'success'))
           end
         end
       end
@@ -54,7 +51,7 @@ module StatsD
             truthiness = (yield(result) rescue false) if block_given?
             result
           ensure
-            StatsD.increment(send(metric_name)) if truthiness
+            StatsD.increment(metric_name) if truthiness
           end
         end
       end
@@ -63,27 +60,15 @@ module StatsD
     def statsd_count(method, name)
       add_to_method(method, name, :count) do |old_method, new_method, metric_name|
         define_method(new_method) do |*args|
-          StatsD.increment(send(metric_name))
+          StatsD.increment(metric_name)
           send(old_method, *args)
         end
       end
     end
 
     private
-    def statsd_memoize(metric_name, name)
-      define_method(metric_name) do
-        name = eval("\"#{name}\"", binding)
-
-        self.class.send(:define_method, metric_name) do
-          name
-        end
-        send(metric_name)
-      end
-    end
-
     def add_to_method(method, name, action, &block)
-      metric_name = :"#{method}_#{name}_metric_name"
-      statsd_memoize(metric_name, name)
+      metric_name = name
 
       method_name_without_statsd = :"#{method}_for_#{action}_on_#{self.name}_without_#{name}"
       # raw_ssl_request_for_measure_on_FedEx_without_ActiveMerchant.Shipping.#{self.class.name}.ssl_request

data/statsd-instrument.gemspec

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

data/test/statsd-instrument_test.rb

@@ -23,6 +23,14 @@ class ActiveMerchant::Gateway < ActiveMerchant::Base
   rescue
     false
   end
+
+  def self.sync
+    true
+  end 
+
+  def self.singleton_class
+    class << self; self; end
+  end
 end
 
 class ActiveMerchant::UniqueGateway < ActiveMerchant::Base
@@ -43,7 +51,7 @@ class StatsDTest < Test::Unit::TestCase
   end
 
   def test_statsd_count_if
-    ActiveMerchant::Gateway.statsd_count_if :ssl_post, 'ActiveMerchant.Billing.#{self.class.name}.if'
+    ActiveMerchant::Gateway.statsd_count_if :ssl_post, 'ActiveMerchant.Gateway.if'
 
     StatsD.expects(:increment).with(includes('if')).once
     ActiveMerchant::Gateway.new.purchase(true)
@@ -51,7 +59,7 @@ class StatsDTest < Test::Unit::TestCase
   end
 
   def test_statsd_count_if_with_block
-    ActiveMerchant::UniqueGateway.statsd_count_if :ssl_post, 'ActiveMerchant.Billing.#{self.class.name}.block' do |result|
+    ActiveMerchant::UniqueGateway.statsd_count_if :ssl_post, 'ActiveMerchant.Gateway.block' do |result|
       result[:success]
     end
 
@@ -61,7 +69,7 @@ class StatsDTest < Test::Unit::TestCase
   end
 
   def test_statsd_count_success
-    ActiveMerchant::Gateway.statsd_count_success :ssl_post, 'ActiveMerchant.Billing.#{self.class.name}'
+    ActiveMerchant::Gateway.statsd_count_success :ssl_post, 'ActiveMerchant.Gateway'
 
     StatsD.expects(:increment).with(includes('success'))
     ActiveMerchant::Gateway.new.purchase(true)
@@ -71,7 +79,7 @@ class StatsDTest < Test::Unit::TestCase
   end
 
   def test_statsd_count_success_with_block
-    ActiveMerchant::UniqueGateway.statsd_count_success :ssl_post, 'ActiveMerchant.Billing.#{self.class.name}' do |result|
+    ActiveMerchant::UniqueGateway.statsd_count_success :ssl_post, 'ActiveMerchant.Gateway' do |result|
       result[:success]
     end
 
@@ -83,19 +91,27 @@ class StatsDTest < Test::Unit::TestCase
   end
 
   def test_statsd_count
-    ActiveMerchant::Gateway.statsd_count :ssl_post, 'ActiveMerchant.Billing.#{self.class.name}.ssl_post'
+    ActiveMerchant::Gateway.statsd_count :ssl_post, 'ActiveMerchant.Gateway.ssl_post'
 
     StatsD.expects(:increment).with(includes('ssl_post'))
     ActiveMerchant::Gateway.new.purchase(true)
   end
 
   def test_statsd_measure
-    ActiveMerchant::UniqueGateway.statsd_measure :ssl_post, 'ActiveMerchant.Billing.#{self.class.name}.ssl_post'
+    ActiveMerchant::UniqueGateway.statsd_measure :ssl_post, 'ActiveMerchant.Gateway.ssl_post'
 
     StatsD.expects(:measure).with(includes('ssl_post')).returns({:success => true})
     ActiveMerchant::UniqueGateway.new.purchase(true)
   end
 
+  def test_instrumenting_class_method
+    ActiveMerchant::Gateway.singleton_class.extend StatsD::Instrument
+    ActiveMerchant::Gateway.singleton_class.statsd_count :sync, 'ActiveMerchant.Gateway.sync'
+
+    StatsD.expects(:increment).with(includes('sync'))
+    ActiveMerchant::Gateway.sync
+  end
+
   def test_count_with_sampling
     StatsD.unstub(:increment)
     StatsD.stubs(:rand).returns(0.6)
@@ -131,18 +147,4 @@ class StatsDTest < Test::Unit::TestCase
     StatsD.increment('fooz')
     StatsD.enabled = true
   end
-
-  def test_receiving_TTOU_should_disable
-    Process.kill("TTOU", $$)
-    sleep 0.5
-    assert !StatsD.enabled
-  end
-
-  def test_receiving_TTIN_should_disable
-    StatsD.enabled = false
-
-    Process.kill("TTIN", $$)
-    sleep 0.5
-    assert StatsD.enabled
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: statsd-instrument
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jesse Storimer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-28 00:00:00 -04:00
+date: 2011-08-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - lib/statsd-instrument.rb
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.9.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A StatsD client for Ruby apps