newrelic_rpm 6.8.0.360 → 8.13.1

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

@@ -1,20 +1,56 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require 'forwardable'
 
 module NewRelic
   module Agent
     module Configuration
-
       # Helper since default Procs are evaluated in the context of this module
       def self.value_of(key)
-        Proc.new do
+        proc do
           NewRelic::Agent.config[key]
         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'
+        end
+      end
+
+      # 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}}
+      end
+
       class Boolean
         def self.===(o)
           TrueClass === o or FalseClass === o
@@ -45,26 +81,33 @@ module NewRelic
         end
 
         def self.config_search_paths
-          Proc.new {
+          proc {
             paths = [
-              File.join("config","newrelic.yml"),
-              File.join("newrelic.yml")
+              File.join("config", "newrelic.yml"),
+              File.join("newrelic.yml"),
+              File.join("config", "newrelic.yml.erb"),
+              File.join("newrelic.yml.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")
             end
 
-            if ENV["HOME"]
-              paths << File.join(ENV["HOME"], ".newrelic", "newrelic.yml")
-              paths << File.join(ENV["HOME"], "newrelic.yml")
+            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")
             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")
             end
 
             paths
@@ -72,29 +115,27 @@ module NewRelic
         end
 
         def self.config_path
-          Proc.new {
+          proc {
             found_path = NewRelic::Agent.config[:config_search_paths].detect do |file|
-              File.expand_path(file) if File.exist? file
+              File.expand_path(file) if File.exist?(file)
             end
-            found_path || ""
+            found_path || NewRelic::EMPTY_STR
           }
         end
 
         def self.framework
-          Proc.new {
+          proc {
             case
             when defined?(::NewRelic::TEST) then :test
-            when defined?(::Merb) && defined?(::Merb::Plugins) then :merb
             when defined?(::Rails::VERSION)
               case Rails::VERSION::MAJOR
-              when 0..2
-                :rails
               when 3
                 :rails3
-              when 4..6
+              when 4..7
                 :rails_notifications
               else
-                ::NewRelic::Agent.logger.error "Detected unsupported Rails version #{Rails::VERSION::STRING}"
+                ::NewRelic::Agent.logger.warn("Detected untested Rails version #{Rails::VERSION::STRING}")
+                :rails_notifications
               end
             when defined?(::Sinatra) && defined?(::Sinatra::Base) then :sinatra
             when defined?(::NewRelic::IA) then :external
@@ -104,19 +145,19 @@ module NewRelic
         end
 
         def self.agent_enabled
-          Proc.new {
+          proc {
             NewRelic::Agent.config[:enabled] &&
-            (NewRelic::Agent.config[:test_mode] || NewRelic::Agent.config[:monitor_mode]) &&
-            NewRelic::Agent::Autostart.agent_should_start?
+              (NewRelic::Agent.config[:test_mode] || NewRelic::Agent.config[:monitor_mode]) &&
+              NewRelic::Agent::Autostart.agent_should_start?
           }
         end
 
         DEFAULT_LOG_DIR = 'log/'.freeze
 
         def self.audit_log_path
-          Proc.new {
+          proc {
             log_file_path = NewRelic::Agent.config[:log_file_path]
-            wants_stdout  = (log_file_path.upcase == 'STDOUT')
+            wants_stdout = (log_file_path.casecmp(NewRelic::STANDARD_OUT) == 0)
             audit_log_dir = wants_stdout ? DEFAULT_LOG_DIR : log_file_path
 
             File.join(audit_log_dir, 'newrelic_audit.log')
@@ -124,30 +165,30 @@ module NewRelic
         end
 
         def self.app_name
-          Proc.new { NewRelic::Control.instance.env }
+          proc { NewRelic::Control.instance.env }
         end
 
         def self.dispatcher
-          Proc.new { NewRelic::Control.instance.local_env.discovered_dispatcher }
+          proc { NewRelic::Control.instance.local_env.discovered_dispatcher }
         end
 
         def self.thread_profiler_enabled
-          Proc.new { NewRelic::Agent::Threading::BacktraceService.is_supported? }
+          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.new { NewRelic::Agent.config[:js_errors_beta] ? "full" : "rum"}
+          proc { NewRelic::Agent.config[:js_errors_beta] ? "full" : "rum" }
         end
 
         def self.transaction_tracer_transaction_threshold
-          Proc.new { NewRelic::Agent.config[:apdex_t] * 4 }
+          proc { NewRelic::Agent.config[:apdex_t] * 4 }
         end
 
         def self.profiling_available
-          Proc.new {
+          proc {
             begin
               require 'ruby-prof'
               true
@@ -158,7 +199,7 @@ module NewRelic
         end
 
         def self.host
-          Proc.new do
+          proc do
             regex = /\A(?<identifier>.+?)x/
             if matches = regex.match(String(NewRelic::Agent.config[:license_key]))
               "collector.#{matches['identifier']}.nr-data.net"
@@ -169,12 +210,16 @@ module NewRelic
         end
 
         def self.api_host
-          Proc.new do
-            if String(NewRelic::Agent.config[:license_key]).start_with? 'eu'
-              'rpm.eu.newrelic.com'
+          # only used for deployment task
+          proc do
+            api_version = if NewRelic::Agent.config[:api_key].nil? || NewRelic::Agent.config[:api_key].empty?
+              "rpm"
             else
-              'rpm.newrelic.com'
+              "api"
             end
+            api_region = "eu." if String(NewRelic::Agent.config[:license_key]).start_with?('eu')
+
+            "#{api_version}.#{api_region}newrelic.com"
           end
         end
 
@@ -197,30 +242,28 @@ module NewRelic
         end
 
         SEMICOLON = ';'.freeze
-        def self.convert_to_list_on_semicolon value
+        def self.convert_to_list_on_semicolon(value)
           case value
           when Array then value
           when String then value.split(SEMICOLON)
-          else []
+          else NewRelic::EMPTY_ARRAY
           end
         end
 
         def self.convert_to_constant_list(raw_value)
-          const_names = convert_to_list(raw_value)
-          const_names.map! do |class_name|
-            const = ::NewRelic::LanguageSupport.constantize(class_name)
-
-            unless const
-              NewRelic::Agent.logger.warn("Ignoring unrecognized constant '#{class_name}' in #{raw_value}")
-            end
+          return NewRelic::EMPTY_ARRAY if raw_value.nil? || raw_value.empty?
 
+          constants = convert_to_list(raw_value).map! do |class_name|
+            const = ::NewRelic::LanguageSupport.constantize(class_name)
+            NewRelic::Agent.logger.warn("Ignoring invalid constant '#{class_name}' in #{raw_value}") unless const
             const
           end
-          const_names.compact
+          constants.compact!
+          constants
         end
 
         def self.enforce_fallback(allowed_values: nil, fallback: nil)
-          Proc.new do |configured_value|
+          proc do |configured_value|
             if allowed_values.any? { |v| v =~ /#{configured_value}/i }
               configured_value
             else
@@ -283,27 +326,14 @@ module NewRelic
       ].join(',').freeze
 
       DEFAULTS = {
-        :license_key => {
-          :default => '',
-          :public => true,
-          :type => String,
-          :allowed_from_server => false,
-          :description => 'Your New Relic <a href="https://docs.newrelic.com/docs/accounts-partnerships/accounts/account-setup/license-key">license key</a>.'
-        },
+        # Critical
         :agent_enabled => {
           :default => DefaultSource.agent_enabled,
+          :documentation_default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, allows the Ruby agent to run.'
-        },
-        :enabled => {
-          :default => true,
-          :public => false,
-          :type => Boolean,
-          :aliases => [:enable],
-          :allowed_from_server => false,
-          :description => 'Enable or disable the agent.'
+          :description => 'If `true`, allows the Ruby agent to run.'
         },
         :app_name => {
           :default => DefaultSource.app_name,
@@ -311,91 +341,79 @@ module NewRelic
           :type => String,
           :allowed_from_server => false,
           :transform => DefaultSource.method(:convert_to_list_on_semicolon),
-          :description => 'Specify the <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/installation-configuration/name-your-application">application name</a> used to aggregate data in the New Relic UI. To report data to <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/installation-configuration/using-multiple-names-app">multiple apps at the same time</a>, specify a list of names separated by a semicolon <code>;</code>. For example, <code>MyApp</code> or <code>MyStagingApp;Instance1</code>.'
+          :description => 'Specify the [application name](/docs/apm/new-relic-apm/installation-configuration/name-your-application) used to aggregate data in the New Relic UI. To report data to [multiple apps at the same time](/docs/apm/new-relic-apm/installation-configuration/using-multiple-names-app), specify a list of names separated by a semicolon `;`. For example, `MyApp` or `MyStagingApp;Instance1`.'
         },
-        :entity_guid => {
-          :default => nil,
-          :allow_nil => true,
+        :license_key => {
+          :default => '',
           :public => true,
           :type => String,
-          :allowed_from_server => true,
-          :description => 'The <a href="https://docs.newrelic.com/attribute-dictionary/span/entityguid">Entity GUID</a> for the entity running this agent.'
-        },
-        :monitor_mode => {
-          :default => value_of(:enabled),
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'When <code>true</code>, the agent transmits data about your app to the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a>.'
-        },
-        :test_mode => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Used in tests for agent to start up but not connect to collector. Formerly used <code>developer_mode</code> in test config for this purpose.'
+          :description => 'Your New Relic [license key](/docs/apis/intro-apis/new-relic-api-keys/#ingest-license-key).'
         },
         :log_level => {
           :default => 'info',
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Sets the level of detail of log messages. Possible log levels, in increasing verbosity, are: <code>error</code>, <code>warn</code>, <code>info</code> or <code>debug</code>.'
+          :description => 'Sets the level of detail of log messages. Possible log levels, in increasing verbosity, are: `error`, `warn`, `info` or `debug`.'
         },
-        :high_security => {
-          :default => false,
+        # General
+        :apdex_t => {
+          :default => 0.5,
           :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'If <code>true</code>, enables <a href="https://docs.newrelic.com/docs/accounts-partnerships/accounts/security/high-security">high security mode</a>. Ensure you understand the implications of high security mode before enabling this setting.'
+          :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).'
         },
-        :security_policies_token => {
+        :api_key => {
           :default => '',
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Applies Language Agent Security Policy settings.'
-        },
-        :proxy_host => {
-          :default => nil,
-          :allow_nil => true,
-          :public => true,
-          :type => String,
-          :allowed_from_server => false,
-          :description => 'Defines a host for communicating with the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a> via a proxy server.'
+          :description => 'Your New Relic API key. Required when using the New Relic REST API v2 to record deployments using the `newrelic deployments` command.'
         },
-        :proxy_port => {
-          :default => 8080,
-          :allow_nil => true,
+        :backport_fast_active_record_connection_lookup => {
+          :default => false,
           :public => true,
-          :type => Integer,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Defines a port for communicating with the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a> via a proxy server.'
+          :description => 'Backports the faster ActiveRecord connection lookup introduced in Rails 6, which improves agent performance when instrumenting ActiveRecord. Note that this setting may not be compatible with other gems that patch ActiveRecord.'
         },
-        :proxy_user => {
+        :ca_bundle_path => {
           :default => nil,
           :allow_nil => true,
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :exclude_from_reported_settings => true,
-          :description => 'Defines a user for communicating with the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a> via a proxy server.'
+          :description => "Manual override for the path to your local CA bundle. This CA bundle will be used to validate the SSL certificate presented by New Relic's data collection service."
         },
-        :proxy_pass => {
-          :default => nil,
-          :allow_nil => true,
+        :capture_memcache_keys => {
+          :default => false,
           :public => true,
-          :type => String,
-          :allowed_from_server => false,
-          :exclude_from_reported_settings => true,
-          :description => 'Defines a password for communicating with the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a> via a proxy server.'
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'Enable or disable the capture of memcache keys from transaction traces.'
         },
         :capture_params => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'When <code>true</code>, the agent captures HTTP request parameters and attaches them to transaction traces, traced errors, and <a href="https://docs.newrelic.com/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights">TransactionError events</a>.'
+          :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>
+          DESCRIPTION
+        },
+        :'clear_transaction_state_after_fork' => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'If `true`, the agent will clear `Tracer::State` in `Agent.drop_buffered_data`.'
         },
         :config_path => {
           :default => DefaultSource.config_path,
@@ -404,1474 +422,1960 @@ module NewRelic
           :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>.'
         },
-        :config_search_paths => {
-          :default => DefaultSource.config_search_paths,
-          :public => false,
-          :type => Array,
-          :allowed_from_server => false,
-          :description => "An array of candidate locations for the agent\'s configuration file."
-        },
-        :dispatcher => {
-          :default => DefaultSource.dispatcher,
-          :public => false,
-          :type => Symbol,
-          :allowed_from_server => false,
-          :description => 'Autodetected application component that reports metrics to New Relic.'
-        },
-        :framework => {
-          :default => DefaultSource.framework,
-          :public => false,
-          :type => Symbol,
-          :allowed_from_server => false,
-          :description => 'Autodetected application framework used to enable framework-specific functionality.'
+        :'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."
         },
-        :'autostart.blacklisted_constants' => {
-          :default => 'Rails::Console',
+        :force_install_exit_handler => {
+          :default => false,
           :public => true,
-          :type => String,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Deprecated.  ' \
-              'For agent versions 6.8.0 or higher, ' \
-              'use <a href="#autostart-denylisted_constants"><code>' \
-                'autostart.denylisted_constants' \
-              '</code></a> instead.'
+          :description => 'Forces the exit handler that sends all cached data to collector ' \
+            'before shutting down to be installed regardless of detecting scenarios where it generally should not be. ' \
+            '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.'
         },
-        :'autostart.denylisted_constants' => {
-          :default => 'Rails::Console',
+        :high_security => {
+          :default => false,
           :public => true,
-          :type => String,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Specify a list of constants that should prevent the agent from starting automatically. Separate individual constants with a comma <code>,</code>. For example, <code>Rails::Console,UninstrumentedBackgroundJob</code>.'
+          :description => 'If `true`, enables [high security mode](/docs/accounts-partnerships/accounts/security/high-security). Ensure you understand the implications of high security mode before enabling this setting.'
         },
-        :'autostart.blacklisted_executables' => {
-          :default => 'irb,rspec',
+        :labels => {
+          :default => '',
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Deprecated.  ' \
-              'For agent versions 6.8.0 or higher, ' \
-              'use <a href="#autostart-denylisted_executables"><code>' \
-                'autostart.denylisted_executables' \
-              '</code></a> instead.'
+          :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>`.'
         },
-        :'autostart.denylisted_executables' => {
-          :default => value_of(:'autostart.blacklisted_executables'),
+        :log_file_name => {
+          :default => 'newrelic_agent.log',
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Defines a comma-delimited list of executables that the agent should not instrument. For example, <code>rake,my_ruby_script.rb</code>.'
+          :description => 'Defines a name for the log file.'
         },
-        :'autostart.blacklisted_rake_tasks' => {
-          :default => AUTOSTART_DENYLISTED_RAKE_TASKS,
+        :log_file_path => {
+          :default => DefaultSource::DEFAULT_LOG_DIR,
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Deprecated.  ' \
-              'For agent versions 6.8.0 or higher, ' \
-              'use <a href="#autostart-denylisted_rake_tasks"><code>' \
-                'autostart.denylisted_rake_tasks' \
-              '</code></a> instead.'
+          :description => 'Defines a path to the agent log file, excluding the filename.'
         },
-        :'autostart.denylisted_rake_tasks' => {
-          :default => value_of(:'autostart.blacklisted_rake_tasks'),
+        :marshaller => {
+          :default => 'json',
           :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, <code>assets:precompile,db:migrate</code>.'
+          :description => 'Specifies a marshaller for transmitting data to the New Relic [collector](/docs/apm/new-relic-apm/getting-started/glossary#collector). Currently `json` is the only valid value for this setting.'
         },
-        :disable_rake => {
-          :default => false,
+        :monitor_mode => {
+          :default => value_of(:enabled),
+          :documentation_default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables Rake instrumentation.'
+          :description => 'When `true`, the agent transmits data about your app to the New Relic [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector).'
         },
-        :disable_rake_instrumentation => {
+        :prepend_active_record_instrumentation => {
           :default => false,
-          :public => false,
+          :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Enable or disable Rake instrumentation. Preferred key is `disable_rake`'
+          :description => 'If `true`, uses `Module#prepend` rather than `alias_method` for ActiveRecord instrumentation.'
         },
-        :'rake.tasks' => {
-          :default => [],
+        :proxy_host => {
+          :default => nil,
+          :allow_nil => true,
           :public => true,
-          :type => Array,
+          :type => String,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_regexp_list),
-          :description => 'Specify an array of Rake tasks to automatically instrument.'
+          :description => 'Defines a host for communicating with the New Relic [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector) via a proxy server.'
         },
-        :'rake.connect_timeout' => {
-          :default => 10,
+        :proxy_pass => {
+          :default => nil,
+          :allow_nil => true,
           :public => true,
-          :type => Integer,
+          :type => String,
           :allowed_from_server => false,
-          :description => 'Timeout for waiting on connect to complete before a rake task'
-        },
-        :apdex_t => {
-          :default => 0.5,
-          :public => true,
-          :type => Float,
-          :allowed_from_server => true,
-          :deprecated => true,
-          :description => 'Deprecated. For agent versions 3.5.0 or higher, <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/apdex/changing-your-apdex-settings">set your Apdex T via the New Relic UI</a>.'
+          :exclude_from_reported_settings => true,
+          :description => 'Defines a password for communicating with the New Relic [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector) via a proxy server.'
         },
-        :'strip_exception_messages.enabled' => {
-          :default => value_of(:high_security),
+        :proxy_port => {
+          :default => 8080,
+          :allow_nil => true,
           :public => true,
-          :type => Boolean,
+          :type => Integer,
           :allowed_from_server => false,
-          :description => 'If true, the agent strips messages from all exceptions except those in the <a href="#strip_exception_messages-allowlist">allowlist</a>. Enabled automatically in <a href="https://docs.newrelic.com/docs/accounts-partnerships/accounts/security/high-security">high security mode</a>.'
+          :description => 'Defines a port for communicating with the New Relic [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector) via a proxy server.'
         },
-        :'strip_exception_messages.whitelist' => {
-          :default => '',
+        :proxy_user => {
+          :default => nil,
+          :allow_nil => true,
           :public => true,
           :type => String,
-          :deprecated => true,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_constant_list),
-          :description => 'Deprecated.  ' \
-              'For agent versions 6.8.0 or higher, ' \
-              'use <a href="#strip_exception_messages-allowlist"><code>' \
-                'strip_exception_messages.allowed_classes' \
-              '</code></a> instead.'
+          :exclude_from_reported_settings => true,
+          :description => 'Defines a user for communicating with the New Relic [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector) via a proxy server.'
         },
-        :'strip_exception_messages.allowed_classes' => {
+        :security_policies_token => {
           :default => '',
           :public => true,
           :type => String,
-          :deprecated => true,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_constant_list),
-          :description => 'Specify a list of exceptions you do not want the agent to strip when <a href="#strip_exception_messages-enabled">strip_exception_messages</a> is <code>true</code>. Separate exceptions with a comma. For example, <code>"ImportantException,PreserveMessageException"</code>.'
+          :description => 'Applies Language Agent Security Policy settings.'
         },
-        :host => {
-          :default => DefaultSource.host,
-          :public => false,
-          :type => String,
+        :send_data_on_exit => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => "URI for the New Relic data collection service."
+          :description => 'If `true`, enables the exit handler that sends data to the New Relic [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector) before shutting down.'
         },
-        :api_host => {
-          :default => DefaultSource.api_host,
-          :public => false,
-          :type => String,
+        :sync_startup => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'API host for New Relic.'
+          :description => 'When set to `true`, forces a synchronous connection to the New Relic [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector) during application startup. For very short-lived processes, this helps ensure the New Relic agent has time to report.'
         },
-        :port => {
-          :default => 443,
-          :public => false,
+        :timeout => {
+          :default => 2 * 60, # 2 minutes
+          :public => true,
           :type => Integer,
           :allowed_from_server => false,
-          :description => 'Port for the New Relic data collection service.'
+          :description => 'Defines the maximum number of seconds the agent should spend attempting to connect to the collector.'
         },
-        :api_port => {
-          :default => value_of(:port),
-          :public => false,
-          :type => Integer,
+        # Transaction tracer
+        :'transaction_tracer.capture_attributes' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Port for the New Relic API host.'
+          :description => 'Use [`transaction_tracer.attributes.enabled`](#transaction_tracer-attributes-enabled) instead.'
         },
-        :sync_startup => {
-          :default => false,
+        :'transaction_tracer.enabled' => {
+          :default => true,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'When set to <code>true</code>, forces a synchronous connection to the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a> during application startup. For very short-lived processes, this helps ensure the New Relic agent has time to report.'
+          :allowed_from_server => true,
+          :description => 'If `true`, enables collection of [transaction traces](/docs/apm/traces/transaction-traces/transaction-traces).'
         },
-        :send_data_on_exit => {
+        :'transaction_tracer.explain_enabled' => {
           :default => true,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'If <code>true</code>, enables the exit handler that sends data to the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a> before shutting down.'
+          :allowed_from_server => true,
+          :description => 'If `true`, enables the collection of explain plans in transaction traces. This setting will also apply to explain plans in slow SQL traces if [`slow_sql.explain_enabled`](#slow_sql-explain_enabled) is not set separately.'
         },
-        :max_payload_size_in_bytes => {
-          :default => 1000000,
-          :public => false,
+        :'transaction_tracer.explain_threshold' => {
+          :default => 0.5,
+          :public => true,
+          :type => Float,
+          :allowed_from_server => true,
+          :description => 'Threshold (in seconds) above which the agent will collect explain plans. Relevant only when [`explain_enabled`](#transaction_tracer.explain_enabled) is true.'
+        },
+        :'transaction_tracer.limit_segments' => {
+          :default => 4000,
+          :public => true,
           :type => Integer,
           :allowed_from_server => true,
-          :description => 'Maximum number of bytes to send to the New Relic data collection service.'
+          :description => 'Maximum number of transaction trace nodes to record in a single transaction trace.'
         },
-        :put_for_data_send => {
+        :'transaction_tracer.record_redis_arguments' => {
           :default => false,
-          :public => false,
+          :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Use HTTP PUT requests instead of POST.'
+          :description => 'If `true`, the agent records Redis command arguments in transaction traces.'
         },
-        :compressed_content_encoding => {
-          :default => 'gzip',
-          :public => false,
+        :'transaction_tracer.record_sql' => {
+          :default => 'obfuscated',
+          :public => true,
           :type => String,
-          :allowed_from_server => false,
-          :description => 'Encoding to use if data needs to be compressed. The options are deflate and gzip.'
+          :allowed_from_server => true,
+          :description => 'Obfuscation level for SQL queries reported in transaction trace nodes.
+
+  By default, this is set to `obfuscated`, which strips out the numeric and string literals.
+
+  - 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`.
+  '
         },
-        :simple_compression => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'When enabled the agent will compress payloads destined for the collector, but will not pre-compress parts of the payload.'
+
+        :'transaction_tracer.stack_trace_threshold' => {
+          :default => 0.5,
+          :public => true,
+          :type => Float,
+          :allowed_from_server => true,
+          :description => 'Specify a threshold in seconds. The agent includes stack traces in transaction trace nodes when the stack trace duration exceeds this threshold.'
         },
-        :timeout => {
-          :default => 2 * 60, # 2 minutes
+        :'transaction_tracer.transaction_threshold' => {
+          :default => DefaultSource.transaction_tracer_transaction_threshold,
           :public => true,
-          :type => Integer,
-          :allowed_from_server => false,
-          :description => 'Defines the maximum number of seconds the agent should spend attempting to connect to the collector.'
+          :type => Float,
+          :allowed_from_server => true,
+          :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`.'
         },
-        :send_environment_info => {
+        # Error collector
+        :'error_collector.capture_attributes' => {
           :default => true,
-          :public => false,
+          :public => true,
           :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Enable or disable transmission of application environment information to the New Relic data collection service.'
+          :description => 'Use [`error_collector.attributes.enabled`](#error_collector-attributes-enabled) instead.'
         },
-        :data_report_period => {
-          :default => 60,
-          :public => false,
-          :type => Integer,
+        :'error_collector.ignore_classes' => {
+          :default => [],
+          :public => true,
+          :type => Array,
           :allowed_from_server => true,
-          :description => 'Number of seconds betwixt connections to the New Relic data collection service.'
+          :dynamic_name => true,
+          :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>
+          DESCRIPTION
         },
-        :event_report_period => {
-          :default => 60,
-          :public => false,
-          :type => Integer,
+        :'error_collector.capture_events' => {
+          :default => value_of(:'error_collector.enabled'),
+          :documentation_default => true,
+          :public => true,
+          :type => Boolean,
           :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,
+          :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,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => true,
-          :description => 'Number of seconds betwixt connections to the New Relic analytic event collection services.'
+          :description => 'If `true`, the agent captures traced errors and error count metrics.'
         },
-        :'event_report_period.custom_event_data' => {
-          :default => 60,
-          :public => false,
-          :type => Integer,
+        :'error_collector.expected_classes' => {
+          :default => [],
+          :public => true,
+          :type => Array,
+          :allowed_from_server => true,
           :dynamic_name => true,
+          :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>
+          DESCRIPTION
+        },
+        :'error_collector.expected_messages' => {
+          :default => {},
+          :public => true,
+          :type => Hash,
           :allowed_from_server => true,
-          :description => 'Number of seconds betwixt connections to the New Relic custom event collection services.'
+          :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.
+
+  <Callout variant="caution">
+    This option can't be set via environment variable.
+  </Callout>
+          DESCRIPTION
         },
-        :'event_report_period.error_event_data' => {
-          :default => 60,
-          :public => false,
-          :type => Integer,
+        :'error_collector.expected_status_codes' => {
+          :default => '',
+          :public => true,
+          :type => String,
+          :allowed_from_server => true,
           :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,
-          :description => 'Number of seconds betwixt connections to the New Relic error event collection services.'
+          :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
         },
-        :'event_report_period.span_event_data' => {
-          :default => 60,
-          :public => false,
-          :type => Integer,
+        :'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.
+
+  <Callout variant="caution">
+    This option can't be set via environment variable.
+  </Callout>
+          DESCRIPTION
+        },
+        :'error_collector.ignore_status_codes' => {
+          :default => '',
+          :public => true,
+          :type => String,
           :allowed_from_server => true,
-          :description => 'Number of seconds betwixt connections to the New Relic span event collection services.'
+          :dynamic_name => true,
+          :description => 'A comma separated list of status codes, possibly including ranges. Errors associated with these status codes, where applicable, will be ignored.'
         },
-        :'data_report_periods.analytic_event_data' => {
-          :default => 60,
-          :public => false,
+        :'error_collector.max_backtrace_frames' => {
+          :default => 50,
+          :public => true,
+          :type => Integer,
+          :allowed_from_server => false,
+          :description => 'Defines the maximum number of frames in an error backtrace. Backtraces over this amount are truncated at the beginning and end.'
+        },
+        :'error_collector.max_event_samples_stored' => {
+          :default => 100,
+          :public => true,
           :type => Integer,
-          :deprecated => true,
-          :dynamic_name => true,
           :allowed_from_server => true,
-          :description => 'Number of seconds between connections to the New Relic data collection service for sending transaction event data.'
+          :description => 'Defines the maximum number of [TransactionError events](/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights) reported per harvest cycle.'
         },
-        :keep_retrying => {
-          :default => true,
-          :public => false,
+        # Browser monitoring
+        :'browser_monitoring.auto_instrument' => {
+          :default => value_of(:'rum.enabled'),
+          :documentation_default => true,
+          :public => true,
           :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => 'Enable or disable retrying failed connections to the New Relic data collection service.'
+          :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).'
         },
-        :force_reconnect => {
+        :'browser_monitoring.capture_attributes' => {
           :default => false,
-          :public => false,
+          :public => true,
           :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Force a new connection to the server before running the worker loop. Creates a separate agent run and is recorded as a separate instance by the New Relic data collection service.'
+          :description => 'Use [`browser_monitoring.attributes.enabled`](#browser_monitoring-attributes-enabled) instead.'
         },
-        :report_instance_busy => {
+        # Analytics events
+        :'analytics_events.capture_attributes' => {
           :default => true,
-          :public => false,
+          :public => true,
           :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Enable or disable transmission of metrics recording the percentage of time application instances spend servicing requests (duty cycle metrics).'
+          :description => 'Use [`transaction_events.attributes.enabled`](#transaction_events-attributes-enabled) instead.'
         },
-        :log_file_name => {
-          :default => 'newrelic_agent.log',
+        :'analytics_events.enabled' => {
+          :default => true,
           :public => true,
-          :type => String,
-          :allowed_from_server => false,
-          :description => 'Defines a name for the log file.'
+          :type => Boolean,
+          :deprecated => true,
+          :allowed_from_server => true,
+          :description => deprecated_description(:'transaction_events.enabled', 'If `true`, enables analytics event sampling.')
         },
-        :log_file_path => {
-          :default => DefaultSource::DEFAULT_LOG_DIR,
+        :'analytics_events.max_samples_stored' => {
+          :default => 1200,
           :public => true,
-          :type => String,
-          :allowed_from_server => false,
-          :description => 'Defines a path to the agent log file, excluding the filename.'
+          :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.')
         },
-        :'audit_log.enabled' => {
-          :default => false,
+        # Transaction events
+        :'transaction_events.enabled' => {
+          :default => value_of(:'analytics_events.enabled'),
+          :documentation_default => true,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'If <code>true</code>, enables an audit log which logs communications with the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a>.'
-        },
-        :'audit_log.path' => {
-          :default => DefaultSource.audit_log_path,
-          :public => true,
-          :type => String,
-          :allowed_from_server => false,
-          :description => 'Specifies a path to the audit log file (including the filename).'
+          :allowed_from_server => true,
+          :description => 'If `true`, enables transaction event sampling.'
         },
-        :'audit_log.endpoints' => {
-          :default => [".*"],
+        :'transaction_events.max_samples_stored' => {
+          :default => value_of(:'analytics_events.max_samples_stored'),
+          :documentation_default => 1200,
           :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'
+          :type => Integer,
+          :allowed_from_server => true,
+          :description => 'Defines the maximum number of transaction events reported from a single harvest.'
         },
-        :disable_samplers => {
-          :default => false,
+        # Application logging
+        :'application_logging.enabled' => {
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables the collection of sampler metrics. Sampler metrics are metrics that are not event-based (such as CPU time or memory usage).'
+          :description => 'If `true`, enables log decoration and the collection of log events and metrics.'
         },
-        :disable_resque => {
-          :default => false,
+        :'application_logging.forwarding.enabled' => {
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables <a href="https://docs.newrelic.com/docs/agents/ruby-agent/background-jobs/resque-instrumentation">Resque instrumentation</a>.'
+          :description => 'If `true`, the agent captures log records emitted by your application.'
         },
-        :disable_sidekiq => {
-          :default => false,
+        :'application_logging.forwarding.max_samples_stored' => {
+          :default => 10000,
           :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables <a href="https://docs.newrelic.com/docs/agents/ruby-agent/background-jobs/sidekiq-instrumentation">Sidekiq instrumentation</a>.'
+          :type => Integer,
+          :allowed_from_server => true,
+          :description => 'Defines the maximum number of log records to buffer in memory at a time.',
+          :dynamic_name => true
         },
-        :disable_dj => {
+        :'application_logging.local_decorating.enabled' => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables <a href="https://docs.newrelic.com/docs/agents/ruby-agent/background-jobs/delayedjob">Delayed::Job instrumentation</a>.'
+          :description => 'If `true`, the agent decorates logs with metadata to link to entities, hosts, traces, and spans.'
         },
-        :disable_sinatra => {
-          :default => false,
+        :'application_logging.metrics.enabled' => {
+          :default => true,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'If <code>true</code> , disables <a href="https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/sinatra-support">Sinatra instrumentation</a>.'
+          :allowed_from_server => true,
+          :description => 'If `true`, the agent captures metrics related to logging for your application.'
         },
-        :disable_sinatra_auto_middleware => {
-          :default => false,
+        # Attributes
+        :'attributes.enabled' => {
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables agent middleware for Sinatra. This middleware is responsible for advanced feature support such as <a href="https://docs.newrelic.com/docs/apm/transactions/cross-application-traces/cross-application-tracing">cross application tracing</a>, <a href="https://docs.newrelic.com/docs/browser/new-relic-browser/getting-started/new-relic-browser">page load timing</a>, and <a href="https://docs.newrelic.com/docs/apm/applications-menu/events/view-apm-error-analytics">error collection</a>.'
+          :description => 'If `true`, enables capture of attributes for all destinations.'
         },
-        :disable_view_instrumentation => {
-          :default => false,
+        :'attributes.exclude' => {
+          :default => [],
           :public => true,
-          :type => Boolean,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables view instrumentation.'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to exclude from all destinations. Allows `*` as wildcard at end.'
         },
-        :disable_harvest_thread => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
+        :'attributes.include' => {
+          :default => [],
+          :public => true,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'Enable or disable the harvest thread.'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to include in all destinations. Allows `*` as wildcard at end.'
         },
-        :skip_ar_instrumentation => {
-          :default => false,
-          :public => false,
+        :'browser_monitoring.attributes.enabled' => {
+          :default => value_of(:'browser_monitoring.capture_attributes'),
+          :documentation_default => false,
+          :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Enable or disable active record instrumentation.'
+          :description => 'If `true`, the agent captures attributes from browser monitoring.'
         },
-        :disable_activerecord_instrumentation => {
-          :default => value_of(:skip_ar_instrumentation),
+        :'browser_monitoring.attributes.exclude' => {
+          :default => [],
           :public => true,
-          :type => Boolean,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables active record instrumentation.'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to exclude from browser monitoring. Allows `*` as wildcard at end.'
         },
-        :prepend_active_record_instrumentation => {
-          :default => false,
+        :'browser_monitoring.attributes.include' => {
+          :default => [],
           :public => true,
-          :type => Boolean,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, uses Module.prepend rather than alias_method for ActiveRecord instrumentation.'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to include in browser monitoring. Allows `*` as wildcard at end.'
         },
-        :disable_data_mapper => {
-          :default => false,
+        :'error_collector.attributes.enabled' => {
+          :default => value_of(:'error_collector.capture_attributes'),
+          :documentation_default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables DataMapper instrumentation.'
+          :description => 'If `true`, the agent captures attributes from error collection.'
         },
-        :disable_activejob => {
-          :default => false,
+        :'error_collector.attributes.exclude' => {
+          :default => [],
           :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables ActiveJob instrumentation.'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to exclude from error collection. Allows `*` as wildcard at end.'
         },
-        :disable_action_cable_instrumentation => {
-          :default => false,
+        :'error_collector.attributes.include' => {
+          :default => [],
           :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables Action Cable instrumentation.'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to include in error collection. Allows `*` as wildcard at end.'
         },
-        :disable_active_storage => {
-          :default => false,
+        :'span_events.attributes.enabled' => {
+          :default => true,
           :public => true,
           :type => Boolean,
-          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables ActiveStorage instrumentation.'
+          :description => 'If `true`, the agent captures attributes on span events.'
         },
-        :disable_memcached => {
-          :default => value_of(:disable_memcache_instrumentation),
+        :'span_events.attributes.exclude' => {
+          :default => [],
           :public => true,
-          :type => Boolean,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables instrumentation for the memcached gem.'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to exclude from span events. Allows `*` as wildcard at end.'
         },
-        :disable_memcache_client => {
-          :default => value_of(:disable_memcache_instrumentation),
+        :'span_events.attributes.include' => {
+          :default => [],
           :public => true,
-          :type => Boolean,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables instrumentation for the memcache-client gem.'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to include on span events. Allows `*` as wildcard at end.'
         },
-        :disable_dalli => {
-          :default => value_of(:disable_memcache_instrumentation),
+        :'transaction_events.attributes.enabled' => {
+          :default => value_of(:'analytics_events.capture_attributes'),
+          :documentation_default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables instrumentation for the dalli gem.'
+          :description => 'If `true`, the agent captures attributes from transaction events.'
         },
-        :disable_dalli_cas_client => {
-          :default => value_of(:disable_memcache_instrumentation),
+        :'transaction_events.attributes.exclude' => {
+          :default => [],
           :public => true,
-          :type => Boolean,
+          :type => Array,
           :allowed_from_server => false,
-          :description => "If <code>true</code>, disables instrumentation for the dalli gem\'s additional CAS client support."
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to exclude from transaction events. Allows `*` as wildcard at end.'
         },
-        :disable_memcache_instrumentation => {
-          :default => false,
+        :'transaction_events.attributes.include' => {
+          :default => [],
           :public => true,
-          :type => Boolean,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables memcache instrumentation.'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to include in transaction events. Allows `*` as wildcard at end.'
         },
-        :disable_gc_profiler => {
-          :default => false,
+        :'transaction_segments.attributes.enabled' => {
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables the use of GC::Profiler to measure time spent in garbage collection'
+          :description => 'If `true`, the agent captures attributes on transaction segments.'
         },
-        :'sidekiq.capture_params' => {
-          :default => false,
+        :'transaction_segments.attributes.exclude' => {
+          :default => [],
           :public => true,
-          :type => Boolean,
+          :type => Array,
           :allowed_from_server => false,
-          :dynamic_name => true,
-          :deprecated => true,
-          :description => 'If <code>true</code>, enables the capture of job arguments for transaction traces and traced errors in Sidekiq.'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to exclude from transaction segments. Allows `*` as wildcard at end.'
         },
-        :'resque.capture_params' => {
-          :default => false,
+        :'transaction_segments.attributes.include' => {
+          :default => [],
           :public => true,
-          :type => Boolean,
+          :type => Array,
           :allowed_from_server => false,
-          :dynamic_name => true,
-          :deprecated => true,
-          :description => 'If <code>true</code>, enables the capture of job arguments for transaction traces and traced errors in Resque.'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to include on transaction segments. Allows `*` as wildcard at end.'
         },
-        :'resque.use_ruby_dns' => {
-          :default => true,
-          :public => false,
+        :'transaction_tracer.attributes.enabled' => {
+          :default => value_of(:'transaction_tracer.capture_attributes'),
+          :documentation_default => true,
+          :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Replace the libc DNS resolver with the all Ruby resolver Resolv'
+          :description => 'If `true`, the agent captures attributes from transaction traces.'
         },
-        :capture_memcache_keys => {
+        :'transaction_tracer.attributes.exclude' => {
+          :default => [],
+          :public => true,
+          :type => Array,
+          :allowed_from_server => false,
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to exclude from transaction traces. Allows `*` as wildcard at end.'
+        },
+        :'transaction_tracer.attributes.include' => {
+          :default => [],
+          :public => true,
+          :type => Array,
+          :allowed_from_server => false,
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to include in transaction traces. Allows `*` as wildcard at end.'
+        },
+        # Audit log
+        :'audit_log.enabled' => {
           :default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'Enable or disable the capture of memcache keys from transaction traces.'
+          :allowed_from_server => false,
+          :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).'
         },
-        :'transaction_tracer.enabled' => {
-          :default => true,
+        :'audit_log.endpoints' => {
+          :default => [".*"],
           :public => true,
-          :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If <code>true</code>, enables collection of <a href="https://docs.newrelic.com/docs/apm/traces/transaction-traces/transaction-traces">transaction traces</a>.'
+          :type => Array,
+          :allowed_from_server => false,
+          :transform => DefaultSource.method(:convert_to_regexp_list),
+          :description => 'List of allowed endpoints to include in audit log'
         },
-        :'transaction_tracer.transaction_threshold' => {
-          :default => DefaultSource.transaction_tracer_transaction_threshold,
+        :'audit_log.path' => {
+          :default => DefaultSource.audit_log_path,
+          :documentation_default => 'config/newrelic_audit.log',
           :public => true,
-          :type => Float,
-          :allowed_from_server => true,
-          :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 <code><a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#apdex_f">apdex_f</a></code>.'
+          :type => String,
+          :allowed_from_server => false,
+          :description => 'Specifies a path to the audit log file (including the filename).'
         },
-        :'transaction_tracer.record_sql' => {
-          :default => 'obfuscated',
+        # Autostart
+        :'autostart.denylisted_constants' => {
+          :default => 'Rails::Console',
           :public => true,
           :type => String,
-          :allowed_from_server => true,
-          :description => 'Obfuscation level for SQL queries reported in transaction trace nodes.</p>
-
-  <p>By default, this is set to <code>obfuscated</code>, which strips out the numeric and string literals.</p>
-
-  <ul>
-    <li>If you do not want the agent to capture query information, set this to <code>none</code>.</li>
-    <li>If you want the agent to capture all query information in its original form, set this to <code>raw</code>.</li>
-    <li>When you enable <a href="/docs/agents/manage-apm-agents/configuration/high-security-mode">high security mode</a>, this is automatically set to <code>obfuscated</code>.</li>
-  </ul>
-  <p>' # Doc generator will wrap this in <p>...</p>
+          :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`.'
         },
-        :'transaction_tracer.record_redis_arguments' => {
-          :default => false,
+        :'autostart.denylisted_executables' => {
+          :default => 'irb,rspec',
           :public => true,
-          :type => Boolean,
+          :type => String,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent records Redis command arguments in transaction traces.'
+          :description => 'Defines a comma-delimited list of executables that the agent should not instrument. For example, `rake,my_ruby_script.rb`.'
         },
-        :'transaction_tracer.capture_attributes' => {
+        :'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`.'
+        },
+        # Code level metrics
+        :'code_level_metrics.enabled' => {
           :default => true,
           :public => true,
           :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => 'Deprecated; use <a href="#transaction_tracer-attributes-enabled"><code>transaction_tracer.attributes.enabled</code></a> instead.'
+          :allowed_from_server => true,
+          :description => "If `true`, the agent will report source code level metrics for traced methods.\nsee: " \
+                          'https://docs.newrelic.com/docs/apm/agents/ruby-agent/features/ruby-codestream-integration/'
         },
-        :'transaction_tracer.explain_threshold' => {
-          :default => 0.5,
+        # Cross application tracer
+        :"cross_application_tracer.enabled" => {
+          :default => false,
           :public => true,
-          :type => Float,
+          :type => Boolean,
           :allowed_from_server => true,
-          :description => 'Threshold (in seconds) above which the agent will collect explain plans. Relevant only when <code><a href="#transaction_tracer.explain_enabled">explain_enabled</a></code> is true.'
+          :deprecated => true,
+          :description => deprecated_description(
+            :'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`.'
+          )
         },
-        :'transaction_tracer.explain_enabled' => {
+        # Custom attributes
+        :'custom_attributes.enabled' => {
           :default => true,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If <code>true</code>, enables the collection of explain plans in transaction traces. This setting will also apply to explain plans in slow SQL traces if <a href="#slow_sql-explain_enabled"><code>slow_sql.explain_enabled</code></a> is not set separately.'
+          :allowed_from_server => false,
+          :description => 'If `false`, custom attributes will not be sent on events.'
         },
-        :'transaction_tracer.stack_trace_threshold' => {
-          :default => 0.5,
+        # Custom events
+        :'custom_insights_events.enabled' => {
+          :default => true,
           :public => true,
-          :type => Float,
+          :type => Boolean,
           :allowed_from_server => true,
-          :description => 'Specify a threshold in seconds. The agent includes stack traces in transaction trace nodes when the stack trace duration exceeds this threshold.'
+          :description => 'If `true`, the agent captures [custom events](/docs/insights/new-relic-insights/adding-querying-data/inserting-custom-events-new-relic-apm-agents).'
         },
-        :'transaction_tracer.limit_segments' => {
-          :default => 4000,
+        :'custom_insights_events.max_samples_stored' => {
+          :default => 3000,
           :public => true,
           :type => Integer,
           :allowed_from_server => true,
-          :description => 'Maximum number of transaction trace nodes to record in a single transaction trace.'
+          :description => 'Specify a maximum number of custom events to buffer in memory at a time.',
+          :dynamic_name => true
         },
-        :disable_sequel_instrumentation => {
-          :default => false,
+        # Datastore tracer
+        :'datastore_tracer.database_name_reporting.enabled' => {
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables <a href="https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/sequel-instrumentation">Sequel instrumentation</a>.'
+          :description => 'If `false`, the agent will not add `database_name` parameter to transaction or slow sql traces.'
         },
-        :disable_database_instrumentation => {
-          :default => false,
+        :'datastore_tracer.instance_reporting.enabled' => {
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :deprecated => true,
-          :description => 'Deprecated; use <a href="#disable_sequel_instrumentation"><code>disable_sequel_instrumentation</code></a> instead.'
+          :description => 'If `false`, the agent will not report datastore instance metrics, nor add `host` or `port_path_or_id` parameters to transaction or slow SQL traces.'
         },
-        :disable_mongo => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :allowed_from_server => false,
+        # Disabling
+        :disable_action_cable_instrumentation => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
           :dynamic_name => true,
-          :description  => 'If <code>true</code>, the agent won\'t install <a href="https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/mongo-instrumentation">instrumentation for the Mongo gem</a>.'
-        },
-        :disable_redis => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t install <a href="https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/redis-instrumentation">instrumentation for Redis</a>.'
+          :description => 'If `true`, disables Action Cable instrumentation.'
         },
-        :disable_redis_instrumentation => {
-          :default      => false,
-          :public       => false,
-          :type         => Boolean,
+        :disable_activejob => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'Disables installation of Redis instrumentation. Standard key to use is disable_redis.'
-        },
-        :'message_tracer.segment_parameters.enabled' => {
-          :default      => true,
-          :public       => true,
-          :type         => Boolean,
-          :allowed_from_server => true,
-          :description  => 'If <code>true</code>, the agent will collect metadata about messages and attach them as segment parameters.'
+          :description => 'If `true`, disables ActiveJob instrumentation.'
         },
-        :'slow_sql.enabled' => {
-          :default => value_of(:'transaction_tracer.enabled'),
+        :disable_active_storage => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If <code>true</code>, the agent collects <a href="https://docs.newrelic.com/docs/apm/applications-menu/monitoring/viewing-slow-query-details">slow SQL queries</a>.'
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'If `true`, disables ActiveStorage instrumentation.'
         },
-        :'slow_sql.explain_threshold' => {
-          :default => value_of(:'transaction_tracer.explain_threshold'),
+        :disable_activerecord_instrumentation => {
+          :default => value_of(:skip_ar_instrumentation),
+          :documentation_default => false,
           :public => true,
-          :type => Float,
-          :allowed_from_server => true,
-          :description => 'Specify a threshold in seconds. The agent collects <a href="https://docs.newrelic.com/docs/apm/applications-menu/monitoring/viewing-slow-query-details">slow SQL queries</a> and explain plans that exceed this threshold.'
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'If `true`, disables active record instrumentation.'
         },
-        :'slow_sql.explain_enabled' => {
-          :default => value_of(:'transaction_tracer.explain_enabled'),
+        :disable_active_record_notifications => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If <code>true</code>, the agent collects explain plans in slow SQL queries. If this setting is omitted, the <a href="#transaction_tracer-explain_enabled"><code>transaction_tracer.explain_enabled</code></a> setting will be applied as the default setting for explain plans in slow SQL as well.'
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'If `true`, disables instrumentation for ActiveRecord 4, 5, and 6.'
         },
-        :'slow_sql.record_sql' => {
-          :default => value_of(:'transaction_tracer.record_sql'),
+        :disable_bunny => {
+          :default => false,
           :public => true,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'Defines an obfuscation level for slow SQL queries. Valid options are <code>obfuscated</code>, <code>raw</code>, or <code>none</code>).'
+          :type => Boolean,
+          :deprecated => true,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => deprecated_description(:'instrumentation.bunny', 'If `true`, disables instrumentation for the bunny gem.')
         },
-        :'slow_sql.use_longer_sql_id' => {
+        :disable_cpu_sampler => {
           :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.'
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'If `true`, the agent won\'t sample the CPU usage of the host process.'
         },
-        :'mongo.capture_queries' => {
-          :default => true,
+        :disable_curb => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If <code>true</code>, the agent captures Mongo queries in transaction traces.'
+          :deprecated => true,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => deprecated_description(:'instrumentation.curb', 'If `true`, disables instrumentation for the curb gem.')
         },
-        :'mongo.obfuscate_queries' => {
-          :default => true,
+        :disable_database_instrumentation => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If <code>true</code>, the agent obfuscates Mongo queries in transaction traces.'
+          :allowed_from_server => false,
+          :deprecated => true,
+          :description => 'Use [`disable_sequel_instrumentation`](#disable_sequel_instrumentation) instead.'
         },
-        :'error_collector.enabled' => {
-          :default => true,
+        :disable_data_mapper => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If <code>true</code>, the agent captures traced errors and error count metrics.'
+          :allowed_from_server => false,
+          :description => 'If `true`, disables DataMapper instrumentation.'
         },
-        :'error_collector.capture_attributes' => {
-          :default => true,
+        :disable_dalli => {
+          :default => value_of(:disable_memcache_instrumentation),
+          :documentation_default => false,
           :public => true,
           :type => Boolean,
           :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Deprecated; use <a href="#error_collector-attributes-enabled"><code>error_collector.attributes.enabled</code></a> instead.'
-        },
-        :'error_collector.ignore_errors' => {
-          :default => 'ActionController::RoutingError,Sinatra::NotFound',
-          :public => true,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'Specify a comma-delimited list of error classes that the agent should ignore.'
+          :description => deprecated_description(:'instrumentation.memcache', 'If `true`, disables instrumentation for the dalli gem.')
         },
-        :'error_collector.max_backtrace_frames' => {
-          :default => 50,
+        :disable_dalli_cas_client => {
+          :default => value_of(:disable_memcache_instrumentation),
+          :documentation_default => false,
           :public => true,
-          :type => Integer,
+          :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Defines the maximum number of frames in an error backtrace. Backtraces over this amount are truncated at the beginning and end.'
+          :description => deprecated_description(:'instrumentation.memcache', "If `true`, disables instrumentation for the dalli gem's additional CAS client support.")
         },
-        :'error_collector.capture_events' => {
-          :default => value_of(:'error_collector.enabled'),
+        :disable_delayed_job_sampler => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
           :dynamic_name => true,
-          :description => 'If <code>true</code>, the agent collects <a href="https://docs.newrelic.com/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights">TransactionError events</a>.'
+          :allowed_from_server => false,
+          :description => 'If `true`, the agent won\'t measure the depth of Delayed Job queues.'
         },
-        :'error_collector.max_event_samples_stored' => {
-          :default => 100,
+        :disable_dj => {
+          :default => false,
           :public => true,
-          :type => Integer,
-          :allowed_from_server => true,
-          :description => 'Defines the maximum number of <a href="https://docs.newrelic.com/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights">TransactionError events</a> sent to Insights per harvest cycle.'
-        },
-        :'rum.enabled' => {
-          :default => true,
-          :public => false,
+          :deprecated => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'Enable or disable page load timing (sometimes referred to as real user monitoring or RUM).'
-        },
-        :browser_key => {
-          :default => '',
-          :public => false,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'Real user monitoring license key for the browser timing header.'
-        },
-        :beacon => {
-          :default => '',
-          :public => false,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'Beacon for real user monitoring.'
-        },
-        :error_beacon => {
-          :default => '',
-          :public => false,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'Error beacon for real user monitoring.'
+          :allowed_from_server => false,
+          :description => deprecated_description(:'instrumentation.delayed_job', 'If `true`, disables [Delayed::Job instrumentation](/docs/agents/ruby-agent/background-jobs/delayedjob).')
         },
-        :application_id => {
-          :default => '',
-          :public => false,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'Application ID for real user monitoring.'
+        :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.')
         },
-        :js_agent_file => {
-          :default => '',
-          :public => false,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'Javascript agent file for real user monitoring.'
+        :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.')
         },
-        :'browser_monitoring.auto_instrument' => {
-          :default => value_of(:'rum.enabled'),
+        :disable_memcache_client => {
+          :default => value_of(:disable_memcache_instrumentation),
+          :documentation_default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If <code>true</code>, enables <a href="https://docs.newrelic.com/docs/browser/new-relic-browser/installation-configuration/adding-apps-new-relic-browser#select-apm-app">auto-injection</a> of the JavaScript header for page load timing (sometimes referred to as real user monitoring or RUM).'
+          :deprecated => true,
+          :allowed_from_server => false,
+          :description => deprecated_description(:'instrumentation.memcache-client', 'If `true`, disables instrumentation for the memcache-client gem.')
         },
-        :'browser_monitoring.capture_attributes' => {
+        :disable_memcache_instrumentation => {
           :default => false,
           :public => true,
           :type => Boolean,
           :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Deprecated; use <a href="#browser_monitoring-attributes-enabled"><code>browser_monitoring.attributes.enabled</code></a> instead.'
-        },
-        :'browser_monitoring.loader' => {
-          :default => DefaultSource.browser_monitoring_loader,
-          :public => false,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'Type of JavaScript agent loader to use for browser monitoring instrumentation.'
+          :description => deprecated_description(:'instrumentation.memcache', 'If `true`, disables memcache instrumentation.')
         },
-        :'browser_monitoring.loader_version' => {
-          :default => '',
-          :public => false,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'Version of JavaScript agent loader (returned from the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a>.)'
+        :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'
         },
-        :'browser_monitoring.debug' => {
+        :disable_grape => {
           :default => false,
-          :public => false,
+          :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'Enable or disable debugging version of JavaScript agent loader for browser monitoring instrumentation.'
+          :allowed_from_server => false,
+          :deprecated => true,
+          :description => deprecated_description(:'instrumentation.grape',
+            'If `true`, the agent won\'t install Grape instrumentation.')
         },
-        :'browser_monitoring.ssl_for_http' => {
-          :default => nil,
-          :allow_nil => true,
-          :public => false,
+        :disable_httpclient => {
+          :default => false,
+          :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'Enable or disable HTTPS instrumentation by JavaScript agent on HTTP pages.'
+          :dynamic_name => true,
+          :deprecated => true,
+          :allowed_from_server => false,
+          :description => deprecated_description(:'instrumentation.httpclient', 'If `true`, disables instrumentation for the httpclient gem.')
         },
-        :js_agent_loader => {
-          :default => '',
-          :public => false,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'JavaScript agent loader content.'
+        :disable_httprb => {
+          :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.')
         },
-        :js_errors_beta => {
+        :disable_mongo => {
           :default => false,
-          :public => false,
+          :public => true,
           :type => Boolean,
           :allowed_from_server => false,
+          :dynamic_name => true,
           :deprecated => true,
-          :description => 'Enable or disable beta JavaScript error reporting.'
+          :description => deprecated_description(:'instrumentation.mongo', 'If `true`, the agent won\'t install [instrumentation for the Mongo gem](/docs/agents/ruby-agent/frameworks/mongo-instrumentation).')
         },
-        :trusted_account_ids => {
-          :default => [],
-          :public => false,
-          :type => Array,
-          :allowed_from_server => true,
-          :description => 'List of trusted New Relic account IDs for the purposes of cross-application tracing. Inbound requests from applications including cross-application headers that do not come from an account in this list will be ignored.'
+        :disable_memory_sampler => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'If `true`, the agent won\'t sample the memory usage of the host process.'
         },
-        :"cross_application_tracer.enabled" => {
-          :default => Proc.new { !NewRelic::Agent.config[:'distributed_tracing.enabled'] },
+        :disable_middleware_instrumentation => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If <code>true</code>, enables <a href="https://docs.newrelic.com/docs/apm/transactions/cross-application-traces/cross-application-tracing">cross-application tracing</a>.'
+          :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).'
         },
-        :cross_application_tracing => {
-          :default => nil,
-          :allow_nil => true,
-          :public => false,
+        :disable_net_http => {
+          :default => false,
+          :public => true,
           :type => Boolean,
+          :dynamic_name => true,
           :allowed_from_server => false,
           :deprecated => true,
-          :description => 'Deprecated in favor of cross_application_tracer.enabled'
-        },
-        :encoding_key => {
-          :default => '',
-          :public => false,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'Encoding key for cross-application tracing.'
+          :description => deprecated_description(:'instrumentation.net_http',
+            'If `true`, disables instrumentation for Net::HTTP.')
         },
-        :cross_process_id => {
-          :default => '',
-          :public => false,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'Cross process ID for cross-application tracing.'
+        :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.')
         },
-        :'thread_profiler.enabled' => {
-          :default => DefaultSource.thread_profiler_enabled,
+        :disable_puma_rack_urlmap => {
+          :default => value_of(:disable_rack_urlmap),
+          :documentation_default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If <code>true</code>, enables use of the <a href="https://docs.newrelic.com/docs/apm/applications-menu/events/thread-profiler-tool">thread profiler</a>.'
+          :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.')
         },
-        :'thread_profiler.max_profile_overhead' => {
-          :default => 0.05,
-          :public => false,
-          :type => Float,
-          :allowed_from_server => true,
-          :description => 'Maximum overhead percentage for thread profiling before agent reduces polling frequency'
+        :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.')
         },
-        :marshaller => {
-          :default => 'json',
+        :disable_rack_urlmap => {
+          :default => false,
           :public => true,
-          :type => String,
+          :type => Boolean,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Specifies a marshaller for transmitting data to the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a>. Currently <code>json</code> is the only valid value for this setting.'
+          :deprecated => true,
+          :description => deprecated_description(:'instrumentation.rack_urlmap', 'If `true`, prevents the agent from hooking into Rack::URLMap to install middleware tracing.')
         },
-        :'analytics_events.enabled' => {
-          :default => true,
+        :disable_rake => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If <code>true</code>, enables analytics event sampling.'
+          :allowed_from_server => false,
+          :deprecated => true,
+          :description => deprecated_description(:'instrumentation.rake', 'If `true`, disables Rake instrumentation.')
         },
-        :'analytics_events.max_samples_stored' => {
-          :default => 1200,
+        :disable_redis => {
+          :default => false,
           :public => true,
-          :type => Integer,
-          :allowed_from_server => true,
-          :description => 'Defines the maximum number of request events reported from a single harvest.'
+          :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).')
         },
-        :'analytics_events.capture_attributes' => {
-          :default => true,
+        :disable_resque => {
+          :default => false,
           :public => true,
           :type => Boolean,
           :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Deprecated; use <a href="#transaction_events-attributes-enabled"><code>transaction_events.attributes.enabled</code></a> instead.'
+          :description => deprecated_description(:'instrumentation.resque', 'If `true`, disables [Resque instrumentation](/docs/agents/ruby-agent/background-jobs/resque-instrumentation).')
         },
-        :restart_thread_in_children => {
-          :default => true,
-          :public => false,
+        :disable_samplers => {
+          :default => false,
+          :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Controls whether to check on running a transaction whether to respawn the harvest thread.'
+          :description => 'If `true`, disables the collection of sampler metrics. Sampler metrics are metrics that are not event-based (such as CPU time or memory usage).'
         },
-        :normalize_json_string_encodings => {
-          :default => true,
-          :public => false,
+        :disable_sequel_instrumentation => {
+          :default => false,
+          :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Controls whether to normalize string encodings prior to serializing data for the collector to JSON.'
+          :description => 'If `true`, disables [Sequel instrumentation](/docs/agents/ruby-agent/frameworks/sequel-instrumentation).'
         },
-        :backport_fast_active_record_connection_lookup => {
+        :disable_sidekiq => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Backports the faster ActiveRecord connection lookup introduced in Rails 6, which improves agent performance when instrumenting ActiveRecord. Note that this setting may not be compatible with other gems that patch ActiveRecord.'
+          :description => 'If `true`, disables [Sidekiq instrumentation](/docs/agents/ruby-agent/background-jobs/sidekiq-instrumentation).'
         },
-        :disable_vm_sampler => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :dynamic_name => true,
+        :disable_sinatra => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t <a href="https://docs.newrelic.com/docs/agents/ruby-agent/features/ruby-vm-measurements">sample performance measurements from the Ruby VM</a>.'
+          :description => deprecated_description(:'instrumentation.sinatra', 'If `true` , disables [Sinatra instrumentation](/docs/agents/ruby-agent/frameworks/sinatra-support).')
         },
-        :disable_memory_sampler => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :dynamic_name => true,
+        :disable_sinatra_auto_middleware => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t sample the memory usage of the host process.'
+          :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](https://docs.newrelic.com/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:
+
+      ```
+      # newrelic.yml
+
+        cross_application_tracer:
+          enabled: true
+        distributed_tracing:
+          enabled: false
+      ```
+    </Callout>
+          DESCRIPTION
         },
-        :disable_cpu_sampler => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
+        :disable_typhoeus => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
           :dynamic_name => true,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t sample the CPU usage of the host process.'
+          :description => deprecated_description(:'instrumentation.typhoeus', 'If `true`, the agent won\'t install instrumentation for the typhoeus gem.')
         },
-        :disable_delayed_job_sampler => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :dynamic_name => true,
+        :disable_view_instrumentation => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t measure the depth of Delayed Job queues.'
+          :description => 'If `true`, disables view instrumentation.'
         },
-        :disable_active_record_4 => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
+        :disable_vm_sampler => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :deprecated   => true,
-          :description  => 'Deprecated.  ' \
-              'For agent versions 6.3 or higher, ' \
-              'use <a href="#disable_active_record_notifications"><code>' \
-                'disable_active_record_notifications' \
-              '</code></a> instead.'
+          :description => 'If `true`, the agent won\'t [sample performance measurements from the Ruby VM](/docs/agents/ruby-agent/features/ruby-vm-measurements).'
         },
-        :disable_active_record_5 => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :deprecated   => true,
-          :description  => 'Deprecated.  ' \
-              'For agent versions 6.3 or higher, ' \
-              'use <a href="#disable_active_record_notifications"><code>' \
-                'disable_active_record_notifications' \
-              '</code></a> instead.'
+        # Distributed tracing
+        :'distributed_tracing.enabled' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'Distributed tracing lets you see the path that a request takes through your distributed system. Enabling distributed tracing changes the behavior of some New Relic features, so carefully consult the [transition guide](/docs/transition-guide-distributed-tracing) before you enable this feature.'
         },
-        :disable_active_record_notifications => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description  => 'If <code>true</code>, disables instrumentation for ActiveRecord 4, 5, and 6.'
+        # Elasticsearch
+        :'elasticsearch.capture_queries' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, the agent captures Elasticsearch queries in transaction traces.'
         },
-        :disable_bunny => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description  => 'If <code>true</code>, disables instrumentation for the bunny gem.'
+        :'elasticsearch.obfuscate_queries' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, the agent obfuscates Elasticsearch queries in transaction traces.'
         },
-        :disable_curb => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :dynamic_name => true,
+        # Heroku
+        :'heroku.use_dyno_names' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, disables instrumentation for the curb gem.'
+          :description => 'If `true`, the agent uses Heroku dyno names as the hostname.'
         },
-        :disable_excon => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :dynamic_name => true,
+        :'heroku.dyno_name_prefixes_to_shorten' => {
+          :default => %w[scheduler run],
+          :public => true,
+          :type => Array,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, disables instrumentation for the excon gem.'
+          :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>).'
         },
-        :disable_httpclient => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :dynamic_name => true,
+        # Infinite tracing
+        :'infinite_tracing.trace_observer.host' => {
+          :default => '',
+          :public => true,
+          :type => String,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, disables instrumentation for the httpclient gem.'
+          :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."
         },
-        :disable_net_http => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :dynamic_name => true,
+        :'infinite_tracing.trace_observer.port' => {
+          :default => 443,
+          :public => true,
+          :type => Integer,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, disables instrumentation for Net::HTTP.'
+          :external => :infinite_tracing,
+          :description => "Configures the TCP/IP port for the Trace Observer Host"
         },
-        :disable_rack => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
+        # Instrumentation
+        :'instrumentation.active_support_logger' => {
+          :default => instrumentation_value_from_boolean(:'application_logging.enabled'),
+          :documentation_default => 'auto',
           :dynamic_name => true,
+          :public => true,
+          :type => String,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, prevents the agent from hooking into the <code>to_app</code> method in Rack::Builder to find gems to instrument during application startup.'
+          :description => 'Controls auto-instrumentation of ActiveSupport::Logger at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :disable_rack_urlmap => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
+        :'instrumentation.bunny' => {
+          :default => instrumentation_value_of(:disable_bunny),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, prevents the agent from hooking into Rack::URLMap to install middleware tracing.'
+          :description => 'Controls auto-instrumentation of bunny at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :disable_puma_rack => {
-          :default      => value_of(:disable_rack),
-          :public       => true,
-          :type         => Boolean,
+        :'instrumentation.curb' => {
+          :default => instrumentation_value_of(:disable_curb),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, prevents the agent from hooking into the <code>to_app</code> method in Puma::Rack::Builder to find gems to instrument during application startup.'
+          :description => 'Controls auto-instrumentation of Curb at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :disable_puma_rack_urlmap => {
-          :default      => value_of(:disable_rack_urlmap),
-          :public       => true,
-          :type         => Boolean,
+        :'instrumentation.delayed_job' => {
+          :default => instrumentation_value_of(:disable_dj),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, prevents the agent from hooking into Puma::Rack::URLMap to install middleware tracing.'
+          :description => 'Controls auto-instrumentation of Delayed Job at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :disable_typhoeus => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
+        :'instrumentation.elasticsearch' => {
+          :default => 'auto',
+          :public => true,
+          :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t install instrumentation for the typhoeus gem.'
+          :description => 'Controls auto-instrumentation of the elasticsearch library at start up. May be one of [auto|prepend|chain|disabled].'
         },
-        :disable_httprb => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
+        :'instrumentation.excon' => {
+          :default => instrumentation_value_of(:disable_excon),
+          :documentation_default => 'enabled',
+          :public => :true,
+          :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t install instrumentation for the http.rb gem.'
-        },
-        :disable_middleware_instrumentation => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t wrap third-party middlewares in instrumentation (regardless of whether they are installed via Rack::Builder or Rails).'
+          :description => "Controls auto-instrumentation of Excon at start up.  May be one of [enabled|disabled]."
         },
-        :disable_rails_middleware => {
-          :default      => false,
-          :public       => false,
-          :type         => Boolean,
-          :allowed_from_server => false,
-          :description  => 'Internal name for controlling Rails 3+ middleware instrumentation'
-        },
-        :'heroku.use_dyno_names' => {
-          :default      => true,
-          :public       => true,
-          :type         => Boolean,
+        :'instrumentation.grape' => {
+          :default => instrumentation_value_of(:disable_grape_instrumentation),
+          :documentation_default => 'auto',
+          :public => :true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent uses Heroku dyno names as the hostname.'
+          :description => "Controls auto-instrumentation of Grape at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :'heroku.dyno_name_prefixes_to_shorten' => {
-          :default      => ['scheduler', 'run'],
-          :public       => true,
-          :type         => Array,
+        :'instrumentation.grpc_client' => {
+          :default => instrumentation_value_of(:disable_grpc_client),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
           :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 => 'Controls auto-instrumentation of gRPC clients at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :'process_host.display_name' => {
-          :default      => Proc.new{ NewRelic::Agent::Hostname.get },
-          :public       => true,
-          :type         => String,
+        :'instrumentation.grpc.host_denylist' => {
+          :default => [],
+          :public => true,
+          :type => Array,
           :allowed_from_server => false,
-          :description  => 'Specify a custom host name for <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/maintenance/add-rename-remove-hosts#display_name">display in the New Relic UI</a>.'
+          :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.*")
         },
-        :labels => {
-          :default      => '',
-          :public       => true,
-          :type         => String,
+        :'instrumentation.grpc_server' => {
+          :default => instrumentation_value_of(:disable_grpc_server),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'A dictionary of <a href="/docs/data-analysis/user-interface-functions/labels-categories-organize-your-apps-servers">label names</a> and values that will be applied to the data sent from this agent. May also be expressed as a semicolon-delimited <code>;</code> string of colon-separated <code>:</code> pairs. For example, <code><var>Server</var>:<var>One</var>;<var>Data Center</var>:<var>Primary</var></code>.'
-        },
-        :aggressive_keepalive => {
-          :default      => true,
-          :public       => false,
-          :type         => Boolean,
-          :allowed_from_server => true,
-          :description  => 'If true, attempt to keep the TCP connection to the collector alive between harvests.'
-        },
-        :keep_alive_timeout => {
-          :default      => 60,
-          :public       => false,
-          :type         => Integer,
-          :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.'
+          :description => 'Controls auto-instrumentation of gRPC servers at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :ca_bundle_path => {
-          :default      => nil,
-          :allow_nil    => true,
-          :public       => true,
-          :type         => String,
+        :'instrumentation.httpclient' => {
+          :default => instrumentation_value_of(:disable_httpclient),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => "Manual override for the path to your local CA bundle. This CA bundle will be used to validate the SSL certificate presented by New Relic\'s data collection service."
-        },
-        :'rules.ignore_url_regexes' => {
-          :default      => [],
-          :public       => true,
-          :type         => Array,
-          :allowed_from_server => true,
-          :transform    => DefaultSource.method(:convert_to_regexp_list),
-          :description  => 'Define transactions you want the agent to ignore, by specifying a list of patterns matching the URI you want to ignore.'
-        },
-        :'synthetics.traces_limit' => {
-          :default      => 20,
-          :public       => false,
-          :type         => Integer,
-          :allowed_from_server => true,
-          :description  => 'Maximum number of synthetics transaction traces to hold for a given harvest'
-        },
-        :'synthetics.events_limit' => {
-          :default      => 200,
-          :public       => false,
-          :type         => Integer,
-          :allowed_from_server => true,
-          :description  => 'Maximum number of synthetics transaction events to hold for a given harvest'
-        },
-        :'custom_insights_events.enabled' => {
-          :default      => true,
-          :public       => true,
-          :type         => Boolean,
-          :allowed_from_server => true,
-          :description  => 'If <code>true</code>, the agent captures <a href="/docs/insights/new-relic-insights/adding-querying-data/inserting-custom-events-new-relic-apm-agents">New Relic Insights custom events</a>.'
-        },
-        :'custom_insights_events.max_samples_stored' => {
-          :default      => 1000,
-          :public       => true,
-          :type         => Integer,
-          :allowed_from_server => true,
-          :description  => 'Specify a maximum number of custom Insights events to buffer in memory at a time.',
-          :dynamic_name => true
+          :description => "Controls auto-instrumentation of HTTPClient at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :disable_grape_instrumentation => {
-          :default      => false,
-          :public       => false,
-          :type         => Boolean,
+        :'instrumentation.httprb' => {
+          :default => instrumentation_value_of(:disable_httprb),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t install Grape instrumentation.'
+          :description => 'Controls auto-instrumentation of http.rb gem at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :disable_grape => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
+        :'instrumentation.logger' => {
+          :default => instrumentation_value_from_boolean(:'application_logging.enabled'),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t install Grape instrumentation.'
+          :description => 'Controls auto-instrumentation of Ruby standard library Logger at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :'attributes.enabled' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
+        :'instrumentation.memcache' => {
+          :default => instrumentation_value_of(:disable_dalli),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, enables capture of attributes for all destinations.'
+          :description => 'Controls auto-instrumentation of dalli gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :'transaction_tracer.attributes.enabled' => {
-          :default     => value_of(:'transaction_tracer.capture_attributes'),
-          :public      => true,
-          :type        => Boolean,
+        :'instrumentation.memcached' => {
+          :default => instrumentation_value_of(:disable_memcached),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent captures attributes from transaction traces.'
+          :description => 'Controls auto-instrumentation of memcached gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :'transaction_events.attributes.enabled' => {
-          :default     => value_of(:'analytics_events.capture_attributes'),
-          :public      => true,
-          :type        => Boolean,
+        :'instrumentation.memcache_client' => {
+          :default => instrumentation_value_of(:disable_memcache_client),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent captures attributes from transaction events.'
+          :description => 'Controls auto-instrumentation of memcache-client gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :'error_collector.attributes.enabled' => {
-          :default     => value_of(:'error_collector.capture_attributes'),
-          :public      => true,
-          :type        => Boolean,
+        :'instrumentation.mongo' => {
+          :default => instrumentation_value_of(:disable_mongo),
+          :documentation_default => 'enabled',
+          :public => :true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent captures attributes from error collection.'
+          :description => "Controls auto-instrumentation of Mongo at start up.  May be one of [enabled|disabled]."
         },
-        :'browser_monitoring.attributes.enabled' => {
-          :default     => value_of(:'browser_monitoring.capture_attributes'),
-          :public      => true,
-          :type        => Boolean,
+        :'instrumentation.net_http' => {
+          :default => instrumentation_value_of(:disable_net_http, :prepend_net_instrumentation),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent captures attributes from browser monitoring.'
+          :description => "Controls auto-instrumentation of Net::HTTP at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :'span_events.attributes.enabled' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
+        :'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)
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent captures attributes on span events.'
+          :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]."
         },
-        :'transaction_segments.attributes.enabled' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
+        :'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)
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent captures attributes on transaction segments.'
+          :description => 'Controls auto-instrumentation of Puma::Rack::URLMap at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :'attributes.exclude' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
+        :'instrumentation.rack' => {
+          :default => instrumentation_value_of(:disable_rack),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :transform   => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from all destinations. Allows <code>*</code> as wildcard at end.'
+          :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]."
         },
-        :'transaction_tracer.attributes.exclude' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
+        :'instrumentation.rack_urlmap' => {
+          :default => instrumentation_value_of(:disable_rack_urlmap),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :transform   => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from transaction traces. Allows <code>*</code> as wildcard at end.'
+          :description => 'Controls auto-instrumentation of Rack::URLMap at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :'transaction_events.attributes.exclude' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
+        :'instrumentation.rake' => {
+          :default => instrumentation_value_of(:disable_rake),
+          :documentation_default => 'auto',
+          :public => :true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from transaction events. Allows <code>*</code> as wildcard at end.'
+          :description => "Controls auto-instrumentation of rake at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :'error_collector.attributes.exclude' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
+        :'instrumentation.redis' => {
+          :default => instrumentation_value_of(:disable_redis),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from error collection. Allows <code>*</code> as wildcard at end.'
+          :description => "Controls auto-instrumentation of Redis at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :'browser_monitoring.attributes.exclude' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
+        :'instrumentation.resque' => {
+          :default => instrumentation_value_of(:disable_resque),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from browser monitoring. Allows <code>*</code> as wildcard at end.'
+          :description => "Controls auto-instrumentation of resque at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :'span_events.attributes.exclude' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
+        :'instrumentation.sinatra' => {
+          :default => instrumentation_value_of(:disable_sinatra),
+          :documentation_default => 'auto',
+          :public => :true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :transform   => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from span events. Allows <code>*</code> as wildcard at end.'
+          :description => "Controls auto-instrumentation of Sinatra at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :'transaction_segments.attributes.exclude' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
+        :'instrumentation.thread' => {
+          :default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :transform   => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from transaction segments. Allows <code>*</code> as wildcard at end.'
+          :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]."
         },
-        :'attributes.include' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
+        :'instrumentation.thread.tracing' => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in all destinations. Allows <code>*</code> as wildcard at end.'
+          :description => "Controls auto-instrumentation of the Thread class at start up to automatically add tracing to all Threads created in the application."
         },
-        :'transaction_tracer.attributes.include' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
+        :'instrumentation.tilt' => {
+          :default => "auto",
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in transaction traces. Allows <code>*</code> as wildcard at end.'
+          :description => 'Controls auto-instrumentation of the Tilt template rendering library at start up. May be one of [auto|prepend|chain|disabled].'
         },
-        :'transaction_events.attributes.include' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
+        :'instrumentation.typhoeus' => {
+          :default => instrumentation_value_of(:disable_typhoeus),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in transaction events. Allows <code>*</code> as wildcard at end.'
+          :description => "Controls auto-instrumentation of Typhoeus at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :'error_collector.attributes.include' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
-          :allowed_from_server => false,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in error collection. Allows <code>*</code> as wildcard at end.'
+        # Message tracer
+        :'message_tracer.segment_parameters.enabled' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, the agent will collect metadata about messages and attach them as segment parameters.'
         },
-        :'browser_monitoring.attributes.include' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
-          :allowed_from_server => false,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in browser monitoring. Allows <code>*</code> as wildcard at end.'
+        # Mongo
+        :'mongo.capture_queries' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, the agent captures Mongo queries in transaction traces.'
         },
-        :'span_events.attributes.include' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
-          :allowed_from_server => false,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include on span events. Allows <code>*</code> as wildcard at end.'
+        :'mongo.obfuscate_queries' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, the agent obfuscates Mongo queries in transaction traces.'
         },
-        :'transaction_segments.attributes.include' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
+        # Process host
+        :'process_host.display_name' => {
+          :default => proc { NewRelic::Agent::Hostname.get },
+          :public => true,
+          :type => String,
           :allowed_from_server => false,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include on transaction segments. Allows <code>*</code> as wildcard at end.'
+          :description => 'Specify a custom host name for [display in the New Relic UI](/docs/apm/new-relic-apm/maintenance/add-rename-remove-hosts#display_name).'
         },
-        :'custom_attributes.enabled' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
+        # Rake
+        :'rake.tasks' => {
+          :default => [],
+          :public => true,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'If <code>false</code>, custom attributes will not be sent on Insights events.'
+          :transform => DefaultSource.method(:convert_to_regexp_list),
+          :description => 'Specify an Array of Rake tasks to automatically instrument. ' \
+          '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].'
         },
-        :'utilization.detect_aws' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
+        :'rake.connect_timeout' => {
+          :default => 10,
+          :public => true,
+          :type => Integer,
           :allowed_from_server => false,
-          :dynamic_name => true,
-          :description => 'If <code>true</code>, the agent automatically detects that it is running in an AWS environment.'
+          :description => 'Timeout for waiting on connect to complete before a rake task'
         },
-        :'utilization.detect_azure' => {
-          :default      => true,
-          :public       => true,
-          :type         => Boolean,
+        # Resque
+        :'resque.capture_params' => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
           :dynamic_name => true,
-          :description  => 'If <code>true</code>, the agent automatically detects that it is running in an Azure environment.'
+          :deprecated => true,
+          :description => 'If `true`, enables the capture of job arguments for transaction traces and traced errors in Resque.'
         },
-        :'utilization.detect_gcp' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
-          :allowed_from_server => false,
-          :dynamic_name => true,
-          :description => 'If <code>true</code>, the agent automatically detects that it is running in an Google Cloud Platform environment.'
+        # Rules
+        :'rules.ignore_url_regexes' => {
+          :default => [],
+          :public => true,
+          :type => Array,
+          :allowed_from_server => true,
+          :transform => DefaultSource.method(:convert_to_regexp_list),
+          :description => 'Define transactions you want the agent to ignore, by specifying a list of patterns matching the URI you want to ignore. See documentation on (ignoring specific transactions)[https://docs.newrelic.com/docs/agents/ruby-agent/api-guides/ignoring-specific-transactions/#config-ignoring] for more details.'
         },
-        :'utilization.detect_pcf' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
+        # Sidekiq
+        :'sidekiq.capture_params' => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
           :dynamic_name => true,
-          :description => 'If <code>true</code>, the agent automatically detects that it is running in a Pivotal Cloud Foundry environment.'
+          :deprecated => true,
+          :description => 'If `true`, enables the capture of job arguments for transaction traces and traced errors in Sidekiq.'
         },
-        :'utilization.detect_docker' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
-          :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent automatically detects that it is running in Docker.'
+        # Slow SQL
+        :'slow_sql.enabled' => {
+          :default => value_of(:'transaction_tracer.enabled'),
+          :documentation_default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, the agent collects [slow SQL queries](/docs/apm/applications-menu/monitoring/viewing-slow-query-details).'
+        },
+        :'slow_sql.explain_threshold' => {
+          :default => value_of(:'transaction_tracer.explain_threshold'),
+          :documentation_default => 0.5,
+          :public => true,
+          :type => Float,
+          :allowed_from_server => true,
+          :description => 'Specify a threshold in seconds. The agent collects [slow SQL queries](/docs/apm/applications-menu/monitoring/viewing-slow-query-details) and explain plans that exceed this threshold.'
+        },
+        :'slow_sql.explain_enabled' => {
+          :default => value_of(:'transaction_tracer.explain_enabled'),
+          :documentation_default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, the agent collects explain plans in slow SQL queries. If this setting is omitted, the [`transaction_tracer.explain_enabled`](#transaction_tracer-explain_enabled) setting will be applied as the default setting for explain plans in slow SQL as well.'
+        },
+        :'slow_sql.record_sql' => {
+          :default => value_of(:'transaction_tracer.record_sql'),
+          :documentation_default => 'obfuscated',
+          :public => true,
+          :type => String,
+          :allowed_from_server => true,
+          :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.'
+        },
+        # Span events
+        :'span_events.enabled' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, enables span event sampling.'
+        },
+        :'span_events.queue_size' => {
+          :default => 10_000,
+          :public => true,
+          :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."
+        },
+        :'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.'
+        },
+        # Strip exception messages
+        :'strip_exception_messages.enabled' => {
+          :default => value_of(:high_security),
+          :documentation_default => false,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'If true, the agent strips messages from all exceptions except those in the [allowlist](#strip_exception_messages-allowlist). Enabled automatically in [high security mode](/docs/accounts-partnerships/accounts/security/high-security).'
+        },
+        :'strip_exception_messages.allowed_classes' => {
+          :default => '',
+          :public => true,
+          :type => String,
+          :allowed_from_server => false,
+          :transform => DefaultSource.method(:convert_to_constant_list),
+          :description => 'Specify a list of exceptions you do not want the agent to strip when [strip_exception_messages](#strip_exception_messages-enabled) is `true`. Separate exceptions with a comma. For example, `"ImportantException,PreserveMessageException"`.'
+        },
+        # Thread profiler
+        :'thread_profiler.enabled' => {
+          :default => DefaultSource.thread_profiler_enabled,
+          :documentation_default => false,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, enables use of the [thread profiler](/docs/apm/applications-menu/events/thread-profiler-tool).'
+        },
+        # Utilization
+        :'utilization.detect_aws' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :dynamic_name => true,
+          :description => 'If `true`, the agent automatically detects that it is running in an AWS environment.'
+        },
+        :'utilization.detect_azure' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :dynamic_name => true,
+          :description => 'If `true`, the agent automatically detects that it is running in an Azure environment.'
+        },
+        :'utilization.detect_docker' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'If `true`, the agent automatically detects that it is running in Docker.'
+        },
+        :'utilization.detect_gcp' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :dynamic_name => true,
+          :description => 'If `true`, the agent automatically detects that it is running in an Google Cloud Platform environment.'
         },
         :'utilization.detect_kubernetes' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'If `true`, the agent automatically detects that it is running in Kubernetes.'
+        },
+        :'utilization.detect_pcf' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :dynamic_name => true,
+          :description => 'If `true`, the agent automatically detects that it is running in a Pivotal Cloud Foundry environment.'
+        },
+        # Private
+        :account_id => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'The account id associated with your application.'
+        },
+        :aggressive_keepalive => {
+          :default => true,
+          :public => false,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If true, attempt to keep the TCP connection to the collector alive between harvests.'
+        },
+        :api_host => {
+          :default => DefaultSource.api_host,
+          :public => false,
+          :type => String,
+          :allowed_from_server => false,
+          :description => 'API host for New Relic.'
+        },
+        :api_port => {
+          :default => value_of(:port),
+          :public => false,
+          :type => Integer,
+          :allowed_from_server => false,
+          :description => 'Port for the New Relic API host.'
+        },
+        :application_id => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'Application ID for real user monitoring.'
+        },
+        :beacon => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'Beacon for real user monitoring.'
+        },
+        :browser_key => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'Real user monitoring license key for the browser timing header.'
+        },
+        :'browser_monitoring.loader' => {
+          :default => DefaultSource.browser_monitoring_loader,
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'Type of JavaScript agent loader to use for browser monitoring instrumentation.'
+        },
+        :'browser_monitoring.loader_version' => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'Version of JavaScript agent loader (returned from the New Relic [collector](/docs/apm/new-relic-apm/getting-started/glossary#collector).)'
+        },
+        :'browser_monitoring.debug' => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'Enable or disable debugging version of JavaScript agent loader for browser monitoring instrumentation.'
+        },
+        :'browser_monitoring.ssl_for_http' => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'Enable or disable HTTPS instrumentation by JavaScript agent on HTTP pages.'
+        },
+        :compressed_content_encoding => {
+          :default => 'gzip',
+          :public => false,
+          :type => String,
+          :allowed_from_server => false,
+          :description => 'Encoding to use if data needs to be compressed. The options are deflate and gzip.'
+        },
+        :config_search_paths => {
+          :default => DefaultSource.config_search_paths,
+          :public => false,
+          :type => Array,
+          :allowed_from_server => false,
+          :description => "An array of candidate locations for the agent's configuration file."
+        },
+        :cross_process_id => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'Cross process ID for cross-application tracing.'
+        },
+        :data_report_period => {
+          :default => 60,
+          :public => false,
+          :type => Integer,
+          :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,
+          :type => Symbol,
+          :allowed_from_server => false,
+          :description => 'Autodetected application component that reports metrics to New Relic.'
+        },
+        :disable_harvest_thread => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'Enable or disable the harvest thread.'
+        },
+        :disable_rails_middleware => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
+          :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,
+          :type => Boolean,
+          :aliases => [:enable],
+          :allowed_from_server => false,
+          :description => 'Enable or disable the agent.'
+        },
+        :encoding_key => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'Encoding key for cross-application tracing.'
+        },
+        :entity_guid => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'The [Entity GUID](/attribute-dictionary/span/entityguid) for the entity running your agent.'
+        },
+        :error_beacon => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'Error beacon for real user monitoring.'
+        },
+        :event_report_period => {
+          :default => 60,
+          :public => false,
+          :type => Integer,
+          :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'),
+          :public => false,
+          :type => Integer,
+          :dynamic_name => true,
+          :allowed_from_server => true,
+          :description => 'Number of seconds betwixt connections to the New Relic transaction event collection services.'
+        },
+        :'event_report_period.custom_event_data' => {
+          :default => 60,
+          :public => false,
+          :type => Integer,
+          :dynamic_name => true,
+          :allowed_from_server => true,
+          :description => 'Number of seconds betwixt connections to the New Relic custom event collection services.'
+        },
+        :'event_report_period.error_event_data' => {
+          :default => 60,
+          :public => false,
+          :type => Integer,
+          :dynamic_name => true,
+          :allowed_from_server => true,
+          :description => 'Number of seconds betwixt connections to the New Relic error event collection services.'
+        },
+        :'event_report_period.log_event_data' => {
+          :default => 60,
+          :public => false,
+          :type => Integer,
+          :dynamic_name => true,
+          :allowed_from_server => true,
+          :description => 'Number of seconds betwixt connections to the New Relic log event collection services.'
+        },
+        :'event_report_period.span_event_data' => {
+          :default => 60,
+          :public => false,
+          :type => Integer,
+          :dynamic_name => true,
+          :allowed_from_server => true,
+          :description => 'Number of seconds betwixt connections to the New Relic span event collection services.'
+        },
+        :force_reconnect => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent automatically detects that it is running in Kubernetes.'
+          :description => 'Force a new connection to the server before running the worker loop. Creates a separate agent run and is recorded as a separate instance by the New Relic data collection service.'
         },
-        :'utilization.billing_hostname' => {
-          :default     => nil,
-          :allow_nil   => true,
-          :public      => false,
-          :type        => String,
+        :framework => {
+          :default => DefaultSource.framework,
+          :public => false,
+          :type => Symbol,
           :allowed_from_server => false,
-          :description => 'The configured server name by a customer.'
+          :description => 'Autodetected application framework used to enable framework-specific functionality.'
         },
-        :'utilization.logical_processors' => {
-          :default     => nil,
-          :allow_nil   => true,
-          :public      => false,
-          :type        => Integer,
+        :host => {
+          :default => DefaultSource.host,
+          :public => false,
+          :type => String,
           :allowed_from_server => false,
-          :description => 'The total number of hyper-threaded execution contexts available.'
+          :description => "URI for the New Relic data collection service."
         },
-        :'utilization.total_ram_mib' => {
-          :default     => nil,
-          :allow_nil   => true,
-          :public      => false,
-          :type        => Integer,
+        :'infinite_tracing.batching' => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'This value represents the total amount of memory available to the host (not the process), in mebibytes (1024 squared or 1,048,576 bytes).'
+          :external => :infinite_tracing,
+          :description => "If true, data sent to the Trace Observer will be batched instead of the default of each " \
+                          "span being sent individually"
         },
-        :'datastore_tracer.instance_reporting.enabled' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
+        :'infinite_tracing.compression_level' => {
+          :default => :none,
+          :public => false,
+          :type => Symbol,
           :allowed_from_server => false,
-          :description => 'If <code>false</code>, the agent will not report datastore instance metrics, nor add <code>host</code> or <code>port_path_or_id</code> parameters to transaction or slow sql traces.'
+          :external => :infinite_tracing,
+          :description => "Configure the compression level for data sent to the Trace Observer\nMay be one of " \
+                          "[none|low|medium|high]\nBy default, compression is not used (level = none)"
         },
-        :'datastore_tracer.database_name_reporting.enabled' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
+        :js_agent_file => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'JavaScript agent file for real user monitoring.'
+        },
+        :js_agent_loader => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'JavaScript agent loader content.'
+        },
+        :js_errors_beta => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>false</code>, the agent will not add <code>database_name</code> parameter to transaction or slow sql traces.'
+          :deprecated => true,
+          :description => 'Enable or disable beta JavaScript error reporting.'
         },
-        :'clear_transaction_state_after_fork' => {
-          :default     => false,
-          :public      => true,
-          :type        => Boolean,
+        :keep_alive_timeout => {
+          :default => 60,
+          :public => false,
+          :type => Integer,
+          :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 => 'If <code>true</code>, the agent will clear <code>Tracer::State</code> in <code>Agent.drop_buffered_data</code>.'
+          :description => 'Enable or disable retrying failed connections to the New Relic data collection service.'
         },
-        :account_id => {
-          :default => nil,
-          :allow_nil => true,
+        :max_payload_size_in_bytes => {
+          :default => 1000000,
           :public => false,
-          :type => String,
+          :type => Integer,
           :allowed_from_server => true,
-          :description => 'The account id associated with this application.'
+          :description => 'Maximum number of bytes to send to the New Relic data collection service.'
+        },
+        :normalize_json_string_encodings => {
+          :default => true,
+          :public => false,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'Controls whether to normalize string encodings prior to serializing data for the collector to JSON.'
+        },
+        :port => {
+          :default => 443,
+          :public => false,
+          :type => Integer,
+          :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,
@@ -1879,32 +2383,42 @@ module NewRelic
           :public => false,
           :type => String,
           :allowed_from_server => true,
-          :description => 'The primary id associated with this application.'
+          :description => 'The primary id associated with your application.'
         },
-        :'distributed_tracing.enabled' => {
-          :default     => false,
-          :public      => true,
-          :type        => Boolean,
+        :put_for_data_send => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Distributed tracing lets you see the path that a request takes through your distributed system. Enabling distributed tracing changes the behavior of some New Relic features, so carefully consult the <a href="https://docs.newrelic.com/docs/transition-guide-distributed-tracing">transition guide</a> before you enable this feature.'
+          :description => 'Use HTTP PUT requests instead of POST.'
         },
-        :'distributed_tracing.format' => {
-          :default => 'newrelic',
+        :report_instance_busy => {
+          :default => true,
           :public => false,
-          :type => String,
-          :transform => DefaultSource.enforce_fallback(
-            allowed_values: ['w3c', 'newrelic'],
-            fallback: 'newrelic'),
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'The format to use for distributed tracing if it is enabled. Options are w3c for W3C Trace Context or newrelic for New Relic Distriburted Tracing. Defaults to New Relic Distributed Tracing.'
+          :description => 'Enable or disable transmission of metrics recording the percentage of time application instances spend servicing requests (duty cycle metrics).'
         },
-        :trusted_account_key => {
-          :default => nil,
-          :allow_nil => true,
+        :restart_thread_in_children => {
+          :default => true,
           :public => false,
-          :type => String,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'Controls whether to check on running a transaction whether to respawn the harvest thread.'
+        },
+        :'resque.use_ruby_dns' => {
+          :default => true,
+          :public => false,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'Replace the libc DNS resolver with the all Ruby resolver Resolv'
+        },
+        :'rum.enabled' => {
+          :default => true,
+          :public => false,
+          :type => Boolean,
           :allowed_from_server => true,
-          :description => 'A shared key to validate that a distributed trace payload came from a trusted account.'
+          :description => 'Enable or disable page load timing (sometimes referred to as real user monitoring or RUM).'
         },
         :sampling_target => {
           :default => 10,
@@ -1920,19 +2434,93 @@ module NewRelic
           :allowed_from_server => true,
           :description => 'The period during which a target number of transactions should be marked as sampled.'
         },
-        :'span_events.enabled' => {
+        :send_environment_info => {
           :default => true,
-          :public => true,
+          :public => false,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'Enable or disable transmission of application environment information to the New Relic data collection service.'
+        },
+        :simple_compression => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'When enabled the agent will compress payloads destined for the collector, but will not pre-compress parts of the payload.'
+        },
+        :skip_ar_instrumentation => {
+          :default => false,
+          :public => false,
           :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'Enable or disable active record instrumentation.'
+        },
+        :'synthetics.traces_limit' => {
+          :default => 20,
+          :public => false,
+          :type => Integer,
           :allowed_from_server => true,
-          :description => 'If <code>true</code>, enables span event sampling.'
+          :description => 'Maximum number of synthetics transaction traces to hold for a given harvest'
         },
-        :'span_events.max_samples_stored' => {
-          :default => 1000,
-          :public => true,
+        :'synthetics.events_limit' => {
+          :default => 200,
+          :public => false,
           :type => Integer,
           :allowed_from_server => true,
-          :description => 'Defines the maximum number of span events reported from a single harvest.'
+          :description => 'Maximum number of synthetics transaction events to hold for a given harvest'
+        },
+        :test_mode => {
+          :default => false,
+          :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.'
+        },
+        :'thread_profiler.max_profile_overhead' => {
+          :default => 0.05,
+          :public => false,
+          :type => Float,
+          :allowed_from_server => true,
+          :description => 'Maximum overhead percentage for thread profiling before agent reduces polling frequency'
+        },
+        :trusted_account_ids => {
+          :default => [],
+          :public => false,
+          :type => Array,
+          :allowed_from_server => true,
+          :description => 'List of trusted New Relic account IDs for the purposes of cross-application tracing. Inbound requests from applications including cross-application headers that do not come from an account in this list will be ignored.'
+        },
+        :trusted_account_key => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'A shared key to validate that a distributed trace payload came from a trusted account.'
+        },
+        :'utilization.billing_hostname' => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
+          :type => String,
+          :allowed_from_server => false,
+          :description => 'The configured server name by a customer.'
+        },
+        :'utilization.logical_processors' => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
+          :type => Integer,
+          :allowed_from_server => false,
+          :description => 'The total number of hyper-threaded execution contexts available.'
+        },
+        :'utilization.total_ram_mib' => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
+          :type => Integer,
+          :allowed_from_server => false,
+          :description => 'This value represents the total amount of memory available to the host (not the process), in mebibytes (1024 squared or 1,048,576 bytes).'
         }
       }.freeze
     end