newrelic-infinite_tracing 6.12.0.367 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8701c192aa4a70795c34856b017f223549cb5ac0d64c6c6c1438745a0144019
-  data.tar.gz: 6b0d930769e43571033465b841c41db78e8e703f4f281c2c4563257c89daa4c5
+  metadata.gz: 0c0cb119fdd9c9388989d99d116add07d20eeeaaab5f0b8e3bc533c4be9f750c
+  data.tar.gz: 925054cff0d639af379cecdaa726230221fe0a5d41def09a86f8e0455c0089e2
 SHA512:
-  metadata.gz: 52c58c4f1d9074e3de7279a1e9fbaac50e1cac4d883ab1e180873df928e8eb1afe2936df50e017272105f028a5c36024435e8b726db3b28767ed5b4dcad16919
-  data.tar.gz: 0da76cc8199bfb29cef261351086b26d7f1ea9f89166453df97e65bd887c211873d731a85fee9b9b584bce76775c6a6d973f73afd0fd7d0f0f0c57bfeb685b02
+  metadata.gz: 373451194aa1a8c8738582a74a2ffa7d10d9c2b0fc7110951caf68d90ed0465794d3835491c71dbb789b080f717b0eed6fc51a3c3530dcd05568e05d1f091266
+  data.tar.gz: 7f4a47aac1e4b26e600985e2abeadbf18f0f11c6ca38cf9a4b2422f21995fbe3a9f7193ca544ac4aa19efa548017f9aa7fc0c9396ed0e3b569cb17a4600429db

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.12.0.367
+  version: 7.0.0
 platform: ruby
 authors:
-- Rachel Klein
+- Aaron Huntsman
 - Tanna McClure
 - Michael Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2021-04-23 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.12.0.367
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.12.0.367
+        version: 7.0.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.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: New Relic Infinite Tracing for the Ruby agent