newrelic-infinite_tracing 6.11.0.365 → 6.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc6db54323c4ae07d8db4e91bf7fc71b39290662585d0b65ac55cf60e5f91a4a
-  data.tar.gz: 928754820a8b4bea71bcb7bc1095058f2dba37bf0d53f7088642fbc67a0027f6
+  metadata.gz: dc39cecc639ecf00228523ab5a0f61c320ebf0ab656bef946e46a98a021dcad9
+  data.tar.gz: fe96fa6bf2ad2cc53a3d6c33e37c2204b8fcb2031e3d22723736a87d35ea5b3a
 SHA512:
-  metadata.gz: 12826887a68e0df4c28f2d7050909318a018f1ed8701b410b3a13a7750de45ee6375952ff8eaf46a56cbb5aac9f1ac5154b1ca14c7f1f38169c0219247bbfdd3
-  data.tar.gz: ea57b78c49205cc3b35af034d4de6f6ccb9d74b902aa2806f521307af9fa10e3fbd06eb5f5a9b1afbfe9f74107733947d870c6e5f240e8547465247e33ea88a3
+  metadata.gz: 38ea40bb30a9b6cf58278761c7b097234773562d373d55172be7ab70f6d5421df85b195150389975859df79e9b1c891394d06f3488bec983cb4c4f9515a98a82
+  data.tar.gz: d48da08ed88d0442a89219eb4212e0b3b1f02904357125803addfb01ed6cf8f9c2c838ec5b99166edd2981ce75b7c5ed34bba446eccceb405cd6736dcdf18d9f

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # New Relic Infinite Tracing for Ruby Agent Release Notes #
 
+  ## 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
+
+  * Implements restarting gRPC stream when server responds with OK response and no error.
+
   ## v6.11.0
 
   * Initial Release!

data/Gemfile

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 source 'https://rubygems.org'

data/lib/infinite_tracing.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 require 'uri'

data/lib/infinite_tracing/agent_integrations.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 module NewRelic::Agent

data/lib/infinite_tracing/agent_integrations/agent.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 module NewRelic::Agent

data/lib/infinite_tracing/agent_integrations/datastore_segment.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 module NewRelic

data/lib/infinite_tracing/agent_integrations/external_request_segment.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 module NewRelic

data/lib/infinite_tracing/agent_integrations/segment.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 module NewRelic

data/lib/infinite_tracing/channel.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 module NewRelic::Agent

data/lib/infinite_tracing/client.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 # The Client class manages the streaming buffer with respect to the gRPC Connection.
@@ -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
@@ -88,6 +89,17 @@ module NewRelic::Agent
         @suspended
       end
 
+      # This method is called when the server closes the record status stream without
+      # raising an error.  The Channel/Connection is not closed or reset in this case.
+      # We simply start streaming again, which will reuse the channel/connection to the 
+      # server and re-establish the gRPC bi-directional stream.  Useful for the server
+      # to initiate a load-balancing scheme.
+      def handle_close
+        NewRelic::Agent.logger.debug "The gRPC Trace Observer closed the stream with OK response. " \
+          "Restarting the stream."
+        start_streaming
+      end
+
       # Places the client into suspended state whereby client will no longer attempt to 
       # reconnect to the gRPC server nor will it attempt to send span events henceforth.
       # The Suspended Streaming Buffer will be installed in this state.
@@ -101,13 +113,23 @@ module NewRelic::Agent
         end
       end
 
-      def restart
+      def reset_connection
         @lock.synchronize do
           Connection.reset
+        end
+      end
+
+      def transfer_buffer
+        @lock.synchronize do
           old_buffer = @buffer
           @buffer = new_streaming_buffer
           old_buffer.transfer @buffer
         end
+      end
+
+      def restart
+        reset_connection
+        transfer_buffer
         start_streaming
       end
 
@@ -131,8 +153,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/config.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 module NewRelic::Agent

data/lib/infinite_tracing/connection.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 # The connection class manages the channel and connection to the gRPC server.
@@ -97,6 +97,7 @@ module NewRelic::Agent
             "license_key" => license_key,
             "agent_run_token" => agent_id
           }
+          @metadata.merge!(request_headers_map)
         end
       end
 
@@ -138,6 +139,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/lib/infinite_tracing/constants.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 module NewRelic::Agent

data/lib/infinite_tracing/proto.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 require 'grpc'

data/lib/infinite_tracing/proto/infinite_tracing_pb.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 # Generated by the protocol buffer compiler.  DO NOT EDIT!

data/lib/infinite_tracing/proto/infinite_tracing_services_pb.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
@@ -8,7 +8,7 @@
 # Original file comments:
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 #
 
 

data/lib/infinite_tracing/record_status_handler.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 module NewRelic::Agent
@@ -28,8 +28,10 @@ module NewRelic::Agent
                 NewRelic::Agent.logger.debug "gRPC Infinite Tracer Observer saw #{messages_seen} messages"
               end
             end
+            NewRelic::Agent.logger.debug "gRPC Infinite Tracer Observer closed the stream"
+            @client.handle_close
           rescue => error
-            @lock.synchronize { @client.handle_error error }
+            @client.handle_error error
           end
         end
       rescue => error

data/lib/infinite_tracing/streaming_buffer.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 # The StreamingBuffer class provides an Enumerator to the standard Ruby Queue
@@ -61,14 +61,6 @@ module NewRelic::Agent
         NewRelic::Agent.increment_metric QUEUE_DUMPED_METRIC
       end
 
-      # # Waits for the queue to be fully consumed or for the
-      # # waiting consumers to release.
-      # def flush_queue
-      #   @queue.num_waiting.times { @queue.push nil }
-      #   close_queue
-      #   until @queue.empty? do sleep(FLUSH_DELAY) end
-      # end
-
       # Waits for the queue to be fully consumed or for the
       # waiting consumers to release.
       def flush_queue

data/lib/infinite_tracing/suspended_streaming_buffer.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 # The SuspendedStreamingBuffer class discards pushed segments and records 

data/lib/infinite_tracing/transformer.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 module NewRelic::Agent

data/lib/infinite_tracing/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 module NewRelic

data/lib/infinite_tracing/worker.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 # The Worker class makes it easy to stop and start a thread at will.

data/lib/new_relic/infinite_tracing.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 require 'uri'

data/lib/newrelic/infinite_tracing.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
 unless defined? NewRelic::Agent::InfiniteTracing

data/lib/proto/infinite_tracing.proto

@@ -1,6 +1,6 @@
 // encoding: utf-8
 // This file is distributed under New Relic's license terms.
-// See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+// See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 syntax = "proto3";
 

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)
 
@@ -34,7 +36,7 @@ Gem::Specification.new do |s|
   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.date = Time.now.strftime('%Y-%m-%d')
-  s.licenses = ['New Relic']
+  s.licenses = ['Apache-2.0']
   s.description = <<-EOS
 The New Relic Ruby agent requires the gem newrelic_rpm, and it includes distributed
 tracing that uses head-based sampling (standard distributed tracing).
@@ -47,7 +49,7 @@ New Relic is a performance management system, developed by New Relic,
 Inc (http://www.newrelic.com).  New Relic provides you with deep
 information about the performance of your web application as it runs
 in production. The New Relic Ruby Agent is dual-purposed as a either a
-Gem or plugin, hosted on https://github.com/newrelic/rpm/
+Gem or plugin, hosted on https://github.com/newrelic/newrelic-ruby-agent/
 EOS
 
   s.email = "support@newrelic.com"
@@ -58,22 +60,23 @@ EOS
   ]
 
   s.metadata = {
-    'bug_tracker_uri'   => 'https://support.newrelic.com/',
-    'changelog_uri'     => 'https://github.com/newrelic/rpm/blob/master/infinite_tracing/CHANGELOG.md',
+    'bug_tracker_uri'   => 'https://github.com/newrelic/newrelic-ruby-agent/issues',
+    'changelog_uri'     => 'https://github.com/newrelic/newrelic-ruby-agent/blob/main/infinite_tracing/CHANGELOG.md',
     'documentation_uri' => 'https://docs.newrelic.com/docs/agents/ruby-agent',
-    'source_code_uri'   => 'https://github.com/newrelic/rpm'
+    'source_code_uri'   => 'https://github.com/newrelic/newrelic-ruby-agent',
+    "homepage_uri"      => "https://newrelic.com/products/edge-infinite-tracing",
   }
 
   file_list = `git ls-files . -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/(?!agent_helper.rb)}) }
   s.files = file_list
 
-  s.homepage = "https://github.com/newrelic/rpm/tree/master/infinite_tracing"
+  s.homepage = "https://github.com/newrelic/newrelic-ruby-agent/tree/main/infinite_tracing"
   s.require_paths = ["lib", "infinite_tracing"]
   s.rubygems_version = Gem::VERSION
   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)
@@ -87,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

data/tasks/all.rb

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

data/tasks/proto.rake

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 namespace :proto do
   desc "Generate proto files"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-infinite_tracing
 version: !ruby/object:Gem::Version
-  version: 6.11.0.365
+  version: 6.15.0
 platform: ruby
 authors:
 - Rachel Klein
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2021-01-19 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.11.0.365
+        version: 6.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.11.0.365
+        version: 6.15.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).
@@ -220,7 +220,7 @@ description: |
   Inc (http://www.newrelic.com).  New Relic provides you with deep
   information about the performance of your web application as it runs
   in production. The New Relic Ruby Agent is dual-purposed as a either a
-  Gem or plugin, hosted on https://github.com/newrelic/rpm/
+  Gem or plugin, hosted on https://github.com/newrelic/newrelic-ruby-agent/
 email: support@newrelic.com
 executables: []
 extensions: []
@@ -259,14 +259,15 @@ files:
 - newrelic-infinite_tracing.gemspec
 - tasks/all.rb
 - tasks/proto.rake
-homepage: https://github.com/newrelic/rpm/tree/master/infinite_tracing
+homepage: https://github.com/newrelic/newrelic-ruby-agent/tree/main/infinite_tracing
 licenses:
-- New Relic
+- Apache-2.0
 metadata:
-  bug_tracker_uri: https://support.newrelic.com/
-  changelog_uri: https://github.com/newrelic/rpm/blob/master/infinite_tracing/CHANGELOG.md
+  bug_tracker_uri: https://github.com/newrelic/newrelic-ruby-agent/issues
+  changelog_uri: https://github.com/newrelic/newrelic-ruby-agent/blob/main/infinite_tracing/CHANGELOG.md
   documentation_uri: https://docs.newrelic.com/docs/agents/ruby-agent
-  source_code_uri: https://github.com/newrelic/rpm
+  source_code_uri: https://github.com/newrelic/newrelic-ruby-agent
+  homepage_uri: https://newrelic.com/products/edge-infinite-tracing
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -283,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: New Relic Infinite Tracing for the Ruby agent