newrelic_rpm 8.15.0 → 9.0.0

data/lib/new_relic/agent.rb

@@ -371,7 +371,7 @@ module NewRelic
     # jobs or other work.  If you are doing this with a web dispatcher
     # that forks worker processes then you will need to force the
     # agent to reconnect, which it won't do by default.  Passenger and
-    # Rainbows and Unicorn are already handled, nothing special needed for them.
+    # Unicorn are already handled, nothing special needed for them.
     #
     # Options:
     # * <tt>:force_reconnect => true</tt> to force the spawned process to
@@ -511,18 +511,6 @@ module NewRelic
       end
     end
 
-    # This method disables the recording of transaction traces in the given
-    # block.  See also #disable_all_tracing
-    #
-    # @api public
-    #
-    def disable_transaction_tracing
-      Deprecator.deprecate(:disable_transaction_tracing,
-        'disable_all_tracing or ignore_transaction')
-      record_api_supportability_metric(:disable_transaction_tracing)
-      yield
-    end
-
     # This method sets the state of sql recording in the transaction
     # sampler feature. Within the given block, no sql will be recorded
     #
@@ -554,12 +542,6 @@ module NewRelic
       NewRelic::Agent::Tracer.state.is_execution_traced?
     end
 
-    # helper method to check the thread local to determine whether sql
-    # is being recorded or not
-    def tl_is_sql_recorded?
-      NewRelic::Agent::Tracer.state.is_sql_recorded?
-    end
-
     # @!group Adding custom attributes to traces
 
     # Add attributes to the transaction trace, Insights Transaction event, and

data/lib/new_relic/cli/commands/install.rb

@@ -45,20 +45,20 @@ class NewRelic::Cli::Install < NewRelic::Cli::Command
 
     File.open(dest_file, 'w') { |out| out.puts(content) }
 
-    puts <<-EOF unless quiet
+    puts <<~EOF unless quiet
 
-Installed a default configuration file at
-#{dest_file}.
+      Installed a default configuration file at
+      #{dest_file}.
     EOF
-    puts <<-EOF unless quiet || @license_key != NO_LICENSE_KEY
+    puts <<~EOF unless quiet || @license_key != NO_LICENSE_KEY
 
-To monitor your application in production mode, sign up for an account
-at www.newrelic.com, and replace the newrelic.yml file with the one
-you receive upon registration.
+      To monitor your application in production mode, sign up for an account
+      at www.newrelic.com, and replace the newrelic.yml file with the one
+      you receive upon registration.
     EOF
-    puts <<-EOF unless quiet
+    puts <<~EOF unless quiet
 
-Visit support.newrelic.com if you are experiencing installation issues.
+      Visit support.newrelic.com if you are experiencing installation issues.
     EOF
   end
 

data/lib/new_relic/control/instance_methods.rb

@@ -65,7 +65,7 @@ module NewRelic
         # An artifact of earlier implementation, we put both #add_method_tracer and #trace_execution
         # methods in the module methods.
         # Rails applications load the next two lines before any other initializers are run
-        unless defined?(Rails::VERSION) && NewRelic::Agent.config[:defer_rails_initialization]
+        unless defined?(Rails::VERSION) && ENV['NEW_RELIC_DEFER_RAILS_INITIALIZATION']
           Module.send(:include, NewRelic::Agent::MethodTracer::ClassMethods)
           Module.send(:include, NewRelic::Agent::MethodTracer)
         end

data/lib/new_relic/local_environment.rb

@@ -74,9 +74,7 @@ module NewRelic
         unicorn
         webrick
         fastcgi
-        rainbows
       ]
-      # TODO: MAJOR VERSION - remove rainbows
       while dispatchers.any? && @discovered_dispatcher.nil?
         send('check_for_' + (dispatchers.shift))
       end
@@ -134,14 +132,6 @@ module NewRelic
       end
     end
 
-    # TODO: MAJOR VERSION - remove this method
-    def check_for_rainbows
-      if (defined?(::Rainbows) && defined?(::Rainbows::HttpServer)) && NewRelic::LanguageSupport.object_space_usable?
-        v = find_class_in_object_space(::Rainbows::HttpServer)
-        @discovered_dispatcher = :rainbows if v
-      end
-    end
-
     def check_for_puma
       if defined?(::Puma) && File.basename($0) == 'puma'
         @discovered_dispatcher = :puma

data/lib/new_relic/supportability_helper.rb

@@ -21,7 +21,6 @@ module NewRelic
       :browser_timing_header,
       :disable_all_tracing,
       :disable_sql_recording,
-      :disable_transaction_tracing,
       :drop_buffered_data,
       :get_request_metadata,
       :get_response_metadata,

data/lib/new_relic/version.rb

@@ -5,8 +5,8 @@
 
 module NewRelic
   module VERSION # :nodoc:
-    MAJOR = 8
-    MINOR = 15
+    MAJOR = 9
+    MINOR = 0
     TINY = 0
 
     STRING = "#{MAJOR}.#{MINOR}.#{TINY}"

data/lib/newrelic_rpm.rb

@@ -20,7 +20,7 @@ require 'new_relic/control'
 if defined?(Rails::VERSION)
   module NewRelic
     class Railtie < Rails::Railtie
-      if NewRelic::Agent.config[:defer_rails_initialization]
+      if ENV['NEW_RELIC_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)

data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb}

@@ -17,7 +17,7 @@ module Sequel
   # instrumentation is loaded:
   #
   #     db = Sequel.connect( ... )
-  #     db.extension :newrelic_instrumentation
+  #     db.extension :new_relic_instrumentation
   #
   # Versions 3.47.0 and later use `Database.extension` to automatically
   # install the extension for new connections.
@@ -93,6 +93,6 @@ module Sequel
     end
   end # module NewRelicInstrumentation
 
-  NewRelic::Agent.logger.debug("Registering the :newrelic_instrumentation extension.")
-  Database.register_extension(:newrelic_instrumentation, NewRelicInstrumentation)
+  NewRelic::Agent.logger.debug("Registering the :new_relic_instrumentation extension.")
+  Database.register_extension(:new_relic_instrumentation, NewRelicInstrumentation)
 end # module Sequel

data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb}

@@ -11,7 +11,7 @@ require 'new_relic/agent/datastores/metric_helper'
 module Sequel
   module Plugins
     # Sequel::Model instrumentation for the New Relic agent.
-    module NewrelicInstrumentation
+    module NewRelicInstrumentation
       # Meta-programming for creating method tracers for the Sequel::Model plugin.
       module MethodWrapping
         # Install a method named +method_name+ that will trace execution
@@ -38,7 +38,7 @@ module Sequel
 
       # Methods to be added to Sequel::Model instances.
       module InstanceMethods
-        extend Sequel::Plugins::NewrelicInstrumentation::MethodWrapping
+        extend Sequel::Plugins::NewRelicInstrumentation::MethodWrapping
 
         wrap_sequel_method :delete
         wrap_sequel_method :destroy
@@ -52,7 +52,7 @@ module Sequel
 
       # Methods to be added to Sequel::Model classes.
       module ClassMethods
-        extend Sequel::Plugins::NewrelicInstrumentation::MethodWrapping
+        extend Sequel::Plugins::NewRelicInstrumentation::MethodWrapping
 
         wrap_sequel_method :[], "get"
         wrap_sequel_method :all

data/lib/tasks/helpers/format.rb

@@ -43,7 +43,7 @@ module Format
   def flatten_config_hash(config_hash)
     sections = []
     config = [GENERAL, 'transaction_tracer', 'error_collector',
-      'browser_monitoring', 'analytics_events', 'transaction_events',
+      'browser_monitoring', 'transaction_events',
       'application_logging']
 
     config.each { |config| sections << pluck(config, config_hash) }

data/lib/tasks/instrumentation_generator/instrumentation.thor

@@ -14,7 +14,7 @@ class Instrumentation < Thor
   NEWRELIC_YML_LOCATION = 'newrelic.yml'
 
   desc('scaffold NAME', 'Scaffold the required files for adding new instrumentation')
-  long_desc <<-LONGDESC
+  long_desc <<~LONGDESC
     `instrumentation scaffold` requires one parameter by default: the name of the
     library or class you are instrumenting. This task generates the basic
     file structure needed to add new instrumentation to the Ruby agent.
@@ -96,7 +96,7 @@ class Instrumentation < Thor
   end
 
   def config_block(name)
-    <<-CONFIG
+    <<~CONFIG
         :'instrumentation.#{name.downcase}' => {
           :default => 'auto',
           :public => true,
@@ -108,16 +108,13 @@ class Instrumentation < Thor
     CONFIG
   end
 
-  # TODO: OLD RUBIES - RUBY_VERSION 2.2
-  # When we only support 2.3+ this can be changed to a sqiggle heredoc (<<~)
-  # and use standard indentation
   def yaml_block(name)
-<<HEREDOC # rubocop:disable Layout/IndentationWidth
+    <<~HEREDOC
 
-  # Controls auto-instrumentation of #{name} at start up.
-  # May be one of [auto|prepend|chain|disabled]
-  # instrumentation.#{name.downcase}: auto
-HEREDOC
+      # Controls auto-instrumentation of #{name} at start up.
+      # May be one of [auto|prepend|chain|disabled]
+      # instrumentation.#{name.downcase}: auto
+    HEREDOC
   end
 end
 

data/lib/tasks/instrumentation_generator/templates/Envfile.tt

@@ -4,6 +4,6 @@
 
 instrumentation_methods :chain, :prepend
 
-gemfile <<-RB
+gemfile <<~RB
   gem '<%= @name.downcase %>'
 RB

data/newrelic.yml

@@ -162,19 +162,24 @@ common: &default_settings
   # or  port_path_or_id parameters to transaction or slow SQL traces.
   # datastore_tracer.instance_reporting.enabled: true
 
-  # If true, when the agent is in an application using Ruby on Rails, it will start after
-  # config/initializers have run.
-  # defer_rails_initialization: false
-
   # If true, disables Action Cable instrumentation.
   # disable_action_cable_instrumentation: false
 
-  # If true, disables instrumentation for Active Record 4, 5, and 6.
+  # If true, disables Action Mailbox instrumentation.
+  # disable_action_mailbox: false
+
+  # If true, disables Action Mailer instrumentation.
+  # disable_action_mailer: false
+
+  # If true, disables instrumentation for Active Record 4+
   # disable_active_record_notifications: false
 
   # If true, disables Active Storage instrumentation.
   # disable_active_storage: false
 
+  # If true, disables Active Support instrumentation.
+  # disable_active_support: false
+
   # If true, disables Active Job instrumentation.
   # disable_activejob: false
 
@@ -187,9 +192,6 @@ common: &default_settings
   # If true, disables ActiveSupport custom events instrumentation.
   # disable_custom_events_instrumentation: false
 
-  # If true, disables DataMapper instrumentation.
-  # disable_data_mapper: false
-
   # If true, the agent won't measure the depth of Delayed Job queues.
   # disable_delayed_job_sampler: false
 
@@ -328,6 +330,10 @@ common: &default_settings
   # May be one of [auto|prepend|chain|disabled].
   # instrumentation.bunny: auto
 
+  # Controls auto-instrumentation of Fiber at start up.
+  # May be one of [auto|prepend|chain|disabled]
+  # instrumentation.fiber: auto
+
   # Controls auto-instrumentation of concurrent_ruby at start up.
   # May be one of [auto|prepend|chain|disabled]
   # instrumentation.concurrent_ruby: auto
@@ -435,7 +441,7 @@ common: &default_settings
   # instrumentation.thread: auto
 
   # Controls auto-instrumentation of the Thread class at start up to automatically add tracing to all Threads created in the application.
-  # instrumentation.thread.tracing: false
+  # instrumentation.thread.tracing: true
 
   # Controls auto-instrumentation of gRPC clients at start up.
   # May be one of [auto|prepend|chain|disabled].

data/newrelic_rpm.gemspec

@@ -8,17 +8,17 @@ require 'new_relic/latest_changes'
 Gem::Specification.new do |s|
   s.name = "newrelic_rpm"
   s.version = NewRelic::VERSION::STRING
-  s.required_ruby_version = '>= 2.2.0'
+  s.required_ruby_version = '>= 2.4.0'
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to?(:required_rubygems_version=)
   s.authors = ["Tanna McClure", "Kayla Reopelle", "James Bunch", "Hannah Ramadan"]
   s.licenses = ['Apache-2.0']
-  s.description = <<-EOS
-New Relic is a performance management system, developed by New Relic,
-Inc (http://www.newrelic.com).  New Relic provides you with deep
-information about the performance of your web application as it runs
-in production. The New Relic Ruby agent is dual-purposed as a either a
-Gem or plugin, hosted on
-https://github.com/newrelic/newrelic-ruby-agent/
+  s.description = <<~EOS
+    New Relic is a performance management system, developed by New Relic,
+    Inc (http://www.newrelic.com).  New Relic provides you with deep
+    information about the performance of your web application as it runs
+    in production. The New Relic Ruby agent is dual-purposed as a either a
+    Gem or plugin, hosted on
+    https://github.com/newrelic/newrelic-ruby-agent/
   EOS
   s.email = "support@newrelic.com"
   s.executables = %w[newrelic_cmd newrelic nrdebug]
@@ -54,11 +54,15 @@ https://github.com/newrelic/newrelic-ruby-agent/
   s.add_development_dependency 'mocha', '~> 1.16'
   s.add_development_dependency 'pry' unless ENV['CI']
   s.add_development_dependency 'rake', '12.3.3'
-  s.add_development_dependency 'rubocop' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
-  s.add_development_dependency 'rubocop-minitest' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
-  s.add_development_dependency 'rubocop-performance' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
-  s.add_development_dependency 'rubocop-rake' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+
+  s.add_development_dependency 'rubocop', '1.44.1' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+  s.add_development_dependency 'rubocop-ast', '1.24.1' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+  s.add_development_dependency 'rubocop-minitest', '0.27.0' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+  s.add_development_dependency 'rubocop-performance', '1.16.0' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+  s.add_development_dependency 'rubocop-rake', '0.6.0' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+
   s.add_development_dependency 'simplecov' if RUBY_VERSION >= '2.7.0'
   s.add_development_dependency 'thor' unless ENV['CI']
-  s.add_development_dependency 'yard', "#{RUBY_VERSION < '2.3.0' ? '0.9.26' : '> 0.9.26'}"
+  s.add_development_dependency 'warning' if RUBY_VERSION >= '2.4.0'
+  s.add_development_dependency 'yard'
 end

data/test/agent_helper.rb

@@ -1021,6 +1021,6 @@ def defer_testing_to_min_supported_rails(test_file, min_rails_version, supports_
 
     yield
   else
-    puts "Skipping tests in #{test_file} because Rails >= #{min_rails_version} is unavailable"
+    puts "Skipping tests in #{File.basename(test_file)} because Rails >= #{min_rails_version} is unavailable" if ENV["VERBOSE_TEST_OUTPUT"]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 8.15.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Tanna McClure
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,20 +97,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: warning
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.26
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.26
+        version: '0'
 description: |
   New Relic is a performance management system, developed by New Relic,
   Inc (http://www.newrelic.com).  New Relic provides you with deep
@@ -241,9 +255,17 @@ files:
 - lib/new_relic/agent/http_clients/uri_util.rb
 - lib/new_relic/agent/instrumentation.rb
 - lib/new_relic/agent/instrumentation/action_cable_subscriber.rb
+- lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb
 - lib/new_relic/agent/instrumentation/action_controller_subscriber.rb
+- lib/new_relic/agent/instrumentation/action_dispatch.rb
+- lib/new_relic/agent/instrumentation/action_dispatch_subscriber.rb
+- lib/new_relic/agent/instrumentation/action_mailbox.rb
+- lib/new_relic/agent/instrumentation/action_mailbox_subscriber.rb
+- lib/new_relic/agent/instrumentation/action_mailer.rb
+- lib/new_relic/agent/instrumentation/action_mailer_subscriber.rb
 - lib/new_relic/agent/instrumentation/action_view_subscriber.rb
 - lib/new_relic/agent/instrumentation/active_job.rb
+- lib/new_relic/agent/instrumentation/active_job_subscriber.rb
 - lib/new_relic/agent/instrumentation/active_merchant.rb
 - lib/new_relic/agent/instrumentation/active_record.rb
 - lib/new_relic/agent/instrumentation/active_record_helper.rb
@@ -257,8 +279,7 @@ files:
 - lib/new_relic/agent/instrumentation/active_support_logger/chain.rb
 - lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb
 - lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb
-- lib/new_relic/agent/instrumentation/acts_as_solr.rb
-- lib/new_relic/agent/instrumentation/authlogic.rb
+- lib/new_relic/agent/instrumentation/active_support_subscriber.rb
 - lib/new_relic/agent/instrumentation/bunny.rb
 - lib/new_relic/agent/instrumentation/bunny/chain.rb
 - lib/new_relic/agent/instrumentation/bunny/instrumentation.rb
@@ -272,8 +293,8 @@ 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.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
 - lib/new_relic/agent/instrumentation/delayed_job/prepend.rb
@@ -284,6 +305,10 @@ files:
 - lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb
 - lib/new_relic/agent/instrumentation/excon.rb
 - lib/new_relic/agent/instrumentation/excon/middleware.rb
+- lib/new_relic/agent/instrumentation/fiber.rb
+- lib/new_relic/agent/instrumentation/fiber/chain.rb
+- lib/new_relic/agent/instrumentation/fiber/instrumentation.rb
+- lib/new_relic/agent/instrumentation/fiber/prepend.rb
 - lib/new_relic/agent/instrumentation/grape.rb
 - lib/new_relic/agent/instrumentation/grape/chain.rb
 - lib/new_relic/agent/instrumentation/grape/instrumentation.rb
@@ -344,7 +369,6 @@ files:
 - 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
 - lib/new_relic/agent/instrumentation/rake/instrumentation.rb
@@ -372,7 +396,6 @@ files:
 - lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb
 - lib/new_relic/agent/instrumentation/sinatra/prepend.rb
 - lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb
-- lib/new_relic/agent/instrumentation/sunspot.rb
 - lib/new_relic/agent/instrumentation/thread.rb
 - lib/new_relic/agent/instrumentation/thread/chain.rb
 - lib/new_relic/agent/instrumentation/thread/instrumentation.rb
@@ -520,8 +543,8 @@ files:
 - lib/new_relic/traced_thread.rb
 - lib/new_relic/version.rb
 - lib/newrelic_rpm.rb
-- lib/sequel/extensions/newrelic_instrumentation.rb
-- lib/sequel/plugins/newrelic_instrumentation.rb
+- lib/sequel/extensions/new_relic_instrumentation.rb
+- lib/sequel/plugins/new_relic_instrumentation.rb
 - lib/tasks/all.rb
 - lib/tasks/config.rake
 - lib/tasks/coverage_report.rake
@@ -570,7 +593,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"

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

@@ -1,83 +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
-
-require 'new_relic/agent/database'
-
-module NewRelic
-  module Instrumentation
-    module ActsAsSolrInstrumentation
-      module ParserMethodsInstrumentation
-        def parse_query_with_newrelic(*args)
-          self.class.trace_execution_scoped(["SolrClient/ActsAsSolr/query"]) do
-            begin
-              parse_query_without_newrelic(*args)
-            ensure
-              return unless txn = ::NewRelic::Agent::Tracer.current_transaction
-
-              txn.current_segment.params[:statement] = ::NewRelic::Agent::Database.truncate_query(args.first.inspect) rescue nil
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
-DependencyDetection.defer do
-  @name = :acts_as_solr
-
-  depends_on do
-    defined?(ActsAsSolr)
-  end
-
-  depends_on do
-    defined?(ActsAsSolr::ParserMethods)
-  end
-
-  depends_on do
-    defined?(ActsAsSolr::ClassMethods)
-  end
-
-  depends_on do
-    defined?(ActsAsSolr::CommonMethods)
-  end
-
-  executes do
-    NewRelic::Agent.logger.info('Installing ActsAsSolr instrumentation')
-    deprecation_msg = 'The instrumentation for ActsAsSolr is deprecated. ' \
-      'It will be removed in version 9.0.0.' \
-
-    NewRelic::Agent.logger.log_once(
-      :warn,
-      :deprecated_acts_as_solr,
-      deprecation_msg
-    )
-  end
-
-  executes do
-    ActsAsSolr::ParserMethods.module_eval do
-      include NewRelic::Instrumentation::ActsAsSolrInstrumentation::ParserMethodsInstrumentation
-      alias :parse_query_without_newrelic :parse_query
-      alias :parse_query :parse_query_with_newrelic
-    end
-  end
-
-  executes do
-    ActsAsSolr::ClassMethods.module_eval do
-      %w[find_by_solr find_id_by_solr multi_solr_search count_by_solr].each do |method|
-        add_method_tracer method, 'SolrClient/ActsAsSolr/query'
-      end
-      add_method_tracer :rebuild_solr_index, 'SolrClient/ActsAsSolr/index'
-    end
-  end
-
-  executes do
-    ActsAsSolr::CommonMethods.module_eval do
-      add_method_tracer :solr_add, 'SolrClient/ActsAsSolr/add'
-      add_method_tracer :solr_delete, 'SolrClient/ActsAsSolr/delete'
-      add_method_tracer :solr_commit, 'SolrClient/ActsAsSolr/commit'
-      add_method_tracer :solr_optimize, 'SolrClient/ActsAsSolr/optimize'
-    end
-  end
-end

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

@@ -1,33 +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
-
-DependencyDetection.defer do
-  @name = :authlogic
-
-  depends_on do
-    defined?(Authlogic) &&
-      defined?(Authlogic::Session) &&
-      defined?(Authlogic::Session::Base)
-  end
-
-  executes do
-    NewRelic::Agent.logger.info('Installing Authlogic instrumentation')
-    deprecation_msg = 'The instrumentation for Authlogic is deprecated. ' \
-      'It will be removed in version 9.0.0.' \
-
-    NewRelic::Agent.logger.log_once(
-      :warn,
-      :deprecated_authlogic,
-      deprecation_msg
-    )
-  end
-
-  executes do
-    Authlogic::Session::Base.class_eval do
-      class << self
-        add_method_tracer :find, 'Custom/Authlogic/find'
-      end
-    end
-  end
-end