statsd-instrument 1.1.1 → 1.1.2

data/lib/statsd/instrument.rb

@@ -1,5 +1,6 @@
 require 'socket'
 require 'benchmark'
+require 'timeout'
 
 class << Benchmark
   def ms
@@ -7,6 +8,7 @@ class << Benchmark
   end
 end
 
+
 module StatsD
   class << self
     attr_accessor :host, :port, :mode, :logger, :enabled, :default_sample_rate
@@ -14,6 +16,8 @@ module StatsD
   self.enabled = true
   self.default_sample_rate = 1
   
+  Timeout = defined?(::SystemTimer) ? ::SystemTimer : ::Timeout
+
   # StatsD.server = 'localhost:1234'
   def self.server=(conn)
     self.host, port = conn.split(':')
@@ -130,10 +134,16 @@ module StatsD
     command << "|@#{sample_rate}" if sample_rate < 1
 
     if mode == :production
-      socket.send(command, 0, host, port)
+      socket_wrapper { socket.send(command, 0, host, port) }
     else
       logger.info "[StatsD] #{command}"
     end
   end
+
+  def self.socket_wrapper(options = {})
+    Timeout.timeout(options.fetch(:timeout, 0.1)) { yield }
+  rescue Timeout::Error, SocketError, IOError, SystemCallError => e
+    logger.error e
+  end
 end
 

data/statsd-instrument.gemspec

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

data/test/statsd-instrument_test.rb

@@ -153,4 +153,45 @@ class StatsDTest < Test::Unit::TestCase
 
     StatsD.measure('values.foobar', 42)
   end
+
+  def test_socket_error_should_not_raise
+    StatsD.mode = :production
+    UDPSocket.any_instance.expects(:send).raises(SocketError)
+    StatsD.measure('values.foobar', 42)
+    StatsD.mode = :test
+  end
+
+  def test_timeout_error_should_not_raise
+    StatsD.mode = :production
+    UDPSocket.any_instance.expects(:send).raises(Timeout::Error)
+    StatsD.measure('values.foobar', 42)
+    StatsD.mode = :test
+  end
+
+  def test_system_call_error_should_not_raise
+    StatsD.mode = :production
+    UDPSocket.any_instance.expects(:send).raises(Errno::ETIMEDOUT)
+    StatsD.measure('values.foobar', 42)
+    StatsD.mode = :test
+  end
+
+  def test_io_error_should_not_raise
+    StatsD.mode = :production
+    UDPSocket.any_instance.expects(:send).raises(IOError)
+    StatsD.measure('values.foobar', 42)
+    StatsD.mode = :test
+  end
+
+  def test_long_request_should_timeout
+    StatsD.mode = :production
+    UDPSocket.any_instance.expects(:send).yields do
+      begin
+        Timeout.timeout(0.5) { sleep 1 }
+      rescue Timeout::Error
+        raise "Allowed long running request"
+      end
+    end
+    StatsD.measure('values.foobar', 42)
+    StatsD.mode = :test
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statsd-instrument
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-11 00:00:00.000000000 Z
+date: 2012-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2164776740 !ruby/object:Gem::Requirement
+  requirement: &2155684560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164776740
+  version_requirements: *2155684560
 description: A StatsD client for Ruby apps. Provides metaprogramming methods to inject
   StatsD instrumentation into your code.
 email:
@@ -65,4 +65,3 @@ specification_version: 3
 summary: A StatsD client for Ruby apps
 test_files:
 - test/statsd-instrument_test.rb
-has_rdoc: