newrelic_rpm 8.13.0 → 8.14.0

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

@@ -14,7 +14,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Bunny instrumentation')
+    NewRelic::Agent.logger.info('Installing Bunny instrumentation')
     require 'new_relic/agent/distributed_tracing/cross_app_tracing'
     require 'new_relic/agent/messaging'
     require 'new_relic/agent/transaction/message_broker_segment'
@@ -22,9 +22,9 @@ DependencyDetection.defer do
 
   executes do
     if use_prepend?
-      prepend_instrument ::Bunny::Exchange, ::NewRelic::Agent::Instrumentation::Bunny::Prepend::Exchange
-      prepend_instrument ::Bunny::Queue, ::NewRelic::Agent::Instrumentation::Bunny::Prepend::Queue
-      prepend_instrument ::Bunny::Consumer, ::NewRelic::Agent::Instrumentation::Bunny::Prepend::Consumer
+      prepend_instrument Bunny::Exchange, NewRelic::Agent::Instrumentation::Bunny::Prepend::Exchange
+      prepend_instrument Bunny::Queue, NewRelic::Agent::Instrumentation::Bunny::Prepend::Queue
+      prepend_instrument Bunny::Consumer, NewRelic::Agent::Instrumentation::Bunny::Prepend::Consumer
     else
       chain_instrument NewRelic::Agent::Instrumentation::Bunny
     end

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

@@ -143,7 +143,7 @@ module NewRelic
               begin
                 segment.process_response_headers(wrapped_response) if segment
               ensure
-                segment.finish if segment
+                ::NewRelic::Agent::Transaction::Segment.finish(segment)
                 # Make sure the existing completion callback is run, and restore the
                 # on_complete callback to how it was before.
                 original_callback.call(finished_request) if original_callback

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

@@ -11,22 +11,22 @@ DependencyDetection.defer do
   CURB_MIN_VERSION = Gem::Version.new("0.8.1")
 
   depends_on do
-    defined?(::Curl) && defined?(::Curl::CURB_VERSION) &&
-      Gem::Version.new(::Curl::CURB_VERSION) >= CURB_MIN_VERSION
+    defined?(Curl) && defined?(Curl::CURB_VERSION) &&
+      Gem::Version.new(Curl::CURB_VERSION) >= CURB_MIN_VERSION
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Curb instrumentation')
+    NewRelic::Agent.logger.info('Installing Curb instrumentation')
     require 'new_relic/agent/distributed_tracing/cross_app_tracing'
     require 'new_relic/agent/http_clients/curb_wrappers'
   end
 
   executes do
     if use_prepend?
-      prepend_instrument ::Curl::Easy, NewRelic::Agent::Instrumentation::Curb::Easy::Prepend
-      prepend_instrument ::Curl::Multi, NewRelic::Agent::Instrumentation::Curb::Multi::Prepend
+      prepend_instrument Curl::Easy, NewRelic::Agent::Instrumentation::Curb::Easy::Prepend
+      prepend_instrument Curl::Multi, NewRelic::Agent::Instrumentation::Curb::Multi::Prepend
     else
-      chain_instrument ::NewRelic::Agent::Instrumentation::Curb::Chain
+      chain_instrument NewRelic::Agent::Instrumentation::Curb::Chain
     end
   end
 end

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

@@ -0,0 +1,37 @@
+# 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/instrumentation/notifications_subscriber'
+
+# Listen for ActiveSupport::Notifications events for custom events
+module NewRelic::Agent::Instrumentation
+  class CustomEventsSubscriber < NotificationsSubscriber
+    def start(name, id, _payload) # THREAD_LOCAL_ACCESS
+      return unless state.is_execution_traced?
+
+      finishable = NewRelic::Agent::Tracer.start_transaction_or_segment(name: transaction_name(name),
+        category: :custom_events)
+      push_segment(id, finishable)
+    rescue => e
+      log_notification_error(e, name, 'start')
+    end
+
+    def finish(name, id, payload) # THREAD_LOCAL_ACCESS
+      return unless state.is_execution_traced?
+
+      NewRelic::Agent.notice_error(payload[:exception_object]) if payload.key?(:exception_object)
+
+      finishable = pop_segment(id)
+      finishable.finish if finishable
+    rescue => e
+      log_notification_error(e, name, 'finish')
+    end
+
+    private
+
+    def transaction_name(name)
+      "ActiveSupport/CustomEvents/#{name}"
+    end
+  end
+end

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

@@ -6,14 +6,14 @@ DependencyDetection.defer do
   named :data_mapper
 
   depends_on do
-    defined?(::DataMapper) &&
-      defined?(::DataMapper::Model) &&
-      defined?(::DataMapper::Resource) &&
-      defined?(::DataMapper::Collection)
+    defined?(DataMapper) &&
+      defined?(DataMapper::Model) &&
+      defined?(DataMapper::Resource) &&
+      defined?(DataMapper::Collection)
   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. ' \
@@ -21,7 +21,7 @@ DependencyDetection.defer do
      'Visit https://docs.newrelic.com/docs/apm/agents/ruby-agent/getting-started/ruby-agent-requirements-supported-frameworks ' \
      'to learn about supported gems.'
 
-    ::NewRelic::Agent.logger.log_once(
+    NewRelic::Agent.logger.log_once(
       :warn,
       :deprecated_datamapper,
       deprecation_msg
@@ -29,76 +29,76 @@ 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)
+    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)
     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)
+    if defined?(DataMapper::Validations::ClassMethods)
+      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)
+    if defined?(DataMapper::Transaction)
+      NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Transaction, :commit, true)
     end
   end
 
   executes do
-    if defined?(::DataObjects::Connection)
-      ::DataObjects::Connection.class_eval do
-        include ::NewRelic::Agent::Instrumentation::DataMapperInstrumentation
+    if defined?(DataObjects::Connection)
+      DataObjects::Connection.class_eval do
+        include NewRelic::Agent::Instrumentation::DataMapperInstrumentation
       end
     end
   end
@@ -181,7 +181,7 @@ module NewRelic
 
               raise
             ensure
-              segment.finish if segment
+              ::NewRelic::Agent::Transaction::Segment.finish(segment)
             end
           end
         end

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

@@ -79,18 +79,18 @@ DependencyDetection.defer do
   @name = :delayed_job
 
   depends_on do
-    defined?(::Delayed) && defined?(::Delayed::Worker)
+    defined?(Delayed) && defined?(Delayed::Worker)
   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
     if use_prepend?
-      prepend_instrument ::Delayed::Worker, ::NewRelic::Agent::Instrumentation::DelayedJob::Prepend
+      prepend_instrument Delayed::Worker, NewRelic::Agent::Instrumentation::DelayedJob::Prepend
     else
-      chain_instrument ::NewRelic::Agent::Instrumentation::DelayedJob::Chain
+      chain_instrument NewRelic::Agent::Instrumentation::DelayedJob::Chain
     end
   end
 
@@ -101,7 +101,7 @@ DependencyDetection.defer do
       'It will stop being monitored in version 9.0.0. ' \
       'Please upgrade your DelayedJob version to continue receiving full support. ' \
 
-    ::NewRelic::Agent.logger.log_once(
+    NewRelic::Agent.logger.log_once(
       :warn,
       :deprecated_delayed_job_version,
       deprecation_msg

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

@@ -10,16 +10,16 @@ DependencyDetection.defer do
   named :elasticsearch
 
   depends_on do
-    defined?(::Elasticsearch)
+    defined?(Elasticsearch)
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Elasticsearch instrumentation')
+    NewRelic::Agent.logger.info('Installing Elasticsearch instrumentation')
 
-    to_instrument = if ::Gem::Version.create(::Elasticsearch::VERSION) < ::Gem::Version.create("8.0.0")
-      ::Elasticsearch::Transport::Client
+    to_instrument = if Gem::Version.create(Elasticsearch::VERSION) < Gem::Version.create("8.0.0")
+      Elasticsearch::Transport::Client
     else
-      ::Elastic::Transport::Client
+      Elastic::Transport::Client
     end
 
     if use_prepend?

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

@@ -57,7 +57,7 @@ module ::Excon
               segment.process_response_headers(wrapped_response)
             end
           ensure
-            segment.finish if segment
+            ::NewRelic::Agent::Transaction::Segment.finish(segment)
           end
         end
       end

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

@@ -21,32 +21,32 @@ DependencyDetection.defer do
   EXCON_MIN_VERSION = Gem::Version.new("0.19.0")
 
   depends_on do
-    defined?(::Excon) && defined?(::Excon::VERSION)
+    defined?(Excon) && defined?(Excon::VERSION)
   end
 
   executes do
-    excon_version = Gem::Version.new(::Excon::VERSION)
+    excon_version = Gem::Version.new(Excon::VERSION)
     if excon_version >= EXCON_MIN_VERSION
       install_excon_instrumentation(excon_version)
     else
-      ::NewRelic::Agent.logger.warn("Excon instrumentation requires at least version #{EXCON_MIN_VERSION}")
+      NewRelic::Agent.logger.warn("Excon instrumentation requires at least version #{EXCON_MIN_VERSION}")
     end
   end
 
   executes do
-    next unless Gem::Version.new(::Excon::VERSION) < Gem::Version.new('0.56.0')
+    next unless Gem::Version.new(Excon::VERSION) < Gem::Version.new('0.56.0')
 
     deprecation_msg = 'Instrumentation for Excon versions below 0.56.0 is deprecated.' \
       'They will stop being monitored in version 9.0.0. ' \
       'Please upgrade your Excon version to continue receiving full support. '
 
-    ::NewRelic::Agent.logger.log_once(
+    NewRelic::Agent.logger.log_once(
       :warn,
       :deprecated_excon_version,
       deprecation_msg
     )
 
-    ::NewRelic::Agent.record_metric("Supportability/Deprecated/Excon", 1)
+    NewRelic::Agent.record_metric("Supportability/Deprecated/Excon", 1)
   end
 
   def install_excon_instrumentation(excon_version)
@@ -57,14 +57,14 @@ 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
 
     if defaults[:middlewares]
-      defaults[:middlewares] << ::Excon::Middleware::NewRelicCrossAppTracing
+      defaults[:middlewares] << Excon::Middleware::NewRelicCrossAppTracing
     else
-      ::NewRelic::Agent.logger.warn("Did not find :middlewares key in Excon.defaults, skipping Excon instrumentation")
+      NewRelic::Agent.logger.warn("Did not find :middlewares key in Excon.defaults, skipping Excon instrumentation")
     end
   end
 end

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

@@ -13,32 +13,32 @@ DependencyDetection.defer do
   configure_with :grape
 
   depends_on do
-    defined?(::Grape::VERSION) &&
-      Gem::Version.new(::Grape::VERSION) >= ::NewRelic::Agent::Instrumentation::Grape::Instrumentation::MIN_VERSION
+    defined?(Grape::VERSION) &&
+      Gem::Version.new(Grape::VERSION) >= NewRelic::Agent::Instrumentation::Grape::Instrumentation::MIN_VERSION
   end
 
   depends_on do
     begin
       if defined?(Bundler) && Bundler.rubygems.all_specs.map(&:name).include?("newrelic-grape")
-        ::NewRelic::Agent.logger.info("Not installing New Relic supported Grape instrumentation because the third party newrelic-grape gem is present")
+        NewRelic::Agent.logger.info("Not installing New Relic supported Grape instrumentation because the third party newrelic-grape gem is present")
         false
       else
         true
       end
     rescue => e
-      ::NewRelic::Agent.logger.info("Could not determine if third party newrelic-grape gem is installed", e)
+      NewRelic::Agent.logger.info("Could not determine if third party newrelic-grape gem is installed", e)
       true
     end
   end
 
   executes do
-    ::NewRelic::Agent::Instrumentation::Grape::Instrumentation.prepare!
+    NewRelic::Agent::Instrumentation::Grape::Instrumentation.prepare!
 
     if use_prepend?
-      instrumented_class = ::NewRelic::Agent::Instrumentation::Grape::Instrumentation.instrumented_class
-      prepend_instrument instrumented_class, ::NewRelic::Agent::Instrumentation::Grape::Prepend
+      instrumented_class = NewRelic::Agent::Instrumentation::Grape::Instrumentation.instrumented_class
+      prepend_instrument instrumented_class, NewRelic::Agent::Instrumentation::Grape::Prepend
     else
-      chain_instrument ::NewRelic::Agent::Instrumentation::Grape::Chain
+      chain_instrument NewRelic::Agent::Instrumentation::Grape::Chain
     end
   end
 end

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

@@ -34,7 +34,7 @@ module NewRelic
             end
           ensure
             add_attributes(segment, grpc_message: grpc_message, grpc_status: grpc_status, grpc_type: grpc_type)
-            segment.finish if segment
+            ::NewRelic::Agent::Transaction::Segment.finish(segment)
           end
 
           private

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

@@ -9,15 +9,15 @@ DependencyDetection.defer do
   named :grpc_client
 
   depends_on do
-    defined?(::GRPC) && defined?(::GRPC::ClientStub)
+    defined?(GRPC) && defined?(GRPC::ClientStub)
   end
 
   executes do
     supportability_name = 'gRPC_Client'
     if use_prepend?
-      prepend_instrument ::GRPC::ClientStub, ::NewRelic::Agent::Instrumentation::GRPC::Client::Prepend, supportability_name
+      prepend_instrument GRPC::ClientStub, NewRelic::Agent::Instrumentation::GRPC::Client::Prepend, supportability_name
     else
-      chain_instrument ::NewRelic::Agent::Instrumentation::GRPC::Client::Chain, supportability_name
+      chain_instrument NewRelic::Agent::Instrumentation::GRPC::Client::Chain, supportability_name
     end
   end
 end

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

@@ -10,16 +10,16 @@ DependencyDetection.defer do
   named :grpc_server
 
   depends_on do
-    defined?(::GRPC) && defined?(::GRPC::RpcServer) && defined?(::GRPC::RpcDesc)
+    defined?(GRPC) && defined?(GRPC::RpcServer) && defined?(GRPC::RpcDesc)
   end
 
   executes do
     supportability_name = 'gRPC_Server'
     if use_prepend?
-      prepend_instrument ::GRPC::RpcServer, ::NewRelic::Agent::Instrumentation::GRPC::Server::RpcServerPrepend, supportability_name
-      prepend_instrument ::GRPC::RpcDesc, ::NewRelic::Agent::Instrumentation::GRPC::Server::RpcDescPrepend, supportability_name
+      prepend_instrument GRPC::RpcServer, NewRelic::Agent::Instrumentation::GRPC::Server::RpcServerPrepend, supportability_name
+      prepend_instrument GRPC::RpcDesc, NewRelic::Agent::Instrumentation::GRPC::Server::RpcDescPrepend, supportability_name
     else
-      chain_instrument ::NewRelic::Agent::Instrumentation::GRPC::Server::Chain, supportability_name
+      chain_instrument NewRelic::Agent::Instrumentation::GRPC::Server::Chain, supportability_name
     end
   end
 end

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

@@ -29,7 +29,7 @@ module NewRelic::Agent::Instrumentation
 
           response
         ensure
-          segment.finish if segment
+          ::NewRelic::Agent::Transaction::Segment.finish(segment)
         end
       end
     end

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

@@ -23,14 +23,14 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing HTTPClient instrumentation')
+    NewRelic::Agent.logger.info('Installing HTTPClient instrumentation')
     require 'new_relic/agent/distributed_tracing/cross_app_tracing'
     require 'new_relic/agent/http_clients/httpclient_wrappers'
   end
 
   executes do
     if use_prepend?
-      prepend_instrument ::HTTPClient, NewRelic::Agent::Instrumentation::HTTPClient::Prepend
+      prepend_instrument HTTPClient, NewRelic::Agent::Instrumentation::HTTPClient::Prepend
     else
       chain_instrument NewRelic::Agent::Instrumentation::HTTPClient::Chain
     end

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

@@ -23,7 +23,7 @@ module NewRelic::Agent::Instrumentation
 
         response
       ensure
-        segment.finish if segment
+        ::NewRelic::Agent::Transaction::Segment.finish(segment)
       end
     end
   end

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

@@ -14,16 +14,16 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info("Installing http.rb Wrappers")
+    NewRelic::Agent.logger.info("Installing http.rb Wrappers")
     require 'new_relic/agent/distributed_tracing/cross_app_tracing'
     require 'new_relic/agent/http_clients/http_rb_wrappers'
   end
 
   executes do
     if use_prepend?
-      prepend_instrument HTTP::Client, ::NewRelic::Agent::Instrumentation::HTTPrb::Prepend
+      prepend_instrument HTTP::Client, NewRelic::Agent::Instrumentation::HTTPrb::Prepend
     else
-      chain_instrument ::NewRelic::Agent::Instrumentation::HTTPrb::Chain
+      chain_instrument NewRelic::Agent::Instrumentation::HTTPrb::Chain
     end
   end
 end

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

@@ -10,15 +10,15 @@ DependencyDetection.defer do
   named :logger
 
   depends_on do
-    defined?(::Logger) &&
+    defined?(Logger) &&
       NewRelic::Agent.config[:'application_logging.enabled']
   end
 
   executes do
-    ::NewRelic::Agent.logger.info("Installing Logger instrumentation")
+    NewRelic::Agent.logger.info("Installing Logger instrumentation")
 
     if use_prepend?
-      prepend_instrument ::Logger, NewRelic::Agent::Instrumentation::Logger::Prepend
+      prepend_instrument Logger, NewRelic::Agent::Instrumentation::Logger::Prepend
     else
       chain_instrument NewRelic::Agent::Instrumentation::Logger
     end

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

@@ -23,7 +23,7 @@ module NewRelic::Agent::Instrumentation
           if NewRelic::Agent.config[:capture_memcache_keys]
             segment.notice_nosql_statement("#{operation} #{args.first.inspect}")
           end
-          segment.finish if segment
+          ::NewRelic::Agent::Transaction::Segment.finish(segment)
         end
       end
 
@@ -50,7 +50,7 @@ module NewRelic::Agent::Instrumentation
         begin
           NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
         ensure
-          segment.finish if segment
+          ::NewRelic::Agent::Transaction::Segment.finish(segment)
         end
       end
 
@@ -67,7 +67,7 @@ module NewRelic::Agent::Instrumentation
           if ::NewRelic::Agent.config[:capture_memcache_keys]
             segment.notice_nosql_statement("#{MULTIGET_METRIC_NAME} #{keys.inspect}")
           end
-          segment.finish if segment
+          ::NewRelic::Agent::Transaction::Segment.finish(segment)
         end
       end