instrumental_agent 3.0.0.beta → 3.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1a781a0abec98e8c737a57fac5134fe2ee847879949fc5134ced2c0b0136076
-  data.tar.gz: 89950c6e0b59713dc6034be99acfc52473ef049b63824685694626d049a85b8b
+  metadata.gz: a86fe597ab71c9660d590e42ef37e0d9012a4f5adbe7742d265f3d20ffda1b9e
+  data.tar.gz: cd56273db7523852982b58162361359fc3c9fcd3b8cae19bf87387bf63fe26b1
 SHA512:
-  metadata.gz: ca82be6040189400c0e01513d517202e8d27d900ad2f10e5558025cad6a499e49985ee58c95efdf90d24e2fd0174b9349c7cd6ac8f906325f2de766c0f14cba3
-  data.tar.gz: 742200da53f676a9341a795f5f8145416650c033466782348fc4852dc62e656e9fed4e2be02c0829c2ec946092e7dfcd7d836cc50e731a6ceb8cb2493b76a1b6
+  metadata.gz: c68427fe4c900db650e45b46423c808263d86df275b9f49b44896973f4db3e25cd61b8fe9a0b67cba54acbe831b4c00a7cbfb8c7b7d6cc30959159e9e149d3dd
+  data.tar.gz: 57f5554f876c9311d76305c60b754af1c7d1a8bb63b8682355217b014b927e1d0f500bea37daff954d5149d4015b1be80793f9f2ed8f713928b4af4d428e576f

data/lib/instrumental/agent.rb

@@ -265,22 +265,22 @@ module Instrumental
         logger.info "Cleaning up agent, aggregator_size: #{@aggregator_queue.size}, thread_running: #{@aggregator_thread.alive?}"
         logger.info "Cleaning up agent, queue size: #{@sender_queue.size}, thread running: #{@sender_thread.alive?}"
         @allow_reconnect = false
-        if @sender_queue.size > 0 || @aggregator_queue.size > 0
-          @sender_queue << ['exit']
-          @aggregator_queue << ['exit']
-          begin
-            with_timeout(EXIT_FLUSH_TIMEOUT) { @aggregator_thread.join }
-            with_timeout(EXIT_FLUSH_TIMEOUT) { @sender_thread.join }
-          rescue Timeout::Error
-            total_size = @sender_queue&.size.to_i +
-                         @aggregator_queue&.size.to_i +
-                         @event_aggregator&.size.to_i
-
-            if total_size > 0
-              logger.error "Timed out working agent thread on exit, dropping #{total_size} metrics"
-            else
-              logger.error "Timed out Instrumental Agent, exiting"
-            end
+        begin
+          with_timeout(EXIT_FLUSH_TIMEOUT) do
+            @aggregator_queue << ['exit']
+            @aggregator_thread.join
+            @sender_queue << ['exit']
+            @sender_thread.join
+          end
+        rescue Timeout::Error
+          total_size = @sender_queue&.size.to_i +
+                       @aggregator_queue&.size.to_i +
+                       @event_aggregator&.size.to_i
+
+          if total_size > 0
+            logger.error "Timed out working agent thread on exit, dropping #{total_size} metrics"
+          else
+            logger.error "Timed out Instrumental Agent, exiting"
           end
         end
       end
@@ -413,13 +413,23 @@ module Instrumental
         disconnect
         address = ipv4_address_for_host(@host, @port)
         if address
-          @pid = Process.pid
+          new_pid = if @pid != Process.pid
+                      @pid = Process.pid
+                      true
+                    else
+                      false
+                    end
+
           @sync_mutex = Mutex.new
           @failures = 0
           @sockaddr_in = Socket.pack_sockaddr_in(@port, address)
 
           logger.info "Starting aggregator thread"
           if !@aggregator_thread&.alive?
+            if new_pid
+              @event_aggregator = nil
+              @aggregator_queue = Queue.new
+            end
             @aggregator_thread = Thread.new do
               run_aggregator_loop
             end
@@ -427,6 +437,7 @@ module Instrumental
 
           if !@sender_thread&.alive?
             logger.info "Starting sender thread"
+            @sender_queue = Queue.new if new_pid
             @sender_thread = Thread.new do
               run_sender_loop
             end
@@ -492,9 +503,12 @@ module Instrumental
                                                 end
                                               end
           if command_and_args
-            sync_resource = command_options && command_options[:sync_resource]
             case command_and_args
             when 'exit'
+              if !@event_aggregator.nil?
+                @sender_queue << @event_aggregator
+                @event_aggregator = nil
+              end
               logger.info "Exiting, #{@aggregator_queue.size} commands remain"
               return true
             when 'flush'

data/lib/instrumental/version.rb

@@ -1,3 +1,3 @@
 module Instrumental
-  VERSION = "3.0.0.beta"
+  VERSION = "3.0.0.beta2"
 end

data/spec/agent_spec.rb

@@ -636,20 +636,21 @@ shared_examples "Instrumental Agent" do
           end
         end
 
-        it "should not wait to exit a process if there are no commands queued" do
+        it "should follow normal exit procedures whether or not there are commands queued" do
           allow(agent).to receive(:open_socket) { |*args, &block| sleep(5) && block.call }
-          with_constants('Instrumental::Agent::EXIT_FLUSH_TIMEOUT' => 3) do
+          with_constants('Instrumental::Agent::EXIT_FLUSH_TIMEOUT' => 1) do
             if (pid = fork { agent.increment('foo', 1); agent.sender_queue.clear })
               tm = Time.now.to_f
               Process.wait(pid)
               diff = Time.now.to_f - tm
-              expect(diff).to be < 1
+              expect(diff).to be < 2
+              expect(diff).to be > 1
             end
           end
         end
       end
 
-      it "should not wait longer than EXIT_FLUSH_TIMEOUT to attempt flushing the socket when disconnecting" do
+      it "should not wait much longer than EXIT_FLUSH_TIMEOUT to attempt flushing the socket when disconnecting" do
         agent.increment('foo', 1)
         wait do
           expect(server.commands.grep(/foo/).size).to eq(1)
@@ -665,12 +666,13 @@ shared_examples "Instrumental Agent" do
               raise
             end
           end.join
-        end
+        end.at_least(1).times
+
         with_constants('Instrumental::Agent::EXIT_FLUSH_TIMEOUT' => 3) do
           tm = Time.now.to_f
           agent.cleanup
           diff = Time.now.to_f - tm
-          expect(diff).to be <= 3
+          expect(diff).to be <= 3.1
         end
       end
 
@@ -1097,6 +1099,33 @@ shared_examples "Instrumental Agent" do
             end
           end
         end
+
+        if FORK_SUPPORTED
+          it "should automatically reconnect when forked when aggregation is enabled" do
+            Timecop.travel start_of_minute
+            agent.frequency = 10
+
+            agent.increment('fork_reconnect_test1', 1, 0, 1)
+            fork do
+              agent.increment('fork_reconnect_test2', 1, 0, 1) # triggers reconnect
+              exit
+            end
+
+
+            sleep 1
+            agent.increment('fork_reconnect_test3', 1, 0, 1) # triggers reconnect
+
+            agent.flush
+            expect(server.connect_count).to eq(2)
+
+            wait do
+              expect(server.commands).to include("increment fork_reconnect_test1 1 0 1")
+              expect(server.commands).to include("increment fork_reconnect_test2 1 0 1")
+              expect(server.commands).to include("increment fork_reconnect_test3 1 0 1")
+              expect(server.commands.grep(/fork_reconnect/).size).to eq(3)
+            end
+          end
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -9,6 +9,15 @@ require 'test_server'
 RSpec.configure do |config|
 
   config.before(:all) do
+    # this is heavily threaded code with lots of really interesting
+    # comparison and matching. forcing rspec to load all its differs
+    # and matchers up front can save considerable time.
+    # Lazy loading these things can be so slow that it causes false
+    # failures in some tests.
+    begin
+      expect(1).to eq(2)
+    rescue Exception
+    end
   end
 
   config.before(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instrumental_agent
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta
+  version: 3.0.0.beta2
 platform: ruby
 authors:
 - Expected Behavior
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metrician