newrelic_rpm 8.15.0 → 9.6.0

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

@@ -3,6 +3,7 @@
 # frozen_string_literal: true
 
 require 'forwardable'
+require_relative '../../constants'
 
 module NewRelic
   module Agent
@@ -14,30 +15,6 @@ module NewRelic
         end
       end
 
-      # Combines potentially two properties into one.
-      # Given the example:
-      #    :disable_net_http and :prepend_net_instrumentation
-      #    if :disable_net_http is true, then returned value is "disabled"
-      #    if :prepend_net_instrumentation is false, then returned value is "chain"
-      #    otherwise, "auto" is returned.
-      #
-      # Intent is:
-      #     - if user sets disable_xxx property, then don't instrument
-      #     - if user set prepend to `false` then we use method_alias chaining
-      #     - auto, when returned means, try to use prepend unless conflicting gems discovered
-      #
-      def self.instrumentation_value_of(disable_key, prepend_key = nil)
-        proc do
-          if NewRelic::Agent.config[disable_key]
-            "disabled"
-          elsif prepend_key && !NewRelic::Agent.config[prepend_key]
-            "chain"
-          else
-            "auto"
-          end
-        end
-      end
-
       def self.instrumentation_value_from_boolean(key)
         proc do
           NewRelic::Agent.config[key] ? 'auto' : 'disabled'
@@ -47,8 +24,8 @@ module NewRelic
       # Marks the config option as deprecated in the documentation once generated.
       # Does not appear in logs.
       def self.deprecated_description(new_setting, description)
-        link_ref = new_setting.to_s.tr(".", "-")
-        %{Please see: [#{new_setting}](docs/agents/ruby-agent/configuration/ruby-agent-configuration##{link_ref}). \n\n#{description}}
+        link_ref = new_setting.to_s.tr('.', '-')
+        %{Please see: [#{new_setting}](##{link_ref}). \n\n#{description}}
       end
 
       class Boolean
@@ -80,34 +57,35 @@ module NewRelic
           default_settings[:transform] if default_settings
         end
 
-        def self.config_search_paths
+        def self.config_search_paths # rubocop:disable Metrics/AbcSize
           proc {
-            paths = [
-              File.join("config", "newrelic.yml"),
-              File.join("newrelic.yml"),
-              File.join("config", "newrelic.yml.erb"),
-              File.join("newrelic.yml.erb")
-            ]
+            yaml = 'newrelic.yml'
+            config_yaml = File.join('config', yaml)
+            erb = 'newrelic.yml.erb'
+            config_erb = File.join('config', erb)
+
+            paths = [config_yaml, yaml, config_erb, erb]
 
             if NewRelic::Control.instance.root
-              paths << File.join(NewRelic::Control.instance.root, "config", "newrelic.yml")
-              paths << File.join(NewRelic::Control.instance.root, "newrelic.yml")
-              paths << File.join(NewRelic::Control.instance.root, "config", "newrelic.yml.erb")
-              paths << File.join(NewRelic::Control.instance.root, "newrelic.yml.erb")
+              paths << File.join(NewRelic::Control.instance.root, config_yaml)
+              paths << File.join(NewRelic::Control.instance.root, yaml)
+              paths << File.join(NewRelic::Control.instance.root, config_erb)
+              paths << File.join(NewRelic::Control.instance.root, erb)
             end
 
             if ENV['HOME']
-              paths << File.join(ENV['HOME'], ".newrelic", "newrelic.yml")
-              paths << File.join(ENV['HOME'], "newrelic.yml")
-              paths << File.join(ENV['HOME'], ".newrelic", "newrelic.yml.erb")
-              paths << File.join(ENV['HOME'], "newrelic.yml.erb")
+              paths << File.join(ENV['HOME'], '.newrelic', yaml)
+              paths << File.join(ENV['HOME'], yaml)
+              paths << File.join(ENV['HOME'], '.newrelic', erb)
+              paths << File.join(ENV['HOME'], erb)
             end
 
             # If we're packaged for warbler, we can tell from GEM_HOME
-            if ENV["GEM_HOME"] && ENV["GEM_HOME"].end_with?(".jar!")
-              app_name = File.basename(ENV["GEM_HOME"], ".jar!")
-              paths << File.join(ENV["GEM_HOME"], app_name, "config", "newrelic.yml")
-              paths << File.join(ENV["GEM_HOME"], app_name, "config", "newrelic.yml.erb")
+            # the following line needs else branch coverage
+            if ENV['GEM_HOME'] && ENV['GEM_HOME'].end_with?('.jar!') # rubocop:disable Style/SafeNavigation
+              app_name = File.basename(ENV['GEM_HOME'], '.jar!')
+              paths << File.join(ENV['GEM_HOME'], app_name, config_yaml)
+              paths << File.join(ENV['GEM_HOME'], app_name, config_erb)
             end
 
             paths
@@ -138,6 +116,7 @@ module NewRelic
                 :rails_notifications
               end
             when defined?(::Sinatra) && defined?(::Sinatra::Base) then :sinatra
+            when defined?(::Roda) then :roda
             when defined?(::NewRelic::IA) then :external
             else :ruby
             end
@@ -176,13 +155,6 @@ module NewRelic
           proc { NewRelic::Agent::Threading::BacktraceService.is_supported? }
         end
 
-        # This check supports the js_errors_beta key we've asked clients to
-        # set. Once JS errors are GA, browser_monitoring.loader can stop
-        # being dynamic.
-        def self.browser_monitoring_loader
-          proc { NewRelic::Agent.config[:js_errors_beta] ? "full" : "rum" }
-        end
-
         def self.transaction_tracer_transaction_threshold
           proc { NewRelic::Agent.config[:apdex_t] * 4 }
         end
@@ -213,11 +185,11 @@ module NewRelic
           # only used for deployment task
           proc do
             api_version = if NewRelic::Agent.config[:api_key].nil? || NewRelic::Agent.config[:api_key].empty?
-              "rpm"
+              'rpm'
             else
-              "api"
+              'api'
             end
-            api_region = "eu." if String(NewRelic::Agent.config[:license_key]).start_with?('eu')
+            api_region = 'eu.' if String(NewRelic::Agent.config[:license_key]).start_with?('eu')
 
             "#{api_version}.#{api_region}newrelic.com"
           end
@@ -241,6 +213,22 @@ module NewRelic
           end
         end
 
+        def self.convert_to_hash(value)
+          return value if value.is_a?(Hash)
+
+          if value.is_a?(String)
+            return value.split(',').each_with_object({}) do |item, hash|
+              key, value = item.split('=')
+              hash[key] = value
+            end
+          end
+
+          raise ArgumentError.new(
+            "Config value '#{value}' of " \
+            "class #{value.class} couldn't be turned into a Hash."
+          )
+        end
+
         SEMICOLON = ';'.freeze
         def self.convert_to_list_on_semicolon(value)
           case value
@@ -348,7 +336,7 @@ module NewRelic
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Your New Relic [license key](/docs/apis/intro-apis/new-relic-api-keys/#ingest-license-key).'
+          :description => 'Your New Relic <InlinePopover type="licenseKey" />.'
         },
         :log_level => {
           :default => 'info',
@@ -363,20 +351,19 @@ module NewRelic
           :public => true,
           :type => Array,
           :allowed_from_server => false,
-          :description => <<-DESCRIPTION
-An array of ActiveSupport custom events names to subscribe to and provide
-instrumentation for. For example,
-  - my.custom.event
-  - another.event
-  - a.third.event
+          :description => <<~DESCRIPTION
+            An array of ActiveSupport custom event names to subscribe to and instrument. For example,
+              - one.custom.event
+              - another.event
+              - a.third.event
           DESCRIPTION
         },
+        # this is only set via server side config
         :apdex_t => {
           :default => 0.5,
-          :public => true,
+          :public => false,
           :type => Float,
           :allowed_from_server => true,
-          :deprecated => true,
           :description => 'For agent versions 3.5.0 or higher, [set your Apdex T via the New Relic UI](/docs/apm/new-relic-apm/apdex/changing-your-apdex-settings).'
         },
         :api_key => {
@@ -384,7 +371,7 @@ instrumentation for. For example,
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Your New Relic [user key](/docs/apis/intro-apis/new-relic-api-keys/#overview-keys). Required when using the New Relic REST API v2 to record deployments using the `newrelic deployments` command.'
+          :description => 'Your New Relic <InlinePopover type="userKey" />. Required when using the New Relic REST API v2 to record deployments using the `newrelic deployments` command.'
         },
         :backport_fast_active_record_connection_lookup => {
           :default => false,
@@ -413,12 +400,12 @@ instrumentation for. For example,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => <<-DESCRIPTION
-When `true`, the agent captures HTTP request parameters and attaches them to transaction traces, traced errors, and [`TransactionError` events](/attribute-dictionary?attribute_name=&events_tids%5B%5D=8241).
+          :description => <<~DESCRIPTION
+            When `true`, the agent captures HTTP request parameters and attaches them to transaction traces, traced errors, and [`TransactionError` events](/attribute-dictionary?attribute_name=&events_tids%5B%5D=8241).
 
-    <Callout variant="caution">
-      When using the `capture_params` setting, the Ruby agent will not attempt to filter secret information. <b>Recommendation:</b> To filter secret information from request parameters, use the [`attributes.include` setting](/docs/agents/ruby-agent/attributes/enable-disable-attributes-ruby) instead. For more information, see the <a href="/docs/agents/ruby-agent/attributes/ruby-attribute-examples#ex_req_params">Ruby attribute examples</a>.
-    </Callout>
+                <Callout variant="caution">
+                  When using the `capture_params` setting, the Ruby agent will not attempt to filter secret information. `Recommendation:` To filter secret information from request parameters, use the [`attributes.include` setting](/docs/agents/ruby-agent/attributes/enable-disable-attributes-ruby) instead. For more information, see the <a href="/docs/agents/ruby-agent/attributes/ruby-attribute-examples#ex_req_params">Ruby attribute examples</a>.
+                </Callout>
           DESCRIPTION
         },
         :'clear_transaction_state_after_fork' => {
@@ -433,14 +420,20 @@ When `true`, the agent captures HTTP request parameters and attaches them to tra
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Path to <b>newrelic.yml</b>. If undefined, the agent checks the following directories (in order): <b>config/newrelic.yml</b>, <b>newrelic.yml</b>, <b>$HOME/.newrelic/newrelic.yml</b> and <b>$HOME/newrelic.yml</b>.'
+          :description => <<~DESC
+            Path to `newrelic.yml`. If undefined, the agent checks the following directories (in order):
+                * `config/newrelic.yml`
+                * `newrelic.yml`
+                * `$HOME/.newrelic/newrelic.yml`
+                * `$HOME/newrelic.yml`
+          DESC
         },
         :'exclude_newrelic_header' => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => "Allows newrelic distributed tracing headers to be suppressed on outbound requests."
+          :description => 'Allows newrelic distributed tracing headers to be suppressed on outbound requests.'
         },
         :force_install_exit_handler => {
           :default => false,
@@ -452,7 +445,7 @@ When `true`, the agent captures HTTP request parameters and attaches them to tra
             'Known use-case for this option is where Sinatra is running as an 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: `send_data_on_exit` should also be set to `true` in  tandem with this setting.'
+            'was also installed in those circumstances. Note: `send_data_on_exit` should also be set to `true` in  tandem with this setting.'
         },
         :high_security => {
           :default => false,
@@ -466,7 +459,7 @@ When `true`, the agent captures HTTP request parameters and attaches them to tra
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'A dictionary of [label names](/docs/data-analysis/user-interface-functions/labels-categories-organize-your-apps-servers) 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, `<var>Server</var>:<var>One</var>;<var>Data Center</var>:<var>Primary</var>`.'
+          :description => 'A dictionary of [label names](/docs/data-analysis/user-interface-functions/labels-categories-organize-your-apps-servers) 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`.'
         },
         :log_file_name => {
           :default => 'newrelic_agent.log',
@@ -567,14 +560,6 @@ When `true`, the agent captures HTTP request parameters and attaches them to tra
           :description => 'Defines the maximum number of seconds the agent should spend attempting to connect to the collector.'
         },
         # Transaction tracer
-        :'transaction_tracer.capture_attributes' => {
-          :default => true,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => 'Use [`transaction_tracer.attributes.enabled`](#transaction_tracer-attributes-enabled) instead.'
-        },
         :'transaction_tracer.enabled' => {
           :default => true,
           :public => true,
@@ -621,8 +606,7 @@ When `true`, the agent captures HTTP request parameters and attaches them to tra
 
   - If you do not want the agent to capture query information, set this to `none`.
   - If you want the agent to capture all query information in its original form, set this to `raw`.
-  - When you enable [high security mode](/docs/agents/manage-apm-agents/configuration/high-security-mode), this is automatically set to `obfuscated`.
-  '
+  - When you enable [high security mode](/docs/agents/manage-apm-agents/configuration/high-security-mode), this is automatically set to `obfuscated`.'
         },
 
         :'transaction_tracer.stack_trace_threshold' => {
@@ -640,26 +624,18 @@ When `true`, the agent captures HTTP request parameters and attaches them to tra
           :description => 'Specify a threshold in seconds. Transactions with a duration longer than this threshold are eligible for transaction traces. Specify a float value or the string `apdex_f`.'
         },
         # Error collector
-        :'error_collector.capture_attributes' => {
-          :default => true,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => 'Use [`error_collector.attributes.enabled`](#error_collector-attributes-enabled) instead.'
-        },
         :'error_collector.ignore_classes' => {
-          :default => [],
+          :default => ['ActionController::RoutingError', 'Sinatra::NotFound'],
           :public => true,
           :type => Array,
           :allowed_from_server => true,
           :dynamic_name => true,
-          :description => <<-DESCRIPTION
-A list of error classes that the agent should ignore.
+          :description => <<~DESCRIPTION
+            A list of error classes that the agent should ignore.
 
-  <Callout variant="caution">
-    This option can't be set via environment variable.
-  </Callout>
+              <Callout variant="caution">
+                This option can't be set via environment variable.
+              </Callout>
           DESCRIPTION
         },
         :'error_collector.capture_events' => {
@@ -669,7 +645,7 @@ A list of error classes that the agent should ignore.
           :type => Boolean,
           :allowed_from_server => true,
           :dynamic_name => true,
-          :description => 'If `true`, the agent collects [TransactionError events](/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights).'
+          :description => 'If `true`, the agent collects [`TransactionError` events](/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights).'
         },
         :'error_collector.enabled' => {
           :default => true,
@@ -684,12 +660,12 @@ A list of error classes that the agent should ignore.
           :type => Array,
           :allowed_from_server => true,
           :dynamic_name => true,
-          :description => <<-DESCRIPTION
-A list of error classes that the agent should treat as expected.
+          :description => <<~DESCRIPTION
+            A list of error classes that the agent should treat as expected.
 
-  <Callout variant="caution">
-    This option can't be set via environment variable.
-  </Callout>
+              <Callout variant="caution">
+                This option can't be set via environment variable.
+              </Callout>
           DESCRIPTION
         },
         :'error_collector.expected_messages' => {
@@ -698,12 +674,12 @@ A list of error classes that the agent should treat as expected.
           :type => Hash,
           :allowed_from_server => true,
           :dynamic_name => true,
-          :description => <<-DESCRIPTION
-A map of error classes to a list of messages. When an error of one of the classes specified here occurs, if its error message contains one of the strings corresponding to it here, that error will be treated as expected.
+          :description => <<~DESCRIPTION
+            A map of error classes to a list of messages. When an error of one of the classes specified here occurs, if its error message contains one of the strings corresponding to it here, that error will be treated as expected.
 
-  <Callout variant="caution">
-    This option can't be set via environment variable.
-  </Callout>
+              <Callout variant="caution">
+                This option can't be set via environment variable.
+              </Callout>
           DESCRIPTION
         },
         :'error_collector.expected_status_codes' => {
@@ -714,33 +690,19 @@ A map of error classes to a list of messages. When an error of one of the classe
           :dynamic_name => true,
           :description => 'A comma separated list of status codes, possibly including ranges. Errors associated with these status codes, where applicable, will be treated as expected.'
         },
-        :'error_collector.ignore_errors' => {
-          :default => 'ActionController::RoutingError,Sinatra::NotFound',
-          :public => true,
-          :type => String,
-          :deprecated => true,
-          :allowed_from_server => true,
-          :dynamic_name => true,
-          :description => <<-DESCRIPTION
-Use `error_collector.ignore_classes` instead. Specify a comma-delimited list of error classes that the agent should ignore.
 
-    <Callout variant="caution">
-      Server side configuration takes precedence for this setting over all environment configurations. This differs from all other configuration settings where environment variable take precedence over server side configuration.
-    </Callout>
-          DESCRIPTION
-        },
         :'error_collector.ignore_messages' => {
           :default => {},
           :public => true,
           :type => Hash,
           :allowed_from_server => true,
           :dynamic_name => true,
-          :description => <<-DESCRIPTION
-A map of error classes to a list of messages. When an error of one of the classes specified here occurs, if its error message contains one of the strings corresponding to it here, that error will be ignored.
+          :description => <<~DESCRIPTION
+            A map of error classes to a list of messages. When an error of one of the classes specified here occurs, if its error message contains one of the strings corresponding to it here, that error will be ignored.
 
-  <Callout variant="caution">
-    This option can't be set via environment variable.
-  </Callout>
+              <Callout variant="caution">
+                This option can't be set via environment variable.
+              </Callout>
           DESCRIPTION
         },
         :'error_collector.ignore_status_codes' => {
@@ -763,7 +725,7 @@ A map of error classes to a list of messages. When an error of one of the classe
           :public => true,
           :type => Integer,
           :allowed_from_server => true,
-          :description => 'Defines the maximum number of [TransactionError events](/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights) reported per harvest cycle.'
+          :description => 'Defines the maximum number of [`TransactionError` events](/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights) reported per harvest cycle.'
         },
         # Browser monitoring
         :'browser_monitoring.auto_instrument' => {
@@ -774,51 +736,16 @@ A map of error classes to a list of messages. When an error of one of the classe
           :allowed_from_server => true,
           :description => 'If `true`, enables [auto-injection](/docs/browser/new-relic-browser/installation-configuration/adding-apps-new-relic-browser#select-apm-app) of the JavaScript header for page load timing (sometimes referred to as real user monitoring or RUM).'
         },
-        :'browser_monitoring.capture_attributes' => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => 'Use [`browser_monitoring.attributes.enabled`](#browser_monitoring-attributes-enabled) instead.'
-        },
-        # Analytics events
-        :'analytics_events.capture_attributes' => {
-          :default => true,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => 'Use [`transaction_events.attributes.enabled`](#transaction_events-attributes-enabled) instead.'
-        },
-        :'analytics_events.enabled' => {
-          :default => true,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => true,
-          :description => deprecated_description(:'transaction_events.enabled', 'If `true`, enables analytics event sampling.')
-        },
-        :'analytics_events.max_samples_stored' => {
-          :default => 1200,
-          :public => true,
-          :type => Integer,
-          :deprecated => true,
-          :allowed_from_server => true,
-          :description => deprecated_description(:'transaction_events.max_samples_stored', 'Defines the maximum number of request events reported from a single harvest.')
-        },
         # Transaction events
         :'transaction_events.enabled' => {
-          :default => value_of(:'analytics_events.enabled'),
-          :documentation_default => true,
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
           :description => 'If `true`, enables transaction event sampling.'
         },
         :'transaction_events.max_samples_stored' => {
-          :default => value_of(:'analytics_events.max_samples_stored'),
-          :documentation_default => 1200,
+          :default => 1200,
           :public => true,
           :type => Integer,
           :allowed_from_server => true,
@@ -839,6 +766,37 @@ A map of error classes to a list of messages. When an error of one of the classe
           :allowed_from_server => false,
           :description => 'If `true`, the agent captures log records emitted by your application.'
         },
+        :'application_logging.forwarding.log_level' => {
+          :default => 'debug',
+          :public => true,
+          :type => String,
+          :allowed_from_server => false,
+          :description => <<~DESCRIPTION
+            Sets the minimum level a log event must have to be forwarded to New Relic.
+
+            This is based on the integer values of Ruby's `Logger::Severity` constants: https://github.com/ruby/ruby/blob/master/lib/logger/severity.rb
+
+            The intention is to forward logs with the level given to the configuration, as well as any logs with a higher level of severity.
+
+            For example, setting this value to "debug" will forward all log events to New Relic. Setting this value to "error" will only forward log events with the levels "error", "fatal", and "unknown".
+
+            Valid values (ordered lowest to highest):
+              * "debug"
+              * "info"
+              * "warn"
+              * "error"
+              * "fatal"
+              * "unknown"
+          DESCRIPTION
+        },
+        :'application_logging.forwarding.custom_attributes' => {
+          :default => {},
+          :public => true,
+          :type => Hash,
+          :transform => DefaultSource.method(:convert_to_hash),
+          :allowed_from_server => false,
+          :description => 'A hash with key/value pairs to add as custom attributes to all log events forwarded to New Relic. If sending using an environment variable, the value must be formatted like: "key1=value1,key2=value2"'
+        },
         :'application_logging.forwarding.max_samples_stored' => {
           :default => 10000,
           :public => true,
@@ -862,6 +820,13 @@ A map of error classes to a list of messages. When an error of one of the classe
           :description => 'If `true`, the agent captures metrics related to logging for your application.'
         },
         # Attributes
+        :'allow_all_headers' => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'If `true`, enables capture of all HTTP request headers for all destinations.'
+        },
         :'attributes.enabled' => {
           :default => true,
           :public => true,
@@ -886,8 +851,7 @@ A map of error classes to a list of messages. When an error of one of the classe
           :description => 'Prefix of attributes to include in all destinations. Allows `*` as wildcard at end.'
         },
         :'browser_monitoring.attributes.enabled' => {
-          :default => value_of(:'browser_monitoring.capture_attributes'),
-          :documentation_default => false,
+          :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
@@ -910,8 +874,7 @@ A map of error classes to a list of messages. When an error of one of the classe
           :description => 'Prefix of attributes to include in browser monitoring. Allows `*` as wildcard at end.'
         },
         :'error_collector.attributes.enabled' => {
-          :default => value_of(:'error_collector.capture_attributes'),
-          :documentation_default => true,
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
@@ -957,8 +920,7 @@ A map of error classes to a list of messages. When an error of one of the classe
           :description => 'Prefix of attributes to include on span events. Allows `*` as wildcard at end.'
         },
         :'transaction_events.attributes.enabled' => {
-          :default => value_of(:'analytics_events.capture_attributes'),
-          :documentation_default => true,
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
@@ -1004,8 +966,7 @@ A map of error classes to a list of messages. When an error of one of the classe
           :description => 'Prefix of attributes to include on transaction segments. Allows `*` as wildcard at end.'
         },
         :'transaction_tracer.attributes.enabled' => {
-          :default => value_of(:'transaction_tracer.capture_attributes'),
-          :documentation_default => true,
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
@@ -1036,16 +997,16 @@ A map of error classes to a list of messages. When an error of one of the classe
           :description => 'If `true`, enables an audit log which logs communications with the New Relic [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector).'
         },
         :'audit_log.endpoints' => {
-          :default => [".*"],
+          :default => ['.*'],
           :public => true,
           :type => Array,
           :allowed_from_server => false,
           :transform => DefaultSource.method(:convert_to_regexp_list),
-          :description => 'List of allowed endpoints to include in audit log'
+          :description => 'List of allowed endpoints to include in audit log.'
         },
         :'audit_log.path' => {
           :default => DefaultSource.audit_log_path,
-          :documentation_default => 'config/newrelic_audit.log',
+          :documentation_default => 'log/newrelic_audit.log',
           :public => true,
           :type => String,
           :allowed_from_server => false,
@@ -1053,25 +1014,38 @@ A map of error classes to a list of messages. When an error of one of the classe
         },
         # Autostart
         :'autostart.denylisted_constants' => {
-          :default => 'Rails::Console',
+          :default => %w[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].join(','),
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Specify a list of constants that should prevent the agent from starting automatically. Separate individual constants with a comma `,`. For example, `Rails::Console,UninstrumentedBackgroundJob`.'
+          :description => '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_executables' => {
           :default => 'irb,rspec',
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Defines a comma-delimited list of executables that the agent should not instrument. For example, `rake,my_ruby_script.rb`.'
+          :description => 'Defines a comma-delimited list of executables that the agent should not instrument. For example, `"rake,my_ruby_script.rb"`.'
         },
         :'autostart.denylisted_rake_tasks' => {
           :default => AUTOSTART_DENYLISTED_RAKE_TASKS,
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Defines a comma-delimited list of Rake tasks that the agent should not instrument. For example, `assets:precompile,db:migrate`.'
+          :description => 'Defines a comma-delimited list of Rake tasks that the agent should not instrument. For example, `"assets:precompile,db:migrate"`.'
         },
         # Code level metrics
         :'code_level_metrics.enabled' => {
@@ -1090,7 +1064,7 @@ A map of error classes to a list of messages. When an error of one of the classe
           :allowed_from_server => true,
           :deprecated => true,
           :description => deprecated_description(
-            :'distributed_tracing-enabled',
+            :'distributed_tracing.enabled',
             'If `true`, enables [cross-application tracing](/docs/agents/ruby-agent/features/cross-application-tracing-ruby/) when `distributed_tracing.enabled` is set to `false`.'
           )
         },
@@ -1138,194 +1112,106 @@ A map of error classes to a list of messages. When an error of one of the classe
           :default => false,
           :public => true,
           :type => Boolean,
-          :dynamic_name => true,
           :allowed_from_server => false,
           :description => 'If `true`, disables Action Cable instrumentation.'
         },
-        :disable_activejob => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description => 'If `true`, disables ActiveJob instrumentation.'
-        },
-        :disable_active_storage => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description => 'If `true`, disables ActiveStorage instrumentation.'
-        },
-        :disable_activerecord_instrumentation => {
-          :default => value_of(:skip_ar_instrumentation),
-          :documentation_default => false,
-          :public => true,
+        # TODO: by subscribing to process_middleware.action_dispatch events,
+        #       we duplicate the efforts already performed by non-notifications
+        #       based instrumentation. In future, we ought to determine the
+        #       extent of the overlap and duplication and end up with only this
+        #       notifications based approach existing and the monkey patching
+        #       approach removed entirely. NOTE that we will likely not want to
+        #       do so until we are okay with dropping support for Rails < v6,
+        #       given that these events are available only for v6+.
+        :disable_action_dispatch => {
+          :default => true,
+          :public => false,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `true`, disables active record instrumentation.'
+          :description => 'If `true`, disables Action Dispatch instrumentation.'
         },
-        :disable_active_record_notifications => {
+        :disable_action_controller => {
           :default => false,
           :public => true,
           :type => Boolean,
-          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'If `true`, disables instrumentation for ActiveRecord 4, 5, and 6.'
+          :description => 'If `true`, disables Action Controller instrumentation.'
         },
-        :disable_bunny => {
+        :disable_action_mailbox => {
           :default => false,
           :public => true,
           :type => Boolean,
-          :deprecated => true,
-          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.bunny', 'If `true`, disables instrumentation for the bunny gem.')
+          :description => 'If `true`, disables Action Mailbox instrumentation.'
         },
-        :disable_cpu_sampler => {
+        :disable_action_mailer => {
           :default => false,
           :public => true,
           :type => Boolean,
-          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent won\'t sample the CPU usage of the host process.'
+          :description => 'If `true`, disables Action Mailer instrumentation.'
         },
-        :disable_curb => {
+        :disable_activejob => {
           :default => false,
           :public => true,
           :type => Boolean,
-          :deprecated => true,
-          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.curb', 'If `true`, disables instrumentation for the curb gem.')
+          :description => 'If `true`, disables Active Job instrumentation.'
         },
-        :disable_database_instrumentation => {
+        :disable_active_storage => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :deprecated => true,
-          :description => 'Use [`disable_sequel_instrumentation`](#disable_sequel_instrumentation) instead.'
+          :description => 'If `true`, disables Active Storage instrumentation.'
         },
-        :disable_data_mapper => {
+        :disable_active_support => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `true`, disables DataMapper instrumentation.'
+          :description => 'If `true`, disables Active Support instrumentation.'
         },
-        :disable_dalli => {
-          :default => value_of(:disable_memcache_instrumentation),
-          :documentation_default => false,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcache', 'If `true`, disables instrumentation for the dalli gem.')
-        },
-        :disable_dalli_cas_client => {
-          :default => value_of(:disable_memcache_instrumentation),
+        :disable_active_record_instrumentation => {
+          :default => value_of(:skip_ar_instrumentation),
           :documentation_default => false,
           :public => true,
           :type => Boolean,
-          :deprecated => true,
+          :aliases => %i[disable_activerecord_instrumentation],
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcache', "If `true`, disables instrumentation for the dalli gem's additional CAS client support.")
+          :description => 'If `true`, disables Active Record instrumentation.'
         },
-        :disable_delayed_job_sampler => {
+        :disable_active_record_notifications => {
           :default => false,
           :public => true,
           :type => Boolean,
           :dynamic_name => true,
+          :aliases => %i[disable_activerecord_notifications],
           :allowed_from_server => false,
-          :description => 'If `true`, the agent won\'t measure the depth of Delayed Job queues.'
-        },
-        :disable_dj => {
-          :default => false,
-          :public => true,
-          :deprecated => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.delayed_job', 'If `true`, disables [Delayed::Job instrumentation](/docs/agents/ruby-agent/background-jobs/delayedjob).')
+          :description => 'If `true`, disables instrumentation for Active Record 4+'
         },
-        :disable_excon => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.excon', 'If `true`, disables instrumentation for the excon gem.')
-        },
-        :disable_memcached => {
-          :default => value_of(:disable_memcache_instrumentation),
-          :documentation_default => false,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcached', 'If `true`, disables instrumentation for the memcached gem.')
-        },
-        :disable_memcache_client => {
-          :default => value_of(:disable_memcache_instrumentation),
-          :documentation_default => false,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcache-client', 'If `true`, disables instrumentation for the memcache-client gem.')
-        },
-        :disable_memcache_instrumentation => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcache', 'If `true`, disables memcache instrumentation.')
-        },
-        :disable_gc_profiler => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'If `true`, disables the use of GC::Profiler to measure time spent in garbage collection'
-        },
-        :disable_grape => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.grape',
-            'If `true`, the agent won\'t install Grape instrumentation.')
-        },
-        :disable_httpclient => {
+        :disable_cpu_sampler => {
           :default => false,
           :public => true,
           :type => Boolean,
           :dynamic_name => true,
-          :deprecated => true,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.httpclient', 'If `true`, disables instrumentation for the httpclient gem.')
+          :description => 'If `true`, the agent won\'t sample the CPU usage of the host process.'
         },
-        :disable_httprb => {
+        :disable_delayed_job_sampler => {
           :default => false,
           :public => true,
           :type => Boolean,
           :dynamic_name => true,
-          :deprecated => true,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.httprb', 'If `true`, the agent won\'t install instrumentation for the http.rb gem.')
+          :description => 'If `true`, the agent won\'t measure the depth of Delayed Job queues.'
         },
-        :disable_mongo => {
+        :disable_gc_profiler => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :dynamic_name => true,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.mongo', 'If `true`, the agent won\'t install [instrumentation for the Mongo gem](/docs/agents/ruby-agent/frameworks/mongo-instrumentation).')
+          :description => 'If `true`, disables the use of `GC::Profiler` to measure time spent in garbage collection'
         },
         :disable_memory_sampler => {
           :default => false,
@@ -1340,79 +1226,13 @@ A map of error classes to a list of messages. When an error of one of the classe
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent won\'t wrap third-party middlewares in instrumentation (regardless of whether they are installed via Rack::Builder or Rails).'
-        },
-        :disable_net_http => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.net_http',
-            'If `true`, disables instrumentation for Net::HTTP.')
-        },
-        :disable_puma_rack => {
-          :default => value_of(:disable_rack),
-          :documentation_default => false,
-          :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.puma_rack', 'If `true`, prevents the agent from hooking into the `to_app` method in Puma::Rack::Builder to find gems to instrument during application startup.')
-        },
-        :disable_puma_rack_urlmap => {
-          :default => value_of(:disable_rack_urlmap),
-          :documentation_default => false,
-          :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.puma_rack_urlmap', 'If `true`, prevents the agent from hooking into Puma::Rack::URLMap to install middleware tracing.')
-        },
-        :disable_rack => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.rack', 'If `true`, prevents the agent from hooking into the `to_app` method in Rack::Builder to find gems to instrument during application startup.')
-        },
-        :disable_rack_urlmap => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.rack_urlmap', 'If `true`, prevents the agent from hooking into Rack::URLMap to install middleware tracing.')
-        },
-        :disable_rake => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.rake', 'If `true`, disables Rake instrumentation.')
-        },
-        :disable_redis => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.redis', 'If `true`, the agent won\'t install [instrumentation for Redis](/docs/agents/ruby-agent/frameworks/redis-instrumentation).')
-        },
-        :disable_resque => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.resque', 'If `true`, disables [Resque instrumentation](/docs/agents/ruby-agent/background-jobs/resque-instrumentation).')
+          :description => <<~DESCRIPTION
+            If `true`, the agent won't wrap third-party middlewares in instrumentation (regardless of whether they are installed via `Rack::Builder` or Rails).
+
+              <Callout variant="important">
+                When middleware instrumentation is disabled, if an application is using middleware that could alter the response code, the HTTP status code reported on the transaction may not reflect the altered value.
+              </Callout>
+          DESCRIPTION
         },
         :disable_samplers => {
           :default => false,
@@ -1435,47 +1255,37 @@ A map of error classes to a list of messages. When an error of one of the classe
           :allowed_from_server => false,
           :description => 'If `true`, disables [Sidekiq instrumentation](/docs/agents/ruby-agent/background-jobs/sidekiq-instrumentation).'
         },
-        :disable_sinatra => {
+        :disable_roda_auto_middleware => {
           :default => false,
           :public => true,
           :type => Boolean,
-          :deprecated => true,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.sinatra', 'If `true` , disables [Sinatra instrumentation](/docs/agents/ruby-agent/frameworks/sinatra-support).')
+          :description => 'If `true`, disables agent middleware for Roda. This middleware is responsible for advanced feature support such as [page load timing](/docs/browser/new-relic-browser/getting-started/new-relic-browser) and [error collection](/docs/apm/applications-menu/events/view-apm-error-analytics).'
         },
         :disable_sinatra_auto_middleware => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => <<-DESCRIPTION
-If `true`, disables agent middleware for Sinatra. This middleware is responsible for advanced feature support such as [cross application tracing](/docs/apm/transactions/cross-application-traces/cross-application-tracing), [page load timing](/docs/browser/new-relic-browser/getting-started/new-relic-browser), and [error collection](/docs/apm/applications-menu/events/view-apm-error-analytics).
+          :description => <<~DESCRIPTION
+            If `true`, disables agent middleware for Sinatra. This middleware is responsible for advanced feature support such as [cross application tracing](/docs/apm/transactions/cross-application-traces/cross-application-tracing), [page load timing](/docs/browser/new-relic-browser/getting-started/new-relic-browser), and [error collection](/docs/apm/applications-menu/events/view-apm-error-analytics).
 
-    <Callout variant="important">
-      Cross application tracing is deprecated in favor of [distributed tracing](/docs/apm/distributed-tracing/getting-started/introduction-distributed-tracing). Distributed tracing is on by default for Ruby agent versions 8.0.0 and above. Middlewares are not required to support distributed tracing.
+                <Callout variant="important">
+                  Cross application tracing is deprecated in favor of [distributed tracing](/docs/apm/distributed-tracing/getting-started/introduction-distributed-tracing). Distributed tracing is on by default for Ruby agent versions 8.0.0 and above. Middlewares are not required to support distributed tracing.
 
-      To continue using cross application tracing, update the following options in your `newrelic.yml` configuration file:
+                  To continue using cross application tracing, update the following options in your `newrelic.yml` configuration file:
 
-      ```
-      # newrelic.yml
+                  ```yaml
+                  # newrelic.yml
 
-        cross_application_tracer:
-          enabled: true
-        distributed_tracing:
-          enabled: false
-      ```
-    </Callout>
+                    cross_application_tracer:
+                      enabled: true
+                    distributed_tracing:
+                      enabled: false
+                  ```
+                </Callout>
           DESCRIPTION
         },
-        :disable_typhoeus => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.typhoeus', 'If `true`, the agent won\'t install instrumentation for the typhoeus gem.')
-        },
         :disable_view_instrumentation => {
           :default => false,
           :public => true,
@@ -1528,7 +1338,7 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :type => Array,
           :allowed_from_server => false,
           :transform => DefaultSource.method(:convert_to_list),
-          :description => 'Ordinarily the agent reports dyno names with a trailing dot and process ID (for example, <b>worker.3</b>). You can remove this trailing data by specifying the prefixes you want to report without trailing data (for example, <b>worker</b>).'
+          :description => 'Ordinarily the agent reports dyno names with a trailing dot and process ID (for example, `worker.3`). You can remove this trailing data by specifying the prefixes you want to report without trailing data (for example, `worker`).'
         },
         # Infinite tracing
         :'infinite_tracing.trace_observer.host' => {
@@ -1537,10 +1347,10 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :type => String,
           :allowed_from_server => false,
           :external => :infinite_tracing,
-          :description => "Configures the hostname for the Trace Observer Host. " \
-            "When configured, enables tail-based sampling by sending all recorded spans " \
-            "to a Trace Observer for further sampling decisions, irrespective of any usual " \
-            "agent sampling decision."
+          :description => 'Configures the hostname for the trace observer Host. ' \
+            'When configured, enables tail-based sampling by sending all recorded spans ' \
+            'to a trace observer for further sampling decisions, irrespective of any usual ' \
+            'agent sampling decision.'
         },
         :'infinite_tracing.trace_observer.port' => {
           :default => 443,
@@ -1548,9 +1358,18 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :type => Integer,
           :allowed_from_server => false,
           :external => :infinite_tracing,
-          :description => "Configures the TCP/IP port for the Trace Observer Host"
+          :description => 'Configures the TCP/IP port for the trace observer Host'
         },
         # Instrumentation
+        :'instrumentation.active_support_broadcast_logger' => {
+          :default => instrumentation_value_from_boolean(:'application_logging.enabled'),
+          :documentation_default => 'auto',
+          :dynamic_name => true,
+          :public => true,
+          :type => String,
+          :allowed_from_server => false,
+          :description => '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_logger' => {
           :default => instrumentation_value_from_boolean(:'application_logging.enabled'),
           :documentation_default => 'auto',
@@ -1558,16 +1377,31 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of ActiveSupport::Logger at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'Controls auto-instrumentation of `ActiveSupport::Logger` at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`. Used in Rails versions below 7.1.'
+        },
+        :'instrumentation.async_http' => {
+          :default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of Async::HTTP at start up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.bunny' => {
-          :default => instrumentation_value_of(:disable_bunny),
-          :documentation_default => 'auto',
+          :default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of bunny at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'Controls auto-instrumentation of bunny at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
+        },
+        :'instrumentation.fiber' => {
+          :default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of the Fiber class at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.concurrent_ruby' => {
           :default => 'auto',
@@ -1575,25 +1409,25 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of the concurrent-ruby library at start up. May be one of [auto|prepend|chain|disabled].'
+          :description => 'Controls auto-instrumentation of the concurrent-ruby library at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.curb' => {
-          :default => instrumentation_value_of(:disable_curb),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of Curb at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'Controls auto-instrumentation of Curb at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.delayed_job' => {
-          :default => instrumentation_value_of(:disable_dj),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of Delayed Job at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'Controls auto-instrumentation of Delayed Job at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.elasticsearch' => {
           :default => 'auto',
@@ -1601,34 +1435,41 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of the elasticsearch library at start up. May be one of [auto|prepend|chain|disabled].'
+          :description => 'Controls auto-instrumentation of the elasticsearch library at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
+        },
+        :'instrumentation.ethon' => {
+          :default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of ethon at start up. May be one of [auto|prepend|chain|disabled]'
         },
         :'instrumentation.excon' => {
-          :default => instrumentation_value_of(:disable_excon),
+          :default => 'enabled',
           :documentation_default => 'enabled',
-          :public => :true,
+          :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Excon at start up.  May be one of [enabled|disabled]."
+          :description => 'Controls auto-instrumentation of Excon at start-up. May be one of: `enabled`, `disabled`.'
         },
         :'instrumentation.grape' => {
-          :default => instrumentation_value_of(:disable_grape_instrumentation),
-          :documentation_default => 'auto',
-          :public => :true,
+          :default => 'auto',
+          :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Grape at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of Grape at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.grpc_client' => {
-          :default => instrumentation_value_of(:disable_grpc_client),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of gRPC clients at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'Controls auto-instrumentation of gRPC clients at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.grpc.host_denylist' => {
           :default => [],
@@ -1636,34 +1477,43 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :type => Array,
           :allowed_from_server => false,
           :transform => DefaultSource.method(:convert_to_regexp_list),
-          :description => %Q(Specifies a list of hostname patterns separated by commas that will match gRPC hostnames that traffic is to be ignored by New Relic for. New Relic's gRPC client instrumentation will ignore traffic streamed to a host matching any of these patterns, and New Relic's gRPC server instrumentation will ignore traffic for a server running on a host whose hostname matches any of these patterns. By default, no traffic is ignored when gRPC instrumentation is itself enabled. For example, "private.com$,exception.*")
+          :description => %Q(Specifies a list of hostname patterns separated by commas that will match gRPC hostnames that traffic is to be ignored by New Relic for. New Relic's gRPC client instrumentation will ignore traffic streamed to a host matching any of these patterns, and New Relic's gRPC server instrumentation will ignore traffic for a server running on a host whose hostname matches any of these patterns. By default, no traffic is ignored when gRPC instrumentation is itself enabled. For example, `"private.com$,exception.*"`)
         },
         :'instrumentation.grpc_server' => {
-          :default => instrumentation_value_of(:disable_grpc_server),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of gRPC servers at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'Controls auto-instrumentation of gRPC servers at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.httpclient' => {
-          :default => instrumentation_value_of(:disable_httpclient),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of HTTPClient at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of HTTPClient at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.httprb' => {
-          :default => instrumentation_value_of(:disable_httprb),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of http.rb gem at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'Controls auto-instrumentation of http.rb gem at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
+        },
+        :'instrumentation.httpx' => {
+          :default => 'auto',
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of httpx at start up. May be one of [auto|prepend|chain|disabled]'
         },
         :'instrumentation.logger' => {
           :default => instrumentation_value_from_boolean(:'application_logging.enabled'),
@@ -1672,128 +1522,167 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of Ruby standard library Logger at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'Controls auto-instrumentation of Ruby standard library Logger at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.memcache' => {
-          :default => instrumentation_value_of(:disable_dalli),
-          :documentation_default => 'auto',
+          :default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of dalli gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'Controls auto-instrumentation of dalli gem for Memcache at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.memcached' => {
-          :default => instrumentation_value_of(:disable_memcached),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of memcached gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'Controls auto-instrumentation of memcached gem for Memcache at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.memcache_client' => {
-          :default => instrumentation_value_of(:disable_memcache_client),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of memcache-client gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'Controls auto-instrumentation of memcache-client gem for Memcache at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.mongo' => {
-          :default => instrumentation_value_of(:disable_mongo),
+          :default => 'enabled',
           :documentation_default => 'enabled',
-          :public => :true,
+          :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Mongo at start up.  May be one of [enabled|disabled]."
+          :description => 'Controls auto-instrumentation of Mongo at start-up. May be one of: `enabled`, `disabled`.'
         },
         :'instrumentation.net_http' => {
-          :default => instrumentation_value_of(:disable_net_http, :prepend_net_instrumentation),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Net::HTTP at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of `Net::HTTP` at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.puma_rack' => {
-          :default => instrumentation_value_of(:disable_puma_rack), # TODO: MAJOR VERSION - change to value_of(:'instrumentation.rack') when we remove :disable_puma_rack in 8.0)
+          :default => value_of(:'instrumentation.rack'),
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Puma::Rack. When enabled, the agent hooks into the " \
-                           "`to_app` method in Puma::Rack::Builder to find gems to instrument during " \
-                           "application startup.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of `Puma::Rack`. When enabled, the agent hooks into the ' \
+                           '`to_app` method in `Puma::Rack::Builder` to find gems to instrument during ' \
+                           'application startup. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.puma_rack_urlmap' => {
-          :default => instrumentation_value_of(:disable_puma_rack_urlmap), # TODO: MAJOR VERSION - change to value_of(:'instrumentation.rack_urlmap') when we remove :disable_puma_rack_urlmap in 8.0)
+          :default => value_of(:'instrumentation.rack_urlmap'),
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of Puma::Rack::URLMap at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'Controls auto-instrumentation of `Puma::Rack::URLMap` at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.rack' => {
-          :default => instrumentation_value_of(:disable_rack),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Rack. When enabled, the agent hooks into the " \
-                           "`to_app` method in Rack::Builder to find gems to instrument during " \
-                           "application startup.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of Rack. When enabled, the agent hooks into the ' \
+                           '`to_app` method in `Rack::Builder` to find gems to instrument during ' \
+                           'application startup. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.rack_urlmap' => {
-          :default => instrumentation_value_of(:disable_rack_urlmap),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of Rack::URLMap at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'Controls auto-instrumentation of `Rack::URLMap` at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.rake' => {
-          :default => instrumentation_value_of(:disable_rake),
-          :documentation_default => 'auto',
-          :public => :true,
+          :default => 'auto',
+          :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of rake at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of rake at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.redis' => {
-          :default => instrumentation_value_of(:disable_redis),
-          :documentation_default => 'auto',
+          :default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Redis at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of Redis at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.resque' => {
-          :default => instrumentation_value_of(:disable_resque),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of resque at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of resque at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
+        },
+        :'instrumentation.roda' => {
+          :default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of Roda at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.sinatra' => {
-          :default => instrumentation_value_of(:disable_sinatra),
-          :documentation_default => 'auto',
-          :public => :true,
+          :default => 'auto',
+          :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Sinatra at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of Sinatra at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
+        },
+        :'instrumentation.stripe' => {
+          :default => 'enabled',
+          :public => true,
+          :type => String,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of Stripe at startup. May be one of: `enabled`, `disabled`.'
+        },
+        :'stripe.user_data.include' => {
+          default: NewRelic::EMPTY_ARRAY,
+          public: true,
+          type: Array,
+          dynamic_name: true,
+          allowed_from_server: false,
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => <<~DESCRIPTION
+            An array of strings to specify which keys inside a Stripe event's `user_data` hash should be reported
+            to New Relic. Each string in this array will be turned into a regular expression via `Regexp.new` to
+            permit advanced matching. Setting the value to `["."]` will report all `user_data`.
+          DESCRIPTION
+        },
+        :'stripe.user_data.exclude' => {
+          default: NewRelic::EMPTY_ARRAY,
+          public: true,
+          type: Array,
+          dynamic_name: true,
+          allowed_from_server: false,
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => <<~DESCRIPTION
+            An array of strings to specify which keys and/or values inside a Stripe event's `user_data` hash should
+            not be reported to New Relic. Each string in this array will be turned into a regular expression via
+            `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
+            the `stripe.user_data.include` option is being used.
+          DESCRIPTION
         },
         :'instrumentation.thread' => {
           :default => 'auto',
@@ -1801,38 +1690,38 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "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]."
+          :description => '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.tracing' => {
-          :default => false,
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of the Thread class at start up to automatically add tracing to all Threads created in the application."
+          :description => 'Controls auto-instrumentation of the Thread class at start-up to automatically add tracing to all Threads created in the application.'
         },
         :'thread_ids_enabled' => {
           :default => false,
           :public => false,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => "If enabled, will append the current Thread and Fiber object ids onto the segment names of segments created in Threads and concurrent-ruby"
+          :description => 'If enabled, will append the current Thread and Fiber object ids onto the segment names of segments created in Threads and concurrent-ruby'
         },
         :'instrumentation.tilt' => {
-          :default => "auto",
+          :default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of the Tilt template rendering library at start up. May be one of [auto|prepend|chain|disabled].'
+          :description => 'Controls auto-instrumentation of the Tilt template rendering library at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         :'instrumentation.typhoeus' => {
-          :default => instrumentation_value_of(:disable_typhoeus),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Typhoeus at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of Typhoeus at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
         },
         # Message tracer
         :'message_tracer.segment_parameters.enabled' => {
@@ -1868,12 +1757,17 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
         # Rails
         :'defer_rails_initialization' => {
           :default => false,
-          :public => false,
+          :public => true,
           :type => Boolean,
+          :external => true, # this config is used directly from the ENV variables
           :allowed_from_server => false,
-          :description => 'This configuration option is currently unreachable. Please do not use. ' \
-            'If `true`, when the agent is in an application using Ruby on Rails, it will start after ' \
-            'config/initializers have run.'
+          :description => <<-DESCRIPTION
+            If `true`, when the agent is in an application using Ruby on Rails, it will start after `config/initializers` run.
+
+            <Callout variant="caution">
+              This option may only be set by environment variable.
+            </Callout>
+          DESCRIPTION
         },
         # Rake
         :'rake.tasks' => {
@@ -1886,7 +1780,7 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           'This configuration option converts the Array to a RegEx list. If you\'d like ' \
           'to allow all tasks by default, use `rake.tasks: [.+]`. No rake tasks will be ' \
           'instrumented unless they\'re added to this list. For more information, ' \
-          'visit the (New Relic Rake Instrumentation docs)[/docs/apm/agents/ruby-agent/background-jobs/rake-instrumentation].'
+          'visit the [New Relic Rake Instrumentation docs](/docs/apm/agents/ruby-agent/background-jobs/rake-instrumentation).'
         },
         :'rake.connect_timeout' => {
           :default => 10,
@@ -1895,16 +1789,6 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => false,
           :description => 'Timeout for waiting on connect to complete before a rake task'
         },
-        # Resque
-        :'resque.capture_params' => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :dynamic_name => true,
-          :deprecated => true,
-          :description => 'If `true`, enables the capture of job arguments for transaction traces and traced errors in Resque.'
-        },
         # Rules
         :'rules.ignore_url_regexes' => {
           :default => [],
@@ -1915,14 +1799,35 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :description => 'Define transactions you want the agent to ignore, by specifying a list of patterns matching the URI you want to ignore. For more detail, see [the docs on ignoring specific transactions](/docs/agents/ruby-agent/api-guides/ignoring-specific-transactions/#config-ignoring).'
         },
         # Sidekiq
-        :'sidekiq.capture_params' => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :dynamic_name => true,
-          :deprecated => true,
-          :description => 'If `true`, enables the capture of job arguments for transaction traces and traced errors in Sidekiq.'
+        :'sidekiq.args.include' => {
+          default: NewRelic::EMPTY_ARRAY,
+          public: true,
+          type: Array,
+          dynamic_name: true,
+          allowed_from_server: false,
+          description: <<~SIDEKIQ_ARGS_INCLUDE.chomp.tr("\n", ' ')
+            An array of strings that will collectively serve as an allowlist for filtering which Sidekiq
+            job arguments get reported to New Relic. To capture any Sidekiq arguments,
+            'job.sidekiq.args.*' must be added to the separate `:'attributes.include'` configuration option. Each
+            string in this array will be turned into a regular expression via `Regexp.new` to permit advanced
+            matching. For job argument hashes, if either a key or value matches the pair will be included. All
+            matching job argument array elements and job argument scalars will be included.
+          SIDEKIQ_ARGS_INCLUDE
+        },
+        :'sidekiq.args.exclude' => {
+          default: NewRelic::EMPTY_ARRAY,
+          public: true,
+          type: Array,
+          dynamic_name: true,
+          allowed_from_server: false,
+          description: <<~SIDEKIQ_ARGS_EXCLUDE.chomp.tr("\n", ' ')
+            An array of strings that will collectively serve as a denylist for filtering which Sidekiq
+            job arguments get reported to New Relic. To capture any Sidekiq arguments,
+            'job.sidekiq.args.*' must be added to the separate `:'attributes.include'` configuration option. Each string
+            in this array will be turned into a regular expression via `Regexp.new` to permit advanced matching.
+            For job argument hashes, if either a key or value matches the pair will be excluded. All matching job
+            argument array elements and job argument scalars will be excluded.
+          SIDEKIQ_ARGS_EXCLUDE
         },
         # Slow SQL
         :'slow_sql.enabled' => {
@@ -1955,14 +1860,14 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :public => true,
           :type => String,
           :allowed_from_server => true,
-          :description => 'Defines an obfuscation level for slow SQL queries. Valid options are `obfuscated`, `raw`, or `none`).'
+          :description => 'Defines an obfuscation level for slow SQL queries. Valid options are `obfuscated`, `raw`, or `none`.'
         },
         :'slow_sql.use_longer_sql_id' => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => 'Generate a longer sql_id for slow SQL traces. sql_id is used for aggregation of similar queries.'
+          :description => 'Generate a longer `sql_id` for slow SQL traces. `sql_id` is used for aggregation of similar queries.'
         },
         # Span events
         :'span_events.enabled' => {
@@ -1978,14 +1883,14 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :type => Integer,
           :allowed_from_server => false,
           :external => :infinite_tracing,
-          :description => "Sets the maximum number of span events to buffer when streaming to the trace observer."
+          :description => 'Sets the maximum number of span events to buffer when streaming to the trace observer.'
         },
         :'span_events.max_samples_stored' => {
           :default => 2000,
           :public => true,
           :type => Integer,
           :allowed_from_server => true,
-          :description => 'Defines the maximum number of span events reported from a single harvest. Any Integer between 1 and 10000 is valid.'
+          :description => 'Defines the maximum number of span events reported from a single harvest. Any Integer between `1` and `10000` is valid.'
         },
         # Strip exception messages
         :'strip_exception_messages.enabled' => {
@@ -2112,7 +2017,7 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :description => 'Real user monitoring license key for the browser timing header.'
         },
         :'browser_monitoring.loader' => {
-          :default => DefaultSource.browser_monitoring_loader,
+          :default => 'rum',
           :public => false,
           :type => String,
           :allowed_from_server => true,
@@ -2168,15 +2073,6 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => true,
           :description => 'Number of seconds betwixt connections to the New Relic data collection service.'
         },
-        :disable_grape_instrumentation => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.grape',
-            'If `true`, the agent won\'t install Grape instrumentation.')
-        },
         :dispatcher => {
           :default => DefaultSource.dispatcher,
           :public => false,
@@ -2198,31 +2094,6 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => false,
           :description => 'Internal name for controlling Rails 3+ middleware instrumentation'
         },
-        :disable_rake_instrumentation => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.rake', 'Enable or disable Rake instrumentation. Preferred key is `disable_rake`')
-        },
-        :disable_redis_instrumentation => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.redis', 'Disables installation of Redis instrumentation. Standard key to use is disable_redis.')
-        },
-        :cross_application_tracing => {
-          :default => nil,
-          :allow_nil => true,
-          :public => false,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => 'Deprecated in favor of distributed_tracing.enabled'
-        },
         :enabled => {
           :default => true,
           :public => false,
@@ -2260,17 +2131,8 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => true,
           :description => 'Number of seconds betwixt connections to the New Relic event collection services.'
         },
-        :'event_report_period.analytic_event_data' => {
-          :default => 60,
-          :public => false,
-          :type => Integer,
-          :dynamic_name => true,
-          :deprecated => true,
-          :allowed_from_server => true,
-          :description => deprecated_description(:'event_report_period.transaction_event_data', 'Number of seconds betwixt connections to the New Relic transaction event collection services.')
-        },
         :'event_report_period.transaction_event_data' => {
-          :default => value_of(:'event_report_period.analytic_event_data'),
+          :default => 60,
           :public => false,
           :type => Integer,
           :dynamic_name => true,
@@ -2328,7 +2190,7 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :public => false,
           :type => String,
           :allowed_from_server => false,
-          :description => "URI for the New Relic data collection service."
+          :description => 'URI for the New Relic data collection service.'
         },
         :'infinite_tracing.batching' => {
           :default => true,
@@ -2336,8 +2198,8 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :type => Boolean,
           :allowed_from_server => false,
           :external => :infinite_tracing,
-          :description => "If true (the default), data sent to the Trace Observer will be batched\ninstead of each " \
-                          "span being sent individually"
+          :description => 'If `true` (the default), data sent to the trace observer is batched instead of ' \
+          'sending each span individually.'
         },
         :'infinite_tracing.compression_level' => {
           :default => :high,
@@ -2345,8 +2207,13 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :type => Symbol,
           :allowed_from_server => false,
           :external => :infinite_tracing,
-          :description => "Configure the compression level for data sent to the Trace Observer\nMay be one of " \
-          "[none|low|medium|high]\n'high' is the default. Set the level to 'none' to disable compression"
+          :description => <<~DESC
+            Configure the compression level for data sent to the trace observer.
+
+              May be one of: `:none`, `:low`, `:medium`, `:high`.
+
+              Set the level to `:none` to disable compression.
+          DESC
         },
         :js_agent_file => {
           :default => '',
@@ -2362,14 +2229,6 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => true,
           :description => 'JavaScript agent loader content.'
         },
-        :js_errors_beta => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => 'Enable or disable beta JavaScript error reporting.'
-        },
         :keep_alive_timeout => {
           :default => 60,
           :public => false,
@@ -2377,14 +2236,6 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => true,
           :description => 'Timeout for keep alive on TCP connection to collector if supported by Ruby version. Only used in conjunction when aggressive_keepalive is enabled.'
         },
-        :keep_retrying => {
-          :default => true,
-          :public => false,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => 'Enable or disable retrying failed connections to the New Relic data collection service.'
-        },
         :max_payload_size_in_bytes => {
           :default => 1000000,
           :public => false,
@@ -2406,15 +2257,6 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => false,
           :description => 'Port for the New Relic data collection service.'
         },
-        :prepend_net_instrumentation => {
-          :default => true,
-          :public => false,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.net_http',
-            'If `true`, uses `Module#prepend` rather than alias_method for Net::HTTP instrumentation.')
-        },
         :primary_application_id => {
           :default => nil,
           :allow_nil => true,
@@ -2512,7 +2354,7 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :public => false,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Used in tests for the agent to start up, but not connect to the collector. Formerly used `developer_mode` in test config for this purpose.'
+          :description => 'Used in tests for the agent to start-up, but not connect to the collector. Formerly used `developer_mode` in test config for this purpose.'
         },
         :'thread_profiler.max_profile_overhead' => {
           :default => 0.05,