newrelic_rpm 8.16.0 → 9.0.0

data/lib/new_relic/agent/configuration/high_security_source.rb

@@ -11,8 +11,6 @@ module NewRelic
         def initialize(local_settings)
           super({
             :capture_params => false,
-            :'resque.capture_params' => false,
-            :'sidekiq.capture_params' => false,
             :'attributes.include' => [],
 
             :'transaction_tracer.record_sql' => record_sql_setting(local_settings, :'transaction_tracer.record_sql'),

data/lib/new_relic/agent/configuration/security_policy_source.rb

@@ -191,22 +191,6 @@ module NewRelic
               disabled_value: false,
               permitted_fn: nil
             }
-          ],
-          "job_arguments" => [
-            {
-              option: :'resque.capture_params',
-              supported: true,
-              enabled_fn: method(:enabled?),
-              disabled_value: false,
-              permitted_fn: nil
-            },
-            {
-              option: :'sidekiq.capture_params',
-              supported: true,
-              enabled_fn: method(:enabled?),
-              disabled_value: false,
-              permitted_fn: nil
-            }
           ]
         }
 

data/lib/new_relic/agent/database.rb

@@ -7,20 +7,6 @@ require 'new_relic/agent/database/explain_plan_helpers'
 require 'new_relic/agent/database/obfuscator'
 
 module NewRelic
-  # columns for a mysql explain plan
-  MYSQL_EXPLAIN_COLUMNS = [
-    "Id",
-    "Select Type",
-    "Table",
-    "Type",
-    "Possible Keys",
-    "Key",
-    "Key Length",
-    "Ref",
-    "Rows",
-    "Extra"
-  ].freeze
-
   module Agent
     module Database
       MAX_QUERY_LENGTH = 16384

data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb

@@ -166,8 +166,7 @@ module NewRelic
 
       def cross_application_tracer_enabled?
         !NewRelic::Agent.config[:"distributed_tracing.enabled"] &&
-          (NewRelic::Agent.config[:"cross_application_tracer.enabled"] ||
-           NewRelic::Agent.config[:cross_application_tracing])
+          NewRelic::Agent.config[:"cross_application_tracer.enabled"]
       end
 
       def obfuscator

data/lib/new_relic/agent/error_collector.rb

@@ -26,7 +26,7 @@ module NewRelic
         @error_filter = NewRelic::Agent::ErrorFilter.new
 
         %w[
-          ignore_errors ignore_classes ignore_messages ignore_status_codes
+          ignore_classes ignore_messages ignore_status_codes
           expected_classes expected_messages expected_status_codes
         ].each do |w|
           Agent.config.register_callback(:"error_collector.#{w}") do |value|

data/lib/new_relic/agent/error_filter.rb

@@ -19,7 +19,7 @@ module NewRelic
 
       def load_all
         %i[
-          ignore_errors ignore_classes ignore_messages ignore_status_codes
+          ignore_classes ignore_messages ignore_status_codes
           expected_classes expected_messages expected_status_codes
         ].each { |setting| load_from_config(setting) }
       end
@@ -31,7 +31,7 @@ module NewRelic
         return if new_value.nil? || (new_value.respond_to?(:empty?) && new_value.empty?)
 
         case setting.to_sym
-        when :ignore_errors, :ignore_classes
+        when :ignore_classes
           new_value = new_value.split(',').map!(&:strip) if new_value.is_a?(String)
           errors = @ignore_classes = new_value
         when :ignore_messages
@@ -120,7 +120,7 @@ module NewRelic
 
       def log_filter(setting, errors)
         case setting
-        when :ignore_errors, :ignore_classes
+        when :ignore_classes
           errors.each do |error|
             ::NewRelic::Agent.logger.debug("Ignoring errors of type '#{error}'")
           end

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

@@ -71,7 +71,7 @@ module NewRelic
         end
 
         def self.run_in_trace(job, block, event)
-          trace_execution_scoped("MessageBroker/#{adapter}/Queue/#{event}/Named/#{job.queue_name}",
+          trace_execution_scoped("ActiveJob/#{adapter.sub(/^ActiveJob::/, '')}/Queue/#{event}/Named/#{job.queue_name}",
             code_information: code_information_for_job(job)) do
             block.call
           end

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

@@ -180,7 +180,7 @@ module NewRelic
             code_info = NewRelic::Agent::MethodTracerHelpers.code_information(self, method)
             argument_list = generate_argument_list(options.merge(code_info))
 
-            class_eval(<<-EOC)
+            class_eval(<<~EOC)
               def #{with_method_name}(*args, &block)
                 perform_action_with_newrelic_trace(#{argument_list.join(',')}) do
                   #{without_method_name}(*args, &block)

data/lib/new_relic/agent/instrumentation/fiber/chain.rb

@@ -0,0 +1,20 @@
+# 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::Agent::Instrumentation
+  module MonitoredFiber
+    def self.instrument!
+      ::Fiber.class_eval do
+        include NewRelic::Agent::Instrumentation::MonitoredFiber
+
+        alias_method(:initialize_without_new_relic, :initialize)
+
+        def initialize(*args, &block)
+          traced_block = add_thread_tracing(*args, &block)
+          initialize_with_newrelic_tracing { initialize_without_new_relic(*args, &traced_block) }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+# 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::Agent::Instrumentation
+  module MonitoredFiber
+    attr_reader :nr_parent_key
+
+    def initialize_with_newrelic_tracing
+      @nr_parent_key = NewRelic::Agent::Tracer.current_segment_key
+      yield
+    end
+
+    def add_thread_tracing(*args, &block)
+      return block if !NewRelic::Agent::Tracer.thread_tracing_enabled?
+
+      NewRelic::Agent::Tracer.thread_block_with_current_transaction(
+        *args,
+        segment_name: 'Ruby/Fiber',
+        &block
+      )
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+# 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_relative 'instrumentation'
+
+module NewRelic::Agent::Instrumentation
+  module MonitoredFiber
+    module Prepend
+      include NewRelic::Agent::Instrumentation::MonitoredFiber
+
+      def initialize(*args, &block)
+        traced_block = add_thread_tracing(*args, &block)
+        initialize_with_newrelic_tracing { super(*args, &traced_block) }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# 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_relative 'fiber/instrumentation'
+require_relative 'fiber/chain'
+require_relative 'fiber/prepend'
+
+DependencyDetection.defer do
+  named :fiber
+
+  depends_on do
+    defined?(Fiber)
+  end
+
+  executes do
+    NewRelic::Agent.logger.info('Installing Fiber instrumentation')
+
+    if use_prepend?
+      prepend_instrument Fiber, NewRelic::Agent::Instrumentation::MonitoredFiber::Prepend
+    else
+      chain_instrument NewRelic::Agent::Instrumentation::MonitoredFiber
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ require_relative 'grape/prepend'
 DependencyDetection.defer do
   # Why not just :grape? newrelic-grape used that name already, and while we're
   # not shipping yet, overloading the name interferes with the plugin.
-  named :grape_instrumentation
+  @name = :grape_instrumentation
   configure_with :grape
 
   depends_on do

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

@@ -46,7 +46,7 @@ DependencyDetection.defer do
 end
 
 DependencyDetection.defer do
-  named :dalli
+  @name = :dalli
   configure_with :memcache
 
   depends_on { defined? Dalli::Client }
@@ -67,7 +67,7 @@ end
 # dalli/cas/client. Use a separate dependency block so it can potentially
 # re-evaluate after they've done that require.
 DependencyDetection.defer do
-  named :dalli_cas_client
+  @name = :dalli_cas_client
   configure_with :memcache
 
   depends_on { defined? Dalli::Client }

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

@@ -27,7 +27,7 @@ DependencyDetection.defer do
   end
 
   conflicts_with_prepend do
-    defined?(Rack::MiniProfiler)
+    defined?(Rack::MiniProfiler) && !defined?(Rack::MINI_PROFILER_PREPEND_NET_HTTP_PATCH)
   end
 
   conflicts_with_prepend do

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

@@ -73,10 +73,6 @@ module NewRelic
           task.instance_eval do
             def invoke_prerequisites_concurrently(*_)
               NewRelic::Agent::MethodTracer.trace_execution_scoped("Rake/execute/multitask") do
-                prereqs = self.prerequisite_tasks.map(&:name).join(", ")
-                if txn = ::NewRelic::Agent::Tracer.current_transaction
-                  txn.current_segment.params[:statement] = NewRelic::Agent::Database.truncate_query("Couldn't trace concurrent prereq tasks: #{prereqs}")
-                end
                 super
               end
             end
@@ -86,12 +82,9 @@ module NewRelic
         def before_invoke_transaction(task)
           ensure_at_exit
 
-          # We can't represent overlapping operations yet, so if multitask just
-          # make one node and annotate with prereq task names
+          instrument_execute_on_prereqs(task)
           if task.application.options.always_multitask
             instrument_invoke_prerequisites_concurrently(task)
-          else
-            instrument_execute_on_prereqs(task)
           end
         rescue => e
           NewRelic::Agent.logger.error("Error during Rake task invoke", e)

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

@@ -8,7 +8,7 @@ require_relative 'rake/prepend'
 
 DependencyDetection.defer do
   # Why not :rake? newrelic-rake used that name, so avoid conflicting
-  named :rake_instrumentation
+  @name = :rake_instrumentation
   configure_with :rake
 
   depends_on { defined?(Rake) && defined?(Rake::VERSION) }

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

@@ -13,7 +13,7 @@ require_relative 'redis/middleware'
 
 DependencyDetection.defer do
   # Why not :redis? newrelic-redis used that name, so avoid conflicting
-  named :redis_instrumentation
+  @name = :redis_instrumentation
   configure_with :redis
 
   depends_on do

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

@@ -10,7 +10,7 @@ DependencyDetection.defer do
   @name = :resque
 
   depends_on do
-    defined?(Resque::Job) && !NewRelic::Agent.config[:disable_resque]
+    defined?(Resque::Job)
   end
 
   # Airbrake uses method chaining on Resque::Job on versions < 11.0.3

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

@@ -11,8 +11,7 @@ DependencyDetection.defer do
   end
 
   depends_on do
-    !NewRelic::Agent.config[:disable_sequel_instrumentation] &&
-      !NewRelic::Agent.config[:disable_database_instrumentation]
+    !NewRelic::Agent.config[:disable_sequel_instrumentation]
   end
 
   def supported_sequel_version?
@@ -27,7 +26,7 @@ DependencyDetection.defer do
       NewRelic::Agent.logger.info('Installing Sequel instrumentation')
 
       if Sequel::Database.respond_to?(:extension)
-        Sequel::Database.extension(:newrelic_instrumentation)
+        Sequel::Database.extension(:new_relic_instrumentation)
       else
         NewRelic::Agent.logger.info("Detected Sequel version %s." % [Sequel::VERSION])
         NewRelic::Agent.logger.info("Please see additional documentation: " +
@@ -35,10 +34,10 @@ DependencyDetection.defer do
       end
 
       Sequel.synchronize { Sequel::DATABASES.dup }.each do |db|
-        db.extension(:newrelic_instrumentation)
+        db.extension(:new_relic_instrumentation)
       end
 
-      Sequel::Model.plugin(:newrelic_instrumentation) if defined?(Sequel::Model)
+      Sequel::Model.plugin(:new_relic_instrumentation) if defined?(Sequel::Model)
     else
 
       NewRelic::Agent.logger.info("Sequel instrumentation requires at least version 3.37.0.")

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

@@ -6,15 +6,15 @@ module NewRelic
   module Agent
     module Instrumentation
       module MonitoredThread
-        attr_reader :nr_parent_thread_id
+        attr_reader :nr_parent_key
 
         def initialize_with_newrelic_tracing
-          @nr_parent_thread_id = ::Thread.current.object_id
+          @nr_parent_key = NewRelic::Agent::Tracer.current_segment_key
           yield
         end
 
         def add_thread_tracing(*args, &block)
-          return block if skip_tracing?
+          return block if !NewRelic::Agent::Tracer.thread_tracing_enabled?
 
           NewRelic::Agent::Tracer.thread_block_with_current_transaction(
             *args,
@@ -22,10 +22,6 @@ module NewRelic
             &block
           )
         end
-
-        def skip_tracing?
-          !NewRelic::Agent.config[:'instrumentation.thread.tracing']
-        end
       end
     end
   end

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

@@ -12,7 +12,6 @@ module NewRelic
   module Agent
     module DistributedTracing
       class CrossAppMonitor < InboundRequestMonitor
-        NEWRELIC_ID_HEADER = 'X-NewRelic-ID'.freeze
         NEWRELIC_TXN_HEADER = 'X-NewRelic-Transaction'.freeze
         NEWRELIC_APPDATA_HEADER = 'X-NewRelic-App-Data'.freeze
 

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

@@ -14,7 +14,6 @@ module NewRelic
           custom_parameters
           custom_instrumentation_editor
           message_parameters
-          job_arguments
         ].map(&:freeze)
 
         def self.preliminary_settings(security_policies)

data/lib/new_relic/agent/new_relic_service.rb

@@ -595,7 +595,7 @@ module NewRelic
         return if post_string.size < Agent.config[:max_payload_size_in_bytes]
 
         ::NewRelic::Agent.logger.debug("Tried to send too much data: #{post_string.size} bytes")
-        NewRelic::Agent.increment_metric("Supportability/Agent/Collector/#{endpoint}/MaxPayloadSizeLimit")
+        NewRelic::Agent.increment_metric("Supportability/Ruby/Collector/#{endpoint}/MaxPayloadSizeLimit")
         raise UnrecoverableServerException.new('413 Request Entity Too Large')
       end
 

data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb

@@ -11,7 +11,6 @@ module NewRelic
         SEGMENT_PLACEHOLDER = '*'.freeze
         ADJACENT_PLACEHOLDERS_REGEX = %r{((?:^|/)\*)(?:/\*)*}.freeze
         ADJACENT_PLACEHOLDERS_REPLACEMENT = '\1'.freeze
-        VALID_PREFIX_SEGMENT_COUNT = 2
 
         attr_reader :prefix, :terms
 

data/lib/new_relic/agent/samplers/delayed_job_sampler.rb

@@ -25,7 +25,7 @@ module NewRelic
         end
 
         def initialize
-          raise Unsupported, "DJ queue sampler disabled" if Agent.config[:disable_dj]
+          raise Unsupported, "DJ queue sampler disabled" if Agent.config[:'instrumentation.delayed_job'] == 'disabled'
           raise Unsupported, "DJ queue sampling unsupported with backend '#{::Delayed::Worker.backend}'" unless self.class.supported_backend?
           raise Unsupported, "No DJ worker present. Skipping DJ queue sampler" unless NewRelic::DelayedJobInjection.worker_name
         end

data/lib/new_relic/agent/tracer.rb

@@ -410,8 +410,17 @@ module NewRelic
 
         alias_method :tl_clear, :clear_state
 
+        def current_segment_key
+          ::Fiber.current.object_id
+        end
+
+        def thread_tracing_enabled?
+          NewRelic::Agent.config[:'instrumentation.thread.tracing']
+        end
+
         def thread_block_with_current_transaction(*args, segment_name:, parent: nil, &block)
-          current_txn = ::Thread.current[:newrelic_tracer_state].current_transaction if ::Thread.current[:newrelic_tracer_state] && ::Thread.current[:newrelic_tracer_state].is_execution_traced?
+          parent ||= current_segment
+          current_txn = ::Thread.current[:newrelic_tracer_state]&.current_transaction if ::Thread.current[:newrelic_tracer_state]&.is_execution_traced?
           proc do
             begin
               if current_txn

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

@@ -20,14 +20,14 @@ module NewRelic
         # after its parent. We will use the optimized exclusive duration
         # calculation in all other cases.
         #
-        attr_reader :start_time, :end_time, :duration, :exclusive_duration, :guid, :starting_thread_id
+        attr_reader :start_time, :end_time, :duration, :exclusive_duration, :guid, :starting_segment_key
         attr_accessor :name, :parent, :children_time, :transaction, :transaction_name
         attr_writer :record_metrics, :record_scoped_metric, :record_on_finish
         attr_reader :noticed_error
 
         def initialize(name = nil, start_time = nil)
           @name = name
-          @starting_thread_id = ::Thread.current.object_id
+          @starting_segment_key = NewRelic::Agent::Tracer.current_segment_key
           @transaction_name = nil
           @transaction = nil
           @guid = NewRelic::Agent::GuidGenerator.generate_guid

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

@@ -35,8 +35,8 @@ module NewRelic
 
         def segment_complete(segment)
           # if parent was in another thread, remove the current_segment entry for this thread
-          if segment.parent && segment.parent.starting_thread_id != ::Thread.current.object_id
-            remove_current_segment_by_thread_id(::Thread.current.object_id)
+          if segment.parent && segment.parent.starting_segment_key != NewRelic::Agent::Tracer.current_segment_key
+            remove_current_segment_by_thread_id(NewRelic::Agent::Tracer.current_segment_key)
           else
             set_current_segment(segment.parent)
           end

data/lib/new_relic/agent/transaction.rb

@@ -53,9 +53,6 @@ module NewRelic
 
       JRUBY_CPU_TIME_ERROR = "Error calculating JRuby CPU Time"
 
-      # reference to the transaction state managing this transaction
-      attr_accessor :state
-
       # A Time instance for the start time, never nil
       attr_accessor :start_time
 
@@ -121,7 +118,6 @@ module NewRelic
       def self.start_new_transaction(state, category, options)
         txn = Transaction.new(category, options)
         state.reset(txn)
-        txn.state = state
         txn.start(options)
         txn
       end
@@ -248,6 +244,7 @@ module NewRelic
         @priority = nil
 
         @starting_thread_id = Thread.current.object_id
+        @starting_segment_key = current_segment_key
 
         @attributes = Attributes.new(NewRelic::Agent.instance.attribute_filter)
 
@@ -260,20 +257,26 @@ module NewRelic
         end
       end
 
-      def parent_thread_id
-        ::Thread.current.nr_parent_thread_id if ::Thread.current.respond_to?(:nr_parent_thread_id)
+      def state
+        NewRelic::Agent::Tracer.state
       end
 
-      def current_segment
-        current_thread_id = ::Thread.current.object_id
-        return current_segment_by_thread[current_thread_id] if current_segment_by_thread[current_thread_id]
-        return current_segment_by_thread[parent_thread_id] if current_segment_by_thread[parent_thread_id]
+      def current_segment_key
+        Tracer.current_segment_key
+      end
 
-        current_segment_by_thread[@starting_thread_id]
+      def parent_segment_key
+        (::Fiber.current.nr_parent_key if ::Fiber.current.respond_to?(:nr_parent_key)) || (::Thread.current.nr_parent_key if ::Thread.current.respond_to?(:nr_parent_key))
+      end
+
+      def current_segment
+        current_segment_by_thread[current_segment_key] ||
+          current_segment_by_thread[parent_segment_key] ||
+          current_segment_by_thread[@starting_segment_key]
       end
 
       def set_current_segment(new_segment)
-        @current_segment_lock.synchronize { current_segment_by_thread[::Thread.current.object_id] = new_segment }
+        @current_segment_lock.synchronize { current_segment_by_thread[current_segment_key] = new_segment }
       end
 
       def remove_current_segment_by_thread_id(id)
@@ -359,10 +362,8 @@ module NewRelic
       def set_overriding_transaction_name(name, category)
         return log_frozen_name(name) if name_frozen?
 
-        if influences_transaction_name?(category)
-          self.overridden_name = name
-          @category = category if category
-        end
+        self.overridden_name = name
+        @category = category if category
       end
 
       def log_frozen_name(name)

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