newrelic_rpm 9.0.0 → 9.2.2

data/lib/new_relic/agent/instrumentation/active_record_helper.rb

@@ -49,7 +49,7 @@ module NewRelic
 
             alias_method(:delete_all_without_newrelic, :delete_all)
 
-            if RUBY_VERSION < "2.7.0"
+            if RUBY_VERSION < '2.7.0'
               def delete_all(*args, &blk)
                 ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
                   delete_all_without_newrelic(*args, &blk)
@@ -92,9 +92,9 @@ module NewRelic
           end
         end
 
-        ACTIVE_RECORD = "ActiveRecord".freeze
-        OTHER = "other".freeze
-        MAKARA_SUFFIX = "_makara".freeze
+        ACTIVE_RECORD = 'ActiveRecord'.freeze
+        OTHER = 'other'.freeze
+        MAKARA_SUFFIX = '_makara'.freeze
 
         # convert vendor (makara, etc.) wrapper names to their bare names
         # ex: postgresql_makara -> postgresql
@@ -102,7 +102,7 @@ module NewRelic
           # TODO: OLD RUBIES - RUBY_VERSION < 2.5
           # With Ruby 2.5+ we could use #delete_suffix instead of #chomp for a
           # potential speed boost
-          return adapter_name.chomp(MAKARA_SUFFIX) if adapter_name && adapter_name.end_with?(MAKARA_SUFFIX)
+          return adapter_name.chomp(MAKARA_SUFFIX) if adapter_name&.end_with?(MAKARA_SUFFIX)
 
           adapter_name
         end
@@ -118,7 +118,7 @@ module NewRelic
         SPACE = ' '.freeze
 
         def split_name(name)
-          if name && name.respond_to?(:split)
+          if name&.respond_to?(:split)
             name.split(SPACE)
           else
             NewRelic::EMPTY_ARRAY
@@ -163,47 +163,50 @@ module NewRelic
         end
 
         PRODUCT_NAMES = {
-          "mysql" => "MySQL",
-          "mysql2" => "MySQL",
+          'mysql' => 'MySQL',
+          'mysql2' => 'MySQL',
 
-          "postgresql" => "Postgres",
+          'postgresql' => 'Postgres',
 
-          "sqlite3" => "SQLite",
+          'sqlite3' => 'SQLite',
 
           # https://rubygems.org/gems/activerecord-jdbcpostgresql-adapter
-          "jdbcmysql" => "MySQL",
+          'jdbcmysql' => 'MySQL',
 
           # https://rubygems.org/gems/activerecord-jdbcpostgresql-adapter
-          "jdbcpostgresql" => "Postgres",
+          'jdbcpostgresql' => 'Postgres',
 
           # https://rubygems.org/gems/activerecord-postgis-adapter
-          "postgis" => "Postgres",
+          'postgis' => 'Postgres',
 
           # https://rubygems.org/gems/activerecord-jdbcsqlite3-adapter
-          "jdbcsqlite3" => "SQLite",
+          'jdbcsqlite3' => 'SQLite',
 
           # https://rubygems.org/gems/activerecord-jdbcderby-adapter
-          "derby" => "Derby",
-          "jdbcderby" => "Derby",
+          'derby' => 'Derby',
+          'jdbcderby' => 'Derby',
 
           # https://rubygems.org/gems/activerecord-jdbc-adapter
-          "jdbc" => "JDBC",
+          'jdbc' => 'JDBC',
 
           # https://rubygems.org/gems/activerecord-jdbcmssql-adapter
-          "jdbcmssql" => "MSSQL",
-          "mssql" => "MSSQL",
+          'jdbcmssql' => 'MSSQL',
+          'mssql' => 'MSSQL',
 
           # https://rubygems.org/gems/activerecord-sqlserver-adapter
-          "sqlserver" => "MSSQL",
+          'sqlserver' => 'MSSQL',
 
           # https://rubygems.org/gems/activerecord-odbc-adapter
-          "odbc" => "ODBC",
+          'odbc' => 'ODBC',
 
           # https://rubygems.org/gems/activerecord-oracle_enhanced-adapter
-          "oracle_enhanced" => "Oracle"
+          'oracle_enhanced' => 'Oracle',
+
+          # https://rubygems.org/gems/activerecord-amazon-timestream-adapter
+          'amazon_timestream' => 'Timestream'
         }.freeze
 
-        ACTIVE_RECORD_DEFAULT_PRODUCT_NAME = "ActiveRecord".freeze
+        ACTIVE_RECORD_DEFAULT_PRODUCT_NAME = 'ActiveRecord'.freeze
 
         def map_product(adapter_name)
           PRODUCT_NAMES.fetch(adapter_name, ACTIVE_RECORD_DEFAULT_PRODUCT_NAME)
@@ -213,24 +216,24 @@ module NewRelic
           extend self
 
           PRODUCT_SYMBOLS = {
-            "mysql" => :mysql,
-            "mysql2" => :mysql,
-            "jdbcmysql" => :mysql,
+            'mysql' => :mysql,
+            'mysql2' => :mysql,
+            'jdbcmysql' => :mysql,
 
-            "postgresql" => :postgres,
-            "jdbcpostgresql" => :postgres,
-            "postgis" => :postgres
+            'postgresql' => :postgres,
+            'jdbcpostgresql' => :postgres,
+            'postgis' => :postgres
           }.freeze
 
           DATASTORE_DEFAULT_PORTS = {
-            :mysql => "3306",
-            :postgres => "5432"
+            :mysql => '3306',
+            :postgres => '5432'
           }.freeze
 
-          DEFAULT = "default".freeze
-          UNKNOWN = "unknown".freeze
-          SLASH = "/".freeze
-          LOCALHOST = "localhost".freeze
+          DEFAULT = 'default'.freeze
+          UNKNOWN = 'unknown'.freeze
+          SLASH = '/'.freeze
+          LOCALHOST = 'localhost'.freeze
 
           def adapter_from_config(config)
             bare_name = NewRelic::Agent::Instrumentation::ActiveRecordHelper.bare_adapter_name(config[:adapter])

data/lib/new_relic/agent/instrumentation/active_record_notifications.rb

@@ -16,7 +16,7 @@ module NewRelic
 
         module BaseExtensions4x
           # https://github.com/rails/rails/blob/4-1-stable/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb#L371
-          def log(sql, name = "SQL", binds = [], statement_name = nil)
+          def log(sql, name = 'SQL', binds = [], statement_name = nil)
             @instrumenter.instrument(
               SQL_ACTIVE_RECORD,
               :sql => sql,
@@ -38,7 +38,7 @@ module NewRelic
 
         module BaseExtensions50
           # https://github.com/rails/rails/blob/5-0-stable/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb#L582
-          def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil)
+          def log(sql, name = 'SQL', binds = [], type_casted_binds = [], statement_name = nil)
             @instrumenter.instrument(
               SQL_ACTIVE_RECORD,
               sql: sql,
@@ -56,7 +56,7 @@ module NewRelic
 
         module BaseExtensions51
           # https://github.com/rails/rails/blob/5-1-stable/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb#L603
-          def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil) # :doc:
+          def log(sql, name = 'SQL', binds = [], type_casted_binds = [], statement_name = nil) # :doc:
             @instrumenter.instrument(
               SQL_ACTIVE_RECORD,
               sql: sql,

data/lib/new_relic/agent/instrumentation/active_record_prepend.rb

@@ -11,7 +11,7 @@ module NewRelic
         ACTIVE_RECORD = 'ActiveRecord'.freeze
 
         module BaseExtensions
-          if RUBY_VERSION < "2.7.0"
+          if RUBY_VERSION < '2.7.0'
             def save(*args, &blk)
               ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
                 super
@@ -46,7 +46,7 @@ module NewRelic
           # Starting in v5.1.6, this call no longer happens. We'll
           # have to set the database metrics explicitly now.
           #
-          if RUBY_VERSION < "2.7.0"
+          if RUBY_VERSION < '2.7.0'
             def touch(*args, **kwargs, &blk)
               ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
                 super

data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb

@@ -33,7 +33,7 @@ module NewRelic
           # defensive.
           return if defined?(cached?)
 
-          if defined?(::ActiveRecord) && ::ActiveRecord::VERSION::STRING >= "5.1.0"
+          if defined?(::ActiveRecord) && ::ActiveRecord::VERSION::STRING >= '5.1.0'
             def cached?(payload)
               payload.fetch(:cached, false)
             end
@@ -74,7 +74,8 @@ module NewRelic
             ::ActiveRecord::Base.send("#{statement.config[:adapter]}_connection",
               statement.config)
           end
-          if connection && connection.respond_to?(:exec_query)
+          # the following line needs else branch coverage
+          if connection && connection.respond_to?(:exec_query) # rubocop:disable Style/SafeNavigation
             return connection.exec_query("EXPLAIN #{statement.sql}",
               "Explain #{statement.name}",
               statement.binds)

data/lib/new_relic/agent/instrumentation/bunny/chain.rb

@@ -3,7 +3,7 @@
 # frozen_string_literal: true
 
 module NewRelic::Agent::Instrumentation
-  module Bunny
+  module Bunny::Chain
     def self.instrument!
       ::Bunny::Exchange.class_eval do
         include NewRelic::Agent::Instrumentation::Bunny::Exchange

data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb

@@ -46,7 +46,7 @@ module NewRelic
                 exchange_type: type
               )
             rescue => e
-              NewRelic::Agent.logger.error("Error starting message broker segment in Bunny::Exchange#publish", e)
+              NewRelic::Agent.logger.error('Error starting message broker segment in Bunny::Exchange#publish', e)
               yield
             else
               NewRelic::Agent::Tracer.capture_segment_error(segment) do
@@ -90,7 +90,7 @@ module NewRelic
                 start_time: t0
               )
             rescue => e
-              NewRelic::Agent.logger.error("Error starting message broker segment in Bunny::Queue#pop", e)
+              NewRelic::Agent.logger.error('Error starting message broker segment in Bunny::Queue#pop', e)
             else
               if bunny_error
                 segment.notice_error(bunny_error)
@@ -113,7 +113,7 @@ module NewRelic
                 destination_name: name
               )
             rescue => e
-              NewRelic::Agent.logger.error("Error starting message broker segment in Bunny::Queue#purge", e)
+              NewRelic::Agent.logger.error('Error starting message broker segment in Bunny::Queue#purge', e)
               yield
             else
               NewRelic::Agent::Tracer.capture_segment_error(segment) do

data/lib/new_relic/agent/instrumentation/bunny.rb

@@ -26,7 +26,7 @@ DependencyDetection.defer do
       prepend_instrument Bunny::Queue, NewRelic::Agent::Instrumentation::Bunny::Prepend::Queue
       prepend_instrument Bunny::Consumer, NewRelic::Agent::Instrumentation::Bunny::Prepend::Consumer
     else
-      chain_instrument NewRelic::Agent::Instrumentation::Bunny
+      chain_instrument NewRelic::Agent::Instrumentation::Bunny::Chain
     end
   end
 end

data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb

@@ -236,7 +236,8 @@ module NewRelic
           end
 
           def self.prefix_for_category(txn, category = nil)
-            category ||= (txn && txn.category)
+            # the following line needs else branch coverage
+            category ||= (txn && txn.category) # rubocop:disable Style/SafeNavigation
             case category
             when :controller then ::NewRelic::Agent::Transaction::CONTROLLER_PREFIX
             when :web then ::NewRelic::Agent::Transaction::CONTROLLER_PREFIX
@@ -360,7 +361,7 @@ module NewRelic
           skip_tracing = do_not_trace? || !state.is_execution_traced?
 
           if skip_tracing
-            state.current_transaction.ignore! if state.current_transaction
+            state.current_transaction&.ignore!
             NewRelic::Agent.disable_all_tracing { return yield }
           end
 
@@ -386,7 +387,8 @@ module NewRelic
               raise
             end
           ensure
-            finishable.finish if finishable
+            # the following line needs else branch coverage
+            finishable.finish if finishable # rubocop:disable Style/SafeNavigation
           end
         end
 

data/lib/new_relic/agent/instrumentation/curb/chain.rb

@@ -7,7 +7,7 @@ require_relative 'instrumentation'
 module NewRelic::Agent::Instrumentation
   module Curb
     module Chain
-      def self.instrument!
+      def self.instrument! # rubocop:disable Metrics/AbcSize
         Curl::Easy.class_eval do
           include NewRelic::Agent::Instrumentation::Curb::Easy
 

data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb

@@ -81,7 +81,7 @@ module NewRelic
           def perform_with_tracing
             return yield if first_request_is_serial?
 
-            trace_execution_scoped("External/Multiple/Curb::Multi/perform") do
+            trace_execution_scoped('External/Multiple/Curb::Multi/perform') do
               yield
             end
           end
@@ -107,7 +107,7 @@ module NewRelic
               request._nr_instrumented = true
             end
           rescue => err
-            NewRelic::Agent.logger.error("Untrapped exception", err)
+            NewRelic::Agent.logger.error('Untrapped exception', err)
           end
 
           # Create request and response adapter objects for the specified +request+
@@ -141,12 +141,12 @@ module NewRelic
             request._nr_original_on_complete = original_callback
             request.on_complete do |finished_request|
               begin
-                segment.process_response_headers(wrapped_response) if segment
+                segment&.process_response_headers(wrapped_response)
               ensure
                 ::NewRelic::Agent::Transaction::Segment.finish(segment)
                 # Make sure the existing completion callback is run, and restore the
                 # on_complete callback to how it was before.
-                original_callback.call(finished_request) if original_callback
+                original_callback&.call(finished_request)
                 remove_instrumentation_callbacks(request)
               end
             end
@@ -173,7 +173,7 @@ module NewRelic
                   segment.notice_error(noticeable_error)
                 end
               ensure
-                original_callback.call(failed_request, error) if original_callback
+                original_callback&.call(failed_request, error)
                 remove_failure_callback(failed_request)
               end
             end

data/lib/new_relic/agent/instrumentation/curb.rb

@@ -8,7 +8,7 @@ require_relative 'curb/prepend'
 DependencyDetection.defer do
   named :curb
 
-  CURB_MIN_VERSION = Gem::Version.new("0.8.1")
+  CURB_MIN_VERSION = Gem::Version.new('0.8.1')
 
   depends_on do
     defined?(Curl) && defined?(Curl::CURB_VERSION) &&

data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb

@@ -23,7 +23,8 @@ module NewRelic::Agent::Instrumentation
       NewRelic::Agent.notice_error(payload[:exception_object]) if payload.key?(:exception_object)
 
       finishable = pop_segment(id)
-      finishable.finish if finishable
+      # the following line needs else branch coverage
+      finishable.finish if finishable # rubocop:disable Style/SafeNavigation
     rescue => e
       log_notification_error(e, name, 'finish')
     end

data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb

@@ -1,6 +1,7 @@
 # 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 'instrumentation'
 
 module NewRelic::Agent::Instrumentation

data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb

@@ -22,7 +22,7 @@ module NewRelic
             install_newrelic_job_tracer
             NewRelic::Control.instance.init_plugin(:dispatcher => :delayed_job)
           else
-            NewRelic::Agent.logger.warn("Did not find a Delayed::Job class responding to invoke_job, aborting DJ instrumentation")
+            NewRelic::Agent.logger.warn('Did not find a Delayed::Job class responding to invoke_job, aborting DJ instrumentation')
           end
         end
       end

data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb

@@ -109,6 +109,7 @@ DependencyDetection.defer do
   end
 
   def delayed_job_version
-    Gem.loaded_specs['delayed_job'].version if Gem.loaded_specs['delayed_job']
+    # the following line needs else branch coverage
+    Gem.loaded_specs['delayed_job'].version if Gem.loaded_specs['delayed_job'] # rubocop:disable Style/SafeNavigation
   end
 end

data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb

@@ -3,10 +3,10 @@
 # frozen_string_literal: true
 
 module NewRelic::Agent::Instrumentation
-  module Elasticsearch
+  module Elasticsearch::Chain
     def self.instrument!
       to_instrument = if ::Gem::Version.create(::Elasticsearch::VERSION) <
-          ::Gem::Version.create("8.0.0")
+          ::Gem::Version.create('8.0.0')
         ::Elasticsearch::Transport::Client
       else
         ::Elastic::Transport::Client

data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb

@@ -1,6 +1,7 @@
 # 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 '../../datastores/nosql_obfuscator'
 
 module NewRelic::Agent::Instrumentation
@@ -37,7 +38,7 @@ module NewRelic::Agent::Instrumentation
       end
       return nil unless operation_index
 
-      caller_locations[operation_index].to_s.split('`')[-1].gsub(/\W/, "")
+      caller_locations[operation_index].to_s.split('`')[-1].gsub(/\W/, '')
     end
 
     def nr_reported_query(query)
@@ -52,10 +53,10 @@ module NewRelic::Agent::Instrumentation
       return if nr_hosts.empty?
 
       NewRelic::Agent.disable_all_tracing do
-        @nr_cluster_name ||= perform_request('GET', '_cluster/health').body["cluster_name"]
+        @nr_cluster_name ||= perform_request('GET', '_cluster/health').body['cluster_name']
       end
     rescue StandardError => e
-      NewRelic::Agent.logger.error("Failed to get cluster name for elasticsearch", e)
+      NewRelic::Agent.logger.error('Failed to get cluster name for elasticsearch', e)
       nil
     end
 

data/lib/new_relic/agent/instrumentation/elasticsearch.rb

@@ -16,7 +16,7 @@ DependencyDetection.defer do
   executes do
     NewRelic::Agent.logger.info('Installing Elasticsearch instrumentation')
 
-    to_instrument = if Gem::Version.create(Elasticsearch::VERSION) < Gem::Version.create("8.0.0")
+    to_instrument = if Gem::Version.create(Elasticsearch::VERSION) < Gem::Version.create('8.0.0')
       Elasticsearch::Transport::Client
     else
       Elastic::Transport::Client
@@ -25,7 +25,7 @@ DependencyDetection.defer do
     if use_prepend?
       prepend_instrument to_instrument, NewRelic::Agent::Instrumentation::Elasticsearch::Prepend
     else
-      chain_instrument NewRelic::Agent::Instrumentation::Elasticsearch
+      chain_instrument NewRelic::Agent::Instrumentation::Elasticsearch::Chain
     end
   end
 end

data/lib/new_relic/agent/instrumentation/excon/middleware.rb

@@ -46,7 +46,8 @@ module ::Excon
       end
 
       def finish_trace(datum) # THREAD_LOCAL_ACCESS
-        segment = datum[:connection] && datum[:connection].instance_variable_get(TRACE_DATA_IVAR)
+        # The following line needs else branch coverage
+        segment = datum[:connection] && datum[:connection].instance_variable_get(TRACE_DATA_IVAR) # rubocop:disable Style/SafeNavigation
         if segment
           begin
             segment.notice_error(datum[:error]) if datum[:error]

data/lib/new_relic/agent/instrumentation/excon.rb

@@ -18,7 +18,7 @@ DependencyDetection.defer do
   # but alas, it does not yet.
 
   # TODO: MAJOR VERSION - update min version to 0.56.0
-  EXCON_MIN_VERSION = Gem::Version.new("0.19.0")
+  EXCON_MIN_VERSION = Gem::Version.new('0.19.0')
 
   depends_on do
     defined?(Excon) && defined?(Excon::VERSION)
@@ -46,7 +46,7 @@ DependencyDetection.defer do
       deprecation_msg
     )
 
-    NewRelic::Agent.record_metric("Supportability/Deprecated/Excon", 1)
+    NewRelic::Agent.record_metric('Supportability/Deprecated/Excon', 1)
   end
 
   def install_excon_instrumentation(excon_version)
@@ -64,7 +64,7 @@ DependencyDetection.defer do
     if defaults[:middlewares]
       defaults[:middlewares] << Excon::Middleware::NewRelicCrossAppTracing
     else
-      NewRelic::Agent.logger.warn("Did not find :middlewares key in Excon.defaults, skipping Excon instrumentation")
+      NewRelic::Agent.logger.warn('Did not find :middlewares key in Excon.defaults, skipping Excon instrumentation')
     end
   end
 end

data/lib/new_relic/agent/instrumentation/fiber/chain.rb

@@ -3,7 +3,7 @@
 # frozen_string_literal: true
 
 module NewRelic::Agent::Instrumentation
-  module MonitoredFiber
+  module MonitoredFiber::Chain
     def self.instrument!
       ::Fiber.class_eval do
         include NewRelic::Agent::Instrumentation::MonitoredFiber

data/lib/new_relic/agent/instrumentation/fiber.rb

@@ -19,7 +19,7 @@ DependencyDetection.defer do
     if use_prepend?
       prepend_instrument Fiber, NewRelic::Agent::Instrumentation::MonitoredFiber::Prepend
     else
-      chain_instrument NewRelic::Agent::Instrumentation::MonitoredFiber
+      chain_instrument NewRelic::Agent::Instrumentation::MonitoredFiber::Chain
     end
   end
 end

data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb

@@ -23,12 +23,12 @@ module NewRelic::Agent::Instrumentation
           api_class = (context.class.respond_to?(:base) && context.class.base) || context.class
           handle_transaction(endpoint, api_class.name, version)
         rescue => e
-          ::NewRelic::Agent.logger.warn("Error in Grape instrumentation", e)
+          ::NewRelic::Agent.logger.warn('Error in Grape instrumentation', e)
         end
       end
 
       def prepare!
-        if defined?(::Grape::VERSION) && Gem::Version.new(::Grape::VERSION) >= Gem::Version.new("0.16.0")
+        if defined?(::Grape::VERSION) && Gem::Version.new(::Grape::VERSION) >= Gem::Version.new('0.16.0')
           send(:remove_method, :name_for_transaction_deprecated)
         else
           send(:remove_method, :name_for_transaction)
@@ -40,7 +40,7 @@ module NewRelic::Agent::Instrumentation
       API_VERSION = 'api.version'.freeze
       FORMAT_REGEX = /\(\/?\.[\:\w]*\)/.freeze # either :format (< 0.12.0) or .ext (>= 0.12.0)
       VERSION_REGEX = /:version(\/|$)/.freeze
-      MIN_VERSION = Gem::Version.new("0.2.0")
+      MIN_VERSION = Gem::Version.new('0.2.0')
       PIPE_STRING = '|'.freeze
 
       def handle_transaction(endpoint, class_name, version)
@@ -91,7 +91,7 @@ module NewRelic::Agent::Instrumentation
         txn = ::NewRelic::Agent::Transaction.tl_current
         env = endpoint.request.env
         params = ::NewRelic::Agent::ParameterFiltering::apply_filters(env, endpoint.params)
-        params.delete("route_info")
+        params.delete('route_info')
         txn.filtered_params = params
         txn.merge_request_parameters(params)
       end

data/lib/new_relic/agent/instrumentation/grape.rb

@@ -19,14 +19,14 @@ DependencyDetection.defer do
 
   depends_on do
     begin
-      if defined?(Bundler) && Bundler.rubygems.all_specs.map(&:name).include?("newrelic-grape")
-        NewRelic::Agent.logger.info("Not installing New Relic supported Grape instrumentation because the third party newrelic-grape gem is present")
+      if defined?(Bundler) && Bundler.rubygems.all_specs.map(&:name).include?('newrelic-grape')
+        NewRelic::Agent.logger.info('Not installing New Relic supported Grape instrumentation because the third party newrelic-grape gem is present')
         false
       else
         true
       end
     rescue => e
-      NewRelic::Agent.logger.info("Could not determine if third party newrelic-grape gem is installed", e)
+      NewRelic::Agent.logger.info('Could not determine if third party newrelic-grape gem is installed', e)
       true
     end
   end

data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb

@@ -1,6 +1,6 @@
-# frozen_string_literal: true
 # 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 'instrumentation'
 

data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb

@@ -1,6 +1,6 @@
-# frozen_string_literal: true
 # 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 'request_wrapper'
 require_relative '../helper'
@@ -18,7 +18,8 @@ module NewRelic
 
             segment = request_segment(method)
             request_wrapper = NewRelic::Agent::Instrumentation::GRPC::Client::RequestWrapper.new(@host)
-            segment.add_request_headers(request_wrapper)
+            # do not insert CAT headers for gRPC requests https://github.com/newrelic/newrelic-ruby-agent/issues/1730
+            segment.add_request_headers(request_wrapper) unless CrossAppTracing.cross_app_enabled?
             metadata.merge!(request_wrapper.instance_variable_get(:@newrelic_metadata))
             grpc_message = nil
             grpc_status = 0

data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb

@@ -1,6 +1,6 @@
-# frozen_string_literal: true
 # 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 'instrumentation'
 

data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb

@@ -1,6 +1,6 @@
-# frozen_string_literal: true
 # 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 NewRelic
   module Agent

data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb

@@ -1,6 +1,6 @@
-# frozen_string_literal: true
 # 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 '../helper'
 
@@ -37,7 +37,7 @@ module NewRelic
               raise
             end
           ensure
-            txn.finish if txn
+            txn&.finish
           end
 
           def add_http2_port_with_tracing(*args)
@@ -55,12 +55,12 @@ module NewRelic
           def add_attributes(txn, metadata, streamer_type)
             grpc_params(metadata, streamer_type).each do |attr, value|
               txn.add_agent_attribute(attr, value, DESTINATIONS)
-              txn.current_segment.add_agent_attribute(attr, value) if txn.current_segment
+              txn.current_segment&.add_agent_attribute(attr, value)
             end
           end
 
           def metadata_for_call(active_call)
-            return NewRelic::EMPTY_HASH unless active_call && active_call.metadata
+            return NewRelic::EMPTY_HASH unless active_call&.metadata
 
             active_call.metadata
           end