newrelic_rpm 9.19.0 → 9.20.0

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.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.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/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/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/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

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

@@ -8,11 +8,11 @@ module NewRelic
       module Typhoeus
         HYDRA_SEGMENT_NAME = 'External/Multiple/Typhoeus::Hydra/run'
         NOTICEABLE_ERROR_CLASS = 'Typhoeus::Errors::TyphoeusError'
-        EARLIEST_VERSION = Gem::Version.new('0.5.3')
+        EARLIEST_VERSION = '0.5.3'
         INSTRUMENTATION_NAME = NewRelic::Agent.base_name(name)
 
         def self.is_supported_version?
-          Gem::Version.new(::Typhoeus::VERSION) >= EARLIEST_VERSION
+          NewRelic::Helper.version_satisfied?(::Typhoeus::VERSION, '>=', EARLIEST_VERSION)
         end
 
         def self.request_is_hydra_enabled?(request)

data/lib/new_relic/agent/llm/chat_completion_summary.rb

@@ -32,7 +32,7 @@ module NewRelic
           # TODO: OLD RUBIES < 2.6
           # Hash#merge accepts multiple arguments in 2.6
           # Remove condition once support for Ruby <2.6 is dropped
-          if RUBY_VERSION >= '2.6.0'
+          if NewRelic::Helper.version_satisfied?(RUBY_VERSION, '>=', '2.6.0')
             LlmEvent::ATTRIBUTE_NAME_EXCEPTIONS.merge(ResponseHeaders::ATTRIBUTE_NAME_EXCEPTIONS, ATTRIBUTE_NAME_EXCEPTIONS)
           else
             LlmEvent::ATTRIBUTE_NAME_EXCEPTIONS.merge(ResponseHeaders::ATTRIBUTE_NAME_EXCEPTIONS).merge(ATTRIBUTE_NAME_EXCEPTIONS)

data/lib/new_relic/agent/llm/embedding.rb

@@ -25,7 +25,7 @@ module NewRelic
           # TODO: OLD RUBIES < 2.6
           # Hash#merge accepts multiple arguments in 2.6
           # Remove condition once support for Ruby <2.6 is dropped
-          if RUBY_VERSION >= '2.6.0'
+          if NewRelic::Helper.version_satisfied?(RUBY_VERSION, '>=', '2.6.0')
             LlmEvent::ATTRIBUTE_NAME_EXCEPTIONS.merge(ResponseHeaders::ATTRIBUTE_NAME_EXCEPTIONS, ATTRIBUTE_NAME_EXCEPTIONS)
           else
             LlmEvent::ATTRIBUTE_NAME_EXCEPTIONS.merge(ResponseHeaders::ATTRIBUTE_NAME_EXCEPTIONS).merge(ATTRIBUTE_NAME_EXCEPTIONS)

data/lib/new_relic/agent/local_log_decorator.rb

@@ -43,7 +43,7 @@ module NewRelic
         # URI version 1.0+ will ship with Ruby 3.4
         # Once we drop support for Rubies below 3.4, we can use the
         # URI::RFC2396 parser exclusively.
-        if Gem::Version.new(URI::VERSION) >= Gem::Version.new('1.0')
+        if NewRelic::Helper.version_satisfied?(URI::VERSION, '>=', '1.0')
           URI::RFC2396_PARSER.escape(entity_name)
         else
           URI::DEFAULT_PARSER.escape(entity_name)

data/lib/new_relic/agent/logging.rb

@@ -165,7 +165,7 @@ module NewRelic
         # Positional and Keyword arguments are separated beginning with Ruby 2.7
         # Signature of ::Logger constructor changes in Ruby 2.4 to have both positional and keyword args
         # We pivot on Ruby 2.7 for widest supportability with least amount of hassle.
-        if RUBY_VERSION < '2.7.0'
+        if NewRelic::Helper.version_satisfied?(RUBY_VERSION, '<', '2.7.0')
           def initialize(*args)
             super(*args)
             self.formatter = DecoratingFormatter.new

data/lib/new_relic/agent/messaging.rb

@@ -49,6 +49,7 @@ module NewRelic
       #
       # @return [NewRelic::Agent::Transaction::MessageBrokerSegment]
       #
+      # @!scope class
       # @api public
       #
       def start_message_broker_segment(action: nil,
@@ -107,6 +108,7 @@ module NewRelic
       # @return return value of given block, which will be the same as the
       #   return value of an un-instrumented subscribed callback
       #
+      # @!scope class
       # @api public
       #
       def wrap_message_broker_consume_transaction(library:,
@@ -180,6 +182,7 @@ module NewRelic
       #
       # @return [NewRelic::Agent::Transaction::MessageBrokerSegment]
       #
+      # @!scope class
       # @api public
       #
       def start_amqp_publish_segment(library:,
@@ -240,6 +243,7 @@ module NewRelic
       #
       # @return [NewRelic::Agent::Transaction::MessageBrokerSegment]
       #
+      # @!scope class
       # @api public
       #
       def start_amqp_consume_segment(library:,
@@ -301,6 +305,7 @@ module NewRelic
       # @return return value of given block, which will be the same as the
       #   return value of an un-instrumented subscribed callback
       #
+      # @!scope class
       # @api public
       #
       def wrap_amqp_consume_transaction(library: nil,

data/lib/new_relic/agent/method_tracer.rb

@@ -65,6 +65,7 @@ module NewRelic
       # categories, but generally this *should never ever be done*.  Most of the time you can aggregate
       # on the server.
       #
+      # @!scope class
       # @api public
       #
       def trace_execution_scoped(metric_names, options = NewRelic::EMPTY_HASH) # THREAD_LOCAL_ACCESS
@@ -81,6 +82,7 @@ module NewRelic
       #
       # * <tt>metric_names</tt> is a single name or an array of names of metrics
       #
+      # @!scope class
       # @api public
       #
       def trace_execution_unscoped(metric_names, options = NewRelic::EMPTY_HASH) # THREAD_LOCAL_ACCESS
@@ -241,6 +243,7 @@ module NewRelic
         #   # Instrument foo in transaction traces only
         #   add_method_tracer :foo, 'Custom/foo', :metric => false
         #
+        # @!scope class
         # @api public
         #
         def add_method_tracer(method_name, metric_name = nil, options = {})

data/lib/new_relic/agent/monitors/inbound_request_monitor.rb

@@ -32,7 +32,7 @@ module NewRelic
 
       def deserialize_header(encoded_header, key)
         decoded_header = obfuscator.deobfuscate(encoded_header)
-        ::JSON.load(decoded_header)
+        ::JSON.parse(decoded_header)
       rescue => err
         # If we have a failure of any type here, just return nil and carry on
         NewRelic::Agent.logger.debug("Failure deserializing encoded header '#{key}' in #{self.class}, #{err.class}, #{err.message}")

data/lib/new_relic/agent/monitors/synthetics_monitor.rb

@@ -35,7 +35,7 @@ module NewRelic
       end
 
       def load_json(header, key)
-        ::JSON.load(header)
+        ::JSON.parse(header)
       rescue => err
         NewRelic::Agent.logger.debug("Failure loading json header '#{key}' in #{self.class}, #{err.class}, #{err.message}")
         nil

data/lib/new_relic/agent/new_relic_service/json_marshaller.rb

@@ -19,7 +19,7 @@ module NewRelic
         def warn_for_yajl
           if defined?(::Yajl)
             require 'yajl/version'
-            if Gem::Version.new(::Yajl::VERSION) < OK_YAJL_VERSION
+            if NewRelic::Helper.version_satisfied?(::Yajl::VERSION, '<', OK_YAJL_VERSION)
               ::NewRelic::Agent.logger.warn("Detected yajl-ruby version #{::Yajl::VERSION} which can cause segfaults with newrelic_rpm's thread profiling features. We strongly recommend you upgrade to the latest yajl-ruby version available.")
             end
           end
@@ -42,7 +42,7 @@ module NewRelic
             return nil
           end
 
-          return_value(::JSON.load(data))
+          return_value(::JSON.parse(data))
         rescue => e
           ::NewRelic::Agent.logger.debug("#{e.class.name} : #{e.message} encountered loading collector response: #{data}")
           raise

data/lib/new_relic/agent/opentelemetry/context/propagation/trace_propagator.rb

@@ -0,0 +1,66 @@
+# 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
+    module OpenTelemetry
+      module Context
+        module Propagation
+          class TracePropagator
+            # The carrier is the object carrying the headers
+            # The context argument is a no-op, as the OpenTelemetry context is not used
+            # The setter argument is a no-op, added for consistency with the OpenTelemetry API
+            def inject(carrier, context: ::OpenTelemetry::Context.current, setter: nil)
+              # TODO: determine if we need to update this method to take Context into account
+              NewRelic::Agent::DistributedTracing.insert_distributed_trace_headers(carrier)
+            end
+
+            # The return value for this method should be an instance of the
+            # OpenTelemetry Context class. The return value of
+            # #accept_distributed_trace_headers is a transaction, so we cannot
+            # use it to extract the context.
+            def extract(carrier, context: ::OpenTelemetry::Context.current, getter: ::OpenTelemetry::Context::Propagation.text_map_getter)
+              carrier_format = determine_format(getter)
+              trace_context = NewRelic::Agent::DistributedTracing::TraceContext.parse(
+                carrier: carrier,
+                format: carrier_format,
+                trace_state_entry_key: Transaction::TraceContext::AccountHelpers.trace_state_entry_key
+              )
+              tp = trace_context.trace_parent
+              span_context = ::OpenTelemetry::Trace::SpanContext.new(
+                trace_id: tp['trace_id'],
+                span_id: tp['parent_id'],
+                trace_flags: tp['trace_flags'],
+                tracestate: trace_context.trace_state_payload,
+                remote: true
+              )
+              span = ::OpenTelemetry::Trace.non_recording_span(span_context)
+
+              ::OpenTelemetry::Trace.context_with_span(span, parent_context: context)
+            rescue StandardError => e
+              NewRelic::Agent.logger.error("Unable to extract context: #{e.message}")
+              context
+            end
+
+            private
+
+            # The getter is the way OpenTelemetry handles Rack vs. non-Rack
+            # formats. Rather than using their parser, get the class info we
+            # need to do things the New Relic way
+            def determine_format(getter)
+              case getter
+              when ::OpenTelemetry::Context::Propagation::RackEnvGetter
+                FORMAT_RACK
+              when defined?(::OpenTelemetry::Common) && ::OpenTelemetry::Common::Propagation::RackEnvGetter
+                FORMAT_RACK
+              else
+                FORMAT_NON_RACK
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end