newrelic_rpm 9.5.0 → 9.7.0

data/lib/new_relic/base64.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
+
+module NewRelic
+  module Base64
+    extend self
+
+    def encode64(bin)
+      [bin].pack('m')
+    end
+
+    def decode64(str)
+      str.unpack1('m')
+    end
+
+    def strict_encode64(bin)
+      [bin].pack('m0')
+    end
+
+    def strict_decode64(str)
+      str.unpack1('m0')
+    end
+  end
+end

data/lib/new_relic/cli/command.rb

@@ -60,11 +60,13 @@ module NewRelic
         extra = []
         options = ARGV.options do |opts|
           script_name = File.basename($0)
-          # TODO: MAJOR VERSION - remove newrelic_cmd, deprecated since version 2.13
-          if /newrelic_cmd$/.match?(script_name)
-            $stdout.puts "warning: the 'newrelic_cmd' script has been renamed 'newrelic'"
-            script_name = 'newrelic'
+
+          # TODO: MAJOR VERSION - remove newrelic, deprecated since version x.xx
+          if /newrelic$/.match?(script_name)
+            $stdout.puts "warning: the 'newrelic' script has been renamed 'newrelic_rpm'"
+            script_name = 'newrelic_rpm'
           end
+
           opts.banner = "Usage: #{script_name} [ #{@command_names.join(' | ')} ] [options]"
           opts.separator("use '#{script_name} <command> -h' to see detailed command options")
           opts

data/lib/new_relic/constants.rb

@@ -3,6 +3,8 @@
 # frozen_string_literal: true
 
 module NewRelic
+  ASTERISK = '*'
+
   PRIORITY_PRECISION = 6
 
   EMPTY_ARRAY = [].freeze
@@ -35,4 +37,7 @@ module NewRelic
 
   CONNECT_RETRY_PERIODS = [15, 15, 30, 60, 120, 300]
   MAX_RETRY_PERIOD = 300
+
+  SLASH = '/'
+  ROOT = SLASH
 end

data/lib/new_relic/control/frameworks/rails.rb

@@ -10,6 +10,9 @@ module NewRelic
       # Rails specific configuration, instrumentation, environment values,
       # etc.
       class Rails < NewRelic::Control::Frameworks::Ruby
+        BROWSER_MONITORING_INSTALLED_SINGLETON = NewRelic::Agent.config
+        BROWSER_MONITORING_INSTALLED_VARIABLE = :@browser_monitoring_installed
+
         def env
           @env ||= (ENV['NEW_RELIC_ENV'] || RAILS_ENV.dup)
         end
@@ -71,7 +74,7 @@ module NewRelic
             # Might not be running if it does not think mongrel, thin,
             # passenger, etc. is running, if it thinks it's a rake task, or
             # if the agent_enabled is false.
-            ::NewRelic::Agent.logger.info('New Relic Agent not running. Skipping browser monitoring and agent hooks.')
+            ::NewRelic::Agent.logger.info('New Relic agent not running. Skipping browser monitoring and agent hooks.')
           else
             install_browser_monitoring(rails_config)
             install_agent_hooks(rails_config)
@@ -89,17 +92,17 @@ module NewRelic
             return unless NewRelic::Rack::AgentHooks.needed?
 
             config.middleware.use(NewRelic::Rack::AgentHooks)
-            ::NewRelic::Agent.logger.debug('Installed New Relic Agent Hooks middleware')
+            ::NewRelic::Agent.logger.debug('Installed New Relic agent hooks middleware')
           rescue => e
-            ::NewRelic::Agent.logger.warn('Error installing New Relic Agent Hooks middleware', e)
+            ::NewRelic::Agent.logger.warn('Error installing New Relic agent hooks middleware', e)
           end
         end
 
         def install_browser_monitoring(config)
           @install_lock.synchronize do
-            return if defined?(@browser_monitoring_installed) && @browser_monitoring_installed
+            return if browser_agent_already_installed?
 
-            @browser_monitoring_installed = true
+            mark_browser_agent_as_installed
             return if config.nil? || !config.respond_to?(:middleware) || !Agent.config[:'browser_monitoring.auto_instrument']
 
             begin
@@ -112,6 +115,15 @@ module NewRelic
           end
         end
 
+        def browser_agent_already_installed?
+          BROWSER_MONITORING_INSTALLED_SINGLETON.instance_variable_defined?(BROWSER_MONITORING_INSTALLED_VARIABLE) &&
+            BROWSER_MONITORING_INSTALLED_SINGLETON.instance_variable_get(BROWSER_MONITORING_INSTALLED_VARIABLE)
+        end
+
+        def mark_browser_agent_as_installed
+          BROWSER_MONITORING_INSTALLED_SINGLETON.instance_variable_set(BROWSER_MONITORING_INSTALLED_VARIABLE, true)
+        end
+
         def rails_version
           @rails_version ||= Gem::Version.new(::Rails::VERSION::STRING)
         end

data/lib/new_relic/control/instrumentation.rb

@@ -70,7 +70,7 @@ module NewRelic
     def rails_32_deprecation
       return unless defined?(Rails::VERSION) && Gem::Version.new(Rails::VERSION::STRING) <= Gem::Version.new('3.2')
 
-      deprecation_msg = 'The Ruby Agent is dropping support for Rails 3.2 ' \
+      deprecation_msg = 'The Ruby agent is dropping support for Rails 3.2 ' \
         'in a future major release. Please upgrade your Rails version to continue receiving support. ' \
 
       Agent.logger.log_once(

data/lib/new_relic/language_support.rb

@@ -83,6 +83,10 @@ module NewRelic
       camelized[0].downcase.concat(camelized[1..-1])
     end
 
+    def snakeize(string)
+      string.gsub(/(.)([A-Z])/, '\1_\2').downcase
+    end
+
     def bundled_gem?(gem_name)
       defined?(Bundler) && Bundler.rubygems.all_specs.map(&:name).include?(gem_name)
     rescue => e

data/lib/new_relic/local_environment.rb

@@ -74,6 +74,7 @@ module NewRelic
         unicorn
         webrick
         fastcgi
+        falcon
       ]
       while dispatchers.any? && @discovered_dispatcher.nil?
         send('check_for_' + (dispatchers.shift))
@@ -126,16 +127,24 @@ module NewRelic
     end
 
     def check_for_unicorn
-      if (defined?(::Unicorn) && defined?(::Unicorn::HttpServer)) && NewRelic::LanguageSupport.object_space_usable?
-        v = find_class_in_object_space(::Unicorn::HttpServer)
-        @discovered_dispatcher = :unicorn if v
-      end
+      return unless (defined?(::Unicorn) && defined?(::Unicorn::HttpServer)) &&
+        NewRelic::LanguageSupport.object_space_usable?
+
+      v = find_class_in_object_space(::Unicorn::HttpServer)
+      @discovered_dispatcher = :unicorn if v
     end
 
     def check_for_puma
-      if defined?(::Puma) && File.basename($0) == 'puma'
-        @discovered_dispatcher = :puma
-      end
+      return unless defined?(::Puma) && File.basename($0) == 'puma'
+
+      @discovered_dispatcher = :puma
+    end
+
+    def check_for_falcon
+      return unless defined?(::Falcon::Server) &&
+        NewRelic::LanguageSupport.object_space_usable?
+
+      @discovered_dispatcher = :falcon if find_class_in_object_space(::Falcon::Server)
     end
 
     def check_for_delayed_job
@@ -178,15 +187,15 @@ module NewRelic
     end
 
     def check_for_litespeed
-      if caller.pop.include?('fcgi-bin/RailsRunner.rb')
-        @discovered_dispatcher = :litespeed
-      end
+      return unless caller.pop.include?('fcgi-bin/RailsRunner.rb')
+
+      @discovered_dispatcher = :litespeed
     end
 
     def check_for_passenger
-      if defined?(::PhusionPassenger)
-        @discovered_dispatcher = :passenger
-      end
+      return unless defined?(::PhusionPassenger)
+
+      @discovered_dispatcher = :passenger
     end
 
     public

data/lib/new_relic/supportability_helper.rb

@@ -80,7 +80,7 @@ module NewRelic
         "Expected #{klass} for `#{name}` but got #{arg.class}"
 
       NewRelic::Agent.logger.warn(message)
-      nil
+      false
     end
   end
 end

data/lib/new_relic/version.rb

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

data/lib/tasks/config.rake

@@ -19,7 +19,7 @@ namespace :newrelic do
       DISABLING => 'Use these settings to toggle instrumentation types during agent startup.',
       ATTRIBUTES => '[Attributes](/docs/features/agent-attributes) are key-value pairs containing information that determines the properties of an event or transaction. These key-value pairs can be viewed within transaction traces in APM, traced errors in APM, transaction events in dashboards, and page views in dashboards. You can customize exactly which attributes will be sent to each of these destinations',
       'transaction_tracer' => 'The [transaction traces](/docs/apm/traces/transaction-traces/transaction-traces) feature collects detailed information from a selection of transactions, including a summary of the calling sequence, a breakdown of time spent, and a list of SQL queries and their query plans (on mysql and postgresql). Available features depend on your New Relic subscription level.',
-      'error_collector' => "The agent collects and reports all uncaught exceptions by default. These configuration options allow you to customize the error collection.\n\nFor information on ignored and expected errors, [see this page on Error Analytics in APM](/docs/agents/manage-apm-agents/agent-data/manage-errors-apm-collect-ignore-or-mark-expected/). To set expected errors via the `NewRelic::Agent.notice_error` Ruby method, [consult the Ruby Agent API](/docs/agents/ruby-agent/api-guides/sending-handled-errors-new-relic/).",
+      'error_collector' => "The agent collects and reports all uncaught exceptions by default. These configuration options allow you to customize the error collection.\n\nFor information on ignored and expected errors, [see this page on Error Analytics in APM](/docs/agents/manage-apm-agents/agent-data/manage-errors-apm-collect-ignore-or-mark-expected/). To set expected errors via the `NewRelic::Agent.notice_error` Ruby method, [consult the Ruby agent API](/docs/agents/ruby-agent/api-guides/sending-handled-errors-new-relic/).",
       'browser_monitoring' => "The browser monitoring [page load timing](/docs/browser/new-relic-browser/page-load-timing/page-load-timing-process) feature (sometimes referred to as real user monitoring or RUM) gives you insight into the performance real users are experiencing with your website. This is accomplished by measuring the time it takes for your users' browsers to download and render your web pages by injecting a small amount of JavaScript code into the header and footer of each page.",
       'application_logging' => "The Ruby agent supports [APM logs in context](/docs/apm/new-relic-apm/getting-started/get-started-logs-context). For some tips on configuring logs for the Ruby agent, see [Configure Ruby logs in context](/docs/logs/logs-context/configure-logs-context-ruby).\n\nAvailable logging-related config options include:",
       'analytics_events' => '[New Relic dashboards](/docs/query-your-data/explore-query-data/dashboards/introduction-new-relic-one-dashboards) is a resource to gather and visualize data about your software and what it says about your business. With it you can quickly and easily create real-time dashboards to get immediate answers about end-user experiences, clickstreams, mobile activities, and server transactions.'

data/lib/tasks/helpers/config.html.erb

@@ -14,7 +14,7 @@ redirects:
 
 <CONTRIBUTOR_NOTE>
   This file is automatically generated from values defined in `lib/new_relic/agent/configuration/default_source.rb`.
-  All changes should be made directly to `default_source.rb.`
+  Make all changes directly to `default_source.rb.`
   Submit PRs or raise issues at: https://github.com/newrelic/newrelic-ruby-agent
 </CONTRIBUTOR_NOTE>
 
@@ -42,9 +42,9 @@ In other words, environment variables override all other configuration settings
 
 ## View and edit config file options [#Edit]
 
-The Ruby agent's `newrelic.yml` is a standard YAML configuration file. It typically includes a `Defaults` section at the top, plus sections below for each application environment; for example, `Development`, `Testing`, and `Production`.
+The Ruby agent's `newrelic.yml` is a standard YAML configuration file. It typically includes a `Defaults` section at the top, plus sections below for each application environment (`Development`, `Test`, `Staging`, and `Production`).
 
-The Ruby agent determines which section of the `newrelic.yml` config file to read from by looking at certain environment variables to derive the application's environment. This can be useful, for example, when you want to use `info` for the `log_level` config setting in your production environment, and you want more verbose `log_level` config settings (such as `debug` in your development environment.
+The Ruby agent determines which section of the `newrelic.yml` config file to read from by looking at certain environment variables to derive the application's environment. This can be useful when you want to use `info` for the `log_level` config setting in your production environment, and you want more verbose `log_level` config settings (such as `debug`) in your development environment.
 
 Here is an example `newrelic.yml` config file:
 
@@ -60,7 +60,7 @@ development:
   log_level: debug
 ```
 
-For non-Rails apps, the Ruby agent looks for the following environment variables, in this order, to determine the application environment:
+The Ruby agent looks for the following environment variables, in this order, to find the application environment:
 
 1. `NEW_RELIC_ENV`
 2. `RUBY_ENV`
@@ -68,9 +68,9 @@ For non-Rails apps, the Ruby agent looks for the following environment variables
 4. `APP_ENV`
 5. `RACK_ENV`
 
-If the Ruby agent does not detect values for any of those environment variables, it will default the application environment to `development` and read from the `development` section of the `newrelic.yml` config file.
+If the Ruby agent doesn't detect values for any of those environment variables, it will default the application environment to `development` and read from the `development` section of the `newrelic.yml` config file.
 
-When running the Ruby agent in a Rails app, the agent first looks for the `NEW_RELIC_ENV` environment variable to determine the application environment and which section of the `newrelic.yml` to use. If `NEW_RELIC_ENV` is not present, the agent uses the Rails environment (`RAILS_ENV` or `RAILS.env`, depending on the version of Rails) .
+When running the Ruby agent in a Rails app, the agent first looks for the `NEW_RELIC_ENV` environment variable to determine the application environment and which section of the `newrelic.yml` to use. If `NEW_RELIC_ENV` is not present, the agent uses the Rails environment (`RAILS_ENV`).
 
 When you edit the config file, be sure to:
 

data/lib/tasks/helpers/newrelicyml.rb

@@ -16,7 +16,7 @@ module NewRelicYML
 
   HEADER = <<~HEADER
     #
-    # This file configures the New Relic Agent.  New Relic monitors Ruby, Java,
+    # This file configures the New Relic agent.  New Relic monitors Ruby, Java,
     # .NET, PHP, Python, Node, and Go applications with deep visibility and low
     # overhead.  For more information, visit www.newrelic.com.
 

data/lib/tasks/instrumentation_generator/instrumentation.thor

@@ -82,7 +82,7 @@ class Instrumentation < Thor
     insert_into_file(
       DEFAULT_SOURCE_LOCATION,
       config_block(name.downcase),
-      after: ":description => 'Controls auto-instrumentation of bunny at start up.  May be one of [auto|prepend|chain|disabled].'
+      after: ":description => 'Controls auto-instrumentation of bunny at start-up.  May be one of [auto|prepend|chain|disabled].'
         },\n"
     )
   end
@@ -103,7 +103,7 @@ class Instrumentation < Thor
         :type => String,
         :dynamic_name => true,
         :allowed_from_server => false,
-        :description => 'Controls auto-instrumentation of the #{name} library at start up. May be one of [auto|prepend|chain|disabled].'
+        :description => 'Controls auto-instrumentation of the #{name} library at start-up. May be one of [auto|prepend|chain|disabled].'
       },
     CONFIG
   end
@@ -111,7 +111,7 @@ class Instrumentation < Thor
   def yaml_block(name)
     <<~HEREDOC
 
-      # Controls auto-instrumentation of #{name} at start up.
+      # Controls auto-instrumentation of #{name} at start-up.
       # May be one of [auto|prepend|chain|disabled]
       # instrumentation.#{name.downcase}: auto
     HEREDOC

data/lib/tasks/tests.rake

@@ -11,6 +11,75 @@ rescue LoadError
 end
 
 if defined? Rake::TestTask
+  def name_for_number(content, number)
+    (number - 1).downto(0).each do |i|
+      return Regexp.last_match(1) if content[i] =~ /^\s*def (test_.+)\s*$/
+    end
+  end
+
+  def info_from_test_var
+    return {} unless ENV['TEST'].to_s =~ /^(.+)((?::\d+)+)/
+
+    file = Regexp.last_match(1)
+    numbers = Regexp.last_match(2).split(':').reject(&:empty?).uniq.map(&:to_i)
+    abs = File.expand_path(File.join('../../..', file), __FILE__)
+    raise "File >>#{abs}<< does not exist!" unless File.exist?(abs)
+
+    content = File.read(abs).split("\n")
+    {file: file, numbers: numbers, content: content}
+  end
+
+  def test_names_from_test_file(info)
+    info[:numbers].each_with_object([]) do |number, names|
+      name = name_for_number(info[:content], number)
+      unless name
+        warn "Unable to determine a test name given line >>#{number}<< for file >>#{info[:file]}<<"
+        next
+      end
+      names << name
+    end
+  end
+
+  # Allow ENV['TEST'] to be set to a test file path with one or more
+  # `:<line number>` patterns on the end of it.
+  #
+  # For example:
+  #   TEST=test/new_relic/agent/autostart_test.rb:57 bundle exec rake test
+  #
+  # The `autostart_test.rb` file will be read, and starting from line 57 and
+  # working upwards in the file (downwards by line number), a test definition
+  # will be searched for that matches `def test_<rest of the test name>`.
+  #
+  # Multiple line numbers can be specified like so:
+  #   TEST=test/new_relic/agent/autostart_test.rb:57:26 bundle exec rake test
+  #
+  # For this multiple line number based example, both lines 57 and 26 will
+  # serve as separate starting points for the search for a test name.
+  #
+  # All test names that are discovered will be "ORed" into a regex pattern with
+  # pipes ('|') that is passed to Minitest via
+  #   `TESTOPTS="--name='test_name1|test_name2'"`
+  #
+  # Once a line with one or more `:<line number>` values on the end of it has
+  # been found, replace the value of ENV['TEST'] with the path leading up to
+  # the first colon before invoking Minitest.
+  #
+  # Why refer to a test by line number instead of just supplying the name
+  # directly? The primary use case is text editor integration. A text editor
+  # can be taught to "run the single unit test containing the line the cursor is
+  # on" by building a string containing the path to the file, a colon, (':'),
+  # and the line number.
+  def process_line_numbers
+    info = info_from_test_var
+    return unless info.key?(:file)
+
+    test_names = test_names_from_test_file(info)
+    raise "Could not determine any test names for file >>#{abs}<< given numbers >>#{numbers}" if test_names.empty?
+
+    ENV['TESTOPTS'] = "#{ENV['TESTOPTS']} --name='#{test_names.map { |n| Regexp.escape(n) }.join('|')}'"
+    ENV['TEST'] = info[:file]
+  end
+
   namespace :test do
     tasks = Rake.application.top_level_tasks
     ENV['TESTOPTS'] ||= ''
@@ -21,6 +90,8 @@ if defined? Rake::TestTask
       ENV['TESTOPTS'] += ' --' + seed
     end
 
+    process_line_numbers
+
     agent_home = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 
     Rake::TestTask.new(:newrelic) do |t|

data/newrelic.yml

@@ -1,5 +1,5 @@
 #
-# This file configures the New Relic Agent.  New Relic monitors Ruby, Java,
+# This file configures the New Relic agent.  New Relic monitors Ruby, Java,
 # .NET, PHP, Python, Node, and Go applications with deep visibility and low
 # overhead.  For more information, visit www.newrelic.com.
 
@@ -102,7 +102,7 @@ common: &default_settings
   # Specify a list of constants that should prevent the agent from starting
   # automatically. Separate individual constants with a comma ,. For example,
   # "Rails::Console,UninstrumentedBackgroundJob".
-  # autostart.denylisted_constants: Rails::Console
+  # autostart.denylisted_constants: Rails::Command::ConsoleCommand,Rails::Command::CredentialsCommand,Rails::Command::Db::System::ChangeCommand,Rails::Command::DbConsoleCommand,Rails::Command::DestroyCommand,Rails::Command::DevCommand,Rails::Command::EncryptedCommand,Rails::Command::GenerateCommand,Rails::Command::InitializersCommand,Rails::Command::NotesCommand,Rails::Command::RoutesCommand,Rails::Command::SecretsCommand,Rails::Console,Rails::DBConsole
 
   # Defines a comma-delimited list of executables that the agent should not
   # instrument. For example, "rake,my_ruby_script.rb".
@@ -341,7 +341,7 @@ common: &default_settings
   # embedded service within another framework and the agent is detecting the Sinatra
   # app and skipping the at_exit handler as a result. Sinatra classically runs the
   # entire application in an at_exit block and would otherwise misbehave if the
-  # Agent's at_exit handler was also installed in those circumstances. Note:
+  # agent's at_exit handler was also installed in those circumstances. Note:
   # send_data_on_exit should also be set to true in  tandem with this setting.
   # force_install_exit_handler: false
 
@@ -374,39 +374,51 @@ common: &default_settings
   # Configures the TCP/IP port for the trace observer Host
   # infinite_tracing.trace_observer.port: 443
 
+  # Controls auto-instrumentation of ActiveSupport::BroadcastLogger at start up. May
+  # be one of: auto, prepend, chain, disabled. Used in Rails versions >= 7.1.
+  # instrumentation.active_support_broadcast_logger: auto
+
   # Controls auto-instrumentation of ActiveSupport::Logger at start up. May be one
-  # of: auto, prepend, chain, disabled.
+  # of: auto, prepend, chain, disabled. Used in Rails versions below 7.1.
   # instrumentation.active_support_logger: auto
 
-  # Controls auto-instrumentation of bunny at start up. May be one of: auto,
+  # Controls auto-instrumentation of Async::HTTP at start up. May be one of: auto,
+  # prepend, chain, disabled.
+  # instrumentation.async_http: auto
+
+  # Controls auto-instrumentation of bunny at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.bunny: auto
 
-  # Controls auto-instrumentation of the concurrent-ruby library at start up. May be
+  # Controls auto-instrumentation of the concurrent-ruby library at start-up. May be
   # one of: auto, prepend, chain, disabled.
   # instrumentation.concurrent_ruby: auto
 
-  # Controls auto-instrumentation of Curb at start up. May be one of: auto, prepend,
+  # Controls auto-instrumentation of Curb at start-up. May be one of: auto, prepend,
   # chain, disabled.
   # instrumentation.curb: auto
 
-  # Controls auto-instrumentation of Delayed Job at start up. May be one of: auto,
+  # Controls auto-instrumentation of Delayed Job at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.delayed_job: auto
 
-  # Controls auto-instrumentation of the elasticsearch library at start up. May be
+  # Controls auto-instrumentation of the elasticsearch library at start-up. May be
   # one of: auto, prepend, chain, disabled.
   # instrumentation.elasticsearch: auto
 
-  # Controls auto-instrumentation of Excon at start up. May be one of: enabled,
+  # Controls auto-instrumentation of ethon at start up. May be one of
+  # [auto|prepend|chain|disabled]
+  # instrumentation.ethon: auto
+
+  # Controls auto-instrumentation of Excon at start-up. May be one of: enabled,
   # disabled.
   # instrumentation.excon: enabled
 
-  # Controls auto-instrumentation of the Fiber class at start up. May be one of:
+  # Controls auto-instrumentation of the Fiber class at start-up. May be one of:
   # auto, prepend, chain, disabled.
   # instrumentation.fiber: auto
 
-  # Controls auto-instrumentation of Grape at start up. May be one of: auto,
+  # Controls auto-instrumentation of Grape at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.grape: auto
 
@@ -419,43 +431,47 @@ common: &default_settings
   # example, "private.com$,exception.*"
   # instrumentation.grpc.host_denylist: []
 
-  # Controls auto-instrumentation of gRPC clients at start up. May be one of: auto,
+  # Controls auto-instrumentation of gRPC clients at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.grpc_client: auto
 
-  # Controls auto-instrumentation of gRPC servers at start up. May be one of: auto,
+  # Controls auto-instrumentation of gRPC servers at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.grpc_server: auto
 
-  # Controls auto-instrumentation of HTTPClient at start up. May be one of: auto,
+  # Controls auto-instrumentation of HTTPClient at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.httpclient: auto
 
-  # Controls auto-instrumentation of http.rb gem at start up. May be one of: auto,
+  # Controls auto-instrumentation of http.rb gem at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.httprb: auto
 
-  # Controls auto-instrumentation of Ruby standard library Logger at start up. May
+  # Controls auto-instrumentation of httpx at start up. May be one of
+  # [auto|prepend|chain|disabled]
+  # instrumentation.httpx: auto
+
+  # Controls auto-instrumentation of Ruby standard library Logger at start-up. May
   # be one of: auto, prepend, chain, disabled.
   # instrumentation.logger: auto
 
-  # Controls auto-instrumentation of dalli gem for Memcache at start up. May be one
+  # Controls auto-instrumentation of dalli gem for Memcache at start-up. May be one
   # of: auto, prepend, chain, disabled.
   # instrumentation.memcache: auto
 
-  # Controls auto-instrumentation of memcache-client gem for Memcache at start up.
+  # Controls auto-instrumentation of memcache-client gem for Memcache at start-up.
   # May be one of: auto, prepend, chain, disabled.
   # instrumentation.memcache_client: auto
 
-  # Controls auto-instrumentation of memcached gem for Memcache at start up. May be
+  # Controls auto-instrumentation of memcached gem for Memcache at start-up. May be
   # one of: auto, prepend, chain, disabled.
   # instrumentation.memcached: auto
 
-  # Controls auto-instrumentation of Mongo at start up. May be one of: enabled,
+  # Controls auto-instrumentation of Mongo at start-up. May be one of: enabled,
   # disabled.
   # instrumentation.mongo: enabled
 
-  # Controls auto-instrumentation of Net::HTTP at start up. May be one of: auto,
+  # Controls auto-instrumentation of Net::HTTP at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.net_http: auto
 
@@ -464,7 +480,7 @@ common: &default_settings
   # application startup. May be one of: auto, prepend, chain, disabled.
   # instrumentation.puma_rack: auto
 
-  # Controls auto-instrumentation of Puma::Rack::URLMap at start up. May be one of:
+  # Controls auto-instrumentation of Puma::Rack::URLMap at start-up. May be one of:
   # auto, prepend, chain, disabled.
   # instrumentation.puma_rack_urlmap: auto
 
@@ -473,27 +489,27 @@ common: &default_settings
   # startup. May be one of: auto, prepend, chain, disabled.
   # instrumentation.rack: auto
 
-  # Controls auto-instrumentation of Rack::URLMap at start up. May be one of: auto,
+  # Controls auto-instrumentation of Rack::URLMap at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.rack_urlmap: auto
 
-  # Controls auto-instrumentation of rake at start up. May be one of: auto, prepend,
+  # Controls auto-instrumentation of rake at start-up. May be one of: auto, prepend,
   # chain, disabled.
   # instrumentation.rake: auto
 
-  # Controls auto-instrumentation of Redis at start up. May be one of: auto,
+  # Controls auto-instrumentation of Redis at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.redis: auto
 
-  # Controls auto-instrumentation of resque at start up. May be one of: auto,
+  # Controls auto-instrumentation of resque at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.resque: auto
 
-  # Controls auto-instrumentation of Roda at start up. May be one of: auto, prepend,
+  # Controls auto-instrumentation of Roda at start-up. May be one of: auto, prepend,
   # chain, disabled.
   # instrumentation.roda: auto
 
-  # Controls auto-instrumentation of Sinatra at start up. May be one of: auto,
+  # Controls auto-instrumentation of Sinatra at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.sinatra: auto
 
@@ -501,24 +517,28 @@ common: &default_settings
   # disabled.
   # instrumentation.stripe: enabled
 
-  # Controls auto-instrumentation of the Thread class at start up to allow the agent
+  # Controls auto-instrumentation of the Thread class at start-up to allow the agent
   # to correctly nest spans inside of an asynchronous transaction. This does not
   # enable the agent to automatically trace all threads created (see
   # instrumentation.thread.tracing). May be one of: auto, prepend, chain, disabled.
   # instrumentation.thread: auto
 
-  # Controls auto-instrumentation of the Thread class at start up to automatically
+  # Controls auto-instrumentation of the Thread class at start-up to automatically
   # add tracing to all Threads created in the application.
   # instrumentation.thread.tracing: true
 
-  # Controls auto-instrumentation of the Tilt template rendering library at start
-  # up. May be one of: auto, prepend, chain, disabled.
+  # Controls auto-instrumentation of the Tilt template rendering library at
+  # start-up. May be one of: auto, prepend, chain, disabled.
   # instrumentation.tilt: auto
 
-  # Controls auto-instrumentation of Typhoeus at start up. May be one of: auto,
+  # Controls auto-instrumentation of Typhoeus at start-up. May be one of: auto,
   # prepend, chain, disabled.
   # instrumentation.typhoeus: auto
 
+  # Controls auto-instrumentation of ViewComponent at startup. May be one of: auto,
+  # prepend, chain, disabled.
+  # instrumentation.view_component: auto
+
   # A dictionary of label names and values that will be applied to the data sent
   # from this agent. May also be expressed as a semicolon-delimited ; string of
   # colon-separated : pairs. For example, Server:One;Data Center:Primary.
@@ -668,7 +688,7 @@ common: &default_settings
   # Regexp.new to permit advanced matching. For each hash pair, if either the key or
   # value is matched the
   # pair will not be reported. By default, no user_data is reported, so this option
-  # should only be used if 
+  # should only be used if
   # the stripe.user_data.include option is being used.
   # stripe.user_data.exclude: []