statsd-instrument 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 185cb2c919df0365e7808fdc36f0eece2ffac2aa
-  data.tar.gz: 6f64c341a7d7cd1ef9ae7400b99cca75641388f8
+  metadata.gz: 07d8112cad58dadf807022eb9f47f444605687bc
+  data.tar.gz: 2251f7bd1bff223149eff0138b62c386394ddffc
 SHA512:
-  metadata.gz: 95db3eab39e1cecaa4938bab5df81de7f9c4c0b36d8f0640a0a95b6b0d036f65edb91f180a41d3ee64446841430f29d58d42ad9c58bfec1967114236f0d18030
-  data.tar.gz: 7df38af3a361e4ba803994f09292c66c2c78ecaf681e02aa937982cdd7ab9005c0872a1442a96d0d2fdcafc43e36535363a38cb3dadc94cc3bf49761bc49b6cd
+  metadata.gz: db2b61af65189ebd3fa0e9c9fd2e3e816562a3a47a6c622055ee364b471773ac1b047d2313e48fd36869892deae7ec59f35f641edd22fcc132ee33360bde7345
+  data.tar.gz: b01a840d4aabef2139c4501596680a65d790a1f6afa43a95575db0f8a8372986a8ed08cb92695205eb2532f98fe64a56b415af0948eacfefdabcb15933e6a94e

data/CHANGELOG.md

@@ -5,6 +5,11 @@ please at an entry to the "unreleased changes" section below.
 
 ### Unreleased changes
 
+### Version 2.1.3
+
+- The `assert_statsd_calls` test helper will now raise an exception whenever a block isn't passed.
+- Sending stats inside an exit handler will no longer cause programs to exit abruptly.
+
 ### Version 2.1.2
 
 - Use `prepend` instead of rewriting classes for metaprogramming methods.

data/lib/statsd/instrument/assertions.rb

@@ -33,6 +33,10 @@ module StatsD::Instrument::Assertions
 
   # @private
   def assert_statsd_calls(expected_metrics, &block)
+    unless block
+      raise ArgumentError, "block must be given"
+    end
+
     metrics = capture_statsd_calls(&block)
     matched_expected_metrics = []
 

data/lib/statsd/instrument/backends/udp_backend.rb

@@ -64,7 +64,7 @@ module StatsD::Instrument::Backends
     def generate_packet(metric)
       command = "#{metric.name}:#{metric.value}|#{metric.type}"
       command << "|@#{metric.sample_rate}" if metric.sample_rate < 1 || (implementation == :statsite && metric.sample_rate > 1)
-      if metric.tags 
+      if metric.tags
         if tags_supported?
           command << "|##{metric.tags.join(',')}"
         else
@@ -84,6 +84,11 @@ module StatsD::Instrument::Backends
       synchronize do
         socket.send(command, 0) > 0
       end
+    rescue ThreadError => e
+      # In cases where a TERM or KILL signal has been sent, and we send stats as
+      # part of a signal handler, locks cannot be acquired, so we do our best
+      # to try and send the command without a lock.
+      socket.send(command, 0) > 0
     rescue SocketError, IOError, SystemCallError => e
       StatsD.logger.error "[StatsD] #{e.class.name}: #{e.message}"
     end

data/lib/statsd/instrument/version.rb

@@ -1,5 +1,5 @@
 module StatsD
   module Instrument
-    VERSION = "2.1.2"
+    VERSION = "2.1.3"
   end
 end

data/test/statsd_instrumentation_test.rb

@@ -77,7 +77,7 @@ class StatsDInstrumentationTest < Minitest::Test
       ActiveMerchant::Gateway.new.purchase(true)
       ActiveMerchant::Gateway.new.purchase(false)
     end
-
+  ensure
     ActiveMerchant::Gateway.statsd_remove_count_if :ssl_post, 'ActiveMerchant.Gateway.if'
   end
 
@@ -90,7 +90,7 @@ class StatsDInstrumentationTest < Minitest::Test
       assert_equal 'true',  ActiveMerchant::Base.new.post_with_block { 'true' }
       assert_equal 'false', ActiveMerchant::Base.new.post_with_block { 'false' }
     end
-
+  ensure
     ActiveMerchant::Base.statsd_remove_count_if :post_with_block, 'ActiveMerchant.Base.post_with_block'
   end
 
@@ -103,7 +103,7 @@ class StatsDInstrumentationTest < Minitest::Test
       ActiveMerchant::UniqueGateway.new.purchase(true)
       ActiveMerchant::UniqueGateway.new.purchase(false)
     end
-
+  ensure
     ActiveMerchant::UniqueGateway.statsd_remove_count_if :ssl_post, 'ActiveMerchant.Gateway.block'
   end
 
@@ -119,7 +119,7 @@ class StatsDInstrumentationTest < Minitest::Test
       ActiveMerchant::Gateway.new.purchase(false)
       ActiveMerchant::Gateway.new.purchase(true)
     end
-
+  ensure
     ActiveMerchant::Gateway.statsd_remove_count_success :ssl_post, 'ActiveMerchant.Gateway'
   end
 
@@ -137,7 +137,7 @@ class StatsDInstrumentationTest < Minitest::Test
       assert_equal 'successful', ActiveMerchant::Base.new.post_with_block { 'successful' }
       assert_equal 'not so successful', ActiveMerchant::Base.new.post_with_block { 'not so successful' }
     end
-
+  ensure
     ActiveMerchant::Base.statsd_remove_count_success :post_with_block, 'ActiveMerchant.Base.post_with_block'
   end
 
@@ -153,7 +153,7 @@ class StatsDInstrumentationTest < Minitest::Test
     assert_statsd_increment('ActiveMerchant.Gateway.failure') do
       ActiveMerchant::UniqueGateway.new.purchase(false)
     end
-
+  ensure
     ActiveMerchant::UniqueGateway.statsd_remove_count_success :ssl_post, 'ActiveMerchant.Gateway'
   end
 
@@ -163,7 +163,7 @@ class StatsDInstrumentationTest < Minitest::Test
     assert_statsd_increment('ActiveMerchant.Gateway.ssl_post') do
       ActiveMerchant::Gateway.new.purchase(true)
     end
-
+  ensure
     ActiveMerchant::Gateway.statsd_remove_count :ssl_post, 'ActiveMerchant.Gateway.ssl_post'
   end
 
@@ -174,7 +174,7 @@ class StatsDInstrumentationTest < Minitest::Test
     assert_statsd_increment('gatewaysubclass.insert.true') do
       GatewaySubClass.new.purchase(true)
     end
-
+  ensure
     ActiveMerchant::Gateway.statsd_remove_count(:ssl_post, metric_namer)
   end
 
@@ -184,7 +184,7 @@ class StatsDInstrumentationTest < Minitest::Test
     assert_statsd_increment('ActiveMerchant.Base.post_with_block') do
       assert_equal 'block called', ActiveMerchant::Base.new.post_with_block { 'block called' }
     end
-
+  ensure
     ActiveMerchant::Base.statsd_remove_count :post_with_block, 'ActiveMerchant.Base.post_with_block'
   end
 
@@ -194,7 +194,7 @@ class StatsDInstrumentationTest < Minitest::Test
     assert_statsd_measure('ActiveMerchant.Gateway.ssl_post', sample_rate: 0.3) do
       ActiveMerchant::UniqueGateway.new.purchase(true)
     end
-
+  ensure
     ActiveMerchant::UniqueGateway.statsd_remove_measure :ssl_post, 'ActiveMerchant.Gateway.ssl_post'
   end
 
@@ -204,17 +204,24 @@ class StatsDInstrumentationTest < Minitest::Test
     assert_statsd_measure('ActiveMerchant.Gateway.ssl_post') do
       ActiveMerchant::UniqueGateway.new.purchase(true)
     end
-
+  ensure
     ActiveMerchant::UniqueGateway.statsd_remove_measure :ssl_post, 'ActiveMerchant::Gateway.ssl_post'
   end
 
+  def test_statsd_measure_yells_without_block
+    err = assert_raises(ArgumentError) do
+      assert_statsd_measure('ActiveMerchant.Gateway.ssl_post')
+    end
+    assert_equal "block must be given", err.to_s
+  end
+
   def test_statsd_measure_with_method_receiving_block
     ActiveMerchant::Base.statsd_measure :post_with_block, 'ActiveMerchant.Base.post_with_block'
 
     assert_statsd_measure('ActiveMerchant.Base.post_with_block') do
       assert_equal 'block called', ActiveMerchant::Base.new.post_with_block { 'block called' }
     end
-
+  ensure
     ActiveMerchant::Base.statsd_remove_measure :post_with_block, 'ActiveMerchant.Base.post_with_block'
   end
 
@@ -225,7 +232,7 @@ class StatsDInstrumentationTest < Minitest::Test
     assert_statsd_increment('ActiveMerchant.Gateway.sync') do
       ActiveMerchant::Gateway.sync
     end
-
+  ensure
     ActiveMerchant::Gateway.singleton_class.statsd_remove_count :sync, 'ActiveMerchant.Gateway.sync'
   end
 
@@ -236,7 +243,7 @@ class StatsDInstrumentationTest < Minitest::Test
     assert_statsd_increment('ActiveMerchant.Gateway.sync', tags: ['key:value']) do
       ActiveMerchant::Gateway.sync
     end
-
+  ensure
     ActiveMerchant::Gateway.singleton_class.statsd_remove_count :sync, 'ActiveMerchant.Gateway.sync'
   end
 

data/test/udp_backend_test.rb

@@ -19,13 +19,13 @@ class UDPBackendTest < Minitest::Test
 
     @backend.server = "localhost:1234"
     @backend.socket
-    
+
     @backend.port = 2345
     @backend.socket
 
     @backend.host = '127.0.0.1'
     @backend.socket
-  end  
+  end
 
   def test_collect_respects_sampling_rate
     @socket.expects(:send).once.returns(1)
@@ -35,13 +35,13 @@ class UDPBackendTest < Minitest::Test
     @backend.collect_metric(metric)
 
     @backend.stubs(:rand).returns(0.6)
-    @backend.collect_metric(metric)    
+    @backend.collect_metric(metric)
   end
 
   def test_support_counter_syntax
     @backend.expects(:write_packet).with('counter:1|c').once
     StatsD.increment('counter', sample_rate: 1.0)
-    
+
     @backend.expects(:write_packet).with('counter:1|c|@0.5').once
     StatsD.increment('counter', sample_rate: 0.5)
   end
@@ -100,7 +100,7 @@ class UDPBackendTest < Minitest::Test
     @backend.expects(:write_packet).never
     @logger.expects(:warn)
     StatsD.key_value('fookv', 3.33)
-  end  
+  end
 
   def test_support_tags_syntax_on_datadog
     @backend.implementation = :datadog
@@ -116,7 +116,7 @@ class UDPBackendTest < Minitest::Test
   end
 
   def test_socket_error_should_not_raise_but_log
-    @socket.stubs(:connect).raises(SocketError)    
+    @socket.stubs(:connect).raises(SocketError)
     @logger.expects(:error)
     StatsD.increment('fail')
   end
@@ -132,4 +132,29 @@ class UDPBackendTest < Minitest::Test
     @logger.expects(:error)
     StatsD.increment('fail')
   end
+
+  def test_synchronize_in_exit_handler_handles_thread_error_and_exits_cleanly
+    pid = fork do
+      Signal.trap('TERM') do
+        $sent_packet = false
+
+        class << @backend.socket
+          def send(command, *args)
+            $sent_packet = true if command == 'exiting:1|c'
+            command.length
+          end
+        end
+
+        StatsD.increment('exiting')
+        Process.exit!($sent_packet)
+      end
+
+      sleep 100
+    end
+
+    Process.kill('TERM', pid)
+    Process.waitpid(pid)
+
+    assert $?.success?, 'socket did not write on exit'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statsd-instrument
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Jesse Storimer
@@ -10,90 +10,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A StatsD client for Ruby apps. Provides metaprogramming methods to inject
@@ -104,8 +104,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -152,17 +152,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A StatsD client for Ruby apps
@@ -180,4 +180,3 @@ test_files:
 - test/statsd_test.rb
 - test/test_helper.rb
 - test/udp_backend_test.rb
-has_rdoc: