newrelic_rpm 9.17.0 → 9.21.0

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

@@ -8,7 +8,7 @@ module NewRelic
   module Agent
     module Instrumentation
       class ActiveJobSubscriber < NotificationsSubscriber
-        PAYLOAD_KEYS = %i[adapter db_runtime error job wait]
+        PAYLOAD_KEYS = %i[adapter db_runtime error job wait jobs]
 
         def add_segment_params(segment, payload)
           PAYLOAD_KEYS.each do |key|
@@ -16,8 +16,12 @@ module NewRelic
           end
         end
 
+        # NOTE: For `enqueue_all.active_job`, only the first job is used to determine the queue.
+        # Therefore, this assumes all jobs given as arguments for perform_all_later share the same queue.
         def metric_name(name, payload)
-          queue = payload[:job].queue_name
+          job = payload[:job] || payload[:jobs].first
+
+          queue = job.queue_name
           method = method_from_name(name)
           "Ruby/ActiveJob/#{queue}/#{method}"
         end

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

@@ -13,7 +13,8 @@ module NewRelic
         end
 
         def self.insert_instrumentation
-          if defined?(::ActiveRecord::VERSION::MAJOR) && ::ActiveRecord::VERSION::MAJOR.to_i >= 3
+          if defined?(::ActiveRecord::VERSION::MAJOR) &&
+              NewRelic::Helper.version_satisfied?(::ActiveRecord::VERSION::MAJOR, '>=', 3)
             if ::NewRelic::Agent.config[:prepend_active_record_instrumentation]
               ::ActiveRecord::Base.prepend(::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::BaseExtensions)
               ::ActiveRecord::Relation.prepend(::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::RelationExtensions)
@@ -37,7 +38,7 @@ module NewRelic
           end
         end
 
-        if RUBY_VERSION < '2.7.0'
+        if NewRelic::Helper.version_satisfied?(RUBY_VERSION, '<', '2.7.0')
           def log_with_newrelic_instrumentation(*args, &block)
             state = NewRelic::Agent::Tracer.state
 
@@ -137,7 +138,7 @@ DependencyDetection.defer do
   depends_on do
     defined?(ActiveRecord) && defined?(ActiveRecord::Base) &&
       (!defined?(ActiveRecord::VERSION) ||
-        ActiveRecord::VERSION::MAJOR.to_i <= 3)
+        NewRelic::Helper.version_satisfied?(ActiveRecord::VERSION::MAJOR, '<=', 3))
   end
 
   depends_on do
@@ -151,7 +152,8 @@ DependencyDetection.defer do
   executes do
     require 'new_relic/agent/instrumentation/active_record_helper'
 
-    if defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR.to_i == 3
+    if defined?(Rails::VERSION::MAJOR) &&
+        NewRelic::Helper.version_satisfied?(Rails::VERSION::MAJOR, '==', 3)
       ActiveSupport.on_load(:active_record) do
         NewRelic::Agent::Instrumentation::ActiveRecord.insert_instrumentation
       end

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 NewRelic::Helper.version_satisfied?(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)
@@ -235,7 +235,7 @@ module NewRelic
           }.freeze
 
           DEFAULT = 'default'.freeze
-          UNKNOWN = 'unknown'.freeze
+          UNKNOWN = NewRelic::UNKNOWN_LOWER
           LOCALHOST = 'localhost'.freeze
 
           def adapter_from_config(config)

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

@@ -28,7 +28,7 @@ module NewRelic
             ) { yield }
           rescue => e
             # The translate_exception_class method got introduced in 4.1
-            if ::ActiveRecord::VERSION::MINOR == 0
+            if NewRelic::Helper.version_satisfied?(::ActiveRecord::VERSION::MINOR, '==', 0)
               raise translate_exception(e, sql)
             else
               raise translate_exception_class(e, sql)
@@ -86,7 +86,7 @@ DependencyDetection.defer do
   depends_on do
     defined?(ActiveRecord) && defined?(ActiveRecord::Base) &&
       defined?(ActiveRecord::VERSION) &&
-      ActiveRecord::VERSION::MAJOR.to_i >= 4
+      NewRelic::Helper.version_satisfied?(ActiveRecord::VERSION::MAJOR, '>=', 4)
   end
 
   depends_on do
@@ -113,7 +113,7 @@ DependencyDetection.defer do
 
       # Default to .prepending, unless the ActiveRecord version is <=4
       # **AND** the :prepend_active_record_instrumentation config is false
-      if ActiveRecord::VERSION::MAJOR > 4 \
+      if NewRelic::Helper.version_satisfied?(ActiveRecord::VERSION::MAJOR, '>', 4) \
           || NewRelic::Agent.config[:prepend_active_record_instrumentation]
 
         ActiveRecord::Base.send(:prepend,
@@ -131,11 +131,13 @@ DependencyDetection.defer do
       major_version = ActiveRecord::VERSION::MAJOR.to_i
       minor_version = ActiveRecord::VERSION::MINOR.to_i
 
-      activerecord_extension = if major_version == 4
+      activerecord_extension = if NewRelic::Helper.version_satisfied?(major_version, '==', 4)
         NewRelic::Agent::Instrumentation::ActiveRecordNotifications::BaseExtensions4x
-      elsif major_version == 5 && minor_version == 0
+      elsif NewRelic::Helper.version_satisfied?(major_version, '==', 5) &&
+          NewRelic::Helper.version_satisfied?(minor_version, '==', 0)
         NewRelic::Agent::Instrumentation::ActiveRecordNotifications::BaseExtensions50
-      elsif major_version == 5 && minor_version == 1
+      elsif NewRelic::Helper.version_satisfied?(major_version, '==', 5) &&
+          NewRelic::Helper.version_satisfied?(minor_version, '==', 1)
         NewRelic::Agent::Instrumentation::ActiveRecordNotifications::BaseExtensions51
       end
 
@@ -146,9 +148,9 @@ DependencyDetection.defer do
   end
 
   executes do
-    if ActiveRecord::VERSION::MAJOR == 5 \
-        && ActiveRecord::VERSION::MINOR.to_i == 1 \
-        && ActiveRecord::VERSION::TINY.to_i >= 6
+    if NewRelic::Helper.version_satisfied?(ActiveRecord::VERSION::MAJOR, '==', 5) \
+        && NewRelic::Helper.version_satisfied?(ActiveRecord::VERSION::MINOR, '==', 1) \
+        && NewRelic::Helper.version_satisfied?(ActiveRecord::VERSION::TINY, '>=', 6)
 
       ActiveRecord::Base.prepend(NewRelic::Agent::Instrumentation::ActiveRecordPrepend::BaseExtensions516)
     end

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 NewRelic::Helper.version_satisfied?(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 NewRelic::Helper.version_satisfied?(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/async_http.rb

@@ -11,7 +11,7 @@ DependencyDetection.defer do
 
   depends_on do
     defined?(Async::HTTP) &&
-      Gem::Version.new(Async::HTTP::VERSION) >= Gem::Version.new('0.59.0') &&
+      NewRelic::Helper.version_satisfied?(Async::HTTP::VERSION, '>=', '0.59.0') &&
       !defined?(Traces::Backend::NewRelic) # defined in the traces-backend-newrelic gem
   end
 

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

@@ -69,7 +69,7 @@ module NewRelic::Agent::Instrumentation
     end
 
     def get_stream_name(params, arn)
-      params&.dig(:stream_name) || arn.split('/').last || 'unknown'
+      params&.dig(:stream_name) || arn.split('/').last || NewRelic::UNKNOWN_LOWER
     rescue => e
       NewRelic::Agent.logger.warn("Failed to get stream name: #{e}")
     end

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

@@ -12,7 +12,7 @@ DependencyDetection.defer do
   depends_on do
     defined?(Concurrent) &&
       defined?(Concurrent::VERSION) &&
-      Gem::Version.new(Concurrent::VERSION) >= Gem::Version.new('1.1.5')
+      NewRelic::Helper.version_satisfied?(Concurrent::VERSION, '>=', '1.1.5')
   end
 
   executes do

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

@@ -54,6 +54,7 @@ module NewRelic
           # Have NewRelic ignore actions in this controller.  Specify the actions as hash options
           # using :except and :only.  If no actions are specified, all actions are ignored.
           #
+          # @!scope class
           # @api public
           #
           def newrelic_ignore(specifiers = {})
@@ -65,6 +66,7 @@ module NewRelic
           # actions that are not user facing or that skew your overall apdex measurement.
           # Accepts :except and :only options, as with #newrelic_ignore.
           #
+          # @!scope class
           # @api public
           #
           def newrelic_ignore_apdex(specifiers = {})
@@ -72,6 +74,7 @@ module NewRelic
             newrelic_ignore_aspect(NR_IGNORE_APDEX_KEY, specifiers)
           end
 
+          # @!scope class
           # @api public
           def newrelic_ignore_enduser(specifiers = {})
             NewRelic::Agent.record_api_supportability_metric(:newrelic_ignore_enduser)
@@ -159,6 +162,7 @@ module NewRelic
           # See NewRelic::Agent::Instrumentation::ControllerInstrumentation#perform_action_with_newrelic_trace
           # for the full list of available options.
           #
+          # @!scope class
           # @api public
           #
           def add_transaction_tracer(method, options = {})

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

@@ -12,7 +12,7 @@ DependencyDetection.defer do
 
   depends_on do
     defined?(Curl) && defined?(Curl::CURB_VERSION) &&
-      Gem::Version.new(Curl::CURB_VERSION) >= CURB_MIN_VERSION
+      NewRelic::Helper.version_satisfied?(Curl::CURB_VERSION, '>=', CURB_MIN_VERSION)
   end
 
   executes do

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

@@ -5,8 +5,7 @@
 module NewRelic::Agent::Instrumentation
   module Elasticsearch::Chain
     def self.instrument!
-      to_instrument = if ::Gem::Version.create(::Elasticsearch::VERSION) <
-          ::Gem::Version.create('8.0.0')
+      to_instrument = if NewRelic::Helper.version_satisfied?(::Elasticsearch::VERSION, '<', '8.0.0')
         ::Elasticsearch::Transport::Client
       else
         ::Elastic::Transport::Client

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

@@ -102,6 +102,7 @@ module NewRelic::Agent::Instrumentation
     end
 
     def nr_cluster_name
+      return unless NewRelic::Agent.config[:'elasticsearch.capture_cluster_name']
       return @nr_cluster_name if defined?(@nr_cluster_name)
       return if nr_hosts.empty?
 

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

@@ -14,7 +14,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    to_instrument = if Gem::Version.create(Elasticsearch::VERSION) < Gem::Version.create('8.0.0')
+    to_instrument = if NewRelic::Helper.version_satisfied?(Elasticsearch::VERSION, '<', '8.0.0')
       Elasticsearch::Transport::Client
     else
       Elastic::Transport::Client

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

@@ -18,7 +18,7 @@ DependencyDetection.defer do
   end
 
   depends_on do
-    defined?(Ethon) && Gem::Version.new(Ethon::VERSION) >= Gem::Version.new('0.12.0')
+    defined?(Ethon) && NewRelic::Helper.version_satisfied?(Ethon::VERSION, '>=', '0.12.0')
   end
 
   executes do

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

@@ -26,7 +26,7 @@ DependencyDetection.defer do
 
   executes do
     excon_version = Gem::Version.new(Excon::VERSION)
-    if excon_version >= EXCON_MIN_VERSION
+    if NewRelic::Helper.version_satisfied?(excon_version, '>=', EXCON_MIN_VERSION)
       install_excon_instrumentation(excon_version)
     else
       NewRelic::Agent.logger.warn("Excon instrumentation requires at least version #{EXCON_MIN_VERSION}")

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

@@ -10,7 +10,7 @@ module NewRelic::Agent::Instrumentation
 
         alias_method(:initialize_without_new_relic, :initialize)
 
-        if RUBY_VERSION < '2.7.0'
+        if NewRelic::Helper.version_satisfied?(RUBY_VERSION, '<', '2.7.0')
           def initialize(*_args, &block)
             traced_block = add_thread_tracing(&block)
             initialize_with_newrelic_tracing { initialize_without_new_relic(&traced_block) }

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

@@ -9,7 +9,7 @@ module NewRelic::Agent::Instrumentation
     module Prepend
       include NewRelic::Agent::Instrumentation::MonitoredFiber
 
-      if RUBY_VERSION < '2.7.0'
+      if NewRelic::Helper.version_satisfied?(RUBY_VERSION, '<', '2.7.0')
         def initialize(*_args, &block)
           traced_block = add_thread_tracing(&block)
           initialize_with_newrelic_tracing { super(&traced_block) }

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

@@ -16,10 +16,7 @@ DependencyDetection.defer do
   end
 
   depends_on do
-    minimum_supported_version = Gem::Version.new(HTTPCLIENT_MIN_VERSION)
-    current_version = Gem::Version.new(HTTPClient::VERSION)
-
-    current_version >= minimum_supported_version
+    NewRelic::Helper.version_satisfied?(HTTPClient::VERSION, '>=', HTTPCLIENT_MIN_VERSION)
   end
 
   executes do

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

@@ -30,7 +30,7 @@ module NewRelic::Agent::Instrumentation::HTTPX
 
   def nr_finish_segment
     proc do |request, segment|
-      response = @responses[request]
+      response = request.response if request
 
       unless response
         NewRelic::Agent.logger.debug('Processed an on-response callback for HTTPX but could not find the response!')

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

@@ -10,7 +10,7 @@ DependencyDetection.defer do
   named :httpx
 
   depends_on do
-    defined?(HTTPX) && Gem::Version.new(HTTPX::VERSION) >= Gem::Version.new('1.0.0')
+    defined?(HTTPX) && NewRelic::Helper.version_satisfied?(HTTPX::VERSION, '>=', '1.0.0')
   end
 
   executes do

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

@@ -11,7 +11,7 @@ DependencyDetection.defer do
 
   depends_on do
     defined?(LogStasher) &&
-      Gem::Version.new(LogStasher::VERSION) >= Gem::Version.new('1.0.0') &&
+      NewRelic::Helper.version_satisfied?(LogStasher::VERSION, '>=', '1.0.0') &&
       NewRelic::Agent.config[:'application_logging.enabled']
   end
 

data/lib/new_relic/agent/instrumentation/memcache/dalli.rb

@@ -61,7 +61,7 @@ module NewRelic
               # TODO: MAJOR VERSION
               # Dalli - 3.1.0 renamed send_multiget to pipelined_get, but the method is otherwise the same
               # Once we no longer support Dalli < 3.1.0, remove this conditional logic
-              if Gem::Version.new(::Dalli::VERSION) >= Gem::Version.new('3.1.0')
+              if NewRelic::Helper.version_satisfied?(::Dalli::VERSION, '>=', '3.1.0')
                 alias_method(:pipelined_get_without_newrelic_trace, :pipelined_get)
                 def pipelined_get(keys)
                   send_multiget_with_newrelic_tracing(keys) { pipelined_get_without_newrelic_trace(keys) }

data/lib/new_relic/agent/instrumentation/memcache/helper.rb

@@ -9,11 +9,11 @@ module NewRelic::Agent::Instrumentation
       BINARY_PROTOCOL_SUPPORTED_VERSION = Gem::Version.new('3.0.2')
 
       def supports_datastore_instances?
-        DATASTORE_INSTANCES_SUPPORTED_VERSION <= Gem::Version.new(::Dalli::VERSION)
+        NewRelic::Helper.version_satisfied?(DATASTORE_INSTANCES_SUPPORTED_VERSION, '<=', ::Dalli::VERSION)
       end
 
       def supports_binary_protocol?
-        BINARY_PROTOCOL_SUPPORTED_VERSION <= Gem::Version.new(::Dalli::VERSION)
+        NewRelic::Helper.version_satisfied?(BINARY_PROTOCOL_SUPPORTED_VERSION, '<=', ::Dalli::VERSION)
       end
 
       def client_methods

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

@@ -6,7 +6,7 @@ module NewRelic::Agent::Instrumentation
   module Memcache
     module Tracer
       SLASH = '/'
-      UNKNOWN = 'unknown'
+      UNKNOWN = NewRelic::UNKNOWN_LOWER
       LOCALHOST = 'localhost'
       MULTIGET_METRIC_NAME = 'get_multi_request'
       MEMCACHED = 'Memcached'

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

@@ -87,7 +87,7 @@ module NewRelic::Agent::Instrumentation
           # TODO: MAJOR VERSION
           # Dalli - 3.1.0 renamed send_multiget to pipelined_get, but the method is otherwise the same
           # Once we no longer support Dalli < 3.1.0, remove this conditional logic
-          if Gem::Version.new(::Dalli::VERSION) >= Gem::Version.new('3.1.0')
+          if NewRelic::Helper.version_satisfied?(::Dalli::VERSION, '>=', '3.1.0')
             def pipelined_get(keys)
               send_multiget_with_newrelic_tracing(keys) { super }
             end

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

@@ -106,7 +106,7 @@ module NewRelic
           )
         end
 
-        UNKNOWN = 'unknown'.freeze
+        UNKNOWN = NewRelic::UNKNOWN_LOWER
         LOCALHOST = 'localhost'.freeze
 
         def host_from_address(address)

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

@@ -21,7 +21,7 @@ module NewRelic
 
           begin
             response = nil
-            segment.add_request_headers(wrapped_request)
+            segment&.add_request_headers(wrapped_request)
 
             # RUBY-1244 Disable further tracing in request to avoid double
             # counting if connection wasn't started (which calls request again).
@@ -34,10 +34,10 @@ module NewRelic
             wrapped_response = NewRelic::Agent::HTTPClients::NetHTTPResponse.new(response)
 
             if NewRelic::Agent::LLM.openai_parent?(segment)
-              NewRelic::Agent::LLM.populate_openai_response_headers(wrapped_response, segment.parent)
+              NewRelic::Agent::LLM.populate_openai_response_headers(wrapped_response, segment&.parent)
             end
 
-            segment.process_response_headers(wrapped_response)
+            segment&.process_response_headers(wrapped_response)
 
             response
           ensure

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

@@ -19,7 +19,8 @@ DependencyDetection.defer do
 
   # Airbrake uses method chaining on Net::HTTP in versions < 10.0.2 (10.0.2 updated to prepend for Net:HTTP)
   conflicts_with_prepend do
-    defined?(Airbrake) && defined?(Airbrake::AIRBRAKE_VERSION) && Gem::Version.create(Airbrake::AIRBRAKE_VERSION) < Gem::Version.create('10.0.2')
+    defined?(Airbrake) && defined?(Airbrake::AIRBRAKE_VERSION) &&
+      NewRelic::Helper.version_satisfied?(Airbrake::AIRBRAKE_VERSION, '<', '10.0.2')
   end
 
   conflicts_with_prepend do

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

@@ -16,8 +16,6 @@ module NewRelic
         end
 
         def self.find_all_subscribers
-          # TODO: need to talk to Rails core about an API for this,
-          # rather than digging through Listener ivars
           instance_variable_names = [:@subscribers, :@string_subscribers, :@other_subscribers]
           all_subscribers = []
 

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

@@ -12,7 +12,7 @@ DependencyDetection.defer do
   configure_with :rake
 
   depends_on { defined?(Rake) && defined?(Rake::VERSION) }
-  depends_on { Gem::Version.new(Rake::VERSION) >= Gem::Version.new('10.0.0') }
+  depends_on { NewRelic::Helper.version_satisfied?(Rake::VERSION, '>=', '10.0.0') }
   depends_on { NewRelic::Agent.config[:'rake.tasks'].any? }
   depends_on { NewRelic::Agent::Instrumentation::Rake.safe_from_third_party_gem? }
 

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

@@ -40,8 +40,8 @@ module NewRelic::Agent::Instrumentation
         alias_method(:producer_without_new_relic, :producer)
         alias_method(:consumer_without_new_relic, :consumer)
 
-        if Gem::Version.new(::Rdkafka::VERSION) >= Gem::Version.new('0.16.0') ||
-            (Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7.0'))
+        if NewRelic::Helper.version_satisfied?(::Rdkafka::VERSION, '>=', '0.16.0') ||
+            NewRelic::Helper.version_satisfied?(RUBY_VERSION, '>=', '2.7.0')
           def producer(**kwargs)
             producer_without_new_relic(**kwargs).tap do |producer|
               set_nr_config(producer)

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

@@ -36,8 +36,8 @@ module NewRelic::Agent::Instrumentation
     module Prepend
       include NewRelic::Agent::Instrumentation::RdkafkaConfig
 
-      if (defined?(::Rdkafka) && Gem::Version.new(::Rdkafka::VERSION) >= Gem::Version.new('0.16.0')) ||
-          (Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7.0'))
+      if (defined?(::Rdkafka) && NewRelic::Helper.version_satisfied?(::Rdkafka::VERSION, '>=', '0.16.0')) ||
+          NewRelic::Helper.version_satisfied?(RUBY_VERSION, '>=', '2.7.0')
         def producer(**kwargs)
           super.tap do |producer|
             set_nr_config(producer)

data/lib/new_relic/agent/instrumentation/redis/constants.rb

@@ -6,12 +6,12 @@ module NewRelic::Agent::Instrumentation::Redis
   class Constants
     PRODUCT_NAME = 'Redis'
     CONNECT = 'connect'
-    UNKNOWN = 'unknown'
+    UNKNOWN = NewRelic::UNKNOWN_LOWER
     LOCALHOST = 'localhost'
     MULTI_OPERATION = 'multi'
     PIPELINE_OPERATION = 'pipeline'
     HAS_REDIS_CLIENT = defined?(::Redis) &&
-      Gem::Version.new(::Redis::VERSION) >= Gem::Version.new('5.0.0') &&
+      NewRelic::Helper.version_satisfied?(::Redis::VERSION, '>=', '5.0.0') &&
       !defined?(::RedisClient).nil?
   end
 end

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

@@ -15,7 +15,7 @@ DependencyDetection.defer do
 
   # Airbrake uses method chaining on Resque::Job on versions < 11.0.3
   conflicts_with_prepend do
-    defined?(Airbrake) && defined?(Airbrake::AIRBRAKE_VERSION) && Gem::Version.create(Airbrake::AIRBRAKE_VERSION) < Gem::Version.create('11.0.3')
+    defined?(Airbrake) && defined?(Airbrake::AIRBRAKE_VERSION) && NewRelic::Helper.version_satisfied?(Airbrake::AIRBRAKE_VERSION, '<', '11.0.3')
   end
 
   executes do
@@ -25,7 +25,7 @@ DependencyDetection.defer do
         # we don't believe this lib is still necessary for Ruby 3.4 users.
         # however, if we receive customer feedback to the contrary, we can find
         # an alternate approach.
-        Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.4')
+        NewRelic::Helper.version_satisfied?(RUBY_VERSION, '<', '3.4')
       NewRelic::Agent.logger.info('Requiring resolv-replace')
       require 'resolv'
       require 'resolv-replace'

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

@@ -11,7 +11,7 @@ DependencyDetection.defer do
 
   depends_on do
     defined?(Roda) &&
-      Gem::Version.new(Roda::RodaVersion) >= Gem::Version.new('3.19.0') &&
+      NewRelic::Helper.version_satisfied?(Roda::RodaVersion, '>=', '3.19.0') &&
       Roda::RodaPlugins::Base::ClassMethods.private_method_defined?(:build_rack_app) &&
       Roda::RodaPlugins::Base::InstanceMethods.method_defined?(:_roda_handle_main_route)
   end

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

@@ -20,7 +20,7 @@ module NewRelic::Agent::Instrumentation
     module Prepend
       include NewRelic::Agent::Instrumentation::RubyKafka
 
-      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3')
+      if NewRelic::Helper.version_satisfied?(RUBY_VERSION, '>=', '3')
         def each_message(**args)
           super do |message|
             each_message_with_new_relic(message) do

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

@@ -12,13 +12,13 @@ DependencyDetection.defer do
   depends_on do
     NewRelic::Agent.config[:'ai_monitoring.enabled'] &&
       defined?(OpenAI) && defined?(OpenAI::Client) &&
-      Gem::Version.new(OpenAI::VERSION) >= Gem::Version.new('3.4.0')
+      NewRelic::Helper.version_satisfied?(OpenAI::VERSION, '>=', '3.4.0')
   end
 
   executes do
     if use_prepend?
       # TODO: Remove condition when we drop support for versions below 5.0.0
-      if Gem::Version.new(OpenAI::VERSION) >= Gem::Version.new('5.0.0')
+      if NewRelic::Helper.version_satisfied?(OpenAI::VERSION, '>=', '5.0.0')
         prepend_instrument OpenAI::Client,
           NewRelic::Agent::Instrumentation::OpenAI::Prepend,
           NewRelic::Agent::Instrumentation::OpenAI::VENDOR

data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delay_extensions.rb

@@ -0,0 +1,24 @@
+# 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
+
+if defined?(Sidekiq::DelayExtensions)
+  class Sidekiq::DelayExtensions::GenericJob
+    def newrelic_trace_args(msg, queue)
+      (target, method_name, *) = ::Sidekiq::DelayExtensions::YAML.unsafe_load(msg['args'][0])
+
+      if target.is_a?(String)
+        target = target.constantize
+      end
+
+      {
+        :name => method_name,
+        :class_name => target.class.name,
+        :category => 'OtherTransaction/SidekiqJob'
+      }
+    rescue => e
+      NewRelic::Agent.logger.error('Failure during deserializing YAML for Sidekiq::DelayExtensions::GenericJob', e)
+      NewRelic::Agent::Instrumentation::Sidekiq::Server.default_trace_args(msg)
+    end
+  end
+end

data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb

@@ -8,7 +8,7 @@
 #
 #       see https://github.com/sidekiq/sidekiq/issues/5076 for the discussion
 #       of the removal, which includes mentions of alternatives
-if defined?(Sidekiq::VERSION) && Sidekiq::VERSION < '7.0.0'
+if defined?(Sidekiq::VERSION) && NewRelic::Helper.version_satisfied?(Sidekiq::VERSION, '<', '7.0.0')
   class Sidekiq::Extensions::DelayedClass
     def newrelic_trace_args(msg, queue)
       (target, method_name, _args) = if YAML.respond_to?(:unsafe_load)

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

@@ -5,6 +5,7 @@
 require_relative 'sidekiq/client'
 require_relative 'sidekiq/server'
 require_relative 'sidekiq/extensions/delayed_class'
+require_relative 'sidekiq/extensions/delay_extensions'
 
 DependencyDetection.defer do
   @name = :sidekiq
@@ -29,7 +30,14 @@ DependencyDetection.defer do
         chain.add(NewRelic::Agent::Instrumentation::Sidekiq::Client)
       end
       config.server_middleware do |chain|
-        chain.add(NewRelic::Agent::Instrumentation::Sidekiq::Server)
+        # We started prepending v chaining NR middleware in 9.18.0 in response to:
+        # https://github.com/newrelic/newrelic-ruby-agent/issues/3037
+        # This way, exceptions resolved by Sidekiq's own middleware are not reported in the agent
+        if chain.respond_to?(:prepend)
+          chain.prepend(NewRelic::Agent::Instrumentation::Sidekiq::Server)
+        else
+          chain.add(NewRelic::Agent::Instrumentation::Sidekiq::Server)
+        end
       end
 
       if config.respond_to?(:error_handlers)

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

@@ -13,7 +13,7 @@ DependencyDetection.defer do
 
   depends_on do
     defined?(Stripe) &&
-      Gem::Version.new(Stripe::VERSION) >= Gem::Version.new('5.38.0')
+      NewRelic::Helper.version_satisfied?(Stripe::VERSION, '>=', '5.38.0')
   end
 
   executes do