newrelic-infinite_tracing 6.13.0 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84d7700049bb159c02fef04b675cc0d1cc55f602c3ad8ac37486acacbddede61
-  data.tar.gz: becd29db3b7bcbe26bfcd6ce5fc60924a7547ebdaedc009df7d59d9d9da11c5b
+  metadata.gz: ddce2a0b747d68216244e8e78a9cce4ba310826d199ac080a90a7001ceb3f3ea
+  data.tar.gz: e765855c5b9094c88893ad3b81eacdb840651f9a558281ec9a785185290cfcf0
 SHA512:
-  metadata.gz: 144b7121f2b3a3368eeada890bc624a8d14e43ff7b3ff333465f3ba126d7344035242b3cc29af9ef094307dee574f8af4d180745cfc8b08c9c52abb3369e5d65
-  data.tar.gz: b87d88250bba4dc3d5bbbbc679d9e078c5e37a48d1739af7121dacc9bc8cadf2b285a2b61ffcba8f9ee11ab2bf523e4d4b26e00fbbff88542c9629f1db2174e7
+  metadata.gz: bb6ddfc5989dba549e446a14825421a44eb4180f8f1afb2d120a78d7a598913cecd575bfd05c68a33816bc032604c264e8cc19ff5b2da801b51c51f15b3d5abf
+  data.tar.gz: b7bbd3bc6e201e16da55638789296cb172b9e2498fe4e574fa88750c0cbe032e449b218fa01f15555d972dbba97c162875790d061ff7c6d991d9990bee05d6e4

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 # 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.
   
   ## v6.12.0
 

data/lib/infinite_tracing/client.rb

@@ -77,6 +77,7 @@ module NewRelic::Agent
 
         case error
         when GRPC::Unavailable then restart
+        when GRPC::FailedPrecondition then restart
         when GRPC::Unimplemented then suspend
         else
           # Set exponential backoff to false so we'll reconnect at periodic (15 second) intervals instead
@@ -142,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
 
@@ -152,8 +154,6 @@ module NewRelic::Agent
       def record_span_batches exponential_backoff
         RecordStatusHandler.new self, Connection.record_span_batches(self, buffer.batch_enumerator, exponential_backoff)
       end
-
     end
-
   end
 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,12 +98,12 @@ module NewRelic::Agent
         return @metadata if @metadata
 
         @lock.synchronize do
-          @agent_started.wait(@lock) if !@agent_connected
 
           @metadata = {
             "license_key" => license_key,
             "agent_run_token" => agent_id
           }
+          @metadata.merge!(request_headers_map)
         end
       end
 
@@ -138,6 +145,12 @@ module NewRelic::Agent
         NewRelic::Agent.config[:license_key]
       end
 
+      def request_headers_map
+        headers = NewRelic::Agent.agent.service.instance_variable_get(:@request_headers_map) || NewRelic::EMPTY_HASH
+        # transform_keys only 2.5+, but infinite tracing is 2.5+ only also
+        headers.transform_keys(&:downcase)
+      end
+
       # Continues retrying the connection at backoff intervals until a successful connection is made
       def with_reconnection_backoff exponential_backoff=true, &block
         @connection_attempts = 0

data/newrelic-infinite_tracing.gemspec

@@ -1,6 +1,8 @@
 #-*- coding: utf-8 -*-
 # frozen_string_literal: true
 
+require 'fileutils'
+
 agent_lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(agent_lib) unless $LOAD_PATH.include?(agent_lib)
 
@@ -30,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", "Michael Lang" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.licenses = ['Apache-2.0']
   s.description = <<-EOS
@@ -74,7 +76,7 @@ EOS
   s.summary = "New Relic Infinite Tracing for the Ruby agent"
 
   s.add_dependency 'newrelic_rpm', NewRelic::VERSION::STRING
-  s.add_dependency 'grpc', '~> 1.28.0'
+  s.add_dependency 'grpc', '~> 1.34'
 
   s.add_development_dependency 'rake', '12.3.3'
   s.add_development_dependency 'rb-inotify', '0.9.10'   # locked to support < Ruby 2.3 (and listen 3.0.8)
@@ -88,5 +90,5 @@ EOS
   s.add_development_dependency 'hometown', '~> 0.2.5'
   s.add_development_dependency 'bundler'
 
-  s.add_development_dependency 'grpc-tools', "~> 1.14.0"
+  s.add_development_dependency 'grpc-tools', "~> 1.14"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-infinite_tracing
 version: !ruby/object:Gem::Version
-  version: 6.13.0
+  version: 7.1.0
 platform: ruby
 authors:
-- Rachel Klein
+- Aaron Huntsman
 - Tanna McClure
 - Michael Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.13.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.13.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.28.0
+        version: '1.34'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.28.0
+        version: '1.34'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -200,14 +200,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: '1.14'
 description: |
   The New Relic Ruby agent requires the gem newrelic_rpm, and it includes distributed
   tracing that uses head-based sampling (standard distributed tracing).
@@ -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