newrelic_rpm 8.2.0 → 9.0.0

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

@@ -1,16 +1,15 @@
-# encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require '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
@@ -27,8 +26,8 @@ module NewRelic
       #     - 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.new do
+      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]
@@ -39,10 +38,16 @@ module NewRelic
         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.gsub(".", "-")
+      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
 
@@ -76,11 +81,11 @@ module NewRelic
         end
 
         def self.config_search_paths
-          Proc.new {
+          proc {
             paths = [
-              File.join("config","newrelic.yml"),
+              File.join("config", "newrelic.yml"),
               File.join("newrelic.yml"),
-              File.join("config","newrelic.yml.erb"),
+              File.join("config", "newrelic.yml.erb"),
               File.join("newrelic.yml.erb")
             ]
 
@@ -91,11 +96,11 @@ module NewRelic
               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")
-              paths << File.join(ENV["HOME"], ".newrelic", "newrelic.yml.erb")
-              paths << File.join(ENV["HOME"], "newrelic.yml.erb")
+            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
@@ -110,28 +115,26 @@ 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?(::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.warn "Detected untested 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
@@ -142,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')
@@ -162,30 +165,23 @@ 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? }
-        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::Threading::BacktraceService.is_supported? }
         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
@@ -196,7 +192,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"
@@ -207,12 +203,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
 
@@ -235,30 +235,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
@@ -321,28 +319,15 @@ module NewRelic
       ].join(',').freeze
 
       DEFAULTS = {
-        :license_key => {
-          :default => '',
-          :public => true,
-          :type => String,
-          :allowed_from_server => false,
-          :description => 'Your New Relic [license key](/docs/accounts-partnerships/accounts/account-setup/license-key).'
-        },
+        # Critical
         :agent_enabled => {
           :default => DefaultSource.agent_enabled,
+          :documentation_default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
           :description => 'If `true`, 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.'
-        },
         :app_name => {
           :default => DefaultSource.app_name,
           :public => true,
@@ -351,27 +336,12 @@ module NewRelic
           :transform => DefaultSource.method(:convert_to_list_on_semicolon),
           :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,
-          :public => false,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'The [Entity GUID](/attribute-dictionary/span/entityguid) for the entity running this agent.'
-        },
-        :monitor_mode => {
-          :default => value_of(:enabled),
+        :license_key => {
+          :default => '',
           :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :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).'
-        },
-        :test_mode => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
+          :type => String,
           :allowed_from_server => false,
-          :description => 'Used in tests for agent to start up but not connect to collector. Formerly used `developer_mode` in test config for this purpose.'
+          :description => 'Your New Relic <LicenseKey />.'
         },
         :log_level => {
           :default => 'info',
@@ -380,73 +350,75 @@ module NewRelic
           :allowed_from_server => false,
           :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
+        :active_support_custom_events_names => {
+          :default => [],
           :public => true,
-          :type => Boolean,
+          :type => Array,
           :allowed_from_server => false,
-          :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.'
+          :description => <<~DESCRIPTION
+            An array of ActiveSupport custom event names to subscribe to and instrument. For example,
+              - one.custom.event
+              - another.event
+              - a.third.event
+          DESCRIPTION
         },
-        :security_policies_token => {
-          :default => '',
-          :public => true,
-          :type => String,
-          :allowed_from_server => false,
-          :description => 'Applies Language Agent Security Policy settings.'
+        # this is only set via server side config
+        :apdex_t => {
+          :default => 0.5,
+          :public => false,
+          :type => Float,
+          :allowed_from_server => 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).'
         },
-        :proxy_host => {
-          :default => nil,
-          :allow_nil => true,
+        :api_key => {
+          :default => '',
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :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.'
+          :description => 'Your New Relic [user key](/docs/apis/intro-apis/new-relic-api-keys/#overview-keys). Required when using the New Relic REST API v2 to record deployments using the `newrelic deployments` command.'
         },
-        :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 [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector) 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 [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector) 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 [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector) 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 `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)'\
-            "\n" \
-            '<div class="callout-warning">' \
-            "\n" \
-            '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>.' \
-            "\n" \
-            '</div>'
+          :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,
@@ -455,130 +427,122 @@ 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,
+        :'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."
+        },
+        :force_install_exit_handler => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => "An array of candidate locations for the agent\'s configuration file."
+          :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.'
         },
-        :dispatcher => {
-          :default => DefaultSource.dispatcher,
-          :public => false,
-          :type => Symbol,
+        :high_security => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Autodetected application component that reports metrics to New Relic.'
+          :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.'
         },
-        :framework => {
-          :default => DefaultSource.framework,
-          :public => false,
-          :type => Symbol,
+        :labels => {
+          :default => '',
+          :public => true,
+          :type => String,
           :allowed_from_server => false,
-          :description => 'Autodetected application framework used to enable framework-specific functionality.'
+          :description => 'A dictionary of [label names](/docs/data-analysis/user-interface-functions/labels-categories-organize-your-apps-servers) and values that will be applied to the data sent from this agent. May also be expressed as a semicolon-delimited `;` string of colon-separated `:` pairs. For example, `Server:One;Data Center:Primary`.'
         },
-        :'autostart.denylisted_constants' => {
-          :default => 'Rails::Console',
+        :log_file_name => {
+          :default => 'newrelic_agent.log',
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Specify a list of constants that should prevent the agent from starting automatically. Separate individual constants with a comma `,`. For example, `Rails::Console,UninstrumentedBackgroundJob`.'
+          :description => 'Defines a name for the log file.'
         },
-        :'autostart.denylisted_executables' => {
-          :default => 'irb,rspec',
+        :log_file_path => {
+          :default => DefaultSource::DEFAULT_LOG_DIR,
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Defines a comma-delimited list of executables that the agent should not instrument. For example, `rake,my_ruby_script.rb`.'
+          :description => 'Defines a path to the agent log file, excluding the filename.'
         },
-        :'autostart.denylisted_rake_tasks' => {
-          :default => AUTOSTART_DENYLISTED_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, `assets:precompile,db:migrate`.'
+          :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,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.rake', 'If `true`, 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,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.rake', '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 => '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).'
+          :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 [allowlist](#strip_exception_messages-allowlist). Enabled automatically in [high security mode](/docs/accounts-partnerships/accounts/security/high-security).'
+          :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.allowed_classes' => {
-          :default => '',
+        :proxy_user => {
+          :default => nil,
+          :allow_nil => true,
           :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"`.'
-        },
-        :host => {
-          :default => DefaultSource.host,
-          :public => false,
-          :type => String,
-          :allowed_from_server => false,
-          :description => "URI for the New Relic data collection service."
+          :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.'
         },
-        :api_host => {
-          :default => DefaultSource.api_host,
-          :public => false,
+        :security_policies_token => {
+          :default => '',
+          :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'API host for New Relic.'
-        },
-        :port => {
-          :default => 443,
-          :public => false,
-          :type => Integer,
-          :allowed_from_server => false,
-          :description => 'Port for the New Relic data collection service.'
+          :description => 'Applies Language Agent Security Policy settings.'
         },
-        :api_port => {
-          :default => value_of(:port),
-          :public => false,
-          :type => Integer,
+        :send_data_on_exit => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Port for the New Relic API host.'
+          :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.'
         },
         :sync_startup => {
           :default => false,
@@ -587,616 +551,636 @@ module NewRelic
           :allowed_from_server => false,
           :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.'
         },
-        :send_data_on_exit => {
-          :default => true,
+        :timeout => {
+          :default => 2 * 60, # 2 minutes
           :public => true,
-          :type => Boolean,
+          :type => Integer,
           :allowed_from_server => false,
-          :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.'
+          :description => 'Defines the maximum number of seconds the agent should spend attempting to connect to the collector.'
         },
-        :max_payload_size_in_bytes => {
-          :default => 1000000,
-          :public => false,
+        # Transaction tracer
+        :'transaction_tracer.enabled' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, enables collection of [transaction traces](/docs/apm/traces/transaction-traces/transaction-traces).'
+        },
+        :'transaction_tracer.explain_enabled' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :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.'
+        },
+        :'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 => {
-          :default => true,
-          :public => false,
+        # Error collector
+        :'error_collector.ignore_classes' => {
+          :default => ['ActionController::RoutingError', 'Sinatra::NotFound'],
+          :public => true,
+          :type => Array,
+          :allowed_from_server => true,
+          :dynamic_name => true,
+          :description => <<~DESCRIPTION
+            A list of error classes that the agent should ignore.
+
+              <Callout variant="caution">
+                This option can't be set via environment variable.
+              </Callout>
+          DESCRIPTION
+        },
+        :'error_collector.capture_events' => {
+          :default => value_of(:'error_collector.enabled'),
+          :documentation_default => true,
+          :public => true,
           :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'Enable or disable transmission of application environment information to the New Relic data collection service.'
+          :allowed_from_server => true,
+          :dynamic_name => true,
+          :description => 'If `true`, the agent collects [TransactionError events](/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights).'
         },
-        :data_report_period => {
-          :default => 60,
-          :public => false,
-          :type => Integer,
+        :'error_collector.enabled' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => true,
-          :description => 'Number of seconds betwixt connections to the New Relic data collection service.'
+          :description => 'If `true`, the agent captures traced errors and error count metrics.'
         },
-        :event_report_period => {
-          :default => 60,
-          :public => false,
-          :type => Integer,
+        :'error_collector.expected_classes' => {
+          :default => [],
+          :public => true,
+          :type => Array,
           :allowed_from_server => true,
-          :description => 'Number of seconds betwixt connections to the New Relic event collection services.'
+          :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
         },
-        :'event_report_period.analytic_event_data' => {
-          :default => 60,
-          :public => false,
-          :type => Integer,
+        :'error_collector.expected_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 treated as expected.
+
+              <Callout variant="caution">
+                This option can't be set via environment variable.
+              </Callout>
+          DESCRIPTION
+        },
+        :'error_collector.expected_status_codes' => {
+          :default => '',
+          :public => true,
+          :type => String,
           :allowed_from_server => true,
-          :description => 'Number of seconds betwixt connections to the New Relic analytic 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 treated as expected.'
         },
-        :'event_report_period.custom_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 custom 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.'
         },
-        :'event_report_period.error_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,
-          :dynamic_name => true,
           :allowed_from_server => true,
-          :description => 'Number of seconds betwixt connections to the New Relic error event collection services.'
+          :description => 'Defines the maximum number of [TransactionError events](/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights) reported per harvest cycle.'
         },
-        :'event_report_period.span_event_data' => {
-          :default => 60,
-          :public => false,
+        # Browser monitoring
+        :'browser_monitoring.auto_instrument' => {
+          :default => value_of(:'rum.enabled'),
+          :documentation_default => true,
+          :public => true,
+          :type => Boolean,
+          :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).'
+        },
+        # Transaction events
+        :'transaction_events.enabled' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, enables transaction event sampling.'
+        },
+        :'transaction_events.max_samples_stored' => {
+          :default => 1200,
+          :public => true,
           :type => Integer,
-          :dynamic_name => true,
           :allowed_from_server => true,
-          :description => 'Number of seconds betwixt connections to the New Relic span event collection services.'
+          :description => 'Defines the maximum number of transaction events reported from a single harvest.'
         },
-        :keep_retrying => {
+        # Application logging
+        :'application_logging.enabled' => {
           :default => true,
-          :public => false,
+          :public => true,
           :type => Boolean,
-          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Enable or disable retrying failed connections to the New Relic data collection service.'
+          :description => 'If `true`, enables log decoration and the collection of log events and metrics.'
         },
-        :force_install_exit_handler => {
-          :default => false,
+        :'application_logging.forwarding.enabled' => {
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :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.'
+          :description => 'If `true`, the agent captures log records emitted by your application.'
         },
-        :force_reconnect => {
+        :'application_logging.forwarding.max_samples_stored' => {
+          :default => 10000,
+          :public => true,
+          :type => Integer,
+          :allowed_from_server => true,
+          :description => 'Defines the maximum number of log records to buffer in memory at a time.',
+          :dynamic_name => true
+        },
+        :'application_logging.local_decorating.enabled' => {
           :default => false,
-          :public => false,
+          :public => true,
           :type => Boolean,
           :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 => 'If `true`, the agent decorates logs with metadata to link to entities, hosts, traces, and spans.'
         },
-        :report_instance_busy => {
+        :'application_logging.metrics.enabled' => {
           :default => true,
-          :public => false,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, the agent captures metrics related to logging for your application.'
+        },
+        # Attributes
+        :'attributes.enabled' => {
+          :default => true,
+          :public => true,
           :type => Boolean,
           :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 => 'If `true`, enables capture of attributes for all destinations.'
         },
-        :log_file_name => {
-          :default => 'newrelic_agent.log',
+        :'attributes.exclude' => {
+          :default => [],
           :public => true,
-          :type => String,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'Defines a name for the log file.'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to exclude from all destinations. Allows `*` as wildcard at end.'
         },
-        :log_file_path => {
-          :default => DefaultSource::DEFAULT_LOG_DIR,
+        :'attributes.include' => {
+          :default => [],
           :public => true,
-          :type => String,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'Defines a path to the agent log file, excluding the filename.'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to include in all destinations. Allows `*` as wildcard at end.'
         },
-        :'audit_log.enabled' => {
+        :'browser_monitoring.attributes.enabled' => {
           :default => false,
           :public => true,
           :type => Boolean,
           :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).'
+          :description => 'If `true`, the agent captures attributes from browser monitoring.'
         },
-        :'audit_log.path' => {
-          :default => DefaultSource.audit_log_path,
+        :'browser_monitoring.attributes.exclude' => {
+          :default => [],
           :public => true,
-          :type => String,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'Specifies a path to the audit log file (including the filename).'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to exclude from browser monitoring. Allows `*` as wildcard at end.'
         },
-        :'audit_log.endpoints' => {
-          :default => [".*"],
+        :'browser_monitoring.attributes.include' => {
+          :default => [],
           :public => true,
           :type => Array,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_regexp_list),
-          :description => 'List of allowed endpoints to include in audit log'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to include in browser monitoring. Allows `*` as wildcard at end.'
         },
-        :disable_samplers => {
-          :default => false,
+        :'error_collector.attributes.enabled' => {
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :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).'
+          :description => 'If `true`, the agent captures attributes from error collection.'
         },
-        :disable_resque => {
-          :default => false,
+        :'error_collector.attributes.exclude' => {
+          :default => [],
           :public => true,
-          :type => Boolean,
-          :deprecated => true,
+          :type => Array,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.resque', 'If `true`, disables [Resque instrumentation](/docs/agents/ruby-agent/background-jobs/resque-instrumentation).')
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to exclude from error collection. Allows `*` as wildcard at end.'
         },
-        :disable_sidekiq => {
-          :default => false,
+        :'error_collector.attributes.include' => {
+          :default => [],
           :public => true,
-          :type => Boolean,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'If `true`, disables [Sidekiq instrumentation](/docs/agents/ruby-agent/background-jobs/sidekiq-instrumentation).'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to include in error collection. Allows `*` as wildcard at end.'
         },
-        :disable_dj => {
-          :default => false,
+        :'span_events.attributes.enabled' => {
+          :default => true,
           :public => true,
-          :deprecated => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.delayed_job', 'If `true`, disables [Delayed::Job instrumentation](/docs/agents/ruby-agent/background-jobs/delayedjob).'
-          )
+          :description => 'If `true`, the agent captures attributes on span events.'
         },
-        :disable_sinatra => {
-          :default => false,
+        :'span_events.attributes.exclude' => {
+          :default => [],
           :public => true,
-          :type => Boolean,
-          :deprecated => true,
+          :type => Array,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.sinatra', 'If `true` , disables [Sinatra instrumentation](/docs/agents/ruby-agent/frameworks/sinatra-support).' )
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to exclude from span events. Allows `*` as wildcard at end.'
         },
-        :disable_sinatra_auto_middleware => {
-          :default => false,
+        :'span_events.attributes.include' => {
+          :default => [],
           :public => true,
-          :type => Boolean,
+          :type => Array,
           :allowed_from_server => false,
-          :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).'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to include on span events. Allows `*` as wildcard at end.'
         },
-        :disable_view_instrumentation => {
-          :default => false,
+        :'transaction_events.attributes.enabled' => {
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `true`, disables view instrumentation.'
-        },
-        :disable_harvest_thread => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'Enable or disable the harvest thread.'
-        },
-        :skip_ar_instrumentation => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'Enable or disable active record instrumentation.'
+          :description => 'If `true`, the agent captures attributes from transaction events.'
         },
-        :disable_activerecord_instrumentation => {
-          :default => value_of(:skip_ar_instrumentation),
+        :'transaction_events.attributes.exclude' => {
+          :default => [],
           :public => true,
-          :type => Boolean,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'If `true`, disables active record instrumentation.'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to exclude from transaction events. Allows `*` as wildcard at end.'
         },
-        :prepend_active_record_instrumentation => {
-          :default => false,
+        :'transaction_events.attributes.include' => {
+          :default => [],
           :public => true,
-          :type => Boolean,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'If `true`, uses `Module#prepend` rather than `alias_method` for ActiveRecord instrumentation.'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to include in transaction events. Allows `*` as wildcard at end.'
         },
-        :prepend_net_instrumentation => {
+        :'transaction_segments.attributes.enabled' => {
           :default => true,
-          :public => false,
+          :public => true,
           :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.'
-          )
+          :description => 'If `true`, the agent captures attributes on transaction segments.'
         },
-        :'instrumentation.net_http' => {
-          :default => instrumentation_value_of(:disable_net_http, :prepend_net_instrumentation),
+        :'transaction_segments.attributes.exclude' => {
+          :default => [],
           :public => true,
-          :type => String,
-          :dynamic_name => true,
+          :type => Array,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Net::HTTP at start up.  May be one of [auto|prepend|chain|disabled]."
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to exclude from transaction segments. Allows `*` as wildcard at end.'
         },
-        :'instrumentation.typhoeus' => {
-          :default => instrumentation_value_of(:disable_typhoeus),
+        :'transaction_segments.attributes.include' => {
+          :default => [],
           :public => true,
-          :type => String,
-          :dynamic_name => true,
+          :type => Array,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Typhoeus at start up.  May be one of [auto|prepend|chain|disabled]."
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to include on transaction segments. Allows `*` as wildcard at end.'
         },
-        :'instrumentation.bunny' => {
-          :default => instrumentation_value_of(:disable_bunny),
+        :'transaction_tracer.attributes.enabled' => {
+          :default => true,
           :public => true,
-          :type => String,
-          :dynamic_name => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of bunny at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'If `true`, the agent captures attributes from transaction traces.'
         },
-        :'instrumentation.httprb' => {
-          :default => instrumentation_value_of(:disable_httprb),
+        :'transaction_tracer.attributes.exclude' => {
+          :default => [],
           :public => true,
-          :type => String,
-          :dynamic_name => true,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of http.rb gem at start up.  May be one of [auto|prepend|chain|disabled].'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to exclude from transaction traces. Allows `*` as wildcard at end.'
         },
-        :'instrumentation.resque' => {
-          :default => instrumentation_value_of(:disable_resque),
+        :'transaction_tracer.attributes.include' => {
+          :default => [],
           :public => true,
-          :type => String,
-          :dynamic_name => true,
+          :type => Array,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of resque at start up.  May be one of [auto|prepend|chain|disabled]."
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to include in transaction traces. Allows `*` as wildcard at end.'
         },
-        :'instrumentation.redis' => {
-          :default => instrumentation_value_of(:disable_redis),
+        # Audit log
+        :'audit_log.enabled' => {
+          :default => false,
           :public => true,
-          :type => String,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Redis at start up.  May be one of [auto|prepend|chain|disabled]."
-        },
-        :'instrumentation.rake' => {
-          :default => instrumentation_value_of(:disable_rake),
-          :public => :true,
-          :type => String,
-          :dynamic_name => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of rake at start up.  May be one of [auto|prepend|chain|disabled]."
+          :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).'
         },
-        :'instrumentation.mongo' => {
-          :default => instrumentation_value_of(:disable_mongo),
-          :public => :true,
-          :type => String,
-          :dynamic_name => true,
+        :'audit_log.endpoints' => {
+          :default => [".*"],
+          :public => true,
+          :type => Array,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Mongo at start up.  May be one of [enabled|disabled]."
+          :transform => DefaultSource.method(:convert_to_regexp_list),
+          :description => 'List of allowed endpoints to include in audit log'
         },
-        :'instrumentation.delayed_job' => {
-          :default => instrumentation_value_of(:disable_dj),
+        :'audit_log.path' => {
+          :default => DefaultSource.audit_log_path,
+          :documentation_default => 'config/newrelic_audit.log',
           :public => true,
           :type => String,
-          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of Delayed Job at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'Specifies a path to the audit log file (including the filename).'
         },
-        :'instrumentation.httpclient' => {
-          :default => instrumentation_value_of(:disable_httpclient),
+        # Autostart
+        :'autostart.denylisted_constants' => {
+          :default => 'Rails::Console',
           :public => true,
           :type => String,
-          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of HTTPClient at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Specify a list of constants that should prevent the agent from starting automatically. Separate individual constants with a comma `,`. For example, `Rails::Console,UninstrumentedBackgroundJob`.'
         },
-        :'instrumentation.curb' => {
-          :default => instrumentation_value_of(:disable_curb),
+        :'autostart.denylisted_executables' => {
+          :default => 'irb,rspec',
           :public => true,
           :type => String,
-          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of Curb at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'Defines a comma-delimited list of executables that the agent should not instrument. For example, `rake,my_ruby_script.rb`.'
         },
-        :'instrumentation.sinatra' => {
-          :default => instrumentation_value_of(:disable_sinatra),
-          :public => :true,
+        :'autostart.denylisted_rake_tasks' => {
+          :default => AUTOSTART_DENYLISTED_RAKE_TASKS,
+          :public => true,
           :type => String,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Sinatra at start up.  May be one of [auto|prepend|chain|disabled]."
-        },
-        :'instrumentation.rack' => {
-          :default      => instrumentation_value_of(:disable_rack),
-          :public       => true,
-          :type         => String,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description  => "Controls auto-instrumentation of Rack. When enabled, the agent hooks into the " \
-                           "`to_app` method in Rack::Builder to find gems to instrument during " \
-                           "application startup.  May be one of [auto|prepend|chain|disabled]."
-        },
-        :'instrumentation.rack_urlmap' => {
-          :default      => instrumentation_value_of(:disable_rack_urlmap),
-          :public       => true,
-          :type         => String,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description  => 'Controls auto-instrumentation of Rack::URLMap at start up.  May be one of [auto|prepend|chain|disabled].'
-        },
-        :'instrumentation.puma_rack' => {
-          :default      => instrumentation_value_of(:disable_puma_rack),  # TODO: change to value_of(:'instrumentation.rack') when we remove :disable_puma_rack in 8.0)
-          :public       => true,
-          :type         => String,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description  => "Controls auto-instrumentation of Puma::Rack. When enabled, the agent hooks into the " \
-                           "`to_app` method in Puma::Rack::Builder to find gems to instrument during " \
-                           "application startup.  May be one of [auto|prepend|chain|disabled]."
-        },
-        :'instrumentation.puma_rack_urlmap' => {
-          :default      => instrumentation_value_of(:disable_puma_rack_urlmap),  # TODO: change to value_of(:'instrumentation.rack_urlmap') when we remove :disable_puma_rack_urlmap in 8.0)
-          :public       => true,
-          :type         => String,
-          :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'Controls auto-instrumentation of Puma::Rack::URLMap at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'Defines a comma-delimited list of Rake tasks that the agent should not instrument. For example, `assets:precompile,db:migrate`.'
         },
-        :'instrumentation.memcached' => {
-          :default => instrumentation_value_of(:disable_memcached),
+        # Code level metrics
+        :'code_level_metrics.enabled' => {
+          :default => true,
           :public => true,
-          :type => String,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description  => 'Controls auto-instrumentation of memcached gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
+          :type => Boolean,
+          :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/'
         },
-        :'instrumentation.memcache_client' => {
-          :default => instrumentation_value_of(:disable_memcache_client),
+        # Cross application tracer
+        :"cross_application_tracer.enabled" => {
+          :default => false,
           :public => true,
-          :type => String,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description  => 'Controls auto-instrumentation of memcache-client gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
+          :type => Boolean,
+          :allowed_from_server => 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`.'
+          )
         },
-        :'instrumentation.memcache' => {
-          :default => instrumentation_value_of(:disable_dalli),
+        # Custom attributes
+        :'custom_attributes.enabled' => {
+          :default => true,
           :public => true,
-          :type => String,
-          :dynamic_name => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description  => 'Controls auto-instrumentation of dalli gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'If `false`, custom attributes will not be sent on events.'
         },
-        :'instrumentation.logger' => {
-          :default => "auto",
+        # Custom events
+        :'custom_insights_events.enabled' => {
+          :default => true,
           :public => true,
-          :type => String,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of Ruby standard library Logger at start up.  May be one of [auto|prepend|chain|disabled].'
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, the agent captures [custom events](/docs/insights/new-relic-insights/adding-querying-data/inserting-custom-events-new-relic-apm-agents).'
         },
-        :'instrumentation.tilt' => {
-          :default => "auto",
+        :'custom_insights_events.max_samples_stored' => {
+          :default => 3000,
           :public => true,
-          :type => String,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of Tilt at start up.  May be one of [auto|prepend|chain|disabled].'
+          :type => Integer,
+          :allowed_from_server => true,
+          :description => 'Specify a maximum number of custom events to buffer in memory at a time.',
+          :dynamic_name => true
         },
-        :disable_data_mapper => {
-          :default => false,
+        # Datastore tracer
+        :'datastore_tracer.database_name_reporting.enabled' => {
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `true`, disables DataMapper instrumentation.'
+          :description => 'If `false`, the agent will not add `database_name` parameter to transaction or slow sql traces.'
         },
-        :disable_activejob => {
-          :default => false,
+        :'datastore_tracer.instance_reporting.enabled' => {
+          :default => true,
           :public => true,
           :type => Boolean,
-          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'If `true`, disables ActiveJob instrumentation.'
+          :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.'
         },
+        # Disabling
         :disable_action_cable_instrumentation => {
           :default => false,
           :public => true,
           :type => Boolean,
-          :dynamic_name => true,
           :allowed_from_server => false,
           :description => 'If `true`, disables Action Cable instrumentation.'
         },
-        :disable_active_storage => {
-          :default => false,
-          :public => true,
+        # TODO: by subscribing to process_middleware.action_dispatch events,
+        #       we duplicate the efforts already performed by non-notifications
+        #       based instrumentation. In future, we ought to determine the
+        #       extent of the overlap and duplication and end up with only this
+        #       notifications based approach existing and the monkey patching
+        #       approach removed entirely. NOTE that we will likely not want to
+        #       do so until we are okay with dropping support for Rails < v6,
+        #       given that these events are available only for v6+.
+        :disable_action_dispatch => {
+          :default => true,
+          :public => false,
           :type => Boolean,
-          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'If `true`, disables ActiveStorage instrumentation.'
+          :description => 'If `true`, disables Action Dispatch instrumentation.'
         },
-        :disable_memcached => {
-          :default => value_of(:disable_memcache_instrumentation),
+        :disable_action_controller => {
+          :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.')
+          :description => 'If `true`, disables Action Controller instrumentation.'
         },
-        :disable_memcache_client => {
-          :default => value_of(:disable_memcache_instrumentation),
+        :disable_action_mailbox => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :deprecated => true,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcache-client', 'If `true`, disables instrumentation for the memcache-client gem.')
+          :description => 'If `true`, disables Action Mailbox instrumentation.'
         },
-        :disable_dalli => {
-          :default => value_of(:disable_memcache_instrumentation),
+        :disable_action_mailer => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :deprecated => true,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcache', 'If `true`, disables instrumentation for the dalli gem.')
+          :description => 'If `true`, disables Action Mailer instrumentation.'
         },
-        :disable_dalli_cas_client => {
-          :default => value_of(:disable_memcache_instrumentation),
+        :disable_activejob => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :deprecated => true,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcache', "If `true`, disables instrumentation for the dalli gem\'s additional CAS client support.")
+          :description => 'If `true`, disables Active Job instrumentation.'
         },
-        :disable_memcache_instrumentation => {
+        :disable_active_storage => {
           :default => false,
           :public => true,
           :type => Boolean,
-          :deprecated => true,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcache', 'If `true`, disables memcache instrumentation.')
+          :description => 'If `true`, disables Active Storage instrumentation.'
         },
-        :disable_gc_profiler => {
+        :disable_active_support => {
           :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'
+          :description => 'If `true`, disables Active Support instrumentation.'
         },
-        :'sidekiq.capture_params' => {
-          :default => false,
+        :disable_activerecord_instrumentation => {
+          :default => value_of(:skip_ar_instrumentation),
+          :documentation_default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :dynamic_name => true,
-          :deprecated => true,
-          :description => 'If `true`, enables the capture of job arguments for transaction traces and traced errors in Sidekiq.'
+          :description => 'If `true`, disables Active Record instrumentation.'
         },
-        :'resque.capture_params' => {
+        :disable_active_record_notifications => {
           :default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => false,
           :dynamic_name => true,
-          :deprecated => true,
-          :description => 'If `true`, enables the capture of job arguments for transaction traces and traced errors in Resque.'
-        },
-        :'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'
+          :description => 'If `true`, disables instrumentation for Active Record 4+'
         },
-        :capture_memcache_keys => {
+        :disable_cpu_sampler => {
           :default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'Enable or disable the capture of memcache keys from transaction traces.'
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'If `true`, the agent won\'t sample the CPU usage of the host process.'
         },
-        :'transaction_tracer.enabled' => {
-          :default => true,
+        :disable_delayed_job_sampler => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If `true`, enables collection of [transaction traces](/docs/apm/traces/transaction-traces/transaction-traces).'
-        },
-        :'transaction_tracer.transaction_threshold' => {
-          :default => DefaultSource.transaction_tracer_transaction_threshold,
-          :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 `apdex_f`.'
-        },
-        :'transaction_tracer.record_sql' => {
-          :default => 'obfuscated',
-          :public => true,
-          :type => String,
-          :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.
-
-  <ul>
-    <li>If you do not want the agent to capture query information, set this to `none`.</li>
-    <li>If you want the agent to capture all query information in its original form, set this to `raw`.</li>
-    <li>When you enable [high security mode](/docs/agents/manage-apm-agents/configuration/high-security-mode), this is automatically set to `obfuscated`.</li>
-  </ul>
-  '
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'If `true`, the agent won\'t measure the depth of Delayed Job queues.'
         },
-        :'transaction_tracer.record_redis_arguments' => {
+        :disable_gc_profiler => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent records Redis command arguments in transaction traces.'
+          :description => 'If `true`, disables the use of GC::Profiler to measure time spent in garbage collection'
         },
-        :'transaction_tracer.capture_attributes' => {
-          :default => true,
+        :disable_memory_sampler => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :deprecated => true,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Use [`transaction_tracer.attributes.enabled`](#transaction_tracer-attributes-enabled) instead.'
-        },
-        :'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.'
+          :description => 'If `true`, the agent won\'t sample the memory usage of the host process.'
         },
-        :'transaction_tracer.explain_enabled' => {
-          :default => true,
+        :disable_middleware_instrumentation => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :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.'
-        },
-        :'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.'
+          :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).'
         },
-        :'transaction_tracer.limit_segments' => {
-          :default => 4000,
+        :disable_samplers => {
+          :default => false,
           :public => true,
-          :type => Integer,
-          :allowed_from_server => true,
-          :description => 'Maximum number of transaction trace nodes to record in a single transaction trace.'
+          :type => Boolean,
+          :allowed_from_server => false,
+          :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).'
         },
         :disable_sequel_instrumentation => {
           :default => false,
@@ -1205,963 +1189,937 @@ module NewRelic
           :allowed_from_server => false,
           :description => 'If `true`, disables [Sequel instrumentation](/docs/agents/ruby-agent/frameworks/sequel-instrumentation).'
         },
-        :disable_database_instrumentation => {
+        :disable_sidekiq => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :deprecated => true,
-          :description => 'Use [`disable_sequel_instrumentation`](#disable_sequel_instrumentation) instead.'
-        },
-        :disable_mongo => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :allowed_from_server => false,
-          :dynamic_name => true,
-          :deprecated   => true,
-          :description  => deprecated_description(:'instrumentation.mongo', 'If `true`, the agent won\'t install [instrumentation for the Mongo gem](/docs/agents/ruby-agent/frameworks/mongo-instrumentation).')
-        },
-        :disable_redis => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :deprecated   => true,
-          :allowed_from_server => false,
-          :description  => deprecated_description(:'instrumentation.redis', 'If `true`, the agent won\'t install [instrumentation for Redis](/docs/agents/ruby-agent/frameworks/redis-instrumentation).')
-        },
-        :disable_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.')
-        },
-        :'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.'
+          :description => 'If `true`, disables [Sidekiq instrumentation](/docs/agents/ruby-agent/background-jobs/sidekiq-instrumentation).'
         },
-        :'slow_sql.enabled' => {
-          :default => value_of(:'transaction_tracer.enabled'),
+        :disable_sinatra_auto_middleware => {
+          :default => false,
           :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'),
-          :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.'
+          :allowed_from_server => false,
+          :description => <<~DESCRIPTION
+            If `true`, disables agent middleware for Sinatra. This middleware is responsible for advanced feature support such as [cross application tracing](/docs/apm/transactions/cross-application-traces/cross-application-tracing), [page load timing](/docs/browser/new-relic-browser/getting-started/new-relic-browser), and [error collection](/docs/apm/applications-menu/events/view-apm-error-analytics).
+
+                <Callout variant="important">
+                  Cross application tracing is deprecated in favor of [distributed tracing](/docs/apm/distributed-tracing/getting-started/introduction-distributed-tracing). Distributed tracing is on by default for Ruby agent versions 8.0.0 and above. Middlewares are not required to support distributed tracing.
+
+                  To continue using cross application tracing, update the following options in your `newrelic.yml` configuration file:
+
+                  ```
+                  # newrelic.yml
+
+                    cross_application_tracer:
+                      enabled: true
+                    distributed_tracing:
+                      enabled: false
+                  ```
+                </Callout>
+          DESCRIPTION
         },
-        :'slow_sql.explain_enabled' => {
-          :default => value_of(:'transaction_tracer.explain_enabled'),
+        :disable_view_instrumentation => {
+          :default => false,
           :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'),
-          :public => true,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'Defines an obfuscation level for slow SQL queries. Valid options are `obfuscated`, `raw`, or `none`).'
+          :allowed_from_server => false,
+          :description => 'If `true`, disables view instrumentation.'
         },
-        :'slow_sql.use_longer_sql_id' => {
+        :disable_vm_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 performance measurements from the Ruby VM](/docs/agents/ruby-agent/features/ruby-vm-measurements).'
         },
-        :'mongo.capture_queries' => {
+        # Distributed tracing
+        :'distributed_tracing.enabled' => {
           :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => 'If `true`, the agent captures Mongo queries in transaction traces.'
+          :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.'
         },
-        :'mongo.obfuscate_queries' => {
+        # Elasticsearch
+        :'elasticsearch.capture_queries' => {
           :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => 'If `true`, the agent obfuscates Mongo queries in transaction traces.'
+          :description => 'If `true`, the agent captures Elasticsearch queries in transaction traces.'
         },
-        :'error_collector.enabled' => {
+        :'elasticsearch.obfuscate_queries' => {
           :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => 'If `true`, the agent captures traced errors and error count metrics.'
+          :description => 'If `true`, the agent obfuscates Elasticsearch queries in transaction traces.'
         },
-        :'error_collector.capture_attributes' => {
+        # Heroku
+        :'heroku.use_dyno_names' => {
           :default => true,
           :public => true,
           :type => Boolean,
-          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Use [`error_collector.attributes.enabled`](#error_collector-attributes-enabled) instead.'
+          :description => 'If `true`, the agent uses Heroku dyno names as the hostname.'
+        },
+        :'heroku.dyno_name_prefixes_to_shorten' => {
+          :default => %w[scheduler run],
+          :public => true,
+          :type => Array,
+          :allowed_from_server => false,
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Ordinarily the agent reports dyno names with a trailing dot and process ID (for example, <b>worker.3</b>). You can remove this trailing data by specifying the prefixes you want to report without trailing data (for example, <b>worker</b>).'
         },
-        :'error_collector.ignore_errors' => {
-          :default => 'ActionController::RoutingError,Sinatra::NotFound',
+        # Infinite tracing
+        :'infinite_tracing.trace_observer.host' => {
+          :default => '',
           :public => true,
           :type => String,
-          :deprecated => true, 
-          :allowed_from_server => true,
+          :allowed_from_server => false,
+          :external => :infinite_tracing,
+          :description => "Configures the hostname for the trace observer Host. " \
+            "When configured, enables tail-based sampling by sending all recorded spans " \
+            "to a trace observer for further sampling decisions, irrespective of any usual " \
+            "agent sampling decision."
+        },
+        :'infinite_tracing.trace_observer.port' => {
+          :default => 443,
+          :public => true,
+          :type => Integer,
+          :allowed_from_server => false,
+          :external => :infinite_tracing,
+          :description => "Configures the TCP/IP port for the trace observer Host"
+        },
+        # Instrumentation
+        :'instrumentation.active_support_logger' => {
+          :default => instrumentation_value_from_boolean(:'application_logging.enabled'),
+          :documentation_default => 'auto',
           :dynamic_name => true,
-          :description => 'Use `error_collector.ignore_classes` instead. Specify a comma-delimited list of error classes that the agent should ignore.'
+          :public => true,
+          :type => String,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of ActiveSupport::Logger at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :'error_collector.ignore_classes' => {
-          :default => [],
+        :'instrumentation.bunny' => {
+          :default => 'auto',
           :public => true,
-          :type => Array,
-          :allowed_from_server => true,
+          :type => String,
           :dynamic_name => true,
-          :description => 'A list of error classes that the agent should ignore. *Note: this setting cannot be set via environment variable.*'
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of bunny at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :'error_collector.ignore_messages' => {
-          :default => {},
+        :'instrumentation.fiber' => {
+          :default => 'auto',
           :public => true,
-          :type => Hash,
-          :allowed_from_server => true,
+          :type => String,
           :dynamic_name => true,
-          :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. *Note: this setting cannot be set via environment variable.*'
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of the Fiber class at start up. May be one of [auto|prepend|chain|disabled].'
         },
-        :'error_collector.ignore_status_codes' => {
-          :default => '',
+        :'instrumentation.concurrent_ruby' => {
+          :default => 'auto',
           :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 ignored.'
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of the concurrent-ruby library at start up. May be one of [auto|prepend|chain|disabled].'
         },
-        :'error_collector.expected_classes' => {
-          :default => [],
+        :'instrumentation.curb' => {
+          :default => 'auto',
+          :documentation_default => 'auto',
           :public => true,
-          :type => Array,
-          :allowed_from_server => true,
+          :type => String,
           :dynamic_name => true,
-          :description => 'A list of error classes that the agent should treat as expected. *Note: this setting cannot be set via environment variable.*'
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of Curb at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :'error_collector.expected_messages' => {
-          :default => {},
+        :'instrumentation.delayed_job' => {
+          :default => 'auto',
+          :documentation_default => 'auto',
           :public => true,
-          :type => Hash,
-          :allowed_from_server => true,
+          :type => String,
           :dynamic_name => true,
-          :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. *Note: this setting cannot be set via environment variable.*'
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of Delayed Job at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :'error_collector.expected_status_codes' => {
-          :default => '',
+        :'instrumentation.elasticsearch' => {
+          :default => 'auto',
           :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.'
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of the elasticsearch library at start up. May be one of [auto|prepend|chain|disabled].'
         },
-        :'error_collector.max_backtrace_frames' => {
-          :default => 50,
+        :'instrumentation.excon' => {
+          :default => 'enabled',
+          :documentation_default => 'enabled',
           :public => true,
-          :type => Integer,
+          :type => String,
+          :dynamic_name => 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 => "Controls auto-instrumentation of Excon at start up.  May be one of [enabled|disabled]."
         },
-        :'error_collector.capture_events' => {
-          :default => value_of(:'error_collector.enabled'),
+        :'instrumentation.grape' => {
+          :default => 'auto',
           :public => true,
-          :type => Boolean,
-          :allowed_from_server => true,
+          :type => String,
           :dynamic_name => true,
-          :description => 'If `true`, the agent collects [TransactionError events](/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights).'
+          :allowed_from_server => false,
+          :description => "Controls auto-instrumentation of Grape at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :'error_collector.max_event_samples_stored' => {
-          :default => 100,
+        :'instrumentation.grpc_client' => {
+          :default => instrumentation_value_of(:disable_grpc_client),
+          :documentation_default => 'auto',
           :public => true,
-          :type => Integer,
-          :allowed_from_server => true,
-          :description => 'Defines the maximum number of [TransactionError events](/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights) sent to Insights per harvest cycle.'
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of gRPC clients at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :'rum.enabled' => {
-          :default => true,
-          :public => false,
-          :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'Enable or disable page load timing (sometimes referred to as real user monitoring or RUM).'
+        :'instrumentation.grpc.host_denylist' => {
+          :default => [],
+          :public => true,
+          :type => Array,
+          :allowed_from_server => false,
+          :transform => DefaultSource.method(:convert_to_regexp_list),
+          :description => %Q(Specifies a list of hostname patterns separated by commas that will match gRPC hostnames that traffic is to be ignored by New Relic for. New Relic's gRPC client instrumentation will ignore traffic streamed to a host matching any of these patterns, and New Relic's gRPC server instrumentation will ignore traffic for a server running on a host whose hostname matches any of these patterns. By default, no traffic is ignored when gRPC instrumentation is itself enabled. For example, "private.com$,exception.*")
         },
-        :browser_key => {
-          :default => '',
-          :public => false,
+        :'instrumentation.grpc_server' => {
+          :default => instrumentation_value_of(:disable_grpc_server),
+          :documentation_default => 'auto',
+          :public => true,
           :type => String,
-          :allowed_from_server => true,
-          :description => 'Real user monitoring license key for the browser timing header.'
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of gRPC servers at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :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.'
-        },
-        :application_id => {
-          :default => '',
-          :public => false,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'Application ID for real user monitoring.'
-        },
-        :js_agent_file => {
-          :default => '',
-          :public => false,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'Javascript agent file for real user monitoring.'
-        },
-        :'browser_monitoring.auto_instrument' => {
-          :default => value_of(:'rum.enabled'),
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If `true`, enables [auto-injection](/docs/browser/new-relic-browser/installation-configuration/adding-apps-new-relic-browser#select-apm-app) of the JavaScript header for page load timing (sometimes referred to as real user monitoring or RUM).'
-        },
-        :'browser_monitoring.capture_attributes' => {
-          :default => false,
+        :'instrumentation.httpclient' => {
+          :default => 'auto',
+          :documentation_default => 'auto',
           :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => 'Use [`browser_monitoring.attributes.enabled`](#browser_monitoring-attributes-enabled) 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.'
-        },
-        :'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.'
-        },
-        :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,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :deprecated => true,
-          :description => 'Enable or disable beta JavaScript error reporting.'
-        },
-        :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.'
+          :description => "Controls auto-instrumentation of HTTPClient at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :"cross_application_tracer.enabled" => {
-          :default => false,
+        :'instrumentation.httprb' => {
+          :default => 'auto',
+          :documentation_default => 'auto',
           :public => true,
-          :type => Boolean,
-          :allowed_from_server => true,
-          :deprecated => true,
-          :description => deprecated_description(
-            :'distributed_tracing-enabled',
-            'If `true`, enables [cross-application tracing](/docs/agents/ruby-agent/features/cross-application-tracing-ruby/)'
-          )
-        },
-        :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'
-        },
-        :encoding_key => {
-          :default => '',
-          :public => false,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'Encoding key for cross-application tracing.'
-        },
-        :cross_process_id => {
-          :default => '',
-          :public => false,
           :type => String,
-          :allowed_from_server => true,
-          :description => 'Cross process ID for cross-application tracing.'
-        },
-        :'thread_profiler.enabled' => {
-          :default => DefaultSource.thread_profiler_enabled,
-          :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).'
-        },
-        :'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'
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of http.rb gem at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :marshaller => {
-          :default => 'json',
+        :'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 => '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.'
-        },
-        :'analytics_events.enabled' => {
-          :default => true,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If `true`, enables analytics event sampling.'
-        },
-        :'analytics_events.max_samples_stored' => {
-          :default => 1200,
-          :public => true,
-          :type => Integer,
-          :allowed_from_server => true,
-          :description => 'Defines the maximum number of request events reported from a single harvest.'
+          :description => 'Controls auto-instrumentation of Ruby standard library Logger at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :'analytics_events.capture_attributes' => {
-          :default => true,
+        :'instrumentation.memcache' => {
+          :default => 'auto',
           :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => 'Use [`transaction_events.attributes.enabled`](#transaction_events-attributes-enabled) instead.'
-        },
-        :restart_thread_in_children => {
-          :default => true,
-          :public => false,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'Controls whether to check on running a transaction whether to respawn the harvest thread.'
-        },
-        :normalize_json_string_encodings => {
-          :default => true,
-          :public => false,
-          :type => Boolean,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls whether to normalize string encodings prior to serializing data for the collector to JSON.'
+          :description => 'Controls auto-instrumentation of dalli gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :backport_fast_active_record_connection_lookup => {
-          :default => false,
+        :'instrumentation.memcached' => {
+          :default => 'auto',
+          :documentation_default => 'auto',
           :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.'
-        },
-        :disable_vm_sampler => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
+          :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If `true`, the agent won\'t [sample performance measurements from the Ruby VM](/docs/agents/ruby-agent/features/ruby-vm-measurements).'
+          :description => 'Controls auto-instrumentation of memcached gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :disable_memory_sampler => {
-          :default      => false,
-          :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 `true`, the agent won\'t sample the memory usage of the host process.'
+          :description => 'Controls auto-instrumentation of memcache-client gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :disable_cpu_sampler => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
+        :'instrumentation.mongo' => {
+          :default => 'enabled',
+          :documentation_default => 'enabled',
+          :public => true,
+          :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If `true`, the agent won\'t sample the CPU usage of the host process.'
+          :description => "Controls auto-instrumentation of Mongo at start up.  May be one of [enabled|disabled]."
         },
-        :disable_delayed_job_sampler => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
+        :'instrumentation.net_http' => {
+          :default => 'auto',
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If `true`, the agent won\'t measure the depth of Delayed Job queues.'
+          :description => "Controls auto-instrumentation of Net::HTTP at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :disable_active_record_notifications => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
+        :'instrumentation.puma_rack' => {
+          :default => value_of(:'instrumentation.rack'),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If `true`, disables instrumentation for ActiveRecord 4, 5, and 6.'
+          :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]."
         },
-        :disable_bunny => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :deprecated   => true,
+        :'instrumentation.puma_rack_urlmap' => {
+          :default => value_of(:'instrumentation.rack_urlmap'),
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => deprecated_description(:'instrumentation.bunny', 'If `true`, disables instrumentation for the bunny gem.')
+          :description => 'Controls auto-instrumentation of Puma::Rack::URLMap at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :disable_curb => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :deprecated => true,
+        :'instrumentation.rack' => {
+          :default => 'auto',
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  =>  deprecated_description(:'instrumentation.curb', 'If `true`, disables instrumentation for the curb gem.' )
+          :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]."
         },
-        :disable_excon => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
+        :'instrumentation.rack_urlmap' => {
+          :default => 'auto',
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
           :dynamic_name => true,
-          :deprecated   => true,
           :allowed_from_server => false,
-          :description  => deprecated_description(:'instrumentation.excon', 'If `true`, disables instrumentation for the excon gem.')
+          :description => 'Controls auto-instrumentation of Rack::URLMap at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :'instrumentation.excon' => {
-          :default => instrumentation_value_of(:disable_excon),
-          :public => :true,
+        :'instrumentation.rake' => {
+          :default => 'auto',
+          :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Excon at start up.  May be one of [enabled|disabled]."
+          :description => "Controls auto-instrumentation of rake at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :disable_httpclient => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
+        :'instrumentation.redis' => {
+          :default => 'auto',
+          :public => true,
+          :type => String,
           :dynamic_name => true,
-          :deprecated   => true,
           :allowed_from_server => false,
-          :description  => deprecated_description(:'instrumentation.httpclient', 'If `true`, disables instrumentation for the httpclient gem.')
+          :description => "Controls auto-instrumentation of Redis at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :disable_net_http => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
+        :'instrumentation.resque' => {
+          :default => 'auto',
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :deprecated   => true,
-          :description  => deprecated_description(:'instrumentation.net_http',
-            'If `true`, disables instrumentation for Net::HTTP.'
-          )
+          :description => "Controls auto-instrumentation of resque at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :disable_rack => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
+        :'instrumentation.sinatra' => {
+          :default => 'auto',
+          :public => true,
+          :type => String,
           :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.')
+          :description => "Controls auto-instrumentation of Sinatra at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :disable_rack_urlmap => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
+        :'instrumentation.thread' => {
+          :default => 'auto',
+          :public => true,
+          :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :deprecated   => true,
-          :description  => deprecated_description(:'instrumentation.rack_urlmap', 'If `true`, prevents the agent from hooking into Rack::URLMap to install middleware tracing.')
+          :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]."
         },
-        :disable_puma_rack => {
-          :default      => value_of(:disable_rack),
-          :public       => true,
-          :type         => Boolean,
-          :dynamic_name => true,
+        :'instrumentation.thread.tracing' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
           :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.')
+          :description => "Controls auto-instrumentation of the Thread class at start up to automatically add tracing to all Threads created in the application."
         },
-        :disable_puma_rack_urlmap => {
-          :default      => value_of(:disable_rack_urlmap),
-          :public       => true,
-          :type         => Boolean,
-          :dynamic_name => true,
+        :'thread_ids_enabled' => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
           :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.')
+          :description => "If enabled, will append the current Thread and Fiber object ids onto the segment names of segments created in Threads and concurrent-ruby"
         },
-        :disable_typhoeus => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
+        :'instrumentation.tilt' => {
+          :default => "auto",
+          :public => true,
+          :type => String,
           :dynamic_name => true,
-          :deprecated   => true,
           :allowed_from_server => false,
-          :description  => deprecated_description(:'instrumentation.typhoeus', 'If `true`, the agent won\'t install instrumentation for the typhoeus gem.' )
+          :description => 'Controls auto-instrumentation of the Tilt template rendering library at start up. May be one of [auto|prepend|chain|disabled].'
         },
-        :disable_httprb => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
+        :'instrumentation.typhoeus' => {
+          :default => 'auto',
+          :documentation_default => 'auto',
+          :public => true,
+          :type => String,
           :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.' )
-        },
-        :disable_middleware_instrumentation => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :allowed_from_server => false,
-          :description  => 'If `true`, the agent won\'t wrap third-party middlewares in instrumentation (regardless of whether they are installed via Rack::Builder or Rails).'
+          :description => "Controls auto-instrumentation of Typhoeus at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :disable_rails_middleware => {
-          :default      => false,
-          :public       => false,
-          :type         => Boolean,
-          :allowed_from_server => false,
-          :description  => 'Internal name for controlling Rails 3+ middleware instrumentation'
+        # 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.'
         },
-        :'heroku.use_dyno_names' => {
-          :default      => true,
-          :public       => true,
-          :type         => Boolean,
+        # 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.'
+        },
+        :'mongo.obfuscate_queries' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, the agent obfuscates Mongo queries in transaction traces.'
+        },
+        # Process host
+        :'process_host.display_name' => {
+          :default => proc { NewRelic::Agent::Hostname.get },
+          :public => true,
+          :type => String,
           :allowed_from_server => false,
-          :description  => 'If `true`, the agent uses Heroku dyno names as the hostname.'
+          :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).'
         },
-        :'heroku.dyno_name_prefixes_to_shorten' => {
-          :default      => ['scheduler', 'run'],
-          :public       => true,
-          :type         => Array,
+        # Rails
+        :'defer_rails_initialization' => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
+          :external => true, # this config is used directly from the ENV variables
           :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 => <<-DESCRIPTION
+            If `true`, when the agent is in an application using Ruby on Rails, it will start after `config/initializers` run.
+
+            <Callout variant="caution">
+              This option may only be set by environment variable.
+            </Callout>
+          DESCRIPTION
         },
-        :'process_host.display_name' => {
-          :default      => Proc.new{ NewRelic::Agent::Hostname.get },
-          :public       => true,
-          :type         => String,
+        # Rake
+        :'rake.tasks' => {
+          :default => [],
+          :public => true,
+          :type => Array,
           :allowed_from_server => false,
-          :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).'
+          :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].'
         },
-        :labels => {
-          :default      => '',
-          :public       => true,
-          :type         => String,
+        :'rake.connect_timeout' => {
+          :default => 10,
+          :public => true,
+          :type => Integer,
           :allowed_from_server => false,
-          :description  => 'A dictionary of [label names](/docs/data-analysis/user-interface-functions/labels-categories-organize-your-apps-servers) and values that will be applied to the data sent from this agent. May also be expressed as a semicolon-delimited `;` string of colon-separated `:` pairs. For example, `<var>Server</var>:<var>One</var>;<var>Data Center</var>:<var>Primary</var>`.'
+          :description => 'Timeout for waiting on connect to complete before a rake task'
         },
-        :aggressive_keepalive => {
-          :default      => true,
-          :public       => false,
-          :type         => Boolean,
+        # Rules
+        :'rules.ignore_url_regexes' => {
+          :default => [],
+          :public => true,
+          :type => Array,
           :allowed_from_server => true,
-          :description  => 'If true, attempt to keep the TCP connection to the collector alive between harvests.'
+          :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. For more detail, see [the docs on ignoring specific transactions](/docs/agents/ruby-agent/api-guides/ignoring-specific-transactions/#config-ignoring).'
         },
-        :keep_alive_timeout => {
-          :default      => 60,
-          :public       => false,
-          :type         => Integer,
+        # Slow SQL
+        :'slow_sql.enabled' => {
+          :default => value_of(:'transaction_tracer.enabled'),
+          :documentation_default => true,
+          :public => true,
+          :type => Boolean,
           :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.'
-        },
-        :ca_bundle_path => {
-          :default      => nil,
-          :allow_nil    => true,
-          :public       => true,
-          :type         => String,
-          :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."
+          :description => 'If `true`, the agent collects [slow SQL queries](/docs/apm/applications-menu/monitoring/viewing-slow-query-details).'
         },
-        :'rules.ignore_url_regexes' => {
-          :default      => [],
-          :public       => true,
-          :type         => Array,
+        :'slow_sql.explain_threshold' => {
+          :default => value_of(:'transaction_tracer.explain_threshold'),
+          :documentation_default => 0.5,
+          :public => true,
+          :type => Float,
           :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.' 
+          :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.'
         },
-        :'synthetics.traces_limit' => {
-          :default      => 20,
-          :public       => false,
-          :type         => Integer,
+        :'slow_sql.explain_enabled' => {
+          :default => value_of(:'transaction_tracer.explain_enabled'),
+          :documentation_default => true,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => true,
-          :description  => 'Maximum number of synthetics transaction traces to hold for a given harvest'
+          :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.'
         },
-        :'synthetics.events_limit' => {
-          :default      => 200,
-          :public       => false,
-          :type         => Integer,
+        :'slow_sql.record_sql' => {
+          :default => value_of(:'transaction_tracer.record_sql'),
+          :documentation_default => 'obfuscated',
+          :public => true,
+          :type => String,
           :allowed_from_server => true,
-          :description  => 'Maximum number of synthetics transaction events to hold for a given harvest'
+          :description => 'Defines an obfuscation level for slow SQL queries. Valid options are `obfuscated`, `raw`, or `none`).'
         },
-        :'custom_insights_events.enabled' => {
-          :default      => true,
-          :public       => true,
-          :type         => Boolean,
+        :'slow_sql.use_longer_sql_id' => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => true,
-          :description  => 'If `true`, the agent captures [New Relic Insights custom events](/docs/insights/new-relic-insights/adding-querying-data/inserting-custom-events-new-relic-apm-agents).'
+          :description => 'Generate a longer sql_id for slow SQL traces. sql_id is used for aggregation of similar queries.'
         },
-        :'custom_insights_events.max_samples_stored' => {
-          :default      => 1000,
-          :public       => true,
-          :type         => Integer,
+        # Span events
+        :'span_events.enabled' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => true,
-          :description  => 'Specify a maximum number of custom Insights events to buffer in memory at a time.',
-          :dynamic_name => true
+          :description => 'If `true`, enables span event sampling.'
         },
-        :disable_grape_instrumentation => {
-          :default      => false,
-          :public       => false,
-          :type         => Boolean,
+        :'span_events.queue_size' => {
+          :default => 10_000,
+          :public => true,
+          :type => Integer,
           :allowed_from_server => false,
-          :deprecated   => true,
-          :description  => deprecated_description(:'instrumentation.grape',
-            'If `true`, the agent won\'t install Grape instrumentation.'
-          )
+          :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.'
         },
-        :disable_grape => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
+        # Strip exception messages
+        :'strip_exception_messages.enabled' => {
+          :default => value_of(:high_security),
+          :documentation_default => false,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :deprecated   => true,
-          :description  => deprecated_description(:'instrumentation.grape',
-            'If `true`, the agent won\'t install Grape instrumentation.'
-          )
+          :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).'
         },
-        :'instrumentation.grape' => {
-          :default => instrumentation_value_of(:disable_grape_instrumentation),
-          :public => :true,
+        :'strip_exception_messages.allowed_classes' => {
+          :default => '',
+          :public => true,
           :type => String,
-          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Grape at start up.  May be one of [auto|prepend|chain|disabled]."
+          :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"`.'
         },
-        :'attributes.enabled' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
-          :allowed_from_server => false,
-          :description => 'If `true`, enables capture of attributes for all destinations.'
+        # 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).'
         },
-        :'transaction_tracer.attributes.enabled' => {
-          :default     => value_of(:'transaction_tracer.capture_attributes'),
-          :public      => true,
-          :type        => Boolean,
+        # Utilization
+        :'utilization.detect_aws' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent captures attributes from transaction traces.'
+          :dynamic_name => true,
+          :description => 'If `true`, the agent automatically detects that it is running in an AWS environment.'
         },
-        :'transaction_events.attributes.enabled' => {
-          :default     => value_of(:'analytics_events.capture_attributes'),
-          :public      => true,
-          :type        => Boolean,
+        :'utilization.detect_azure' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent captures attributes from transaction events.'
+          :dynamic_name => true,
+          :description => 'If `true`, the agent automatically detects that it is running in an Azure environment.'
         },
-        :'error_collector.attributes.enabled' => {
-          :default     => value_of(:'error_collector.capture_attributes'),
-          :public      => true,
-          :type        => Boolean,
+        :'utilization.detect_docker' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent captures attributes from error collection.'
+          :description => 'If `true`, the agent automatically detects that it is running in Docker.'
         },
-        :'browser_monitoring.attributes.enabled' => {
-          :default     => value_of(:'browser_monitoring.capture_attributes'),
-          :public      => true,
-          :type        => Boolean,
+        :'utilization.detect_gcp' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent captures attributes from browser monitoring.'
+          :dynamic_name => true,
+          :description => 'If `true`, the agent automatically detects that it is running in an Google Cloud Platform environment.'
         },
-        :'span_events.attributes.enabled' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
+        :'utilization.detect_kubernetes' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent captures attributes on span events.'
+          :description => 'If `true`, the agent automatically detects that it is running in Kubernetes.'
         },
-        :'transaction_segments.attributes.enabled' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
+        :'utilization.detect_pcf' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent captures attributes on transaction segments.'
+          :dynamic_name => true,
+          :description => 'If `true`, the agent automatically detects that it is running in a Pivotal Cloud Foundry environment.'
         },
-        :'attributes.exclude' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
-          :allowed_from_server => false,
-          :transform   => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from all destinations. Allows `*` as wildcard at end.'
+        # Private
+        :account_id => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'The account id associated with your application.'
         },
-        :'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.'
+        :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.'
         },
-        :'transaction_events.attributes.exclude' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
+        :api_host => {
+          :default => DefaultSource.api_host,
+          :public => false,
+          :type => String,
           :allowed_from_server => false,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from transaction events. Allows `*` as wildcard at end.'
+          :description => 'API host for New Relic.'
         },
-        :'error_collector.attributes.exclude' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
+        :api_port => {
+          :default => value_of(:port),
+          :public => false,
+          :type => Integer,
           :allowed_from_server => false,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from error collection. Allows `*` as wildcard at end.'
+          :description => 'Port for the New Relic API host.'
         },
-        :'browser_monitoring.attributes.exclude' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
-          :allowed_from_server => false,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from browser monitoring. Allows `*` as wildcard at end.'
+        :application_id => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'Application ID for real user monitoring.'
         },
-        :'span_events.attributes.exclude' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
-          :allowed_from_server => false,
-          :transform   => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from span events. Allows `*` as wildcard at end.'
+        :beacon => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'Beacon for real user monitoring.'
         },
-        :'transaction_segments.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 segments. Allows `*` as wildcard at end.'
+        :browser_key => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'Real user monitoring license key for the browser timing header.'
         },
-        :'attributes.include' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
-          :allowed_from_server => false,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in all destinations. Allows `*` as wildcard at end.'
+        :'browser_monitoring.loader' => {
+          :default => 'rum',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'Type of JavaScript agent loader to use for browser monitoring instrumentation.'
         },
-        :'transaction_tracer.attributes.include' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
+        :'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,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in transaction traces. Allows `*` as wildcard at end.'
+          :description => 'Encoding to use if data needs to be compressed. The options are deflate and gzip.'
         },
-        :'transaction_events.attributes.include' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
+        :config_search_paths => {
+          :default => DefaultSource.config_search_paths,
+          :public => false,
+          :type => Array,
           :allowed_from_server => false,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in transaction events. Allows `*` as wildcard at end.'
+          :description => "An array of candidate locations for the agent's configuration file."
         },
-        :'error_collector.attributes.include' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
+        :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.'
+        },
+        :dispatcher => {
+          :default => DefaultSource.dispatcher,
+          :public => false,
+          :type => Symbol,
           :allowed_from_server => false,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in error collection. Allows `*` as wildcard at end.'
+          :description => 'Autodetected application component that reports metrics to New Relic.'
         },
-        :'browser_monitoring.attributes.include' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
+        :disable_harvest_thread => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
           :allowed_from_server => false,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in browser monitoring. Allows `*` as wildcard at end.'
+          :description => 'Enable or disable the harvest thread.'
         },
-        :'span_events.attributes.include' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
+        :disable_rails_middleware => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
           :allowed_from_server => false,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include on span events. Allows `*` as wildcard at end.'
+          :description => 'Internal name for controlling Rails 3+ middleware instrumentation'
         },
-        :'transaction_segments.attributes.include' => {
-          :default     => [],
-          :public      => true,
-          :type        => Array,
+        :enabled => {
+          :default => true,
+          :public => false,
+          :type => Boolean,
+          :aliases => [:enable],
           :allowed_from_server => false,
-          :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include on transaction segments. Allows `*` as wildcard at end.'
+          :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.'
         },
-        :'custom_attributes.enabled' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
-          :allowed_from_server => false,
-          :description => 'If `false`, custom attributes will not be sent on Insights events.'
+        :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.'
         },
-        :'utilization.detect_aws' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
-          :allowed_from_server => false,
+        :'event_report_period.transaction_event_data' => {
+          :default => 60,
+          :public => false,
+          :type => Integer,
           :dynamic_name => true,
-          :description => 'If `true`, the agent automatically detects that it is running in an AWS environment.'
+          :allowed_from_server => true,
+          :description => 'Number of seconds betwixt connections to the New Relic transaction event collection services.'
         },
-        :'utilization.detect_azure' => {
-          :default      => true,
-          :public       => true,
-          :type         => Boolean,
-          :allowed_from_server => false,
+        :'event_report_period.custom_event_data' => {
+          :default => 60,
+          :public => false,
+          :type => Integer,
           :dynamic_name => true,
-          :description  => 'If `true`, the agent automatically detects that it is running in an Azure environment.'
+          :allowed_from_server => true,
+          :description => 'Number of seconds betwixt connections to the New Relic custom event collection services.'
         },
-        :'utilization.detect_gcp' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
-          :allowed_from_server => false,
+        :'event_report_period.error_event_data' => {
+          :default => 60,
+          :public => false,
+          :type => Integer,
           :dynamic_name => true,
-          :description => 'If `true`, the agent automatically detects that it is running in an Google Cloud Platform environment.'
+          :allowed_from_server => true,
+          :description => 'Number of seconds betwixt connections to the New Relic error event collection services.'
         },
-        :'utilization.detect_pcf' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
-          :allowed_from_server => false,
+        :'event_report_period.log_event_data' => {
+          :default => 60,
+          :public => false,
+          :type => Integer,
           :dynamic_name => true,
-          :description => 'If `true`, the agent automatically detects that it is running in a Pivotal Cloud Foundry 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_kubernetes' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
-          :allowed_from_server => false,
-          :description => 'If `true`, the agent automatically detects that it is running in Kubernetes.'
+          :allowed_from_server => true,
+          :description => 'Number of seconds betwixt connections to the New Relic log event collection services.'
         },
-        :'utilization.billing_hostname' => {
-          :default     => nil,
-          :allow_nil   => true,
-          :public      => false,
-          :type        => String,
-          :allowed_from_server => false,
-          :description => 'The configured server name by a customer.'
+        :'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.'
         },
-        :'utilization.logical_processors' => {
-          :default     => nil,
-          :allow_nil   => true,
-          :public      => false,
-          :type        => Integer,
+        :force_reconnect => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'The total number of hyper-threaded execution contexts available.'
+          :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.total_ram_mib' => {
-          :default     => nil,
-          :allow_nil   => true,
-          :public      => false,
-          :type        => Integer,
+        :framework => {
+          :default => DefaultSource.framework,
+          :public => false,
+          :type => Symbol,
           :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).'
+          :description => 'Autodetected application framework used to enable framework-specific functionality.'
         },
-        :'datastore_tracer.instance_reporting.enabled' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
+        :host => {
+          :default => DefaultSource.host,
+          :public => false,
+          :type => String,
           :allowed_from_server => false,
-          :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.'
+          :description => "URI for the New Relic data collection service."
         },
-        :'datastore_tracer.database_name_reporting.enabled' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
+        :'infinite_tracing.batching' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `false`, the agent will not add `database_name` parameter to transaction or slow sql traces.'
+          :external => :infinite_tracing,
+          :description => "If `true` (the default), data sent to the trace observer is batched\ninstead of sending " \
+                          "each span individually."
         },
-        :'clear_transaction_state_after_fork' => {
-          :default     => false,
-          :public      => true,
-          :type        => Boolean,
+        :'infinite_tracing.compression_level' => {
+          :default => :high,
+          :public => true,
+          :type => Symbol,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent will clear `Tracer::State` in `Agent.drop_buffered_data`.'
+          :external => :infinite_tracing,
+          :description => "Configure the compression level for data sent to the trace observer\nMay be one of " \
+          "[none|low|medium|high]\n'high' is the default. Set the level to 'none' to disable compression"
         },
-        :account_id => {
-          :default => nil,
-          :allow_nil => true,
+        :js_agent_file => {
+          :default => '',
           :public => false,
           :type => String,
           :allowed_from_server => true,
-          :description => 'The account id associated with this application.'
+          :description => 'JavaScript agent file for real user monitoring.'
         },
-        :primary_application_id => {
-          :default => nil,
-          :allow_nil => true,
+        :js_agent_loader => {
+          :default => '',
           :public => false,
           :type => String,
           :allowed_from_server => true,
-          :description => 'The primary id associated with this application.'
+          :description => 'JavaScript agent loader content.'
         },
-        :'distributed_tracing.enabled' => {
-          :default     => true,
-          :public      => true,
-          :type        => Boolean,
+        :keep_alive_timeout => {
+          :default => 60,
+          :public => false,
+          :type => Integer,
           :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.'
+          :description => 'Timeout for keep alive on TCP connection to collector if supported by Ruby version. Only used in conjunction when aggressive_keepalive is enabled.'
         },
-        :trusted_account_key => {
+        :max_payload_size_in_bytes => {
+          :default => 1000000,
+          :public => false,
+          :type => Integer,
+          :allowed_from_server => true,
+          :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.'
+        },
+        :primary_application_id => {
           :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.'
+          :description => 'The primary id associated with your application.'
+        },
+        :put_for_data_send => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'Use HTTP PUT requests instead of POST.'
+        },
+        :report_instance_busy => {
+          :default => true,
+          :public => false,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'Enable or disable transmission of metrics recording the percentage of time application instances spend servicing requests (duty cycle metrics).'
+        },
+        :restart_thread_in_children => {
+          :default => true,
+          :public => false,
+          :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 => 'Enable or disable page load timing (sometimes referred to as real user monitoring or RUM).'
         },
         :sampling_target => {
           :default => 10,
@@ -2177,53 +2135,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 => true,
-          :description => 'If `true`, enables span event sampling.'
+          :allowed_from_server => false,
+          :description => 'Enable or disable transmission of application environment information to the New Relic data collection service.'
         },
-        :'span_events.queue_size' => {
-          :default => 10_000,
-          :public => true,
-          :type => Integer,
+        :simple_compression => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
           :allowed_from_server => false,
-          :external => :infinite_tracing,
-          :description => "Sets the maximum number of span events to buffer when streaming to the trace observer."
+          :description => 'When enabled the agent will compress payloads destined for the collector, but will not pre-compress parts of the payload.'
         },
-        :'span_events.max_samples_stored' => {
-          :default => 2000,
-          :public => true,
+        :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 => 'Defines the maximum number of span events reported from a single harvest.'
+          :description => 'Maximum number of synthetics transaction traces to hold for a given harvest'
         },
-        :'exclude_newrelic_header' => {
+        :'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'
+        },
+        :test_mode => {
           :default => false,
-          :public => true,
+          :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 => "Allows newrelic distributed tracing headers to be suppressed on outbound requests."
+          :description => 'Maximum overhead percentage for thread profiling before agent reduces polling frequency'
         },
-        :'infinite_tracing.trace_observer.host' => {
-          :default => '',
-          :public => true,
+        :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,
-          :external => :infinite_tracing,
-          :description => "Configures the hostname for the Trace Observer Host. " \
-            "When configured, enables tail-based sampling by sending all recorded spans " \
-            "to a Trace Observer for further sampling decisions, irrespective of any usual " \
-            "agent sampling decision."
+          :description => 'The configured server name by a customer.'
         },
-        :'infinite_tracing.trace_observer.port' => {
-          :default => 443,
-          :public => true,
+        :'utilization.logical_processors' => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
           :type => Integer,
           :allowed_from_server => false,
-          :external => :infinite_tracing,
-          :description => "Configures the TCP/IP port for the Trace Observer Host"
+          :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