newrelic-infinite_tracing 6.15.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc39cecc639ecf00228523ab5a0f61c320ebf0ab656bef946e46a98a021dcad9
-  data.tar.gz: fe96fa6bf2ad2cc53a3d6c33e37c2204b8fcb2031e3d22723736a87d35ea5b3a
+  metadata.gz: 445f6703f6c422340754fe7755d5fc696516b284cb8b124939d7b12df33ab41d
+  data.tar.gz: ca2877a86b3aa2324088040c16d0fa9ac364ca4d6c569f192560d717d6dc661e
 SHA512:
-  metadata.gz: 38ea40bb30a9b6cf58278761c7b097234773562d373d55172be7ab70f6d5421df85b195150389975859df79e9b1c891394d06f3488bec983cb4c4f9515a98a82
-  data.tar.gz: d48da08ed88d0442a89219eb4212e0b3b1f02904357125803addfb01ed6cf8f9c2c838ec5b99166edd2981ce75b7c5ed34bba446eccceb405cd6736dcdf18d9f
+  metadata.gz: 344090f0535457f3b195513bc4cdce46ca29a020e8212239ee394f28429f6d55ecb3a977d2ee6b86b06f5b74278e5c5996b71edb7159e53c10ef048646c7e59b
+  data.tar.gz: 7151ccfacb0587b65cde6fedb0a288b891950ad7011938e9e068ecd37dc317c3ab82685e6cd5f18496fa829d681dfcb918baacdcb889d6662574601f41ba2026

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # New Relic Infinite Tracing for Ruby Agent Release Notes #
 
+  ## v7.0.0
+  * Bugfix: Fixes an intermittent bug where the agent was unable to start when infinite tracing was enabled. 
+
   ## v6.15.0
   * Adds data from the agents connect response `request_headers_map` to the metadata for the connection to the infinite trace observer.
   

data/lib/infinite_tracing/client.rb

@@ -143,6 +143,7 @@ module NewRelic::Agent
 
       def start_streaming exponential_backoff=true
         return if suspended?
+        Connection.instance.wait_for_agent_connect
         @lock.synchronize { @response_handler = record_spans exponential_backoff }
       end
 

data/lib/infinite_tracing/connection.rb

@@ -81,8 +81,15 @@ module NewRelic::Agent
       # We attempt to connect and record spans with reconnection backoff in order to deal with
       # unavailable errors coming from the stub being created and record_span call
       def rpc
+        wait_for_agent_connect
         @rpc ||= Channel.new.stub
       end
+      
+      def wait_for_agent_connect
+        @lock.synchronize do
+          @agent_started.wait(@lock) if !@agent_connected
+        end
+      end
 
       # The metadata for the RPC calls is a blocking call waiting for the Agent to
       # connect and receive the server side configuration, which contains the license_key
@@ -91,7 +98,6 @@ module NewRelic::Agent
         return @metadata if @metadata
 
         @lock.synchronize do
-          @agent_started.wait(@lock) if !@agent_connected
 
           @metadata = {
             "license_key" => license_key,

data/lib/infinite_tracing/streaming_buffer.rb

@@ -15,11 +15,11 @@ module NewRelic::Agent
       include Enumerable
       extend Forwardable
       def_delegators :@queue, :empty?, :num_waiting, :push
-      
+
       DEFAULT_QUEUE_SIZE = 10_000
       FLUSH_DELAY        = 0.005
       MAX_FLUSH_WAIT     = 3 # three seconds
-      
+
       attr_reader :queue
 
       def initialize max_size = DEFAULT_QUEUE_SIZE
@@ -29,7 +29,7 @@ module NewRelic::Agent
         @batch = Array.new
       end
 
-      # Dumps the contents of this streaming buffer onto 
+      # Dumps the contents of this streaming buffer onto
       # the given buffer and closes the queue
       def transfer new_buffer
         @lock.synchronize do
@@ -67,7 +67,7 @@ module NewRelic::Agent
         @queue.num_waiting.times { @queue.push nil }
         close_queue
 
-        # Logs if we're throwing away spans because nothing's 
+        # Logs if we're throwing away spans because nothing's
         # waiting to take them off the queue.
         if @queue.num_waiting == 0 && !@queue.empty?
           NewRelic::Agent.logger.warn "Discarding #{@queue.size} segments on Streaming Buffer"
@@ -75,8 +75,8 @@ module NewRelic::Agent
         end
 
         # Only wait a short while for queue to flush
-        cutoff = Time.now + MAX_FLUSH_WAIT
-        until @queue.empty? || Time.now >= cutoff do sleep(FLUSH_DELAY) end
+        cutoff = Process.clock_gettime(Process::CLOCK_MONOTONIC) + MAX_FLUSH_WAIT
+        until @queue.empty? || Process.clock_gettime(Process::CLOCK_MONOTONIC) >= cutoff do sleep(FLUSH_DELAY) end
       end
 
       def close_queue
@@ -87,9 +87,9 @@ module NewRelic::Agent
       # items off the queue while any items are present
       # If +nil+ is popped, the queue is closing.
       #
-      # The segment is transformed into a serializable 
+      # The segment is transformed into a serializable
       # span here so processing is taking place within
-      # the gRPC call's thread rather than in the main 
+      # the gRPC call's thread rather than in the main
       # application thread.
       def enumerator
         return enum_for(:enumerator) unless block_given?
@@ -106,16 +106,16 @@ module NewRelic::Agent
 
       # Returns the blocking enumerator that will pop
       # items off the queue while any items are present
-      # 
-      # yielding is deferred until batch_size spans is 
+      #
+      # yielding is deferred until batch_size spans is
       # reached.
       #
-      # If +nil+ is popped, the queue is closing. A 
+      # If +nil+ is popped, the queue is closing. A
       # final yield on non-empty batch is fired.
       #
-      # The segment is transformed into a serializable 
+      # The segment is transformed into a serializable
       # span here so processing is taking place within
-      # the gRPC call's thread rather than in the main 
+      # the gRPC call's thread rather than in the main
       # application thread.
       def batch_enumerator
         return enum_for(:enumerator) unless block_given?
@@ -139,7 +139,7 @@ module NewRelic::Agent
 
       def span_event proc_or_segment
         if proc_or_segment.is_a?(Proc)
-          proc_or_segment.call 
+          proc_or_segment.call
         else
           SpanEventPrimitive.for_segment(proc_or_segment)
         end

data/newrelic-infinite_tracing.gemspec

@@ -32,9 +32,9 @@ Gem::Specification.new do |s|
 
   s.name = "newrelic-infinite_tracing"
   s.version = NewRelic::VERSION::STRING
-  s.required_ruby_version = '>= 2.3.0'
+  s.required_ruby_version = '>= 2.5.0'
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [ "Rachel Klein", "Tanna McClure", "Michael Lang" ]
+  s.authors = [ "Aaron Huntsman", "Tanna McClure", "Kayla Reopelle" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.licenses = ['Apache-2.0']
   s.description = <<-EOS

data/tasks/all.rb

@@ -2,7 +2,7 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
-# This is required to load in task definitions from merb
+# This is required to load in task definitions
 Dir.glob(File.join(File.dirname(__FILE__),'*.rake')) do |file|
   load file
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-infinite_tracing
 version: !ruby/object:Gem::Version
-  version: 6.15.0
+  version: 8.0.0
 platform: ruby
 authors:
-- Rachel Klein
+- Aaron Huntsman
 - Tanna McClure
-- Michael Lang
+- Kayla Reopelle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.15.0
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.15.0
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
@@ -277,14 +277,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: New Relic Infinite Tracing for the Ruby agent