newrelic-infinite_tracing 8.10.0 → 8.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82175bbdb36620845384d5a1d9ed84eafe35e4e0b822b92760dd96b30ab5064a
-  data.tar.gz: 8478c0cf1d539a3d618989d0dd436bcf8d5f3f81360c2b1bd005fc37ddefd057
+  metadata.gz: d7dfe6b33e33cdfb49d3c4bc0ef9e766de0139b0aaae353bd7720abe831c6ea6
+  data.tar.gz: 161654c037fea561ed979e70e7a7168495f233177b35a185e1f90c4e326a0599
 SHA512:
-  metadata.gz: 8cd2e71a2508bac59ac35fd8eacc1a8176e44351299808a883b6bd0a6cadca7ffc4c2741005e90647f5d03b197dd40d08ecc97a0468fc1f85744adccc944bdeb
-  data.tar.gz: 9bf7c047221d6d6f3eeabe1ea4381906dbb0dc511dd22638875d6b7d923b80373fcfbaf2afc0516e77bc983773afc08b4616e2c0059ce8990c9671518580d6e7
+  metadata.gz: bdef9830574c92710deab3a8377675539d5394b401cbedbbaf744d81fb89aad7d6ec3072b0cb24d73e61bc01f9e85590be45b1cb958566c621499ed395e6a4f6
+  data.tar.gz: 3c005a7e4983ab120ad84cdceeabc0129161695411ee0c5bb52580851b3e429a9b7fb4a94cf929b4a9d1eb7681fb602db592b4a7a4a4fed6fe24d2437d13fb16

data/Gemfile

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

data/Rakefile

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

data/lib/infinite_tracing/agent_integrations/agent.rb

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

data/lib/infinite_tracing/agent_integrations/datastore_segment.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
@@ -12,7 +11,7 @@ module NewRelic
           return if transaction.ignore?
 
           tracer = ::NewRelic::Agent.agent.infinite_tracer
-          tracer << Proc.new { SpanEventPrimitive.for_datastore_segment(self) }
+          tracer << proc { SpanEventPrimitive.for_datastore_segment(self) }
         end
       end
     end

data/lib/infinite_tracing/agent_integrations/external_request_segment.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
@@ -12,7 +11,7 @@ module NewRelic
           return if transaction.ignore?
 
           tracer = ::NewRelic::Agent.agent.infinite_tracer
-          tracer << Proc.new { SpanEventPrimitive.for_external_request_segment(self) }
+          tracer << proc { SpanEventPrimitive.for_external_request_segment(self) }
         end
       end
     end

data/lib/infinite_tracing/agent_integrations/segment.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
@@ -16,7 +15,7 @@ module NewRelic
           return if transaction.ignore?
 
           tracer = ::NewRelic::Agent.agent.infinite_tracer
-          tracer << Proc.new { SpanEventPrimitive.for_segment(self) }
+          tracer << proc { SpanEventPrimitive.for_segment(self) }
         end
       end
     end

data/lib/infinite_tracing/agent_integrations.rb

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

data/lib/infinite_tracing/channel.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
@@ -6,13 +5,17 @@
 module NewRelic::Agent
   module InfiniteTracing
     class Channel
+      COMPRESSION_LEVELS = %i[none low medium high].freeze
+      DEFAULT_COMPRESSION_LEVEL = :none
+
       def stub
         NewRelic::Agent.logger.debug("Infinite Tracer Opening Channel to #{host_and_port}")
 
         Com::Newrelic::Trace::V1::IngestService::Stub.new( \
           host_and_port,
           credentials,
-          channel_override: channel
+          channel_override: channel,
+          channel_args: channel_args
         )
       end
 
@@ -20,6 +23,37 @@ module NewRelic::Agent
         GRPC::Core::Channel.new(host_and_port, settings, credentials)
       end
 
+      def channel_args
+        return NewRelic::EMPTY_HASH unless compression_enabled?
+
+        GRPC::Core::CompressionOptions.new(compression_options).to_channel_arg_hash
+      end
+
+      def compression_enabled?
+        compression_level != :none
+      end
+
+      def compression_level
+        @compression_level ||= begin
+          level = if valid_compression_level?(configured_compression_level)
+            configured_compression_level
+          else
+            DEFAULT_COMPRESSION_LEVEL
+          end
+          NewRelic::Agent.logger.debug("Infinite Tracer compression level set to #{level}")
+          level
+        end
+      end
+
+      def compression_options
+        {default_algorithm: :gzip,
+         default_level: compression_level}
+      end
+
+      def configured_compression_level
+        NewRelic::Agent.config[:'infinite_tracing.compression_level']
+      end
+
       def credentials
         # Uses system configured certificates by default
         GRPC::Core::ChannelCredentials.new
@@ -35,6 +69,15 @@ module NewRelic::Agent
           'grpc.enable_deadline_checking' => 0
         }
       end
+
+      def valid_compression_level?(level)
+        return true if COMPRESSION_LEVELS.include?(level)
+
+        NewRelic::Agent.logger.error("Invalid compression level '#{level}' specified! Must be one of " \
+          "#{COMPRESSION_LEVELS.join('|')}. Using default level of '#{DEFAULT_COMPRESSION_LEVEL}'")
+
+        false
+      end
     end
   end
 end

data/lib/infinite_tracing/client.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
@@ -26,6 +25,10 @@ module NewRelic::Agent
         buffer << segment
       end
 
+      def batching_enabled?
+        NewRelic::Agent.config[:'infinite_tracing.batching']
+      end
+
       # Transfers spans in streaming buffer from previous
       # client (if any) and returns self (so we chain the call)
       def transfer(previous_client)
@@ -143,8 +146,9 @@ 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) }
+        @lock.synchronize { response_handler(exponential_backoff) }
       end
 
       def record_spans(exponential_backoff)
@@ -154,6 +158,10 @@ module NewRelic::Agent
       def record_span_batches(exponential_backoff)
         RecordStatusHandler.new(self, Connection.record_span_batches(self, buffer.batch_enumerator, exponential_backoff))
       end
+
+      def response_handler(backoff)
+        @response_handler = batching_enabled? ? record_span_batches(backoff) : record_spans(backoff)
+      end
     end
   end
 end

data/lib/infinite_tracing/config.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
@@ -59,7 +58,7 @@ module NewRelic::Agent
       # If the port is declared on the host entry, it overrides the port entry because otherwise
       # we'd need to figure out if user supplied the port or if the default source config set
       # the port.  To help with debugging configuration issues, we log whenever the port entry
-      # is overriden by the presence of the port on the host entry.
+      # is overridden by the presence of the port on the host entry.
       def port_from_host_entry
         port_str = NewRelic::Agent.config[:'infinite_tracing.trace_observer.host'].scan(%r{:(\d+)$}).flatten
         if port = (port_str[0] and port_str[0].to_i)
@@ -75,7 +74,7 @@ module NewRelic::Agent
       end
 
       # The scheme is based on whether the Trace Observer is running locally or remotely.
-      # Remote unsecure (unencypted) streaming is disallowed!
+      # Remote unsecure (unencrypted) streaming is disallowed!
       def trace_observer_scheme
         local? ? NewRelic::HTTP : NewRelic::HTTPS
       end

data/lib/infinite_tracing/connection.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
@@ -52,7 +51,7 @@ module NewRelic::Agent
         # so we're able to signal the client to restart when connectivity to the
         # server is disrupted.
         def record_span_batches(client, enumerator, exponential_backoff)
-          instance.record_span_batch(client, enumerator, exponential_backoff)
+          instance.record_span_batches(client, enumerator, exponential_backoff)
         end
 
         def metadata
@@ -155,7 +154,7 @@ module NewRelic::Agent
         rescue => exception
           retry_connection_period = retry_connection_period(exponential_backoff)
           ::NewRelic::Agent.logger.error("Error establishing connection with infinite tracing service:", exception)
-          ::NewRelic::Agent.logger.info("Will re-attempt infinte tracing connection in #{retry_connection_period} seconds")
+          ::NewRelic::Agent.logger.info("Will re-attempt infinite tracing connection in #{retry_connection_period} seconds")
           sleep(retry_connection_period)
           note_connect_failure
           retry

data/lib/infinite_tracing/constants.rb

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

data/lib/infinite_tracing/proto/infinite_tracing_pb.rb

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

data/lib/infinite_tracing/proto/infinite_tracing_services_pb.rb

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

data/lib/infinite_tracing/proto.rb

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

data/lib/infinite_tracing/record_status_handler.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
@@ -18,26 +17,6 @@ module NewRelic::Agent
         @messages_seen ? @messages_seen.messages_seen : 0
       end
 
-      def start_handler
-        Worker.new(self.class.name) do
-          begin
-            @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")
-              end
-            end
-            NewRelic::Agent.logger.debug("gRPC Infinite Tracer Observer closed the stream")
-            @client.handle_close
-          rescue => error
-            @client.handle_error(error)
-          end
-        end
-      rescue => error
-        NewRelic::Agent.logger.error("gRPC Worker Error", error)
-      end
-
       def stop
         return if @worker.nil?
         @lock.synchronize do
@@ -46,6 +25,30 @@ module NewRelic::Agent
           @worker = nil
         end
       end
+
+      private
+
+      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")
+          end
+        end
+      end
+
+      def start_handler
+        Worker.new(self.class.name) do
+          handle_response
+          NewRelic::Agent.logger.debug("gRPC Infinite Tracer Observer closed the stream")
+          @client.handle_close
+        rescue => error
+          @client.handle_error(error)
+        end
+      rescue => error
+        NewRelic::Agent.logger.error("gRPC Worker Error", error)
+      end
     end
   end
 end

data/lib/infinite_tracing/streaming_buffer.rb

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

data/lib/infinite_tracing/suspended_streaming_buffer.rb

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

data/lib/infinite_tracing/transformer.rb

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

data/lib/infinite_tracing/version.rb

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

data/lib/infinite_tracing/worker.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
@@ -52,7 +51,7 @@ module NewRelic::Agent
 
       def start_thread
         NewRelic::Agent.logger.debug("starting worker #{@name} thread...")
-        @worker_thread = Thread.new do
+        @worker_thread = NewRelic::Agent::Threading::AgentThread.create("infinite_tracing_worker") do
           catch(:exit) do
             begin
               @job.call

data/lib/infinite_tracing.rb

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

data/lib/new_relic/infinite_tracing.rb

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

data/lib/newrelic/infinite_tracing.rb

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

data/lib/proto/infinite_tracing.proto

@@ -1,4 +1,3 @@
-// encoding: utf-8
 // This file is distributed under New Relic's license terms.
 // See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
@@ -39,4 +38,4 @@ message AttributeValue {
 
 message RecordStatus {
   uint64 messages_seen = 1;
-}
+}

data/newrelic-infinite_tracing.gemspec

@@ -1,4 +1,3 @@
-#-*- coding: utf-8 -*-
 # frozen_string_literal: true
 
 require 'fileutils'
@@ -69,7 +68,7 @@ Gem or plugin, hosted on https://github.com/newrelic/newrelic-ruby-agent/
   s.files = file_list
 
   s.homepage = "https://github.com/newrelic/newrelic-ruby-agent/tree/main/infinite_tracing"
-  s.require_paths = ["lib", "infinite_tracing"]
+  s.require_paths = %w[lib infinite_tracing]
   s.summary = "New Relic Infinite Tracing for the Ruby agent"
 
   s.add_dependency 'newrelic_rpm', NewRelic::VERSION::STRING
@@ -78,7 +77,7 @@ Gem or plugin, hosted on https://github.com/newrelic/newrelic-ruby-agent/
   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)
   s.add_development_dependency 'listen', '3.0.8' # locked to support < Ruby 2.3
-  s.add_development_dependency 'minitest', '~> 5.14.0'
+  s.add_development_dependency 'minitest', '~> 5.15'
   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'

data/tasks/all.rb

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

data/tasks/helpers/license.rb

@@ -0,0 +1,25 @@
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
+
+module License
+  def extract_license_terms(file_contents)
+    text = []
+    text << file_contents.shift while !file_contents.empty? && file_contents[0] =~ /^#/
+    text << ""
+    text
+  end
+
+  def add_license_preamble_and_remove_requires(output_path)
+    gemspec_path = File.expand_path(File.join(output_path, '..', '..', '..', '..', '..'))
+    license_terms = extract_license_terms(File.readlines(File.join(gemspec_path, "Gemfile")))
+    Dir.glob(File.join(output_path, "*.rb")) do |filename|
+      contents = File.readlines(filename)
+      contents.reject! { |r| r =~ /^\s*require\s.*$/ }
+      File.open(filename, 'w') do |output|
+        output.puts license_terms
+        output.puts contents
+      end
+    end
+  end
+end

data/tasks/proto.rake

@@ -1,34 +1,13 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
+require_relative 'helpers/license'
+include License
+
 namespace :proto do
   desc "Generate proto files"
-
   task :generate do
-    def extract_license_terms(file_contents)
-      text = []
-      text << file_contents.shift while !file_contents.empty? && file_contents[0] =~ /^#/
-      text << ""
-      text
-    end
-
-    # adds the NewRelic License notice to the top of the generated files
-    # Removes require lines since these are replicated in the proto.rb file.
-    def add_license_preamble_and_remove_requires(output_path)
-      gemspec_path = File.expand_path(File.join(output_path, '..', '..', '..', '..', '..'))
-      license_terms = extract_license_terms(File.readlines(File.join(gemspec_path, "Gemfile")))
-      Dir.glob(File.join(output_path, "*.rb")) do |filename|
-        contents = File.readlines(filename)
-        contents.reject! { |r| r =~ /^\s*require\s.*$/ }
-        File.open(filename, 'w') do |output|
-          output.puts license_terms
-          output.puts contents
-        end
-      end
-    end
-
     gem_folder = File.expand_path(File.join(File.dirname(__FILE__), ".."))
     proto_filename = File.join(gem_folder, "lib", "new_relic", "proto", "infinite_tracing.proto")
     output_path = File.join(gem_folder, "lib", "new_relic", "infinite_tracing", "proto")
@@ -43,7 +22,7 @@ namespace :proto do
 
     if system(cmd)
       puts "Proto file generated!"
-      add_license_preamble_and_remove_requires output_path
+      add_license_preamble_and_remove_requires(output_path)
     else
       puts "Failed to generate proto file."
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-infinite_tracing
 version: !ruby/object:Gem::Version
-  version: 8.10.0
+  version: 8.11.0
 platform: ruby
 authors:
 - Tanna McClure
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2022-10-11 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.10.0
+        version: 8.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.10.0
+        version: 8.11.0
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
@@ -89,14 +89,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.14.0
+        version: '5.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.14.0
+        version: '5.15'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -259,6 +259,7 @@ files:
 - lib/proto/infinite_tracing.proto
 - newrelic-infinite_tracing.gemspec
 - tasks/all.rb
+- tasks/helpers/license.rb
 - tasks/proto.rake
 homepage: https://github.com/newrelic/newrelic-ruby-agent/tree/main/infinite_tracing
 licenses: