newrelic-infinite_tracing 8.7.0 → 8.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d72145b32a77f242716bca17abc09e77ad863495b706e83a11193c7d54982c83
-  data.tar.gz: 10bac6d2ef2bafd679302637c8377b28f7675f6b6aae9852ec2b3ac5f6fe6711
+  metadata.gz: 82175bbdb36620845384d5a1d9ed84eafe35e4e0b822b92760dd96b30ab5064a
+  data.tar.gz: 8478c0cf1d539a3d618989d0dd436bcf8d5f3f81360c2b1bd005fc37ddefd057
 SHA512:
-  metadata.gz: ea9037fd90628f92ba636fd3c63f5196dbfd259fd30dca766f19f2eb16e30b241e8d5c38b1e52ed81bf11f22e95181e22e9809c19b3ded06bade82fabc78a8e2
-  data.tar.gz: 012b46335b457d7c025e21e8d36ba8b359521eefbfce003f04ea6fa38ed20d134c858ff9abdfd1e09e7bd2e7d487f98ca23fc7aa40f56e5f49c4c7e35ab0e909
+  metadata.gz: 8cd2e71a2508bac59ac35fd8eacc1a8176e44351299808a883b6bd0a6cadca7ffc4c2741005e90647f5d03b197dd40d08ecc97a0468fc1f85744adccc944bdeb
+  data.tar.gz: 9bf7c047221d6d6f3eeabe1ea4381906dbb0dc511dd22638875d6b7d923b80373fcfbaf2afc0516e77bc983773afc08b4616e2c0059ce8990c9671518580d6e7

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # New Relic Infinite Tracing for Ruby Agent Release Notes #
 
+  ## v8.9.0
+
+  * **Bugfix: Infinite Tracing hung on connection restart**
+
+    Previously, when using infinite tracing, the agent would intermittently encounter a deadlock when attempting to restart the infinite tracing connection. This bug would prevent the agent from sending all data types, including non-infinite-tracing-related data. This change reworks how we restart infinite tracing to prevent potential deadlocks.
+
   ## v7.0.0
   * Bugfix: Fixes an intermittent bug where the agent was unable to start when infinite tracing was enabled. 
 

data/Rakefile

@@ -1,3 +1,8 @@
+# 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 'rubygems'
 require 'rake/testtask'
 require "#{File.dirname(__FILE__)}/tasks/all.rb"
@@ -12,7 +17,7 @@ task :console do
 end
 
 Rake::TestTask.new do |t|
-  ROOT = File.join File.dirname(__FILE__)
+  ROOT = File.join(File.dirname(__FILE__))
   $LOAD_PATH << ROOT
 
   file_pattern = "#{ROOT}/**/*_test.rb"

data/lib/infinite_tracing/agent_integrations/agent.rb

@@ -4,7 +4,7 @@
 # frozen_string_literal: true
 
 module NewRelic::Agent
-  NewRelic::Agent.logger.debug "Installing Infinite Tracer in Agent"
+  NewRelic::Agent.logger.debug("Installing Infinite Tracer in Agent")
 
   Agent.class_eval do
     def new_infinite_tracer
@@ -12,13 +12,27 @@ module NewRelic::Agent
       # entire start up process for the Agent.
       InfiniteTracing::Client.new.tap do |client|
         @infinite_tracer_thread = InfiniteTracing::Worker.new(:infinite_tracer) do
-          NewRelic::Agent.logger.debug "Opening Infinite Tracer Stream with gRPC server"
+          NewRelic::Agent.logger.debug("Opening Infinite Tracer Stream with gRPC server")
           client.start_streaming
         end
       end
     end
 
+    # Handles the case where the server tells us to restart -
+    # this clears the data, clears connection attempts, and
+    # waits a while to reconnect.
+    def handle_force_restart(error)
+      ::NewRelic::Agent.logger.debug(error.message)
+      drop_buffered_data
+      @service.force_restart if @service
+      @connect_state = :pending
+      close_infinite_tracer
+      sleep(30)
+    end
+
+    # Whenever we reconnect, close and restart
     def close_infinite_tracer
+      NewRelic::Agent.logger.debug("Closing infinite tracer threads")
       return unless @infinite_tracer_thread
       @infinite_tracer_thread.join
       @infinite_tracer_thread.stop

data/lib/infinite_tracing/agent_integrations/datastore_segment.rb

@@ -12,7 +12,7 @@ module NewRelic
           return if transaction.ignore?
 
           tracer = ::NewRelic::Agent.agent.infinite_tracer
-          tracer << Proc.new { SpanEventPrimitive.for_datastore_segment self }
+          tracer << Proc.new { SpanEventPrimitive.for_datastore_segment(self) }
         end
       end
     end

data/lib/infinite_tracing/agent_integrations/external_request_segment.rb

@@ -12,7 +12,7 @@ module NewRelic
           return if transaction.ignore?
 
           tracer = ::NewRelic::Agent.agent.infinite_tracer
-          tracer << Proc.new { SpanEventPrimitive.for_external_request_segment self }
+          tracer << Proc.new { SpanEventPrimitive.for_external_request_segment(self) }
         end
       end
     end

data/lib/infinite_tracing/agent_integrations/segment.rb

@@ -16,7 +16,7 @@ module NewRelic
           return if transaction.ignore?
 
           tracer = ::NewRelic::Agent.agent.infinite_tracer
-          tracer << Proc.new { SpanEventPrimitive.for_segment self }
+          tracer << Proc.new { SpanEventPrimitive.for_segment(self) }
         end
       end
     end

data/lib/infinite_tracing/agent_integrations.rb

@@ -6,7 +6,7 @@
 module NewRelic::Agent
   module InfiniteTracing
     if Config.enabled? || Config.test_framework?
-      NewRelic::Agent.logger.debug "Integrating Infinite Tracer with Agent"
+      NewRelic::Agent.logger.debug("Integrating Infinite Tracer with Agent")
 
       require_relative 'agent_integrations/agent'
       require_relative 'agent_integrations/segment'
@@ -14,7 +14,7 @@ module NewRelic::Agent
       require_relative 'agent_integrations/external_request_segment'
 
     else
-      NewRelic::Agent.logger.debug "Skipped Integrating Infinite Tracer with Agent"
+      NewRelic::Agent.logger.debug("Skipped Integrating Infinite Tracer with Agent")
     end
   end
 end

data/lib/infinite_tracing/channel.rb

@@ -7,12 +7,13 @@ module NewRelic::Agent
   module InfiniteTracing
     class Channel
       def stub
-        NewRelic::Agent.logger.debug "Infinite Tracer Opening Channel to #{host_and_port}"
+        NewRelic::Agent.logger.debug("Infinite Tracer Opening Channel to #{host_and_port}")
 
-        Com::Newrelic::Trace::V1::IngestService::Stub.new \
+        Com::Newrelic::Trace::V1::IngestService::Stub.new( \
           host_and_port,
           credentials,
           channel_override: channel
+        )
       end
 
       def channel
@@ -20,12 +21,8 @@ module NewRelic::Agent
       end
 
       def credentials
-        if Config.local?
-          :this_channel_is_insecure
-        else
-          # Uses system configured certificates by default
-          GRPC::Core::ChannelCredentials.new
-        end
+        # Uses system configured certificates by default
+        GRPC::Core::ChannelCredentials.new
       end
 
       def host_and_port

data/lib/infinite_tracing/client.rb

@@ -22,15 +22,15 @@ module NewRelic::Agent
         @lock = Mutex.new
       end
 
-      def << segment
+      def <<(segment)
         buffer << segment
       end
 
       # Transfers spans in streaming buffer from previous
       # client (if any) and returns self (so we chain the call)
-      def transfer previous_client
+      def transfer(previous_client)
         return self unless previous_client
-        previous_client.buffer.transfer buffer
+        previous_client.buffer.transfer(buffer)
         self
       end
 
@@ -38,7 +38,7 @@ module NewRelic::Agent
       # client is currently suspended.
       def new_streaming_buffer
         buffer_class = suspended? ? SuspendedStreamingBuffer : StreamingBuffer
-        buffer_class.new Config.span_events_queue_size
+        buffer_class.new(Config.span_events_queue_size)
       end
 
       def buffer
@@ -50,30 +50,30 @@ module NewRelic::Agent
       end
 
       # Turns camelcase base class name into upper snake case version of the name.
-      def formatted_class_name class_name
+      def formatted_class_name(class_name)
         class_name = class_name.split(":")[-1]
-        formatted_class_name = (class_name.gsub!(/(.)([A-Z])/, '\1_\2') || class_name).upcase
+        (class_name.gsub!(/(.)([A-Z])/, '\1_\2') || class_name).upcase
       end
 
       # Literal codes are all mapped to unique class names, so we can deduce the
       # name of the error to report in the metric from the error's class name.
-      def grpc_error_metric_name error
+      def grpc_error_metric_name(error)
         GRPC_ERROR_NAME_METRIC % formatted_class_name(error.class.name)
       end
 
       # Reports AND logs general response metric along with a more specific error metric
-      def record_error_metrics_and_log error
-        NewRelic::Agent.record_metric RESPONSE_ERROR_METRIC, 0.0
-        if error.is_a? GRPC::BadStatus
-          NewRelic::Agent.record_metric grpc_error_metric_name(error), 0.0
+      def record_error_metrics_and_log(error)
+        NewRelic::Agent.record_metric(RESPONSE_ERROR_METRIC, 0.0)
+        if error.is_a?(GRPC::BadStatus)
+          NewRelic::Agent.record_metric(grpc_error_metric_name(error), 0.0)
         else
-          NewRelic::Agent.record_metric GRPC_OTHER_ERROR_METRIC, 0.0
+          NewRelic::Agent.record_metric(GRPC_OTHER_ERROR_METRIC, 0.0)
         end
-        NewRelic::Agent.logger.warn "gRPC response error received.", error
+        NewRelic::Agent.logger.warn("gRPC response error received.", error)
       end
 
-      def handle_error error
-        record_error_metrics_and_log error
+      def handle_error(error)
+        record_error_metrics_and_log(error)
 
         case error
         when GRPC::Unavailable then restart
@@ -81,7 +81,7 @@ module NewRelic::Agent
         when GRPC::Unimplemented then suspend
         else
           # Set exponential backoff to false so we'll reconnect at periodic (15 second) intervals instead
-          start_streaming false
+          start_streaming(false)
         end
       end
 
@@ -95,8 +95,8 @@ module NewRelic::Agent
       # 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."
+        NewRelic::Agent.logger.debug("The gRPC Trace Observer closed the stream with OK response. " \
+          "Restarting the stream.")
         start_streaming
       end
 
@@ -108,8 +108,8 @@ module NewRelic::Agent
         @lock.synchronize do
           @suspended = true
           @buffer = new_streaming_buffer
-          NewRelic::Agent.logger.warn "The Trace Observer host signaled to suspend streaming span events. " \
-            "No more span events will be sent during this session."
+          NewRelic::Agent.logger.warn("The Trace Observer host signaled to suspend streaming span events. " \
+            "No more span events will be sent during this session.")
         end
       end
 
@@ -123,7 +123,7 @@ module NewRelic::Agent
         @lock.synchronize do
           old_buffer = @buffer
           @buffer = new_streaming_buffer
-          old_buffer.transfer @buffer
+          old_buffer.transfer(@buffer)
         end
       end
 
@@ -141,18 +141,18 @@ module NewRelic::Agent
         end
       end
 
-      def start_streaming exponential_backoff = true
+      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 = record_spans(exponential_backoff) }
       end
 
-      def record_spans exponential_backoff
-        RecordStatusHandler.new self, Connection.record_spans(self, buffer.enumerator, exponential_backoff)
+      def record_spans(exponential_backoff)
+        RecordStatusHandler.new(self, Connection.record_spans(self, buffer.enumerator, exponential_backoff))
       end
 
-      def record_span_batches exponential_backoff
-        RecordStatusHandler.new self, Connection.record_span_batches(self, buffer.batch_enumerator, exponential_backoff)
+      def record_span_batches(exponential_backoff)
+        RecordStatusHandler.new(self, Connection.record_span_batches(self, buffer.batch_enumerator, exponential_backoff))
       end
     end
   end

data/lib/infinite_tracing/config.rb

@@ -48,12 +48,12 @@ module NewRelic::Agent
       end
 
       # removes the scheme and port from a host entry.
-      def without_scheme_or_port url
+      def without_scheme_or_port(url)
         url.gsub(%r{^https?://|:\d+$}, '')
       end
 
       def trace_observer_host
-        without_scheme_or_port NewRelic::Agent.config[:'infinite_tracing.trace_observer.host']
+        without_scheme_or_port(NewRelic::Agent.config[:'infinite_tracing.trace_observer.host'])
       end
 
       # If the port is declared on the host entry, it overrides the port entry because otherwise
@@ -85,7 +85,7 @@ module NewRelic::Agent
         if trace_observer_configured?
           URI("#{trace_observer_scheme}://#{trace_observer_host_and_port}")
         else
-          NewRelic::Agent.logger.error TRACE_OBSERVER_NOT_CONFIGURED_ERROR
+          NewRelic::Agent.logger.error(TRACE_OBSERVER_NOT_CONFIGURED_ERROR)
           raise TRACE_OBSERVER_NOT_CONFIGURED_ERROR
         end
       end

data/lib/infinite_tracing/connection.rb

@@ -25,9 +25,10 @@ module NewRelic::Agent
         begin
           Connection.instance.notify_agent_started
         rescue => error
-          NewRelic::Agent.logger.error \
+          NewRelic::Agent.logger.error( \
             "Error during notify :server_source_configuration_added event",
             error
+          )
         end
       end
 
@@ -43,15 +44,15 @@ module NewRelic::Agent
         # RPC calls will pass the calling client instance in.  We track this
         # so we're able to signal the client to restart when connectivity to the
         # server is disrupted.
-        def record_spans client, enumerator, exponential_backoff
-          instance.record_spans client, enumerator, exponential_backoff
+        def record_spans(client, enumerator, exponential_backoff)
+          instance.record_spans(client, enumerator, exponential_backoff)
         end
 
         # RPC calls will pass the calling client instance in.  We track this
         # 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
+        def record_span_batches(client, enumerator, exponential_backoff)
+          instance.record_span_batch(client, enumerator, exponential_backoff)
         end
 
         def metadata
@@ -61,17 +62,17 @@ 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 record_spans client, enumerator, exponential_backoff
+      def record_spans(client, enumerator, exponential_backoff)
         @active_clients[client] = client
-        with_reconnection_backoff(exponential_backoff) { rpc.record_span enumerator, metadata: metadata }
+        with_reconnection_backoff(exponential_backoff) { rpc.record_span(enumerator, metadata: metadata) }
       end
 
       # RPC calls will pass the calling client instance in.  We track this
       # 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
+      def record_span_batches(client, enumerator, exponential_backoff)
         @active_clients[client] = client
-        with_reconnection_backoff(exponential_backoff) { rpc.record_span_batch enumerator, metadata: metadata }
+        with_reconnection_backoff(exponential_backoff) { rpc.record_span_batch(enumerator, metadata: metadata) }
       end
 
       # Acquires the new channel stub for the RPC calls.
@@ -114,7 +115,6 @@ module NewRelic::Agent
           @agent_connected = true
           @agent_started.signal
         end
-        @active_clients.each_value(&:restart)
       end
 
       private
@@ -148,21 +148,21 @@ module NewRelic::Agent
       end
 
       # Continues retrying the connection at backoff intervals until a successful connection is made
-      def with_reconnection_backoff exponential_backoff = true, &block
+      def with_reconnection_backoff(exponential_backoff = true, &block)
         @connection_attempts = 0
         begin
           yield
         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"
-          sleep retry_connection_period
+          ::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")
+          sleep(retry_connection_period)
           note_connect_failure
           retry
         end
       end
 
-      def retry_connection_period exponential_backoff = true
+      def retry_connection_period(exponential_backoff = true)
         if exponential_backoff
           NewRelic::CONNECT_RETRY_PERIODS[@connection_attempts] || NewRelic::MAX_RETRY_PERIOD
         else

data/lib/infinite_tracing/record_status_handler.rb

@@ -6,7 +6,7 @@
 module NewRelic::Agent
   module InfiniteTracing
     class RecordStatusHandler
-      def initialize client, enumerator
+      def initialize(client, enumerator)
         @client = client
         @enumerator = enumerator
         @messages_seen = nil
@@ -19,29 +19,29 @@ module NewRelic::Agent
       end
 
       def start_handler
-        Worker.new self.class.name do
+        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"
+                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"
+            NewRelic::Agent.logger.debug("gRPC Infinite Tracer Observer closed the stream")
             @client.handle_close
           rescue => error
-            @client.handle_error error
+            @client.handle_error(error)
           end
         end
       rescue => error
-        NewRelic::Agent.logger.error "gRPC Worker Error", error
+        NewRelic::Agent.logger.error("gRPC Worker Error", error)
       end
 
       def stop
         return if @worker.nil?
         @lock.synchronize do
-          NewRelic::Agent.logger.debug "gRPC Stopping Response Handler"
+          NewRelic::Agent.logger.debug("gRPC Stopping Response Handler")
           @worker.stop
           @worker = nil
         end

data/lib/infinite_tracing/streaming_buffer.rb

@@ -21,7 +21,7 @@ module NewRelic::Agent
 
       attr_reader :queue
 
-      def initialize max_size = DEFAULT_QUEUE_SIZE
+      def initialize(max_size = DEFAULT_QUEUE_SIZE)
         @max_size = max_size
         @lock = Mutex.new
         @queue = Queue.new
@@ -30,9 +30,9 @@ module NewRelic::Agent
 
       # Dumps the contents of this streaming buffer onto
       # the given buffer and closes the queue
-      def transfer new_buffer
+      def transfer(new_buffer)
         @lock.synchronize do
-          until @queue.empty? do new_buffer.push @queue.pop end
+          until @queue.empty? do new_buffer.push(@queue.pop) end
           @queue.close
         end
       end
@@ -45,11 +45,11 @@ module NewRelic::Agent
       # When a restart signal is received, the queue is
       # locked with a mutex, blocking the push until
       # the queue has restarted.
-      def << segment
+      def <<(segment)
         @lock.synchronize do
           clear_queue if @queue.size >= @max_size
-          NewRelic::Agent.increment_metric SPANS_SEEN_METRIC
-          @queue.push segment
+          NewRelic::Agent.increment_metric(SPANS_SEEN_METRIC)
+          @queue.push(segment)
         end
       end
 
@@ -57,19 +57,19 @@ module NewRelic::Agent
       # supportability metric for the event.
       def clear_queue
         @queue.clear
-        NewRelic::Agent.increment_metric QUEUE_DUMPED_METRIC
+        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 }
+        @queue.num_waiting.times { @queue.push(nil) }
         close_queue
 
         # 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"
+          NewRelic::Agent.logger.warn("Discarding #{@queue.size} segments on Streaming Buffer")
           return
         end
 
@@ -94,8 +94,8 @@ module NewRelic::Agent
         return enum_for(:enumerator) unless block_given?
         loop do
           if segment = @queue.pop(false)
-            NewRelic::Agent.increment_metric SPANS_SENT_METRIC
-            yield transform(segment)
+            NewRelic::Agent.increment_metric(SPANS_SENT_METRIC)
+            yield(transform(segment))
 
           else
             raise ClosedQueueError
@@ -120,15 +120,15 @@ module NewRelic::Agent
         return enum_for(:enumerator) unless block_given?
         loop do
           if proc_or_segment = @queue.pop(false)
-            NewRelic::Agent.increment_metric SPANS_SENT_METRIC
+            NewRelic::Agent.increment_metric(SPANS_SENT_METRIC)
             @batch << transform(proc_or_segment)
             if @batch.size >= BATCH_SIZE
-              yield SpanBatch.new(spans: @batch)
+              yield(SpanBatch.new(spans: @batch))
               @batch.clear
             end
 
           else
-            yield SpanBatch.new(spans: @batch) unless @batch.empty?
+            yield(SpanBatch.new(spans: @batch)) unless @batch.empty?
             raise ClosedQueueError
           end
         end
@@ -136,7 +136,7 @@ module NewRelic::Agent
 
       private
 
-      def span_event proc_or_segment
+      def span_event(proc_or_segment)
         if proc_or_segment.is_a?(Proc)
           proc_or_segment.call
         else
@@ -144,8 +144,8 @@ module NewRelic::Agent
         end
       end
 
-      def transform proc_or_segment
-        Span.new Transformer.transform(span_event proc_or_segment)
+      def transform(proc_or_segment)
+        Span.new(Transformer.transform(span_event(proc_or_segment)))
       end
     end
   end

data/lib/infinite_tracing/suspended_streaming_buffer.rb

@@ -13,16 +13,16 @@ module NewRelic::Agent
       extend Forwardable
       def_delegators :@empty_buffer, :empty?, :push
 
-      def initialize max_size = DEFAULT_QUEUE_SIZE
+      def initialize(max_size = DEFAULT_QUEUE_SIZE)
         @empty_buffer = NewRelic::EMPTY_ARRAY
       end
 
       # updates the seen metric and discards the segment
-      def << segment
-        NewRelic::Agent.increment_metric SPANS_SEEN_METRIC
+      def <<(segment)
+        NewRelic::Agent.increment_metric(SPANS_SEEN_METRIC)
       end
 
-      def transfer new_buffer
+      def transfer(new_buffer)
         # NOOP
       end
 

data/lib/infinite_tracing/transformer.rb

@@ -8,7 +8,7 @@ module NewRelic::Agent
     module Transformer
       extend self
 
-      def transform span_event
+      def transform(span_event)
         intrinsics, user_attributes, agent_attributes = span_event
         {
           "trace_id" => intrinsics[NewRelic::Agent::SpanEventPrimitive::TRACE_ID_KEY],
@@ -34,17 +34,16 @@ module NewRelic::Agent
         KLASS_TO_ARG[BigDecimal] = :double_value
       end
 
-      def safe_param_name value
+      def safe_param_name(value)
         KLASS_TO_ARG[value.class] || raise("Unhandled class #{value.class.name}")
       end
 
-      def hash_to_attributes values
+      def hash_to_attributes(values)
         values.map do |key, value|
           begin
             [key, AttributeValue.new(safe_param_name(value) => value)]
           rescue => e
-            puts e.inspect
-            puts [key, value].inspect
+            NewRelic::Agent.logger.debug("Infinite tracing transformer error: #{e.inspect}")
             nil
           end
         end.to_h

data/lib/infinite_tracing/worker.rb

@@ -12,7 +12,7 @@ module NewRelic::Agent
     class Worker
       attr_reader :name, :error
 
-      def initialize name, &job
+      def initialize(name, &job)
         @name = name
         @job = job
         @error = nil
@@ -33,16 +33,16 @@ module NewRelic::Agent
         !!@error
       end
 
-      def join timeout = nil
+      def join(timeout = nil)
         return unless @worker_thread
-        NewRelic::Agent.logger.debug "joining worker #{@name} thread..."
-        @worker_thread.join timeout
+        NewRelic::Agent.logger.debug("joining worker #{@name} thread...")
+        @worker_thread.join(timeout)
       end
 
       def stop
         @lock.synchronize do
           return unless @worker_thread
-          NewRelic::Agent.logger.debug "stopping worker #{@name} thread..."
+          NewRelic::Agent.logger.debug("stopping worker #{@name} thread...")
           @worker_thread.kill
           @worker_thread = nil
         end
@@ -51,7 +51,7 @@ module NewRelic::Agent
       private
 
       def start_thread
-        NewRelic::Agent.logger.debug "starting worker #{@name} thread..."
+        NewRelic::Agent.logger.debug("starting worker #{@name} thread...")
         @worker_thread = Thread.new do
           catch(:exit) do
             begin
@@ -63,7 +63,7 @@ module NewRelic::Agent
           end
         end
         @worker_thread.abort_on_exception = true
-        if @worker_thread.respond_to? :report_on_exception
+        if @worker_thread.respond_to?(:report_on_exception)
           @worker_thread.report_on_exception = NewRelic::Agent.config[:log_level] == "debug"
         end
       end

data/lib/infinite_tracing.rb

@@ -7,7 +7,7 @@ require 'uri'
 
 require 'newrelic_rpm'
 
-NewRelic::Agent.logger.debug "Detected New Relic Infinite Tracing Gem"
+NewRelic::Agent.logger.debug("Detected New Relic Infinite Tracing Gem")
 
 require 'infinite_tracing/version'
 require 'infinite_tracing/config'
@@ -20,7 +20,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent.logger.debug "Loading New Relic Infinite Tracing Library"
+    NewRelic::Agent.logger.debug("Loading New Relic Infinite Tracing Library")
 
     require 'infinite_tracing/proto'
 

data/lib/new_relic/infinite_tracing.rb

@@ -7,7 +7,7 @@ require 'uri'
 
 require 'newrelic_rpm'
 
-NewRelic::Agent.logger.debug "Detected New Relic Infinite Tracing Gem"
+NewRelic::Agent.logger.debug("Detected New Relic Infinite Tracing Gem")
 
 require 'new_relic/infinite_tracing/version'
 require 'new_relic/infinite_tracing/config'
@@ -20,7 +20,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent.logger.debug "Loading New Relic Infinite Tracing Library"
+    NewRelic::Agent.logger.debug("Loading New Relic Infinite Tracing Library")
 
     require 'new_relic/infinite_tracing/proto'
 

data/newrelic-infinite_tracing.gemspec

@@ -12,13 +12,13 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'new_relic/version'
 
 Gem::Specification.new do |s|
-  def self.copy_files filelist
-    subfolder = File.expand_path File.dirname(__FILE__)
+  def self.copy_files(filelist)
+    subfolder = File.expand_path(File.dirname(__FILE__))
 
     filelist.each do |filename|
       source_full_filename = File.expand_path(filename)
       dest_full_filename = File.join(subfolder, File.basename(filename))
-      FileUtils.cp source_full_filename, dest_full_filename
+      FileUtils.cp(source_full_filename, dest_full_filename)
     end
   end
 
@@ -27,12 +27,12 @@ Gem::Specification.new do |s|
     "../CONTRIBUTING.md"
   ]
 
-  self.copy_files shared_files
+  self.copy_files(shared_files)
 
   s.name = "newrelic-infinite_tracing"
   s.version = NewRelic::VERSION::STRING
   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.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to?(:required_rubygems_version=)
   s.authors = ["Tanna McClure", "Kayla Reopelle", "James Bunch", "Hannah Ramadan"]
   s.licenses = ['Apache-2.0']
   s.description = <<-EOS
@@ -70,7 +70,6 @@ Gem or plugin, hosted on https://github.com/newrelic/newrelic-ruby-agent/
 
   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
@@ -85,8 +84,8 @@ Gem or plugin, hosted on https://github.com/newrelic/newrelic-ruby-agent/
   s.add_development_dependency 'pry-stack_explorer', '~> 0.4.9'
   s.add_development_dependency 'guard', '~> 2.16.0'
   s.add_development_dependency 'guard-minitest', '~> 2.4.0'
-  s.add_development_dependency 'hometown', '~> 0.2.5'
   s.add_development_dependency 'bundler'
+  s.add_development_dependency 'simplecov'
 
   s.add_development_dependency 'grpc-tools', "~> 1.14"
 end

data/tasks/all.rb

@@ -1,6 +1,7 @@
 # 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
 
 # This is required to load in task definitions
 Dir.glob(File.join(File.dirname(__FILE__), '*.rake')) do |file|

data/tasks/proto.rake

@@ -1,12 +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
 
 namespace :proto do
   desc "Generate proto files"
 
   task :generate do
-    def extract_license_terms file_contents
+    def extract_license_terms(file_contents)
       text = []
       text << file_contents.shift while !file_contents.empty? && file_contents[0] =~ /^#/
       text << ""
@@ -15,11 +16,11 @@ namespace :proto do
 
     # 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
+    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
+      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
@@ -28,11 +29,11 @@ namespace :proto do
       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"
+    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")
 
-    FileUtils.mkdir_p output_path
+    FileUtils.mkdir_p(output_path)
     cmd = [
       "grpc_tools_ruby_protoc",
       "-I#{gem_folder}/lib/new_relic/proto",
@@ -40,7 +41,7 @@ namespace :proto do
       "--grpc_out=#{output_path} #{proto_filename}"
     ].join(" ")
 
-    if system cmd
+    if system(cmd)
       puts "Proto file generated!"
       add_license_preamble_and_remove_requires output_path
     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-infinite_tracing
 version: !ruby/object:Gem::Version
-  version: 8.7.0
+  version: 8.10.0
 platform: ruby
 authors:
 - Tanna McClure
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-03 00:00:00.000000000 Z
+date: 2022-08-17 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.7.0
+        version: 8.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.7.0
+        version: 8.10.0
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
@@ -168,21 +168,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.4.0
 - !ruby/object:Gem::Dependency
-  name: hometown
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="