instrumental_agent 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5548f3026bc66fb92979da6fd2dd015caa6463f
-  data.tar.gz: 542eb17f2e0b42163df6025a2183cd081eec3877
+  metadata.gz: 1e7ed24aefecf9dcaafe0e844de778dbffcdee97
+  data.tar.gz: 0e02a6016b87304d08510dec4018d589b9b58b19
 SHA512:
-  metadata.gz: f112f43c1f9a13162ad72d2a57ab0fde0b3f83943c6e7f0a924677b127e22593685d363e5df4611cdd0e8a4afbd15836f3f563646731aa20b767d48bcbb454fe
-  data.tar.gz: 85e72c43f368d72510f53b8f3bfeea6c0a4ec85db2b900b17bccf5fc673974ef81645b30501a079b2f4beb765a7032f9f5a8ae57499f731acaf0478d5076cfb7
+  metadata.gz: cc097c786b1b97206883cc0049f2841b1a9913a4364597ed0200f9ccb13fe91be118a1dbab1d90c774c0e014c11905b1f1da2d8a571669386c2b634b08273856
+  data.tar.gz: 05e415812768a7bc6df4095d7a0ad820c8ca8061a8a817e06fcab18490451e3be107c31602703da8b5217339a0dbb7a53724aa60f84d1256763baf6452ba7b83

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 0.13.4 [October 6, 2015]
+* Fixes for when agent times out communicating with server
+
 ### 0.13.3 [August 18, 2015]
 * Fixes for when agent is disconnected from server
 

data/lib/instrumental/agent.rb

@@ -458,7 +458,7 @@ module Instrumental
       case err
       when EOFError
         # nop
-      when Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EADDRINUSE
+      when Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EADDRINUSE, Timeout::Error
         # If the connection has been refused by Instrumental
         # or we cannot reach the server
         # or the connection state of this socket is in a race

data/lib/instrumental/version.rb

@@ -1,3 +1,3 @@
 module Instrumental
-  VERSION = "0.13.3"
+  VERSION = "0.13.4"
 end

data/spec/agent_spec.rb

@@ -534,6 +534,57 @@ shared_examples "Instrumental Agent" do
           attempted_resolutions.should == 2
         end
       end
+
+      it "should attempt to resolve DNS after a connection timeout" do
+        with_constants('Instrumental::Agent::CONNECT_TIMEOUT' => 1) do
+          attempted_opens = 0
+          open_sleep = 0
+          os = agent.method(:open_socket)
+          agent.stub(:open_socket) { |*args, &block| attempted_opens +=1 ; sleep(open_sleep) && os.call(*args) }
+
+          # Connect normally and start running worker loop
+          attempted_resolutions = 0
+          ga = Resolv.method(:getaddresses)
+          Resolv.stub(:getaddresses) { |*args, &block| attempted_resolutions +=1 ; ga.call(*args) }
+          agent.gauge('test', 1)
+          wait 2
+          attempted_resolutions.should == 1
+          attempted_opens.should == 1
+          agent.should be_running
+
+          # Setup a failure for the next command so we'll break out of the inner
+          # loop in run_worker_loop causing another call to open_socket
+          test_connection_fail = true
+          tc = agent.method(:test_connection)
+          agent.stub(:test_connection) { |*args, &block| test_connection_fail ? raise("fail") : tc.call(*args) }
+
+          # Setup a timeout failure in open_socket for the next command
+          open_sleep = 5
+
+          # 1. test_connection fails, triggering a retry, which hits open_socket
+          # 2. we hit open_socket, it times out causing worker thread to end
+          agent.gauge('test', 1)
+          wait 5
+          # On retry we attempt to open_socket, but this times out
+          attempted_opens.should == 2
+          # We don't resolve again yet, we just disconnect
+          attempted_resolutions.should == 1
+          agent.should_not be_running
+
+          # Make test_connection succeed on the next command
+          test_connection_fail = false
+          # Make open_socket succeed again
+          open_sleep = 0
+
+          # We reconnect on the next command
+          # The reconnect causes a new DNS resolution
+          agent.gauge('test', 1)
+          wait 5
+          attempted_resolutions.should == 2
+          attempted_opens.should == 3
+          agent.should be_running
+        end
+      end
     end
 
     describe Instrumental::Agent, "enabled with sync option" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instrumental_agent
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - Elijah Miller
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Agent for reporting data to instrumentalapp.com