newrelic_rpm 8.7.0 → 8.11.0

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

@@ -1,6 +1,6 @@
-# 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
 
 DependencyDetection.defer do
   named :data_mapper
@@ -13,7 +13,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info 'Installing DataMapper instrumentation'
+    ::NewRelic::Agent.logger.info('Installing DataMapper instrumentation')
     require 'new_relic/agent/datastores/metric_helper'
 
     deprecation_msg = 'The instrumentation for DataMapper is deprecated. ' \
@@ -30,69 +30,69 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :get
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :first
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :last
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :all
-
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :create
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :create!
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :update
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :update!
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :destroy
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :destroy!
-
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :aggregate
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :find
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :find_by_sql
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :get)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :first)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :last)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :all)
+
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :create)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :create!)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :update)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :update!)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :destroy)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :destroy!)
+
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :aggregate)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :find)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :find_by_sql)
   end
 
   executes do
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :update
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :update!
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :save
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :save!
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :destroy
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :destroy!
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :update)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :update!)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :save)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :save!)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :destroy)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :destroy!)
   end
 
   executes do
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :get
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :first
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :last
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :all
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :get)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :first)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :last)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :all)
 
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :lazy_load
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :lazy_load)
 
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :create
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :create!
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :update
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :update!
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :destroy
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :destroy!
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :create)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :create!)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :update)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :update!)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :destroy)
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :destroy!)
 
-    NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :aggregate
+    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :aggregate)
   end
 
   executes do
     # Catch direct SQL calls that bypass CRUD
     if defined?(::DataMapper::Adapters::DataObjectsAdapter)
-      NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Adapters::DataObjectsAdapter, :select, true
-      NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Adapters::DataObjectsAdapter, :execute, true
+      NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Adapters::DataObjectsAdapter, :select, true)
+      NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Adapters::DataObjectsAdapter, :execute, true)
     end
   end
 
   executes do
     # DM::Validations overrides Model#create, so we patch it here as well
     if defined?(::DataMapper::Validations::ClassMethods)
-      NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Validations::ClassMethods, :create
+      NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Validations::ClassMethods, :create)
     end
   end
 
   executes do
     # DM::Transaction calls commit() twice, so potentially shows up twice.
     if defined?(::DataMapper::Transaction)
-      NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Transaction, :commit, true
+      NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Transaction, :commit, true)
     end
   end
 
@@ -114,8 +114,8 @@ module NewRelic
             define_method("#{method_name}_with_newrelic",
               NewRelic::Agent::DataMapperTracing.method_body(clazz, method_name, operation_only))
 
-            alias_method "#{method_name}_without_newrelic", method_name
-            alias_method method_name, "#{method_name}_with_newrelic"
+            alias_method("#{method_name}_without_newrelic", method_name)
+            alias_method(method_name, "#{method_name}_with_newrelic")
           end
         end
       end
@@ -129,7 +129,7 @@ module NewRelic
         use_model_name = NewRelic::Helper.instance_methods_include?(clazz, :model)
         metric_operation = method_name.to_s.gsub(/[!?]/, "")
 
-        Proc.new do |*args, &blk|
+        proc do |*args, &blk|
           begin
             if operation_only
               # Used by direct SQL, like ::DataMapper::Adapters::DataObjectsAdapter#select
@@ -152,7 +152,7 @@ module NewRelic
             )
 
             begin
-              NewRelic::Agent::Tracer.capture_segment_error segment do
+              NewRelic::Agent::Tracer.capture_segment_error(segment) do
                 self.send("#{method_name}_without_newrelic", *args, &blk)
               end
             rescue ::DataObjects::ConnectionError => e
@@ -205,7 +205,7 @@ module NewRelic
           txn = state.current_transaction
 
           if txn && txn.current_segment.respond_to?(:notice_sql)
-            txn.current_segment.notice_sql msg.query
+            txn.current_segment.notice_sql(msg.query)
           end
         ensure
           super

data/lib/new_relic/agent/instrumentation/delayed_job/chain.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
@@ -22,7 +21,7 @@ module NewRelic::Agent::Instrumentation
             Delayed::Job.class_eval do
               include NewRelic::Agent::Instrumentation::DelayedJobTracer
 
-              alias_method :invoke_job_without_new_relic, :invoke_job
+              alias_method(:invoke_job_without_new_relic, :invoke_job)
 
               def invoke_job(*args, &block)
                 invoke_job_with_tracing { invoke_job_without_new_relic(*args, &block) }

data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.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
@@ -19,9 +18,9 @@ module NewRelic
           if defined?(::Delayed::Job) && ::Delayed::Job.method_defined?(:invoke_job) &&
               !(::Delayed::Job.method_defined?(:invoke_job_without_new_relic))
 
-            ::NewRelic::Agent.logger.info 'Installing DelayedJob instrumentation [part 2/2]'
+            ::NewRelic::Agent.logger.info('Installing DelayedJob instrumentation [part 2/2]')
             install_newrelic_job_tracer
-            NewRelic::Control.instance.init_plugin :dispatcher => :delayed_job
+            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")
           end

data/lib/new_relic/agent/instrumentation/delayed_job/prepend.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
@@ -17,7 +16,7 @@ module NewRelic
           end
 
           def install_newrelic_job_tracer
-            Delayed::Job.send :prepend, ::NewRelic::Agent::Instrumentation::DelayedJobTracerPrepend
+            Delayed::Job.send(:prepend, ::NewRelic::Agent::Instrumentation::DelayedJobTracerPrepend)
           end
         end
       end

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

@@ -1,6 +1,6 @@
-# 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 'delayed_job/chain'
 require_relative 'delayed_job/prepend'
@@ -21,7 +21,7 @@ module NewRelic
           LEGACY_DJ_DEFAULT_CLASS = '(unknown class)'.freeze
 
           def name_from_payload(payload_object)
-            if payload_object.is_a? ::Delayed::PerformableMethod
+            if payload_object.is_a?(::Delayed::PerformableMethod)
               # payload_object contains a reference to an object
               # that received an asynchronous method call via .delay or .handle_asynchronously
               "#{object_name(payload_object)}#{delimiter(payload_object)}#{method_name(payload_object)}"
@@ -83,7 +83,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info 'Installing DelayedJob instrumentation [part 1/2]'
+    ::NewRelic::Agent.logger.info('Installing DelayedJob instrumentation [part 1/2]')
   end
 
   executes do

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

@@ -1,6 +1,6 @@
-# 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
 
 module ::Excon
   module Middleware
@@ -25,7 +25,7 @@ module ::Excon
               procedure: wrapped_request.method
             )
 
-            segment.add_request_headers wrapped_request
+            segment.add_request_headers(wrapped_request)
 
             datum[:connection].instance_variable_set(TRACE_DATA_IVAR, segment)
           end
@@ -54,7 +54,7 @@ module ::Excon
 
             if datum[:response]
               wrapped_response = ::NewRelic::Agent::HTTPClients::ExconHTTPResponse.new(datum[:response])
-              segment.process_response_headers wrapped_response
+              segment.process_response_headers(wrapped_response)
             end
           ensure
             segment.finish if segment

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

@@ -1,6 +1,6 @@
-# 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
 
 DependencyDetection.defer do
   named :excon
@@ -40,7 +40,7 @@ DependencyDetection.defer do
   end
 
   def install_middleware_excon_instrumentation
-    ::NewRelic::Agent.logger.info 'Installing middleware-based Excon instrumentation'
+    ::NewRelic::Agent.logger.info('Installing middleware-based Excon instrumentation')
     require 'new_relic/agent/instrumentation/excon/middleware'
     defaults = Excon.defaults
 

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

@@ -1,22 +1,22 @@
-# 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
 
 module NewRelic::Agent::Instrumentation
   module Grape
     module Chain
       def self.instrument!
         Grape::Instrumentation.instrumented_class.class_eval do
-          def call_with_new_relic env
+          def call_with_new_relic(env)
             begin
-              call_without_new_relic env
+              call_without_new_relic(env)
             ensure
-              Grape::Instrumentation.capture_transaction env, self
+              Grape::Instrumentation.capture_transaction(env, self)
             end
           end
 
-          alias_method :call_without_new_relic, :call
-          alias_method :call, :call_with_new_relic
+          alias_method(:call_without_new_relic, :call)
+          alias_method(:call, :call_with_new_relic)
         end
       end
     end

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

@@ -1,6 +1,6 @@
-# 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 'new_relic/agent/parameter_filtering'
 
@@ -15,7 +15,7 @@ module NewRelic::Agent::Instrumentation
         defined?(::Grape::API::Instance) ? ::Grape::API::Instance : ::Grape::API
       end
 
-      def capture_transaction env, context
+      def capture_transaction(env, context)
         begin
           endpoint = env[API_ENDPOINT]
           version = env[API_VERSION]
@@ -29,10 +29,10 @@ module NewRelic::Agent::Instrumentation
 
       def prepare!
         if defined?(::Grape::VERSION) && Gem::Version.new(::Grape::VERSION) >= Gem::Version.new("0.16.0")
-          send :remove_method, :name_for_transaction_deprecated
+          send(:remove_method, :name_for_transaction_deprecated)
         else
-          send :remove_method, :name_for_transaction
-          send :alias_method, :name_for_transaction, :name_for_transaction_deprecated
+          send(:remove_method, :name_for_transaction)
+          send(:alias_method, :name_for_transaction, :name_for_transaction_deprecated)
         end
       end
 

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

@@ -1,15 +1,15 @@
-# 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
 
 module NewRelic::Agent::Instrumentation
   module Grape
     module Prepend
-      def call env
+      def call(env)
         begin
-          super env
+          super(env)
         ensure
-          Grape::Instrumentation.capture_transaction env, self
+          Grape::Instrumentation.capture_transaction(env, self)
         end
       end
     end

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

@@ -1,6 +1,6 @@
-# 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 'grape/instrumentation'
 require_relative 'grape/chain'

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

@@ -0,0 +1,97 @@
+# 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.
+
+require_relative 'instrumentation'
+
+module NewRelic::Agent::Instrumentation
+  module GRPC
+    module Client
+      module Chain
+        def self.instrument!
+          ::GRPC::ClientStub.class_eval do
+            include NewRelic::Agent::Instrumentation::GRPC::Client
+
+            def bidi_streamer_with_new_relic_trace(method, requests, marshal, unmarshal,
+              deadline: nil,
+              return_op: false,
+              parent: nil,
+              credentials: nil,
+              metadata: {},
+              &blk)
+
+              issue_request_with_tracing(:bidi_streamer, method, requests, marshal, unmarshal,
+                deadline: deadline,
+                return_op: return_op,
+                parent: parent,
+                credentials: credentials,
+                metadata: metadata)
+
+              # TODO: gRPC - confirm that &blk is being invoked correctly
+            end
+
+            alias bidi_streamer_without_newrelic_trace bidi_streamer
+            alias bidi_streamer bidi_streamer_with_newrelic_trace
+
+            def client_streamer_with_newrelic_trace(method, requests, marshal, unmarshal,
+              deadline: nil,
+              return_op: false,
+              parent: nil,
+              credentials: nil,
+              metadata: {})
+
+              issue_request_with_tracing(:client_streamer, method, requests, marshal, unmarshal,
+                deadline: deadline,
+                return_op: return_op,
+                parent: parent,
+                credentials: credentials,
+                metadata: metadata)
+            end
+
+            alias client_streamer_without_newrelic_trace client_streamer
+            alias client_streamer client_streamer_with_newrelic_trace
+
+            def request_response_with_newrelic_trace(method, req, marshal, unmarshal,
+              deadline: nil,
+              return_op: false,
+              parent: nil,
+              credentials: nil,
+              metadata: {})
+
+              issue_request_with_tracing(:request_response, method, req, marshal, unmarshal,
+                deadline: deadline,
+                return_op: return_op,
+                parent: parent,
+                credentials: credentials,
+                metadata: metadata)
+            end
+
+            alias request_response_without_newrelic_trace request_response
+            alias request_response request_response_with_newrelic_trace
+
+            def server_streamer_with_newrelic_trace(method, req, marshal, unmarshal,
+              deadline: nil,
+              return_op: false,
+              parent: nil,
+              credentials: nil,
+              metadata: {},
+              &blk)
+
+              issue_request_with_tracing(:server_streamer, method, req, marshal, unmarshal,
+                deadline: deadline,
+                return_op: return_op,
+                parent: parent,
+                credentials: credentials,
+                metadata: metadata)
+
+              # TODO: gRPC - confirm that &blk is being invoked correctly
+            end
+
+            alias server_streamer_without_newrelic_trace server_streamer
+            alias server_streamer server_streamer_with_newrelic_trace
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,89 @@
+# 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.
+
+require_relative 'request_wrapper'
+require_relative '../helper'
+
+module NewRelic
+  module Agent
+    module Instrumentation
+      module GRPC
+        module Client
+          include NewRelic::Agent::Instrumentation::GRPC::Helper
+
+          def issue_request_with_tracing(grpc_type, method, requests, marshal, unmarshal,
+            deadline:, return_op:, parent:, credentials:, metadata:)
+            return yield unless trace_with_newrelic?
+
+            segment = request_segment(method)
+            request_wrapper = NewRelic::Agent::Instrumentation::GRPC::Client::RequestWrapper.new(@host)
+            segment.add_request_headers(request_wrapper)
+            metadata.merge!(request_wrapper.instance_variable_get(:@newrelic_metadata))
+            grpc_message = nil
+            grpc_status = 0
+
+            NewRelic::Agent.disable_all_tracing do
+              begin
+                yield
+              rescue => e
+                NewRelic::Agent.notice_error(e)
+                grpc_status, grpc_message = grpc_status_and_message_from_exception(e)
+                raise
+              end
+            end
+          ensure
+            add_attributes(segment, grpc_message: grpc_message, grpc_status: grpc_status, grpc_type: grpc_type)
+            segment.finish if segment
+          end
+
+          private
+
+          def add_attributes(segment, attributes_hash)
+            return unless segment
+
+            attributes_hash.each do |attr, value|
+              segment.add_agent_attribute(attr, value)
+            end
+            segment.record_agent_attributes = true
+          end
+
+          def grpc_status_and_message_from_exception(exception)
+            return unless exception.message =~ /^(\d+):(\w+)\./
+
+            [Regexp.last_match(1).to_i, Regexp.last_match(2)]
+          end
+
+          def request_segment(method)
+            cleaned = cleaned_method(method)
+            NewRelic::Agent::Tracer.start_external_request_segment(
+              library: 'gRPC',
+              uri: method_uri(cleaned),
+              procedure: cleaned
+            )
+          end
+
+          def method_uri(method)
+            return unless @host && method
+
+            "grpc://#{@host}/#{method}"
+          end
+
+          def interceptor?
+            self.class.name.eql?('GRPC::InterceptorRegistry')
+          end
+
+          def trace_with_newrelic?
+            return @trace_with_newrelic unless @trace_with_newrelic.nil? # check for nil, not false
+
+            @trace_with_newrelic = if interceptor?
+              false
+            else
+              !host_denylisted?(@host)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,111 @@
+# 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.
+
+require_relative 'instrumentation'
+
+module NewRelic
+  module Agent
+    module Instrumentation
+      module GRPC
+        module Client
+          module Prepend
+            include NewRelic::Agent::Instrumentation::GRPC::Client
+
+            def bidi_streamer(method, requests, marshal, unmarshal,
+              deadline: nil,
+              return_op: false,
+              parent: nil,
+              credentials: nil,
+              metadata: {},
+              &blk)
+
+              issue_request_with_tracing(:bidi_streamer, method, requests, marshal, unmarshal,
+                deadline: deadline,
+                return_op: return_op,
+                parent: parent,
+                credentials: credentials,
+                metadata: metadata) do
+                  super(method, requests, marshal, unmarshal,
+                        deadline: deadline,
+                        return_op: return_op,
+                        parent: parent,
+                        credentials: credentials,
+                        metadata: metadata,
+                        &blk)
+                end
+            end
+
+            def client_streamer(method, requests, marshal, unmarshal,
+              deadline: nil,
+              return_op: false,
+              parent: nil,
+              credentials: nil,
+              metadata: {})
+
+              issue_request_with_tracing(:client_streamer, method, requests, marshal, unmarshal,
+                deadline: deadline,
+                return_op: return_op,
+                parent: parent,
+                credentials: credentials,
+                metadata: metadata) do
+                  super(method, requests, marshal, unmarshal,
+                        deadline: deadline,
+                        return_op: return_op,
+                        parent: parent,
+                        credentials: credentials,
+                        metadata: metadata)
+                end
+            end
+
+            def request_response(method, req, marshal, unmarshal,
+              deadline: nil,
+              return_op: false,
+              parent: nil,
+              credentials: nil,
+              metadata: {})
+
+              issue_request_with_tracing(:request_response, method, req, marshal, unmarshal,
+                deadline: deadline,
+                return_op: return_op,
+                parent: parent,
+                credentials: credentials,
+                metadata: metadata) do
+                  super(method, req, marshal, unmarshal,
+                        deadline: deadline,
+                        return_op: return_op,
+                        parent: parent,
+                        credentials: credentials,
+                        metadata: metadata)
+                end
+            end
+
+            def server_streamer(method, req, marshal, unmarshal,
+              deadline: nil,
+              return_op: false,
+              parent: nil,
+              credentials: nil,
+              metadata: {},
+              &blk)
+
+              issue_request_with_tracing(:server_streamer, method, req, marshal, unmarshal,
+                deadline: deadline,
+                return_op: return_op,
+                parent: parent,
+                credentials: credentials,
+                metadata: metadata) do
+                  super(method, req, marshal, unmarshal,
+                        deadline: deadline,
+                        return_op: return_op,
+                        parent: parent,
+                        credentials: credentials,
+                        metadata: metadata,
+                        &blk)
+                end
+            end
+          end
+        end
+      end
+    end
+  end
+end