newrelic_rpm 8.13.0 → 8.14.0

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

@@ -9,11 +9,11 @@ DependencyDetection.defer do
   @name = :sidekiq
 
   depends_on do
-    defined?(::Sidekiq) && !NewRelic::Agent.config[:disable_sidekiq]
+    defined?(Sidekiq) && !NewRelic::Agent.config[:disable_sidekiq]
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Sidekiq instrumentation')
+    NewRelic::Agent.logger.info('Installing Sidekiq instrumentation')
   end
 
   executes do
@@ -46,7 +46,7 @@ DependencyDetection.defer do
       'They will stop being monitored in version 9.0.0. ' \
       'Please upgrade your Sidekiq version to continue receiving full support. '
 
-    ::NewRelic::Agent.logger.log_once(
+    NewRelic::Agent.logger.log_once(
       :warn,
       :deprecated_sidekiq_version,
       deprecation_msg

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

@@ -11,24 +11,24 @@ require_relative 'sinatra/prepend'
 DependencyDetection.defer do
   named :sinatra
 
-  depends_on { defined?(::Sinatra) && defined?(::Sinatra::Base) }
+  depends_on { defined?(Sinatra) && defined?(Sinatra::Base) }
   depends_on { Sinatra::Base.private_method_defined?(:dispatch!) }
   depends_on { Sinatra::Base.private_method_defined?(:process_route) }
   depends_on { Sinatra::Base.private_method_defined?(:route_eval) }
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Sinatra instrumentation')
+    NewRelic::Agent.logger.info('Installing Sinatra instrumentation')
   end
 
   executes do
     if use_prepend?
-      prepend_instrument ::Sinatra::Base, NewRelic::Agent::Instrumentation::Sinatra::Prepend
+      prepend_instrument Sinatra::Base, NewRelic::Agent::Instrumentation::Sinatra::Prepend
     else
       chain_instrument NewRelic::Agent::Instrumentation::Sinatra::Chain
     end
 
-    ::Sinatra::Base.class_eval { register ::NewRelic::Agent::Instrumentation::Sinatra::Ignorer }
-    ::Sinatra.module_eval { register NewRelic::Agent::Instrumentation::Sinatra::Ignorer }
+    Sinatra::Base.class_eval { register NewRelic::Agent::Instrumentation::Sinatra::Ignorer }
+    Sinatra.module_eval { register NewRelic::Agent::Instrumentation::Sinatra::Ignorer }
   end
 
   executes do
@@ -37,7 +37,7 @@ DependencyDetection.defer do
     require 'new_relic/rack/agent_hooks'
     require 'new_relic/rack/browser_monitoring'
     if use_prepend?
-      prepend_instrument ::Sinatra::Base.singleton_class, NewRelic::Agent::Instrumentation::Sinatra::Build::Prepend
+      prepend_instrument Sinatra::Base.singleton_class, NewRelic::Agent::Instrumentation::Sinatra::Build::Prepend
     else
       chain_instrument NewRelic::Agent::Instrumentation::Sinatra::Build::Chain
     end
@@ -49,7 +49,7 @@ DependencyDetection.defer do
     deprecation_msg = 'The Ruby Agent is dropping support for Sinatra versions below 2.0.0 ' \
       'in version 9.0.0. Please upgrade your Sinatra version to continue receiving full compatibility. ' \
 
-    ::NewRelic::Agent.logger.log_once(
+    NewRelic::Agent.logger.log_once(
       :warn,
       :deprecated_sinatra_version,
       deprecation_msg

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

@@ -6,15 +6,15 @@ DependencyDetection.defer do
   @name = :sunspot
 
   depends_on do
-    defined?(::Sunspot)
+    defined?(Sunspot)
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Rails Sunspot instrumentation')
+    NewRelic::Agent.logger.info('Installing Rails Sunspot instrumentation')
     deprecation_msg = 'The instrumentation for Sunspot is deprecated. ' \
       'It will be removed in version 9.0.0.'
 
-    ::NewRelic::Agent.logger.log_once(
+    NewRelic::Agent.logger.log_once(
       :warn,
       :deprecated_sunspot,
       deprecation_msg
@@ -22,7 +22,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::Sunspot.module_eval do
+    Sunspot.module_eval do
       class << self
         %w[index index!].each do |method|
           add_method_tracer method, 'SolrClient/Sunspot/index'

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

@@ -9,12 +9,12 @@ DependencyDetection.defer do
   named :thread
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Thread Instrumentation')
+    NewRelic::Agent.logger.info('Installing Thread Instrumentation')
 
     if use_prepend?
-      prepend_instrument ::Thread, ::NewRelic::Agent::Instrumentation::MonitoredThread::Prepend
+      prepend_instrument Thread, NewRelic::Agent::Instrumentation::MonitoredThread::Prepend
     else
-      chain_instrument ::NewRelic::Agent::Instrumentation::MonitoredThread::Chain
+      chain_instrument NewRelic::Agent::Instrumentation::MonitoredThread::Chain
     end
   end
 end

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

@@ -9,15 +9,15 @@ require_relative 'tilt/prepend'
 DependencyDetection.defer do
   named :tilt
 
-  depends_on { defined?(::Tilt) }
+  depends_on { defined?(Tilt) }
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Tilt instrumentation')
+    NewRelic::Agent.logger.info('Installing Tilt instrumentation')
   end
 
   executes do
     if use_prepend?
-      prepend_instrument ::Tilt::Template, NewRelic::Agent::Instrumentation::Tilt::Prepend
+      prepend_instrument Tilt::Template, NewRelic::Agent::Instrumentation::Tilt::Prepend
     else
       chain_instrument NewRelic::Agent::Instrumentation::Tilt::Chain
     end

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

@@ -36,7 +36,7 @@ module NewRelic
           begin
             yield
           ensure
-            segment.finish if segment
+            ::NewRelic::Agent::Transaction::Segment.finish(segment)
           end
         end
 
@@ -68,7 +68,7 @@ module NewRelic
               segment.notice_error(NoticeableError.new(NOTICEABLE_ERROR_CLASS, response_message(request.response)))
             end
 
-            segment.finish if segment
+            ::NewRelic::Agent::Transaction::Segment.finish(segment)
           end
           request.on_complete.unshift(callback)
         rescue => e

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

@@ -18,7 +18,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Typhoeus instrumentation')
+    NewRelic::Agent.logger.info('Installing Typhoeus instrumentation')
     require 'new_relic/agent/distributed_tracing/cross_app_tracing'
     require 'new_relic/agent/http_clients/typhoeus_wrappers'
   end

data/lib/new_relic/agent/method_tracer_helpers.rb

@@ -17,8 +17,7 @@ module NewRelic
       extend self
 
       def trace_execution_scoped(metric_names, options = NewRelic::EMPTY_HASH) # THREAD_LOCAL_ACCESS
-        state = NewRelic::Agent::Tracer.state
-        return yield unless state.is_execution_traced?
+        return yield unless NewRelic::Agent::Tracer.state.is_execution_traced?
 
         metric_names = Array(metric_names)
         first_name = metric_names.shift
@@ -29,19 +28,15 @@ module NewRelic
           unscoped_metrics: metric_names
         )
 
-        if options[:metric] == false
-          segment.record_metrics = false
-        end
+        segment.record_metrics = false if options[:metric] == false
 
         unless !options.key?(:code_information) || options[:code_information].nil? || options[:code_information].empty?
           segment.code_information = options[:code_information]
         end
 
-        begin
-          Tracer.capture_segment_error(segment) { yield }
-        ensure
-          segment.finish if segment
-        end
+        Tracer.capture_segment_error(segment) { yield }
+      ensure
+        ::NewRelic::Agent::Transaction::Segment.finish(segment)
       end
 
       def code_information(object, method_name)
@@ -77,7 +72,7 @@ module NewRelic
         name = Regexp.last_match(1) if object.to_s =~ /^#<Class:(.*)>$/
         return name if name
 
-        raise "Unable to glean a class name from string '#{object}'" unless name
+        raise "Unable to glean a class name from string '#{object}'"
       end
 
       # get at the underlying class from the singleton class

data/lib/new_relic/agent/tracer.rb

@@ -419,7 +419,7 @@ module NewRelic
               end
               yield(*args) if block.respond_to?(:call)
             ensure
-              segment.finish if segment
+              ::NewRelic::Agent::Transaction::Segment.finish(segment)
             end
           end
         end

data/lib/new_relic/agent/transaction/segment.rb

@@ -46,6 +46,12 @@ module NewRelic
           attributes.merge_custom_attributes(p)
         end
 
+        def self.finish(segment)
+          return unless segment
+
+          segment.finish
+        end
+
         private
 
         def record_metrics

data/lib/new_relic/control/instance_methods.rb

@@ -64,8 +64,12 @@ module NewRelic
 
         # An artifact of earlier implementation, we put both #add_method_tracer and #trace_execution
         # methods in the module methods.
-        Module.send(:include, NewRelic::Agent::MethodTracer::ClassMethods)
-        Module.send(:include, NewRelic::Agent::MethodTracer)
+        # Rails applications load the next two lines before any other initializers are run
+        unless defined?(Rails::VERSION) && NewRelic::Agent.config[:defer_rails_initialization]
+          Module.send(:include, NewRelic::Agent::MethodTracer::ClassMethods)
+          Module.send(:include, NewRelic::Agent::MethodTracer)
+        end
+
         init_config(options)
         NewRelic::Agent.agent = NewRelic::Agent::Agent.instance
         init_instrumentation

data/lib/new_relic/recipes/helpers/send_deployment.rb

@@ -29,7 +29,8 @@ module SendDeployment
   end
 
   def fetch_changelog
-    has_scm? ? fetch(:newrelic_changelog) : lookup_changelog
+    newrelic_changelog = fetch(:newrelic_changelog)
+    has_scm? && !newrelic_changelog ? lookup_changelog : newrelic_changelog
   end
 
   def fetch_environment

data/lib/new_relic/version.rb

@@ -6,7 +6,7 @@
 module NewRelic
   module VERSION # :nodoc:
     MAJOR = 8
-    MINOR = 13
+    MINOR = 14
     TINY = 0
 
     STRING = "#{MAJOR}.#{MINOR}.#{TINY}"

data/lib/newrelic_rpm.rb

@@ -20,8 +20,19 @@ require 'new_relic/control'
 if defined?(Rails::VERSION)
   module NewRelic
     class Railtie < Rails::Railtie
-      initializer "newrelic_rpm.start_plugin", before: :load_config_initializers do |app|
-        NewRelic::Control.instance.init_plugin(config: app.config)
+      if NewRelic::Agent.config[:defer_rails_initialization]
+        initializer "newrelic_rpm.include_method_tracers", before: :load_config_initializers do |app|
+          Module.send(:include, NewRelic::Agent::MethodTracer::ClassMethods)
+          Module.send(:include, NewRelic::Agent::MethodTracer)
+        end
+
+        initializer "newrelic_rpm.start_plugin", after: :load_config_initializers do |app|
+          NewRelic::Control.instance.init_plugin(config: app.config)
+        end
+      else
+        initializer "newrelic_rpm.start_plugin", before: :load_config_initializers do |app|
+          NewRelic::Control.instance.init_plugin(config: app.config)
+        end
       end
     end
   end

data/lib/sequel/extensions/newrelic_instrumentation.rb

@@ -54,7 +54,7 @@ module Sequel
         super(*args, &blk)
       ensure
         notice_sql(sql)
-        segment.finish if segment
+        ::NewRelic::Agent::Transaction::Segment.finish(segment)
       end
     end
 

data/lib/sequel/plugins/newrelic_instrumentation.rb

@@ -30,7 +30,7 @@ module Sequel
             begin
               NewRelic::Agent.disable_all_tracing { super(*args, &block) }
             ensure
-              segment.finish if segment
+              ::NewRelic::Agent::Transaction::Segment.finish(segment)
             end
           end
         end

data/newrelic.yml

@@ -26,6 +26,13 @@ common: &default_settings
   # All of the following configuration options are optional. Review them, and
   # uncomment or edit them if they appear relevant to your application needs.
 
+  # An array of ActiveSupport custom events names to subscribe to and provide
+  # instrumentation for. For example,
+  #   - my.custom.event
+  #   - another.event
+  #   - a.third.event
+  # active_support_custom_events_names: ""
+
   # If `true`, all logging-related features for the agent can be enabled or disabled
   # independently. If `false`, all logging-related features are disabled.
   # application_logging.enabled: true
@@ -173,6 +180,9 @@ common: &default_settings
   # If true, the agent won't sample the CPU usage of the host process.
   # disable_cpu_sampler: false
 
+  # If true, disables ActiveSupport custom events instrumentation.
+  # disable_custom_events_instrumentation: false
+
   # If true, disables DataMapper instrumentation.
   # disable_data_mapper: false
 

data/test/agent_helper.rb

@@ -844,7 +844,7 @@ ensure
 end
 
 def json_dump_and_encode(object)
-  Base64.encode64(::JSON.dump(object))
+  Base64.encode64(JSON.dump(object))
 end
 
 def get_last_analytics_event
@@ -870,7 +870,7 @@ def load_cross_agent_test(name)
   test_file_path = File.join(cross_agent_tests_dir, "#{name}.json")
   data = File.read(test_file_path)
   data.gsub!('callCount', 'call_count')
-  data = ::JSON.load(data)
+  data = JSON.load(data)
   data.each { |testcase| testcase['testname'].tr!(' ', '_') if String === testcase['testname'] }
   data
 end
@@ -1014,9 +1014,9 @@ def assert_implements(instance, method, *args)
 end
 
 def defer_testing_to_min_supported_rails(test_file, min_rails_version, supports_jruby = true)
-  if defined?(::Rails) &&
-      defined?(::Rails::VERSION::STRING) &&
-      (::Rails::VERSION::STRING.to_f >= min_rails_version) &&
+  if defined?(Rails) &&
+      defined?(Rails::VERSION::STRING) &&
+      (Rails::VERSION::STRING.to_f >= min_rails_version) &&
       (supports_jruby || !NewRelic::LanguageSupport.jruby?)
 
     yield

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 8.13.0
+  version: 8.14.0
 platform: ruby
 authors:
 - Tanna McClure
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2022-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -162,10 +162,13 @@ files:
 - lib/new_relic/agent.rb
 - lib/new_relic/agent/adaptive_sampler.rb
 - lib/new_relic/agent/agent.rb
-- lib/new_relic/agent/agent/shutdown.rb
-- lib/new_relic/agent/agent/special_startup.rb
-- lib/new_relic/agent/agent/start_worker_thread.rb
-- lib/new_relic/agent/agent/startup.rb
+- lib/new_relic/agent/agent_helpers/connect.rb
+- lib/new_relic/agent/agent_helpers/harvest.rb
+- lib/new_relic/agent/agent_helpers/shutdown.rb
+- lib/new_relic/agent/agent_helpers/special_startup.rb
+- lib/new_relic/agent/agent_helpers/start_worker_thread.rb
+- lib/new_relic/agent/agent_helpers/startup.rb
+- lib/new_relic/agent/agent_helpers/transmit.rb
 - lib/new_relic/agent/agent_logger.rb
 - lib/new_relic/agent/attribute_filter.rb
 - lib/new_relic/agent/attribute_processing.rb
@@ -249,6 +252,7 @@ files:
 - lib/new_relic/agent/instrumentation/active_record_subscriber.rb
 - lib/new_relic/agent/instrumentation/active_storage.rb
 - lib/new_relic/agent/instrumentation/active_storage_subscriber.rb
+- lib/new_relic/agent/instrumentation/active_support.rb
 - lib/new_relic/agent/instrumentation/active_support_logger.rb
 - lib/new_relic/agent/instrumentation/active_support_logger/chain.rb
 - lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb
@@ -264,6 +268,7 @@ files:
 - lib/new_relic/agent/instrumentation/curb/chain.rb
 - lib/new_relic/agent/instrumentation/curb/instrumentation.rb
 - lib/new_relic/agent/instrumentation/curb/prepend.rb
+- lib/new_relic/agent/instrumentation/custom_events_subscriber.rb
 - lib/new_relic/agent/instrumentation/data_mapper.rb
 - lib/new_relic/agent/instrumentation/delayed_job/chain.rb
 - lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb
@@ -334,6 +339,7 @@ files:
 - lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb
 - lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb
 - lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb
+- lib/new_relic/agent/instrumentation/rails_notifications/custom_events.rb
 - lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb
 - lib/new_relic/agent/instrumentation/rake.rb
 - lib/new_relic/agent/instrumentation/rake/chain.rb

data/lib/new_relic/agent/agent/shutdown.rb

@@ -1,35 +0,0 @@
-# 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 Shutdown
-      # Attempt a graceful shutdown of the agent, flushing any remaining
-      # data.
-      def shutdown
-        return unless started?
-
-        ::NewRelic::Agent.logger.info("Starting Agent shutdown")
-
-        stop_event_loop
-        trap_signals_for_litespeed
-        untraced_graceful_disconnect
-        revert_to_default_configuration
-
-        @started = nil
-        Control.reset
-      end
-
-      def untraced_graceful_disconnect
-        begin
-          NewRelic::Agent.disable_all_tracing do
-            graceful_disconnect
-          end
-        rescue => e
-          ::NewRelic::Agent.logger.error(e)
-        end
-      end
-    end
-  end
-end

data/lib/new_relic/agent/agent/special_startup.rb

@@ -1,72 +0,0 @@
-# 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 SpecialStartup
-      # If we're using a dispatcher that forks before serving
-      # requests, we need to wait until the children are forked
-      # before connecting, otherwise the parent process sends useless data
-      def using_forking_dispatcher?
-        # TODO: MAJOR VERSION - remove :rainbows
-        if [:puma, :passenger, :rainbows, :unicorn].include?(Agent.config[:dispatcher])
-          ::NewRelic::Agent.logger.info("Deferring startup of agent reporting thread because #{Agent.config[:dispatcher]} may fork.")
-          true
-        else
-          false
-        end
-      end
-
-      # Return true if we're using resque and it hasn't had a chance to (potentially)
-      # daemonize itself. This avoids hanging when there's a Thread started
-      # before Resque calls Process.daemon (Jira RUBY-857)
-      def defer_for_resque?
-        NewRelic::Agent.config[:dispatcher] == :resque &&
-          NewRelic::Agent::Instrumentation::Resque::Helper.resque_fork_per_job? &&
-          !PipeChannelManager.listener.started?
-      end
-
-      def in_resque_child_process?
-        defined?(@service) && @service.is_a?(PipeService)
-      end
-
-      def defer_for_delayed_job?
-        NewRelic::Agent.config[:dispatcher] == :delayed_job &&
-          !NewRelic::DelayedJobInjection.worker_name
-      end
-
-      # This matters when the following three criteria are met:
-      #
-      # 1. A Sinatra 'classic' application is being run
-      # 2. The app is being run by executing the main file directly, rather
-      #    than via a config.ru file.
-      # 3. newrelic_rpm is required *after* sinatra
-      #
-      # In this case, the entire application runs from an at_exit handler in
-      # Sinatra, and if we were to install ours, it would be executed before
-      # the one in Sinatra, meaning that we'd shutdown the agent too early
-      # and never collect any data.
-      def sinatra_classic_app?
-        (
-          defined?(Sinatra::Application) &&
-          Sinatra::Application.respond_to?(:run) &&
-          Sinatra::Application.run?
-        )
-      end
-
-      def should_install_exit_handler?
-        return false unless Agent.config[:send_data_on_exit]
-
-        !sinatra_classic_app? || Agent.config[:force_install_exit_handler]
-      end
-
-      def install_exit_handler
-        return unless should_install_exit_handler?
-
-        NewRelic::Agent.logger.debug("Installing at_exit handler")
-        at_exit { shutdown }
-      end
-    end
-  end
-end