newrelic_rpm 9.23.0 → 10.0.0

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

@@ -2,12 +2,30 @@
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
-require 'new_relic/agent/instrumentation/notifications_subscriber'
+require_relative 'notifications_subscriber'
 
 module NewRelic
   module Agent
     module Instrumentation
       class ActiveSupportSubscriber < NotificationsSubscriber
+        EVENT_NAME_TO_METHOD_NAME = {
+          'cache_fetch_hit.active_support' => 'fetch_hit',
+          'cache_generate.active_support' => 'generate',
+          'cache_read.active_support' => 'read',
+          'cache_write.active_support' => 'write',
+          'cache_delete.active_support' => 'delete',
+          'cache_exist?.active_support' => 'exist?',
+          'cache_read_multi.active_support' => 'read_multi',
+          'cache_write_multi.active_support' => 'write_multi',
+          'cache_delete_multi.active_support' => 'delete_multi',
+          'cache_delete_matched.active_support' => 'delete_matched',
+          'cache_cleanup.active_support' => 'cleanup',
+          'cache_increment.active_support' => 'increment',
+          'cache_decrement.active_support' => 'decrement',
+          'cache_prune.active_support' => 'prune',
+          'message_serializer_fallback.active_support' => 'message_serializer_fallback'
+        }.freeze
+
         def add_segment_params(segment, payload)
           segment.params[:key] = payload[:key]
           segment.params[:store] = payload[:store]
@@ -18,22 +36,12 @@ module NewRelic
 
         def metric_name(name, payload)
           store = payload[:store]
-          method = method_from_name(name)
+          method = method_name(name)
           "Ruby/ActiveSupport#{"/#{store}" if store}/#{method}"
         end
 
-        PATTERN = /\Acache_([^\.]*)\.active_support\z/
-
-        METHOD_NAME_MAPPING = Hash.new do |h, k|
-          if PATTERN =~ k
-            h[k] = $1
-          else
-            h[k] = NewRelic::UNKNOWN
-          end
-        end
-
-        def method_from_name(name)
-          METHOD_NAME_MAPPING[name]
+        def method_name(name)
+          EVENT_NAME_TO_METHOD_NAME.fetch(name, name.delete_prefix('cache_').delete_suffix('.active_support'))
         end
       end
     end

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

@@ -34,10 +34,7 @@ module NewRelic
             begin
               destination = exchange_name(name)
 
-              tracing_enabled =
-                NewRelic::Agent::CrossAppTracing.cross_app_enabled? ||
-                NewRelic::Agent.config[:'distributed_tracing.enabled']
-              opts[:headers] ||= {} if tracing_enabled
+              opts[:headers] ||= {} if NewRelic::Agent.config[:'distributed_tracing.enabled']
 
               segment = NewRelic::Agent::Messaging.start_amqp_publish_segment(
                 library: LIBRARY,

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

@@ -14,7 +14,6 @@ DependencyDetection.defer do
   end
 
   executes do
-    require 'new_relic/agent/distributed_tracing/cross_app_tracing'
     require 'new_relic/agent/messaging'
     require 'new_relic/agent/transaction/message_broker_segment'
   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! # rubocop:disable Metrics/AbcSize
+      def self.instrument!
         Curl::Easy.class_eval do
           include NewRelic::Agent::Instrumentation::Curb::Easy
 
@@ -69,7 +69,7 @@ module NewRelic::Agent::Instrumentation
         Curl::Multi.class_eval do
           include NewRelic::Agent::Instrumentation::Curb::Multi
 
-          # Add CAT with callbacks if the request is serial
+          # Add tracing with callbacks if the request is serial
           def add_with_newrelic(curl)
             add_with_tracing(curl) { add_without_newrelic(curl) }
           end

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

@@ -70,7 +70,7 @@ module NewRelic
 
           INSTRUMENTATION_NAME = 'Curb'
 
-          # Add CAT with callbacks if the request is serial
+          # Add tracing with callbacks if the request is serial
           def add_with_tracing(curl)
             if curl.respond_to?(:_nr_serial) && curl._nr_serial
               hook_pending_request(curl) if NewRelic::Agent::Tracer.tracing_enabled?
@@ -91,7 +91,7 @@ module NewRelic
           end
 
           # Instrument the specified +request+ (a Curl::Easy object)
-          # and set up cross-application tracing if it's enabled.
+          # and set up distributed tracing headers.
           def hook_pending_request(request)
             wrapped_request, wrapped_response = wrap_request(request)
 
@@ -124,7 +124,6 @@ module NewRelic
           end
 
           # Install a callback that will record the response headers
-          # to enable CAT linking
           def install_header_callback(request, wrapped_response)
             original_callback = request.on_header
             request._nr_original_on_header = original_callback

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

@@ -16,7 +16,6 @@ DependencyDetection.defer do
   end
 
   executes do
-    require 'new_relic/agent/distributed_tracing/cross_app_tracing'
     require 'new_relic/agent/http_clients/curb_wrappers'
   end
 

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

@@ -4,7 +4,7 @@
 
 module ::Excon
   module Middleware
-    class NewRelicCrossAppTracing
+    class NewRelicTracing
       TRACE_DATA_IVAR = :@newrelic_trace_data
       INSTRUMENTATION_NAME = 'Excon'
 

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

@@ -17,7 +17,7 @@ DependencyDetection.defer do
   # so we could safely subscribe and not be clobbered by future subscribers,
   # but alas, it does not yet.
 
-  # TODO: MAJOR VERSION - update min version to 0.56.0
+  # We support and test 0.56.0 and above, but the instrumentation can still be installed and used with earlier versions.
   EXCON_MIN_VERSION = Gem::Version.new('0.19.0')
 
   depends_on do
@@ -34,7 +34,6 @@ DependencyDetection.defer do
   end
 
   def install_excon_instrumentation(excon_version)
-    require 'new_relic/agent/distributed_tracing/cross_app_tracing'
     require 'new_relic/agent/http_clients/excon_wrappers'
 
     install_middleware_excon_instrumentation
@@ -46,7 +45,7 @@ DependencyDetection.defer do
     defaults = Excon.defaults
 
     if defaults[:middlewares]
-      defaults[:middlewares] << Excon::Middleware::NewRelicCrossAppTracing
+      defaults[:middlewares] << Excon::Middleware::NewRelicTracing
     else
       NewRelic::Agent.logger.warn('Did not find :middlewares key in Excon.defaults, skipping Excon instrumentation')
     end

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

@@ -22,8 +22,7 @@ module NewRelic
 
             segment = request_segment(method)
             request_wrapper = NewRelic::Agent::Instrumentation::GRPC::Client::RequestWrapper.new(@host)
-            # 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?
+            segment.add_request_headers(request_wrapper)
             metadata.merge!(request_wrapper.instance_variable_get(:@newrelic_metadata))
             grpc_message = nil
             grpc_status = 0

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

@@ -20,7 +20,6 @@ DependencyDetection.defer do
   end
 
   executes do
-    require 'new_relic/agent/distributed_tracing/cross_app_tracing'
     require 'new_relic/agent/http_clients/httpclient_wrappers'
   end
 

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

@@ -14,7 +14,6 @@ DependencyDetection.defer do
   end
 
   executes do
-    require 'new_relic/agent/distributed_tracing/cross_app_tracing'
     require 'new_relic/agent/http_clients/http_rb_wrappers'
   end
 

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

@@ -58,9 +58,7 @@ module NewRelic
             end.class_eval do
               include NewRelic::Agent::Instrumentation::Memcache::Tracer
 
-              # 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 NewRelic::Helper.version_satisfied?(::Dalli::VERSION, '>=', '3.1.0')
                 alias_method(:pipelined_get_without_newrelic_trace, :pipelined_get)
                 def pipelined_get(keys)

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

@@ -84,9 +84,7 @@ module NewRelic::Agent::Instrumentation
           extend Helper
           include NewRelic::Agent::Instrumentation::Memcache::Tracer
 
-          # 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 NewRelic::Helper.version_satisfied?(::Dalli::VERSION, '>=', '3.1.0')
             def pipelined_get(keys)
               send_multiget_with_newrelic_tracing(keys) { super }

data/lib/new_relic/agent/instrumentation/rack/helpers.rb

@@ -20,9 +20,7 @@ module NewRelic::Agent::Instrumentation
       return false unless defined? ::Puma::Const::PUMA_VERSION
 
       version = Gem::Version.new(::Puma::Const::PUMA_VERSION)
-      # TODO: MAJOR VERSION - update min_version to 3.9.0
-      # min_version = Gem::Version.new('3.9.0')
-      min_version = Gem::Version.new('2.12.0')
+      min_version = Gem::Version.new('3.9.0')
       version >= min_version
     end
 

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

@@ -18,7 +18,6 @@ DependencyDetection.defer do
   end
 
   executes do
-    require 'new_relic/agent/distributed_tracing/cross_app_tracing'
     require 'new_relic/agent/http_clients/typhoeus_wrappers'
   end
 

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

@@ -29,14 +29,7 @@ module NewRelic
         end
 
         def attribute_name_exceptions
-          # TODO: OLD RUBIES < 2.6
-          # Hash#merge accepts multiple arguments in 2.6
-          # Remove condition once support for Ruby <2.6 is dropped
-          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)
-          end
+          LlmEvent::ATTRIBUTE_NAME_EXCEPTIONS.merge(ResponseHeaders::ATTRIBUTE_NAME_EXCEPTIONS, ATTRIBUTE_NAME_EXCEPTIONS)
         end
 
         def event_name

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

@@ -22,14 +22,7 @@ module NewRelic
         end
 
         def attribute_name_exceptions
-          # TODO: OLD RUBIES < 2.6
-          # Hash#merge accepts multiple arguments in 2.6
-          # Remove condition once support for Ruby <2.6 is dropped
-          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)
-          end
+          LlmEvent::ATTRIBUTE_NAME_EXCEPTIONS.merge(ResponseHeaders::ATTRIBUTE_NAME_EXCEPTIONS, ATTRIBUTE_NAME_EXCEPTIONS)
         end
 
         def event_name

data/lib/new_relic/agent/messaging.rb

@@ -16,6 +16,8 @@ module NewRelic
 
       RABBITMQ_TRANSPORT_TYPE = 'RabbitMQ'
 
+      REJECT_HEADERS = %w[newrelic traceparent tracestate NewRelicID NewRelicTransaction NewRelicSynthetics]
+
       ATTR_DESTINATION = AttributeFilter::DST_TRANSACTION_EVENTS |
         AttributeFilter::DST_TRANSACTION_TRACER |
         AttributeFilter::DST_ERROR_COLLECTOR
@@ -134,7 +136,7 @@ module NewRelic
           if headers
             NewRelic::Agent::DistributedTracing::accept_distributed_trace_headers(headers, library) # to handle the new w3c headers
             txn.distributed_tracer.consume_message_headers(headers, state, library) # to do the expected old things
-            CrossAppTracing.reject_messaging_cat_headers(headers).each do |k, v|
+            reject_messaging_internal_headers(headers).each do |k, v|
               txn.add_agent_attribute(:"message.headers.#{k}", v, AttributeFilter::DST_NONE) unless v.nil?
             end
           end
@@ -193,8 +195,6 @@ module NewRelic
         correlation_id: nil,
         exchange_type: nil)
 
-        raise ArgumentError, 'missing required argument: headers' if headers.nil? && CrossAppTracing.cross_app_enabled?
-
         # The following line needs else branch coverage
         original_headers = headers.nil? ? nil : headers.dup # rubocop:disable Style/SafeNavigation
 
@@ -265,8 +265,8 @@ module NewRelic
 
         if segment_parameters_enabled?
           if message_properties[:headers] && !message_properties[:headers].empty?
-            non_cat_headers = CrossAppTracing.reject_messaging_cat_headers(message_properties[:headers])
-            non_synth_headers = SyntheticsMonitor.reject_messaging_synthetics_header(non_cat_headers)
+            non_internal_headers = reject_messaging_internal_headers(message_properties[:headers])
+            non_synth_headers = SyntheticsMonitor.reject_messaging_synthetics_header(non_internal_headers)
             segment.params[:headers] = non_synth_headers unless non_synth_headers.empty?
           end
 
@@ -364,6 +364,13 @@ module NewRelic
 
         transaction_name
       end
+
+      # Filter out internal New Relic headers from message headers
+      def reject_messaging_internal_headers(headers)
+        return headers unless headers
+
+        headers.reject { |k, _v| REJECT_HEADERS.include?(k.to_s) }
+      end
     end
   end
 end

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

@@ -3,8 +3,7 @@
 # frozen_string_literal: true
 
 # This class serves as the base for objects wanting to monitor and respond to
-# incoming web requests. Examples include cross application tracing and
-# synthetics.
+# incoming web requests. Examples include distributed tracing and synthetics.
 #
 # Subclasses are expected to define on_finished_configuring(events) which will
 # be called when the agent is fully configured. That method is expected to

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

@@ -7,6 +7,7 @@ module NewRelic
     class SyntheticsMonitor < InboundRequestMonitor
       SYNTHETICS_HEADER_KEY = 'HTTP_X_NEWRELIC_SYNTHETICS'
       SYNTHETICS_INFO_HEADER_KEY = 'HTTP_X_NEWRELIC_SYNTHETICS_INFO'
+      NON_HTTP_SYNTHETICS_HEADER_KEY = 'NewRelicSynthetics'
 
       SUPPORTED_VERSION = 1
       EXPECTED_PAYLOAD_LENGTH = 5
@@ -56,7 +57,7 @@ module NewRelic
         end
 
         def reject_messaging_synthetics_header(headers)
-          headers.reject { |k, _| k == CrossAppTracing::NR_MESSAGE_BROKER_SYNTHETICS_HEADER }
+          headers.reject { |k, _| k == NON_HTTP_SYNTHETICS_HEADER_KEY }
         end
       end
     end

data/lib/new_relic/agent/monitors.rb

@@ -6,19 +6,16 @@ require_relative 'monitors/inbound_request_monitor'
 
 require_relative 'monitors/synthetics_monitor'
 
-require_relative 'monitors/cross_app_monitor'
 require_relative 'monitors/distributed_tracing_monitor'
 
 module NewRelic
   module Agent
     class Monitors
-      attr_reader :cross_app_monitor
       attr_reader :synthetics_monitor
       attr_reader :distributed_tracing_monitor
 
       def initialize(events)
         @synthetics_monitor = NewRelic::Agent::SyntheticsMonitor.new(events)
-        @cross_app_monitor = NewRelic::Agent::DistributedTracing::CrossAppMonitor.new(events)
         @distributed_tracing_monitor = NewRelic::Agent::DistributedTracing::Monitor.new(events)
       end
     end

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

@@ -23,20 +23,6 @@ module NewRelic
               Zlib::Deflate.deflate(data, Zlib::DEFAULT_COMPRESSION)
             end
           end
-
-          module Gzip
-            BINARY = 'BINARY'.freeze
-
-            def self.encode(data, opts = nil)
-              output = StringIO.new
-              output.set_encoding(BINARY)
-              gz = Zlib::GzipWriter.new(output, Zlib::DEFAULT_COMPRESSION, Zlib::DEFAULT_STRATEGY)
-              gz.write(data)
-              gz.close
-              output.rewind
-              output.string
-            end
-          end
         end
 
         module Base64CompressedJSON

data/lib/new_relic/agent/new_relic_service.rb

@@ -7,7 +7,6 @@ require 'new_relic/agent/audit_logger'
 require 'new_relic/agent/new_relic_service/encoders'
 require 'new_relic/agent/new_relic_service/marshaller'
 require 'new_relic/agent/new_relic_service/json_marshaller'
-require 'new_relic/agent/new_relic_service/security_policy_settings'
 
 module NewRelic
   module Agent
@@ -18,13 +17,7 @@ module NewRelic
 
       # These include Errno connection errors, and all indicate that the
       # underlying TCP connection may be in a bad state.
-      CONNECTION_ERRORS = [Net::OpenTimeout, Net::ReadTimeout, EOFError, SystemCallError, SocketError]
-      # TODO: MAJOR VERSION - Net::WriteTimeout wasn't defined until Ruby 2.6.
-      #       Once support for Ruby 2.5 is dropped, we should simply include
-      #       Net::WriteTimeout in the connection errors array directly instead
-      #       of with a conditional
-      CONNECTION_ERRORS << Net::WriteTimeout if defined?(Net::WriteTimeout)
-      CONNECTION_ERRORS.freeze
+      CONNECTION_ERRORS = [Net::OpenTimeout, Net::ReadTimeout, EOFError, SystemCallError, SocketError, Net::WriteTimeout].freeze
 
       # The maximum number of times to attempt an HTTP request
       MAX_ATTEMPTS = 2
@@ -87,38 +80,19 @@ module NewRelic
 
       def connect(settings = {})
         @request_headers_map = nil
-        security_policies = nil
-        if response = preconnect
-          if host = response['redirect_host']
-            @collector = NewRelic::Control.instance.server_from_host(host)
-          end
-          if policies = response['security_policies']
-            security_policies = SecurityPolicySettings.preliminary_settings(policies)
-            settings.merge!(security_policies)
-          end
+        if (response = preconnect) && (host = response['redirect_host'])
+          @collector = NewRelic::Control.instance.server_from_host(host)
         end
         response = invoke_remote(:connect, [settings])
         @request_headers_map = response['request_headers_map']
         self.agent_id = response['agent_run_id']
-        response.merge!(security_policies) if security_policies
         response
       end
 
       def preconnect
-        token = Agent.config[:security_policies_token]
-
-        if token && !token.empty?
-          response = invoke_remote(:preconnect, [{'security_policies_token' => token, 'high_security' => false}])
+        is_high_security = Agent.config[:high_security] ? true : false
 
-          validator = SecurityPolicySettings::Validator.new(response)
-          validator.validate_matching_agent_config!
-
-          response
-        elsif Agent.config[:high_security]
-          invoke_remote(:preconnect, [{'high_security' => true}])
-        else
-          invoke_remote(:preconnect, [{'high_security' => false}])
-        end
+        invoke_remote(:preconnect, [{'high_security' => is_high_security}])
       end
 
       def shutdown(time)
@@ -226,7 +200,7 @@ module NewRelic
           data = if encoding == 'deflate'
             Encoders::Compressed::Deflate.encode(data)
           else
-            Encoders::Compressed::Gzip.encode(data)
+            Zlib.gzip(data)
           end
         end
         check_post_size(data, endpoint)
@@ -336,9 +310,7 @@ module NewRelic
       def setup_connection_timeouts(conn)
         conn.open_timeout = @request_timeout
         conn.read_timeout = @request_timeout
-        # TODO: MAJOR VERSION - #write_timeout= requires Ruby 2.6+, so remove
-        #       the conditional check once support for Ruby 2.5 is dropped
-        conn.write_timeout = @request_timeout if conn.respond_to?(:write_timeout=)
+        conn.write_timeout = @request_timeout
 
         if conn.respond_to?(:keep_alive_timeout) && NewRelic::Agent.config[:aggressive_keepalive]
           conn.keep_alive_timeout = NewRelic::Agent.config[:keep_alive_timeout]
@@ -463,6 +435,7 @@ module NewRelic
              Net::HTTPInternalServerError,
              Net::HTTPServiceUnavailable,
              Net::OpenTimeout,
+             Net::WriteTimeout,
              Net::ReadTimeout
           handle_server_connection_exception(response, endpoint)
         when Net::HTTPBadRequest,
@@ -484,20 +457,9 @@ module NewRelic
         when Net::HTTPGone
           handle_gone_response(response, endpoint)
         else
-          # TODO: MAJOR VERSION - Net::WriteTimeout wasn't defined until
-          #       Ruby 2.6, so it can't be included in the case statement
-          #       as a constant and instead needs to be found here. Once
-          #       support for Ruby 2.5 is dropped, we should have
-          #       Net::WriteTimeout sit in the 'when' clause above alongside
-          #       Net::OpenTimeout and Net::ReadTimeout and this entire if/else
-          #       conditional can be removed.
-          if response.respond_to?(:name) && response.name == 'Net::WriteTimeout'
-            handle_server_connection_exception(response, endpoint)
-          else
-            record_endpoint_attempts_supportability_metrics(endpoint)
-            record_error_response_supportability_metrics(response.code)
-            raise UnrecoverableServerException, "#{response.code}: #{response.message}"
-          end
+          record_endpoint_attempts_supportability_metrics(endpoint)
+          record_error_response_supportability_metrics(response.code)
+          raise UnrecoverableServerException, "#{response.code}: #{response.message}"
         end
         response
       end

data/lib/new_relic/agent/opentelemetry/trace/span.rb

@@ -8,6 +8,7 @@ module NewRelic
       module Trace
         class Span < ::OpenTelemetry::Trace::Span
           attr_accessor :finishable
+          attr_reader :status
 
           def finish(end_timestamp: nil)
             finishable&.finish
@@ -24,6 +25,46 @@ module NewRelic
           def record_exception(exception, attributes: nil)
             NewRelic::Agent.notice_error(exception, attributes: attributes)
           end
+
+          # @api private
+          def recording?
+            # in OTel, the recording? method checks for the end time on a span
+            # The closest method we have to this is finished? which exists on
+            # both transactions and segments.
+            !finishable&.finished?
+          end
+
+          # @api private
+          def name=(name)
+            if recording?
+              # overridden_name has slightly higher precedence than
+              # set_transaction_name, but still has a small chance of being
+              # overruled by other transaction naming operations if a
+              # @frozen_name has already been set. See Transaction#best_name.
+              if finishable.is_a?(NewRelic::Agent::Transaction)
+                finishable.overridden_name = name
+              # New Relic doesn't allow customers to rename segments
+              # so this method is just to deal with the OTel APIs that may
+              # try to rename a span after it's created.
+              elsif finishable.is_a?(NewRelic::Agent::Transaction::Segment)
+                finishable.instance_variable_set(:@name, name)
+              end
+            else
+              NewRelic::Agent.logger.warn('Calling name= on a finished OpenTelemetry Span')
+            end
+          end
+
+          # @api private
+          def status=(new_status)
+            # When OTel spans are inititalized they get an unset status
+            # During instrumentation, they may have this status overwrritten
+            # with an ok or error status. Error statuses may also have a description
+            @status = new_status
+            attrs = {'status.code' => new_status.code}
+            attrs['status.description'] = new_status.description unless new_status.description.empty?
+
+            NewRelic::Agent.add_custom_span_attributes(attrs)
+          end
         end
       end
     end

data/lib/new_relic/agent/opentelemetry/trace/tracer.rb

@@ -19,7 +19,9 @@ module NewRelic
               return if internal_span_kind_with_invalid_parent?(kind, parent_otel_context)
 
               nr_item = NewRelic::Agent::Tracer.start_transaction_or_segment(name: name, category: :otel)
+
               add_remote_context_to_txn(nr_item, parent_otel_context)
+
               nr_item
             else
               NewRelic::Agent::Tracer.start_segment(name: name)
@@ -27,6 +29,7 @@ module NewRelic
 
             otel_span = get_otel_span_from_finishable(finishable)
             otel_span.finishable = finishable
+            otel_span.status = ::OpenTelemetry::Trace::Status.unset
             add_remote_context_to_otel_span(otel_span, parent_otel_context)
             otel_span.add_attributes(attributes) if attributes
             otel_span
@@ -92,18 +95,24 @@ module NewRelic
           def set_nr_trace_state(distributed_tracer, otel_context)
             distributed_tracer.instance_variable_set(:@trace_state_payload, otel_context.tracestate)
             distributed_tracer.parent_transaction_id = distributed_tracer.trace_state_payload.transaction_id
-            distributed_tracer.determine_sampling_decision(otel_context.tracestate, otel_context.trace_flags)
+            trace_flags = parse_trace_flags(otel_context.trace_flags)
+
+            distributed_tracer.determine_sampling_decision(otel_context.tracestate, trace_flags)
           end
 
           def set_otel_trace_state(distributed_tracer, otel_context)
             nr_entry = otel_context.tracestate.value(Transaction::TraceContext::AccountHelpers.trace_state_entry_key)
-            return unless nr_entry
-
-            nr_payload = NewRelic::Agent::TraceContextPayload.from_s(nr_entry)
-            distributed_tracer.instance_variable_set(:@trace_state_payload, nr_payload)
-            distributed_tracer.parent_transaction_id = distributed_tracer.trace_state_payload.transaction_id
             trace_flags = parse_trace_flags(otel_context.trace_flags)
-            distributed_tracer.determine_sampling_decision(nr_payload, trace_flags)
+
+            if nr_entry
+              nr_payload = NewRelic::Agent::TraceContextPayload.from_s(nr_entry)
+
+              distributed_tracer.instance_variable_set(:@trace_state_payload, nr_payload)
+              distributed_tracer.parent_transaction_id = distributed_tracer.trace_state_payload.transaction_id
+              distributed_tracer.determine_sampling_decision(nr_payload, trace_flags)
+            else
+              distributed_tracer.determine_sampling_decision(NewRelic::Agent::TraceContextPayload::INVALID, trace_flags)
+            end
           end
 
           def parse_trace_flags(trace_flags)

data/lib/new_relic/agent/opentelemetry_bridge.rb

@@ -6,11 +6,15 @@ module NewRelic
   module Agent
     class OpenTelemetryBridge
       def initialize
-        # no-op without OpenTelemetry API & config
-        return unless defined?(OpenTelemetry) &&
-          NewRelic::Agent.config[:'opentelemetry.enabled']
-
-        OpenTelemetryBridge.install
+        # currently, we only have support for traces
+        # this method should change when we add support for metrics and logs.
+        if defined?(OpenTelemetry) && Agent.config[:'opentelemetry.enabled'] && Agent.config[:'opentelemetry.traces.enabled']
+          OpenTelemetryBridge.install
+          NewRelic::Agent.record_metric('Supportability/Tracing/Ruby/OpenTelemetryBridge/enabled', 0.0)
+          # else
+          # This record metric calls happen before the agent is fully started, which causes us to log warnings every single time the agent runs.
+          # NewRelic::Agent.record_metric('Supportability/Tracing/Ruby/OpenTelemetryBridge/disabled', 0.0)
+        end
       end
 
       private