newrelic-infinite_tracing 8.11.0 → 8.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7dfe6b33e33cdfb49d3c4bc0ef9e766de0139b0aaae353bd7720abe831c6ea6
-  data.tar.gz: 161654c037fea561ed979e70e7a7168495f233177b35a185e1f90c4e326a0599
+  metadata.gz: 3d82f3d8556283da9e25f2789f9e83fac58f65b3df011af7d2adf2fd32894917
+  data.tar.gz: '0995598d2923cafdbc3eb38a663500ea48e37ba207cb6c58a1e8a15dbcb25d58'
 SHA512:
-  metadata.gz: bdef9830574c92710deab3a8377675539d5394b401cbedbbaf744d81fb89aad7d6ec3072b0cb24d73e61bc01f9e85590be45b1cb958566c621499ed395e6a4f6
-  data.tar.gz: 3c005a7e4983ab120ad84cdceeabc0129161695411ee0c5bb52580851b3e429a9b7fb4a94cf929b4a9d1eb7681fb602db592b4a7a4a4fed6fe24d2437d13fb16
+  metadata.gz: 2aeb0110716ff65afcc46ef898690cdd951d8318273709840ed303657679dd4fa8110f7dd229fcce0b0a36806d8ced9e16e20297dae1d19f1a4d88093c48f7a2
+  data.tar.gz: d41478145f1891e1f02d5df82bbca1fe711c5d5a99fd352c118e6441635f86cbbf0255b963e791e2d87c1aefb3085a65786306491e89a18032c9907462e6cd0b

data/lib/infinite_tracing/agent_integrations/agent.rb

@@ -33,6 +33,7 @@ module NewRelic::Agent
     def close_infinite_tracer
       NewRelic::Agent.logger.debug("Closing infinite tracer threads")
       return unless @infinite_tracer_thread
+
       @infinite_tracer_thread.join
       @infinite_tracer_thread.stop
       @infinite_tracer_thread = nil

data/lib/infinite_tracing/client.rb

@@ -33,6 +33,7 @@ module NewRelic::Agent
       # client (if any) and returns self (so we chain the call)
       def transfer(previous_client)
         return self unless previous_client
+
         previous_client.buffer.transfer(buffer)
         self
       end
@@ -108,6 +109,7 @@ module NewRelic::Agent
       # The Suspended Streaming Buffer will be installed in this state.
       def suspend
         return if suspended?
+
         @lock.synchronize do
           @suspended = true
           @buffer = new_streaming_buffer
@@ -138,6 +140,7 @@ module NewRelic::Agent
 
       def stop
         return unless @response_handler
+
         @lock.synchronize do
           @response_handler.stop
           @response_handler = nil

data/lib/infinite_tracing/record_status_handler.rb

@@ -19,6 +19,7 @@ module NewRelic::Agent
 
       def stop
         return if @worker.nil?
+
         @lock.synchronize do
           NewRelic::Agent.logger.debug("gRPC Stopping Response Handler")
           @worker.stop
@@ -31,6 +32,7 @@ module NewRelic::Agent
       def handle_response
         @enumerator.each do |response|
           break if response.nil? || response.is_a?(Exception)
+
           @lock.synchronize do
             @messages_seen = response
             NewRelic::Agent.logger.debug("gRPC Infinite Tracer Observer saw #{messages_seen} messages")

data/lib/infinite_tracing/streaming_buffer.rb

@@ -17,6 +17,10 @@ module NewRelic::Agent
       DEFAULT_QUEUE_SIZE = 10_000
       FLUSH_DELAY = 0.005
       MAX_FLUSH_WAIT = 3 # three seconds
+      # To ensure that two bits of info for the same transaction
+      # are recognized as belonging together, set a maximum time
+      # in seconds to elapse between batch submissions.
+      MAX_BATCH_HOLD = 5
 
       attr_reader :queue
 
@@ -91,6 +95,7 @@ module NewRelic::Agent
       # application thread.
       def enumerator
         return enum_for(:enumerator) unless block_given?
+
         loop do
           if segment = @queue.pop(false)
             NewRelic::Agent.increment_metric(SPANS_SENT_METRIC)
@@ -116,13 +121,16 @@ module NewRelic::Agent
       # the gRPC call's thread rather than in the main
       # application thread.
       def batch_enumerator
-        return enum_for(:enumerator) unless block_given?
+        return enum_for(:batch_enumerator) unless block_given?
+
+        last_time = Process.clock_gettime(Process::CLOCK_REALTIME)
         loop do
           if proc_or_segment = @queue.pop(false)
             NewRelic::Agent.increment_metric(SPANS_SENT_METRIC)
             @batch << transform(proc_or_segment)
-            if @batch.size >= BATCH_SIZE
+            if batch_ready?(last_time)
               yield(SpanBatch.new(spans: @batch))
+              last_time = Process.clock_gettime(Process::CLOCK_REALTIME)
               @batch.clear
             end
 
@@ -135,6 +143,10 @@ module NewRelic::Agent
 
       private
 
+      def batch_ready?(last_time)
+        @batch.size >= BATCH_SIZE || Process.clock_gettime(Process::CLOCK_REALTIME) - last_time >= MAX_BATCH_HOLD
+      end
+
       def span_event(proc_or_segment)
         if proc_or_segment.is_a?(Proc)
           proc_or_segment.call

data/lib/infinite_tracing/worker.rb

@@ -22,8 +22,10 @@ module NewRelic::Agent
 
       def status
         return "error" if error?
+
         @lock.synchronize do
           return "stopped" if @worker_thread.nil?
+
           @worker_thread.status || "idle"
         end
       end
@@ -34,6 +36,7 @@ module NewRelic::Agent
 
       def join(timeout = nil)
         return unless @worker_thread
+
         NewRelic::Agent.logger.debug("joining worker #{@name} thread...")
         @worker_thread.join(timeout)
       end
@@ -41,6 +44,7 @@ module NewRelic::Agent
       def stop
         @lock.synchronize do
           return unless @worker_thread
+
           NewRelic::Agent.logger.debug("stopping worker #{@name} thread...")
           @worker_thread.kill
           @worker_thread = nil

data/newrelic-infinite_tracing.gemspec

@@ -78,6 +78,7 @@ Gem or plugin, hosted on https://github.com/newrelic/newrelic-ruby-agent/
   s.add_development_dependency 'rb-inotify', '0.9.10' # locked to support < Ruby 2.3 (and listen 3.0.8)
   s.add_development_dependency 'listen', '3.0.8' # locked to support < Ruby 2.3
   s.add_development_dependency 'minitest', '~> 5.15'
+  s.add_development_dependency 'minitest-stub-const', '0.6'
   s.add_development_dependency 'mocha', '~> 1.9.0'
   s.add_development_dependency 'pry-nav', '~> 0.3.0'
   s.add_development_dependency 'pry-stack_explorer', '~> 0.4.9'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-infinite_tracing
 version: !ruby/object:Gem::Version
-  version: 8.11.0
+  version: 8.12.0
 platform: ruby
 authors:
 - Tanna McClure
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2022-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.11.0
+        version: 8.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.11.0
+        version: 8.12.0
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +97,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.15'
+- !ruby/object:Gem::Dependency
+  name: minitest-stub-const
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement