newrelic-infinite_tracing 8.6.0 → 8.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95214bedd72e2f7c1e37e4327bedcee0b0de72d3ab78ccbb9c3a60da6d446eca
-  data.tar.gz: b32d6d9b9b2fae552c9595e74b8f897a298aec5b693e141fd0216b766376cbd7
+  metadata.gz: e6712a9c3ffb94789cc17ccdcce33735ba3afdfd6bab87b2e03e98f54eba7f1c
+  data.tar.gz: b9e852c742440d75b8c89ba20cd49a92164ead327ddedbeedeefdff674970282
 SHA512:
-  metadata.gz: c6d5c64d406332ea6e1ae327436d9530f3fa26347d2cf128b821213890dfe262abeb3eeee1d24401b0d473f65dccabd5849afcd6cfc85b09ca4418c659e57517
-  data.tar.gz: 8bb52d97a0325ab1957dca4125e756921c5cea8d28cb2b7e11985cdd46526a179079c39faf137140ed8b4567439e1099e278d08049b49abe9234bb4d6efca021
+  metadata.gz: a9cca5b997416ec8b89e45c7833b185429343ce89e899eddcf1620316aaa09a51258c2b505c49cf4b6f69f8ee7daab596edb5dcdb3965bc9a0ee7efc0fce944a
+  data.tar.gz: 3197dc1c5cf9c01631b7a7499fa70b74e218b52c70302f85a03dbc39317feb47122e79331c6575df22ac181b5a84a38aee01374b39ed176e4e876bbbe0b3715a

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/lib/infinite_tracing/agent_integrations/agent.rb

@@ -18,7 +18,21 @@ module NewRelic::Agent
       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/channel.rb

@@ -20,12 +20,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

@@ -52,7 +52,7 @@ module NewRelic::Agent
       # Turns camelcase base class name into upper snake case version of the 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

data/lib/infinite_tracing/connection.rb

@@ -114,7 +114,6 @@ module NewRelic::Agent
           @agent_connected = true
           @agent_started.signal
         end
-        @active_clients.each_value(&:restart)
       end
 
       private

data/lib/infinite_tracing/transformer.rb

@@ -43,8 +43,7 @@ module NewRelic::Agent
           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/newrelic-infinite_tracing.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   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.authors = ["Tanna McClure", "Kayla Reopelle", "James Bunch"]
+  s.authors = ["Tanna McClure", "Kayla Reopelle", "James Bunch", "Hannah Ramadan"]
   s.licenses = ['Apache-2.0']
   s.description = <<-EOS
 The New Relic Ruby agent requires the gem newrelic_rpm, and it includes distributed
@@ -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

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-infinite_tracing
 version: !ruby/object:Gem::Version
-  version: 8.6.0
+  version: 8.9.0
 platform: ruby
 authors:
 - Tanna McClure
 - Kayla Reopelle
 - James Bunch
+- Hannah Ramadan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
@@ -18,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.6.0
+        version: 8.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.6.0
+        version: 8.9.0
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
@@ -167,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:
     - - ">="