newrelic_rpm 8.11.0 → 8.13.0

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

@@ -157,7 +157,7 @@ module NewRelic
         def self.audit_log_path
           proc {
             log_file_path = NewRelic::Agent.config[:log_file_path]
-            wants_stdout = (log_file_path.casecmp('STDOUT').zero?)
+            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')
@@ -326,20 +326,7 @@ module NewRelic
       ].join(',').freeze
 
       DEFAULTS = {
-        :license_key => {
-          :default => '',
-          :public => true,
-          :type => String,
-          :allowed_from_server => false,
-          :description => 'Your New Relic [license key](/docs/apis/intro-apis/new-relic-api-keys/#ingest-license-key).'
-        },
-        :api_key => {
-          :default => '',
-          :public => true,
-          :type => String,
-          :allowed_from_server => false,
-          :description => 'Your New Relic API key. Required when using the New Relic REST API v2 to record deployments using the `newrelic deployments` command.'
-        },
+        # Critical
         :agent_enabled => {
           :default => DefaultSource.agent_enabled,
           :documentation_default => true,
@@ -348,14 +335,6 @@ module NewRelic
           :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,
@@ -364,28 +343,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 your agent.'
-        },
-        :monitor_mode => {
-          :default => value_of(:enabled),
-          :documentation_default => true,
+        :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 the agent to start up, but not connect to the collector. Formerly used `developer_mode` in test config for this purpose.'
+          :description => 'Your New Relic [license key](/docs/apis/intro-apis/new-relic-api-keys/#ingest-license-key).'
         },
         :log_level => {
           :default => 'info',
@@ -394,53 +357,43 @@ 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
+        :apdex_t => {
+          :default => 0.5,
           :public => true,
-          :type => Boolean,
-          :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.'
+          :type => Float,
+          :allowed_from_server => true,
+          :deprecated => true,
+          :description => 'For agent versions 3.5.0 or higher, [set your Apdex T via the New Relic UI](/docs/apm/new-relic-apm/apdex/changing-your-apdex-settings).'
         },
-        :security_policies_token => {
+        :api_key => {
           :default => '',
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Applies Language Agent Security Policy settings.'
-        },
-        :proxy_host => {
-          :default => nil,
-          :allow_nil => true,
-          :public => true,
-          :type => String,
-          :allowed_from_server => false,
-          :description => 'Defines a host for communicating with the New Relic [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector) via a proxy server.'
+          :description => 'Your New Relic API key. Required when using the New Relic REST API v2 to record deployments using the `newrelic deployments` command.'
         },
-        :proxy_port => {
-          :default => 8080,
-          :allow_nil => true,
+        :backport_fast_active_record_connection_lookup => {
+          :default => false,
           :public => true,
-          :type => Integer,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Defines a port for communicating with the New Relic [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,
@@ -455,6 +408,13 @@ When `true`, the agent captures HTTP request parameters and attaches them to tra
     </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,
           :public => true,
@@ -462,688 +422,720 @@ When `true`, the agent captures HTTP request parameters and attaches them to tra
           :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, `<var>Server</var>:<var>One</var>;<var>Data Center</var>:<var>Primary</var>`.'
         },
-        :'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. ' \
-          '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].'
+          :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'
+          :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.'
         },
-        :apdex_t => {
-          :default => 0.5,
+        :proxy_port => {
+          :default => 8080,
+          :allow_nil => true,
           :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).'
+          :type => Integer,
+          :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.'
         },
-        :'strip_exception_messages.enabled' => {
-          :default => value_of(:high_security),
-          :documentation_default => false,
+        :proxy_user => {
+          :default => nil,
+          :allow_nil => true,
           :public => true,
-          :type => Boolean,
+          :type => String,
           :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).'
+          :exclude_from_reported_settings => true,
+          :description => 'Defines a user for communicating with the New Relic [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector) via a proxy server.'
         },
-        :'strip_exception_messages.allowed_classes' => {
+        :security_policies_token => {
           :default => '',
           :public => true,
           :type => String,
           :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"`.'
+          :description => 'Applies Language Agent Security Policy settings.'
         },
-        :host => {
-          :default => DefaultSource.host,
-          :public => false,
-          :type => String,
+        :send_data_on_exit => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => "URI for the New Relic data collection service."
+          :description => 'If `true`, enables the exit handler that sends data to the New Relic [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector) before shutting down.'
         },
-        :api_host => {
-          :default => DefaultSource.api_host,
-          :public => false,
-          :type => String,
+        :sync_startup => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'API host for New Relic.'
+          :description => 'When set to `true`, forces a synchronous connection to the New Relic [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector) during application startup. For very short-lived processes, this helps ensure the New Relic agent has time to report.'
         },
-        :port => {
-          :default => 443,
-          :public => false,
+        :timeout => {
+          :default => 2 * 60, # 2 minutes
+          :public => true,
           :type => Integer,
           :allowed_from_server => false,
-          :description => 'Port for the New Relic data collection service.'
+          :description => 'Defines the maximum number of seconds the agent should spend attempting to connect to the collector.'
         },
-        :api_port => {
-          :default => value_of(:port),
-          :public => false,
-          :type => Integer,
+        # Transaction tracer
+        :'transaction_tracer.capture_attributes' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Port for the New Relic API host.'
+          :description => 'Use [`transaction_tracer.attributes.enabled`](#transaction_tracer-attributes-enabled) instead.'
         },
-        :sync_startup => {
-          :default => false,
+        :'transaction_tracer.enabled' => {
+          :default => true,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'When set to `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.'
+          :allowed_from_server => true,
+          :description => 'If `true`, enables collection of [transaction traces](/docs/apm/traces/transaction-traces/transaction-traces).'
         },
-        :send_data_on_exit => {
+        :'transaction_tracer.explain_enabled' => {
           :default => true,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'If `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.'
+          :allowed_from_server => true,
+          :description => 'If `true`, enables the collection of explain plans in transaction traces. This setting will also apply to explain plans in slow SQL traces if [`slow_sql.explain_enabled`](#slow_sql-explain_enabled) is not set separately.'
         },
-        :max_payload_size_in_bytes => {
-          :default => 1000000,
-          :public => false,
+        :'transaction_tracer.explain_threshold' => {
+          :default => 0.5,
+          :public => true,
+          :type => Float,
+          :allowed_from_server => true,
+          :description => 'Threshold (in seconds) above which the agent will collect explain plans. Relevant only when [`explain_enabled`](#transaction_tracer.explain_enabled) is true.'
+        },
+        :'transaction_tracer.limit_segments' => {
+          :default => 4000,
+          :public => true,
           :type => Integer,
           :allowed_from_server => true,
-          :description => 'Maximum number of bytes to send to the New Relic data collection service.'
+          :description => 'Maximum number of transaction trace nodes to record in a single transaction trace.'
         },
-        :put_for_data_send => {
+        :'transaction_tracer.record_redis_arguments' => {
           :default => false,
-          :public => false,
+          :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Use HTTP PUT requests instead of POST.'
+          :description => 'If `true`, the agent records Redis command arguments in transaction traces.'
         },
-        :compressed_content_encoding => {
-          :default => 'gzip',
-          :public => false,
+        :'transaction_tracer.record_sql' => {
+          :default => 'obfuscated',
+          :public => true,
           :type => String,
-          :allowed_from_server => false,
-          :description => 'Encoding to use if data needs to be compressed. The options are deflate and gzip.'
+          :allowed_from_server => true,
+          :description => 'Obfuscation level for SQL queries reported in transaction trace nodes.
+
+  By default, this is set to `obfuscated`, which strips out the numeric and string literals.
+
+  - If you do not want the agent to capture query information, set this to `none`.
+  - If you want the agent to capture all query information in its original form, set this to `raw`.
+  - When you enable [high security mode](/docs/agents/manage-apm-agents/configuration/high-security-mode), this is automatically set to `obfuscated`.
+  '
         },
-        :simple_compression => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'When enabled the agent will compress payloads destined for the collector, but will not pre-compress parts of the payload.'
+
+        :'transaction_tracer.stack_trace_threshold' => {
+          :default => 0.5,
+          :public => true,
+          :type => Float,
+          :allowed_from_server => true,
+          :description => 'Specify a threshold in seconds. The agent includes stack traces in transaction trace nodes when the stack trace duration exceeds this threshold.'
         },
-        :timeout => {
-          :default => 2 * 60, # 2 minutes
+        :'transaction_tracer.transaction_threshold' => {
+          :default => DefaultSource.transaction_tracer_transaction_threshold,
           :public => true,
-          :type => Integer,
-          :allowed_from_server => false,
-          :description => 'Defines the maximum number of seconds the agent should spend attempting to connect to the collector.'
+          :type => Float,
+          :allowed_from_server => true,
+          :description => 'Specify a threshold in seconds. Transactions with a duration longer than this threshold are eligible for transaction traces. Specify a float value or the string `apdex_f`.'
         },
-        :send_environment_info => {
+        # Error collector
+        :'error_collector.capture_attributes' => {
           :default => true,
-          :public => false,
+          :public => true,
           :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Enable or disable transmission of application environment information to the New Relic data collection service.'
+          :description => 'Use [`error_collector.attributes.enabled`](#error_collector-attributes-enabled) instead.'
         },
-        :data_report_period => {
-          :default => 60,
-          :public => false,
-          :type => Integer,
+        :'error_collector.ignore_classes' => {
+          :default => [],
+          :public => true,
+          :type => Array,
           :allowed_from_server => true,
-          :description => 'Number of seconds betwixt connections to the New Relic data collection service.'
+          :dynamic_name => true,
+          :description => <<-DESCRIPTION
+A list of error classes that the agent should ignore.
+
+  <Callout variant="caution">
+    This option can't be set via environment variable.
+  </Callout>
+          DESCRIPTION
         },
-        :event_report_period => {
-          :default => 60,
-          :public => false,
-          :type => Integer,
+        :'error_collector.capture_events' => {
+          :default => value_of(:'error_collector.enabled'),
+          :documentation_default => true,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => true,
-          :description => 'Number of seconds betwixt connections to the New Relic event collection services.'
-        },
-        :'event_report_period.analytic_event_data' => {
-          :default => 60,
-          :public => false,
-          :type => Integer,
           :dynamic_name => true,
-          :deprecated => true,
+          :description => 'If `true`, the agent collects [TransactionError events](/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights).'
+        },
+        :'error_collector.enabled' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
           :allowed_from_server => true,
-          :description => deprecated_description(:'event_report_period.transaction_event_data', 'Number of seconds betwixt connections to the New Relic transaction event collection services.')
+          :description => 'If `true`, the agent captures traced errors and error count metrics.'
         },
-        :'event_report_period.transaction_event_data' => {
-          :default => value_of(:'event_report_period.analytic_event_data'),
-          :public => false,
-          :type => Integer,
+        :'error_collector.expected_classes' => {
+          :default => [],
+          :public => true,
+          :type => Array,
+          :allowed_from_server => true,
           :dynamic_name => true,
+          :description => <<-DESCRIPTION
+A list of error classes that the agent should treat as expected.
+
+  <Callout variant="caution">
+    This option can't be set via environment variable.
+  </Callout>
+          DESCRIPTION
+        },
+        :'error_collector.expected_messages' => {
+          :default => {},
+          :public => true,
+          :type => Hash,
           :allowed_from_server => true,
-          :description => 'Number of seconds betwixt connections to the New Relic transaction event collection services.'
+          :dynamic_name => true,
+          :description => <<-DESCRIPTION
+A map of error classes to a list of messages. When an error of one of the classes specified here occurs, if its error message contains one of the strings corresponding to it here, that error will be treated as expected.
+
+  <Callout variant="caution">
+    This option can't be set via environment variable.
+  </Callout>
+          DESCRIPTION
         },
-        :'event_report_period.custom_event_data' => {
-          :default => 60,
-          :public => false,
-          :type => Integer,
+        :'error_collector.expected_status_codes' => {
+          :default => '',
+          :public => true,
+          :type => String,
+          :allowed_from_server => true,
           :dynamic_name => true,
+          :description => 'A comma separated list of status codes, possibly including ranges. Errors associated with these status codes, where applicable, will be treated as expected.'
+        },
+        :'error_collector.ignore_errors' => {
+          :default => 'ActionController::RoutingError,Sinatra::NotFound',
+          :public => true,
+          :type => String,
+          :deprecated => true,
           :allowed_from_server => true,
-          :description => 'Number of seconds betwixt connections to the New Relic custom event collection services.'
+          :dynamic_name => true,
+          :description => <<-DESCRIPTION
+Use `error_collector.ignore_classes` instead. Specify a comma-delimited list of error classes that the agent should ignore.
+
+    <Callout variant="caution">
+      Server side configuration takes precedence for this setting over all environment configurations. This differs from all other configuration settings where environment variable take precedence over server side configuration.
+    </Callout>
+          DESCRIPTION
         },
-        :'event_report_period.error_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 error 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.log_event_data' => {
-          :default => 60,
-          :public => false,
+        :'error_collector.max_backtrace_frames' => {
+          :default => 50,
+          :public => true,
           :type => Integer,
-          :dynamic_name => true,
-          :allowed_from_server => true,
-          :description => 'Number of seconds betwixt connections to the New Relic log event collection services.'
+          :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.'
         },
-        :'event_report_period.span_event_data' => {
-          :default => 60,
-          :public => false,
+        :'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 span 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.'
         },
-        :keep_retrying => {
-          :default => true,
-          :public => false,
+        # Browser monitoring
+        :'browser_monitoring.auto_instrument' => {
+          :default => value_of(:'rum.enabled'),
+          :documentation_default => true,
+          :public => true,
           :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => 'Enable or disable retrying failed connections to the New Relic data collection service.'
+          :allowed_from_server => true,
+          :description => 'If `true`, enables [auto-injection](/docs/browser/new-relic-browser/installation-configuration/adding-apps-new-relic-browser#select-apm-app) of the JavaScript header for page load timing (sometimes referred to as real user monitoring or RUM).'
         },
-        :force_install_exit_handler => {
+        :'browser_monitoring.capture_attributes' => {
           :default => false,
           :public => true,
           :type => Boolean,
+          :deprecated => true,
           :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 => 'Use [`browser_monitoring.attributes.enabled`](#browser_monitoring-attributes-enabled) instead.'
         },
-        :force_reconnect => {
-          :default => false,
-          :public => false,
+        # Analytics events
+        :'analytics_events.capture_attributes' => {
+          :default => true,
+          :public => true,
           :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Force a new connection to the server before running the worker loop. Creates a separate agent run and is recorded as a separate instance by the New Relic data collection service.'
+          :description => 'Use [`transaction_events.attributes.enabled`](#transaction_events-attributes-enabled) instead.'
         },
-        :report_instance_busy => {
+        :'analytics_events.enabled' => {
           :default => true,
-          :public => false,
+          :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).'
+          :deprecated => true,
+          :allowed_from_server => true,
+          :description => deprecated_description(:'transaction_events.enabled', 'If `true`, enables analytics event sampling.')
         },
-        :log_file_name => {
-          :default => 'newrelic_agent.log',
+        :'analytics_events.max_samples_stored' => {
+          :default => 1200,
           :public => true,
-          :type => String,
-          :allowed_from_server => false,
-          :description => 'Defines a name for the log file.'
+          :type => Integer,
+          :deprecated => true,
+          :allowed_from_server => true,
+          :description => deprecated_description(:'transaction_events.max_samples_stored', 'Defines the maximum number of request events reported from a single harvest.')
         },
-        :log_file_path => {
-          :default => DefaultSource::DEFAULT_LOG_DIR,
+        # Transaction events
+        :'transaction_events.enabled' => {
+          :default => value_of(:'analytics_events.enabled'),
+          :documentation_default => true,
           :public => true,
-          :type => String,
-          :allowed_from_server => false,
-          :description => 'Defines a path to the agent log file, excluding the filename.'
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, enables transaction event sampling.'
         },
-        :'audit_log.enabled' => {
-          :default => false,
+        :'transaction_events.max_samples_stored' => {
+          :default => value_of(:'analytics_events.max_samples_stored'),
+          :documentation_default => 1200,
+          :public => true,
+          :type => Integer,
+          :allowed_from_server => true,
+          :description => 'Defines the maximum number of transaction events reported from a single harvest.'
+        },
+        # Application logging
+        :'application_logging.enabled' => {
+          :default => true,
           :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`, enables log decoration and the collection of log events and metrics.'
         },
-        :'audit_log.path' => {
-          :default => DefaultSource.audit_log_path,
-          :documentation_default => 'config/newrelic_audit.log',
+        :'application_logging.forwarding.enabled' => {
+          :default => true,
           :public => true,
-          :type => String,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Specifies a path to the audit log file (including the filename).'
+          :description => 'If `true`, the agent captures log records emitted by your application.'
         },
-        :'audit_log.endpoints' => {
-          :default => [".*"],
+        :'application_logging.forwarding.max_samples_stored' => {
+          :default => 10000,
           :public => true,
-          :type => Array,
-          :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_regexp_list),
-          :description => 'List of allowed endpoints to include in audit log'
+          :type => Integer,
+          :allowed_from_server => true,
+          :description => 'Defines the maximum number of log records to buffer in memory at a time.',
+          :dynamic_name => true
         },
-        :disable_samplers => {
+        :'application_logging.local_decorating.enabled' => {
           :default => false,
           :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 decorates logs with metadata to link to entities, hosts, traces, and spans.'
         },
-        :disable_resque => {
-          :default => false,
+        :'application_logging.metrics.enabled' => {
+          :default => true,
           :public => true,
           :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.resque', 'If `true`, disables [Resque instrumentation](/docs/agents/ruby-agent/background-jobs/resque-instrumentation).')
+          :allowed_from_server => true,
+          :description => 'If `true`, the agent captures metrics related to logging for your application.'
         },
-        :disable_sidekiq => {
-          :default => false,
+        # Attributes
+        :'attributes.enabled' => {
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `true`, disables [Sidekiq instrumentation](/docs/agents/ruby-agent/background-jobs/sidekiq-instrumentation).'
+          :description => 'If `true`, enables capture of attributes for all destinations.'
         },
-        :disable_dj => {
-          :default => false,
+        :'attributes.exclude' => {
+          :default => [],
           :public => true,
-          :deprecated => true,
-          :type => Boolean,
+          :type => Array,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.delayed_job', 'If `true`, disables [Delayed::Job instrumentation](/docs/agents/ruby-agent/background-jobs/delayedjob).')
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to exclude from all destinations. Allows `*` as wildcard at end.'
         },
-        :disable_sinatra => {
-          :default => false,
+        :'attributes.include' => {
+          :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 include in all destinations. Allows `*` as wildcard at end.'
         },
-        :disable_sinatra_auto_middleware => {
-          :default => false,
+        :'browser_monitoring.attributes.enabled' => {
+          :default => value_of(:'browser_monitoring.capture_attributes'),
+          :documentation_default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => <<-DESCRIPTION
-If `true`, disables agent middleware for Sinatra. This middleware is responsible for advanced feature support such as [cross application tracing](/docs/apm/transactions/cross-application-traces/cross-application-tracing), [page load timing](/docs/browser/new-relic-browser/getting-started/new-relic-browser), and [error collection](/docs/apm/applications-menu/events/view-apm-error-analytics).
-
-    <Callout variant="important">
-      Cross application tracing is deprecated in favor of [distributed tracing](https://docs.newrelic.com/docs/apm/distributed-tracing/getting-started/introduction-distributed-tracing). Distributed tracing is on by default for Ruby agent versions 8.0.0 and above. Middlewares are not required to support distributed tracing.
-
-      To continue using cross application tracing, update the following options in your `newrelic.yml` configuration file:
-
-      ```
-      # newrelic.yml
-
-        cross_application_tracer:
-          enabled: true
-        distributed_tracing:
-          enabled: false
-      ```
-    </Callout>
-          DESCRIPTION
+          :description => 'If `true`, the agent captures attributes from browser monitoring.'
         },
-        :disable_view_instrumentation => {
-          :default => false,
+        :'browser_monitoring.attributes.exclude' => {
+          :default => [],
           :public => true,
-          :type => Boolean,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'If `true`, disables view instrumentation.'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to exclude from browser monitoring. Allows `*` as wildcard at end.'
         },
-        :disable_harvest_thread => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
+        :'browser_monitoring.attributes.include' => {
+          :default => [],
+          :public => true,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'Enable or disable the harvest thread.'
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to include in browser monitoring. Allows `*` as wildcard at end.'
         },
-        :skip_ar_instrumentation => {
-          :default => false,
-          :public => false,
+        :'error_collector.attributes.enabled' => {
+          :default => value_of(:'error_collector.capture_attributes'),
+          :documentation_default => true,
+          :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Enable or disable active record instrumentation.'
+          :description => 'If `true`, the agent captures attributes from error collection.'
         },
-        :disable_activerecord_instrumentation => {
-          :default => value_of(:skip_ar_instrumentation),
-          :documentation_default => false,
+        :'error_collector.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 error collection. Allows `*` as wildcard at end.'
         },
-        :prepend_active_record_instrumentation => {
-          :default => false,
+        :'error_collector.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 error collection. Allows `*` as wildcard at end.'
         },
-        :prepend_net_instrumentation => {
+        :'span_events.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 span events.'
         },
-        :'instrumentation.net_http' => {
-          :default => instrumentation_value_of(:disable_net_http, :prepend_net_instrumentation),
-          :documentation_default => 'auto',
+        :'span_events.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 span events. Allows `*` as wildcard at end.'
         },
-        :'instrumentation.typhoeus' => {
-          :default => instrumentation_value_of(:disable_typhoeus),
-          :documentation_default => 'auto',
+        :'span_events.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 span events. Allows `*` as wildcard at end.'
         },
-        :'instrumentation.bunny' => {
-          :default => instrumentation_value_of(:disable_bunny),
-          :documentation_default => 'auto',
+        :'transaction_events.attributes.enabled' => {
+          :default => value_of(:'analytics_events.capture_attributes'),
+          :documentation_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 events.'
         },
-        :'instrumentation.httprb' => {
-          :default => instrumentation_value_of(:disable_httprb),
-          :documentation_default => 'auto',
+        :'transaction_events.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 events. Allows `*` as wildcard at end.'
         },
-        :'instrumentation.resque' => {
-          :default => instrumentation_value_of(:disable_resque),
-          :documentation_default => 'auto',
+        :'transaction_events.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 events. Allows `*` as wildcard at end.'
         },
-        :'instrumentation.thread' => {
-          :default => 'auto',
+        :'transaction_segments.attributes.enabled' => {
+          :default => true,
           :public => true,
-          :type => String,
-          :dynamic_name => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of the Thread class at start up to allow the agent to correctly nest spans inside of an asynchronous transaction. This does not enable the agent to automatically trace all threads created (see `instrumentation.thread.tracing`). May be one of [auto|prepend|chain|disabled]."
+          :description => 'If `true`, the agent captures attributes on transaction segments.'
         },
-        :'instrumentation.thread.tracing' => {
-          :default => false,
+        :'transaction_segments.attributes.exclude' => {
+          :default => [],
           :public => true,
-          :type => Boolean,
+          :type => Array,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of the Thread class at start up to automatically add tracing to all Threads created in the application."
+          :transform => DefaultSource.method(:convert_to_list),
+          :description => 'Prefix of attributes to exclude from transaction segments. Allows `*` as wildcard at end.'
         },
-        :'instrumentation.redis' => {
-          :default => instrumentation_value_of(:disable_redis),
-          :documentation_default => 'auto',
+        :'transaction_segments.attributes.include' => {
+          :default => [],
           :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),
-          :documentation_default => 'auto',
-          :public => :true,
-          :type => String,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of rake at start up.  May be one of [auto|prepend|chain|disabled]."
-        },
-        :'instrumentation.mongo' => {
-          :default => instrumentation_value_of(:disable_mongo),
-          :documentation_default => 'enabled',
-          :public => :true,
-          :type => String,
-          :dynamic_name => 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_list),
+          :description => 'Prefix of attributes to include on transaction segments. Allows `*` as wildcard at end.'
         },
-        :'instrumentation.delayed_job' => {
-          :default => instrumentation_value_of(:disable_dj),
-          :documentation_default => 'auto',
+        :'transaction_tracer.attributes.enabled' => {
+          :default => value_of(:'transaction_tracer.capture_attributes'),
+          :documentation_default => true,
           :public => true,
-          :type => String,
-          :dynamic_name => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of Delayed Job at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'If `true`, the agent captures attributes from transaction traces.'
         },
-        :'instrumentation.httpclient' => {
-          :default => instrumentation_value_of(:disable_httpclient),
-          :documentation_default => 'auto',
+        :'transaction_tracer.attributes.exclude' => {
+          :default => [],
           :public => true,
-          :type => String,
-          :dynamic_name => true,
+          :type => Array,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of HTTPClient 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.curb' => {
-          :default => instrumentation_value_of(:disable_curb),
-          :documentation_default => 'auto',
+        :'transaction_tracer.attributes.include' => {
+          :default => [],
           :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].'
-        },
-        :'instrumentation.sinatra' => {
-          :default => instrumentation_value_of(:disable_sinatra),
-          :documentation_default => 'auto',
-          :public => :true,
-          :type => String,
-          :dynamic_name => true,
+          :type => Array,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Sinatra 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.rack' => {
-          :default => instrumentation_value_of(:disable_rack),
-          :documentation_default => 'auto',
+        # Audit log
+        :'audit_log.enabled' => {
+          :default => false,
           :public => true,
-          :type => String,
-          :dynamic_name => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Rack. When enabled, the agent hooks into the " \
-                           "`to_app` method in Rack::Builder to find gems to instrument during " \
-                           "application startup.  May be one of [auto|prepend|chain|disabled]."
+          :description => '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.rack_urlmap' => {
-          :default => instrumentation_value_of(:disable_rack_urlmap),
-          :documentation_default => 'auto',
+        :'audit_log.endpoints' => {
+          :default => [".*"],
           :public => true,
-          :type => String,
-          :dynamic_name => true,
+          :type => Array,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of Rack::URLMap at start up.  May be one of [auto|prepend|chain|disabled].'
+          :transform => DefaultSource.method(:convert_to_regexp_list),
+          :description => 'List of allowed endpoints to include in audit log'
         },
-        :'instrumentation.puma_rack' => {
-          :default => instrumentation_value_of(:disable_puma_rack), # TODO: MAJOR VERSION - change to value_of(:'instrumentation.rack') when we remove :disable_puma_rack in 8.0)
-          :documentation_default => 'auto',
+        :'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 Puma::Rack. When enabled, the agent hooks into the " \
-                           "`to_app` method in Puma::Rack::Builder to find gems to instrument during " \
-                           "application startup.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Specifies a path to the audit log file (including the filename).'
         },
-        :'instrumentation.puma_rack_urlmap' => {
-          :default => instrumentation_value_of(:disable_puma_rack_urlmap), # TODO: MAJOR VERSION - change to value_of(:'instrumentation.rack_urlmap') when we remove :disable_puma_rack_urlmap in 8.0)
-          :documentation_default => 'auto',
+        # Autostart
+        :'autostart.denylisted_constants' => {
+          :default => 'Rails::Console',
           :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 => '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.memcached' => {
-          :default => instrumentation_value_of(:disable_memcached),
-          :documentation_default => 'auto',
+        :'autostart.denylisted_executables' => {
+          :default => 'irb,rspec',
           :public => true,
           :type => String,
-          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of memcached gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'Defines a comma-delimited list of executables that the agent should not instrument. For example, `rake,my_ruby_script.rb`.'
         },
-        :'instrumentation.memcache_client' => {
-          :default => instrumentation_value_of(:disable_memcache_client),
-          :documentation_default => 'auto',
+        :'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 memcache-client gem for Memcache 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.memcache' => {
-          :default => instrumentation_value_of(:disable_dalli),
-          :documentation_default => 'auto',
+        # 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 dalli 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.logger' => {
-          :default => instrumentation_value_from_boolean(:'application_logging.enabled'),
-          :documentation_default => 'auto',
+        # 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 Ruby standard library Logger 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.tilt' => {
-          :default => "auto",
+        # 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 the Tilt template rendering library at start up. May be one of [auto|prepend|chain|disabled].'
+          :description => 'If `false`, custom attributes will not be sent on events.'
         },
-        :'instrumentation.grpc_client' => {
-          :default => instrumentation_value_of(:disable_grpc_client),
-          :documentation_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 gRPC clients 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.grpc.host_denylist' => {
-          :default => [],
+        :'custom_insights_events.max_samples_stored' => {
+          :default => 3000,
           :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.*")
+          :type => Integer,
+          :allowed_from_server => true,
+          :description => 'Specify a maximum number of custom events to buffer in memory at a time.',
+          :dynamic_name => true
         },
-        :'instrumentation.grpc_server' => {
-          :default => instrumentation_value_of(:disable_grpc_server),
-          :documentation_default => 'auto',
+        # Datastore tracer
+        :'datastore_tracer.database_name_reporting.enabled' => {
+          :default => true,
           :public => true,
-          :type => String,
-          :dynamic_name => true,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of gRPC servers at start up.  May be one of [auto|prepend|chain|disabled].'
+          :description => 'If `false`, the agent will not add `database_name` parameter to transaction or slow sql traces.'
         },
-        :disable_data_mapper => {
-          :default => false,
+        :'datastore_tracer.instance_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 report datastore instance metrics, nor add `host` or `port_path_or_id` parameters to transaction or slow SQL traces.'
         },
-        :disable_activejob => {
+        # Disabling
+        :disable_action_cable_instrumentation => {
           :default => false,
           :public => true,
           :type => Boolean,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'If `true`, disables ActiveJob instrumentation.'
+          :description => 'If `true`, disables Action Cable instrumentation.'
         },
-        :disable_action_cable_instrumentation => {
+        :disable_activejob => {
           :default => false,
           :public => true,
           :type => Boolean,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'If `true`, disables Action Cable instrumentation.'
+          :description => 'If `true`, disables ActiveJob instrumentation.'
         },
         :disable_active_storage => {
           :default => false,
@@ -1153,174 +1145,165 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => false,
           :description => 'If `true`, disables ActiveStorage instrumentation.'
         },
-        :disable_memcached => {
-          :default => value_of(:disable_memcache_instrumentation),
+        :disable_activerecord_instrumentation => {
+          :default => value_of(:skip_ar_instrumentation),
           :documentation_default => false,
           :public => true,
           :type => Boolean,
-          :deprecated => true,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcached', 'If `true`, disables instrumentation for the memcached gem.')
+          :description => 'If `true`, disables active record instrumentation.'
         },
-        :disable_memcache_client => {
-          :default => value_of(:disable_memcache_instrumentation),
-          :documentation_default => false,
+        :disable_active_record_notifications => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :deprecated => true,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcache-client', 'If `true`, disables instrumentation for the memcache-client gem.')
+          :description => 'If `true`, disables instrumentation for ActiveRecord 4, 5, and 6.'
         },
-        :disable_dalli => {
-          :default => value_of(:disable_memcache_instrumentation),
-          :documentation_default => false,
+        :disable_bunny => {
+          :default => false,
           :public => true,
           :type => Boolean,
           :deprecated => true,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcache', 'If `true`, disables instrumentation for the dalli gem.')
+          :description => deprecated_description(:'instrumentation.bunny', 'If `true`, disables instrumentation for the bunny gem.')
         },
-        :disable_dalli_cas_client => {
-          :default => value_of(:disable_memcache_instrumentation),
-          :documentation_default => false,
+        :disable_cpu_sampler => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :deprecated => true,
+          :dynamic_name => 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`, the agent won\'t sample the CPU usage of the host process.'
         },
-        :disable_memcache_instrumentation => {
+        :disable_curb => {
           :default => false,
           :public => true,
           :type => Boolean,
           :deprecated => true,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcache', 'If `true`, disables memcache instrumentation.')
+          :description => deprecated_description(:'instrumentation.curb', 'If `true`, disables instrumentation for the curb gem.')
         },
-        :disable_gc_profiler => {
+        :disable_database_instrumentation => {
           :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'
+          :deprecated => true,
+          :description => 'Use [`disable_sequel_instrumentation`](#disable_sequel_instrumentation) instead.'
         },
-        :'sidekiq.capture_params' => {
+        :disable_data_mapper => {
           :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 DataMapper instrumentation.'
         },
-        :'resque.capture_params' => {
-          :default => false,
+        :disable_dalli => {
+          :default => value_of(:disable_memcache_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 Resque.'
+          :allowed_from_server => false,
+          :description => deprecated_description(:'instrumentation.memcache', 'If `true`, disables instrumentation for the dalli gem.')
         },
-        :'resque.use_ruby_dns' => {
-          :default => true,
-          :public => false,
+        :disable_dalli_cas_client => {
+          :default => value_of(:disable_memcache_instrumentation),
+          :documentation_default => false,
+          :public => true,
           :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Replace the libc DNS resolver with the all Ruby resolver Resolv'
+          :description => deprecated_description(:'instrumentation.memcache', "If `true`, disables instrumentation for the dalli gem's additional CAS client support.")
         },
-        :capture_memcache_keys => {
+        :disable_delayed_job_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 measure the depth of Delayed Job queues.'
         },
-        :'transaction_tracer.enabled' => {
-          :default => true,
+        :disable_dj => {
+          :default => false,
           :public => true,
+          :deprecated => 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.
-
-  - 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`.
-  '
+          :allowed_from_server => false,
+          :description => deprecated_description(:'instrumentation.delayed_job', 'If `true`, disables [Delayed::Job instrumentation](/docs/agents/ruby-agent/background-jobs/delayedjob).')
         },
-        :'transaction_tracer.record_redis_arguments' => {
+        :disable_excon => {
           :default => false,
           :public => true,
           :type => Boolean,
+          :dynamic_name => true,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent records Redis command arguments in transaction traces.'
+          :description => deprecated_description(:'instrumentation.excon', 'If `true`, disables instrumentation for the excon gem.')
         },
-        :'transaction_tracer.capture_attributes' => {
-          :default => true,
+        :disable_memcached => {
+          :default => value_of(:disable_memcache_instrumentation),
+          :documentation_default => false,
           :public => true,
           :type => Boolean,
           :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Use [`transaction_tracer.attributes.enabled`](#transaction_tracer-attributes-enabled) instead.'
+          :description => deprecated_description(:'instrumentation.memcached', 'If `true`, disables instrumentation for the memcached gem.')
         },
-        :'transaction_tracer.explain_threshold' => {
-          :default => 0.5,
+        :disable_memcache_client => {
+          :default => value_of(:disable_memcache_instrumentation),
+          :documentation_default => false,
           :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.'
+          :type => Boolean,
+          :deprecated => true,
+          :allowed_from_server => false,
+          :description => deprecated_description(:'instrumentation.memcache-client', 'If `true`, disables instrumentation for the memcache-client gem.')
         },
-        :'transaction_tracer.explain_enabled' => {
-          :default => true,
+        :disable_memcache_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.'
+          :deprecated => true,
+          :allowed_from_server => false,
+          :description => deprecated_description(:'instrumentation.memcache', 'If `true`, disables memcache instrumentation.')
         },
-        :'transaction_tracer.stack_trace_threshold' => {
-          :default => 0.5,
+        :disable_gc_profiler => {
+          :default => false,
           :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.'
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'If `true`, disables the use of GC::Profiler to measure time spent in garbage collection'
         },
-        :'transaction_tracer.limit_segments' => {
-          :default => 4000,
+        :disable_grape => {
+          :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,
+          :deprecated => true,
+          :description => deprecated_description(:'instrumentation.grape',
+            'If `true`, the agent won\'t install Grape instrumentation.')
         },
-        :disable_sequel_instrumentation => {
+        :disable_httpclient => {
           :default => false,
           :public => true,
           :type => Boolean,
+          :dynamic_name => true,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'If `true`, disables [Sequel instrumentation](/docs/agents/ruby-agent/frameworks/sequel-instrumentation).'
+          :description => deprecated_description(:'instrumentation.httpclient', 'If `true`, disables instrumentation for the httpclient gem.')
         },
-        :disable_database_instrumentation => {
+        :disable_httprb => {
           :default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => false,
+          :dynamic_name => true,
           :deprecated => true,
-          :description => 'Use [`disable_sequel_instrumentation`](#disable_sequel_instrumentation) instead.'
+          :allowed_from_server => false,
+          :description => deprecated_description(:'instrumentation.httprb', 'If `true`, the agent won\'t install instrumentation for the http.rb gem.')
         },
         :disable_mongo => {
           :default => false,
@@ -1331,613 +1314,522 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :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 => {
+        :disable_memory_sampler => {
           :default => false,
           :public => true,
           :type => Boolean,
-          :deprecated => true,
+          :dynamic_name => 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).')
+          :description => 'If `true`, the agent won\'t sample the memory usage of the host process.'
         },
-        :disable_redis_instrumentation => {
+        :disable_middleware_instrumentation => {
           :default => false,
-          :public => false,
+          :public => true,
           :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.')
+          :description => 'If `true`, the agent won\'t wrap third-party middlewares in instrumentation (regardless of whether they are installed via Rack::Builder or Rails).'
         },
-        :'message_tracer.segment_parameters.enabled' => {
-          :default => true,
+        :disable_net_http => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If `true`, the agent will collect metadata about messages and attach them as segment parameters.'
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :deprecated => true,
+          :description => deprecated_description(:'instrumentation.net_http',
+            'If `true`, disables instrumentation for Net::HTTP.')
         },
-        :'slow_sql.enabled' => {
-          :default => value_of(:'transaction_tracer.enabled'),
-          :documentation_default => true,
+        :disable_puma_rack => {
+          :default => value_of(:disable_rack),
+          :documentation_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).'
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :deprecated => true,
+          :description => deprecated_description(:'instrumentation.puma_rack', 'If `true`, prevents the agent from hooking into the `to_app` method in Puma::Rack::Builder to find gems to instrument during application startup.')
         },
-        :'slow_sql.explain_threshold' => {
-          :default => value_of(:'transaction_tracer.explain_threshold'),
-          :documentation_default => 0.5,
+        :disable_puma_rack_urlmap => {
+          :default => value_of(:disable_rack_urlmap),
+          :documentation_default => false,
           :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.'
+          :type => Boolean,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :deprecated => true,
+          :description => deprecated_description(:'instrumentation.puma_rack_urlmap', 'If `true`, prevents the agent from hooking into Puma::Rack::URLMap to install middleware tracing.')
         },
-        :'slow_sql.explain_enabled' => {
-          :default => value_of(:'transaction_tracer.explain_enabled'),
-          :documentation_default => true,
+        :disable_rack => {
+          :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.'
+          :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.')
         },
-        :'slow_sql.record_sql' => {
-          :default => value_of(:'transaction_tracer.record_sql'),
-          :documentation_default => 'obfuscated',
+        :disable_rack_urlmap => {
+          :default => false,
           :public => true,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'Defines an obfuscation level for slow SQL queries. Valid options are `obfuscated`, `raw`, or `none`).'
+          :type => Boolean,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :deprecated => true,
+          :description => deprecated_description(:'instrumentation.rack_urlmap', 'If `true`, prevents the agent from hooking into Rack::URLMap to install middleware tracing.')
         },
-        :'slow_sql.use_longer_sql_id' => {
+        :disable_rake => {
           :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.'
+          :allowed_from_server => false,
+          :deprecated => true,
+          :description => deprecated_description(:'instrumentation.rake', 'If `true`, disables Rake instrumentation.')
         },
-        :'mongo.capture_queries' => {
-          :default => true,
+        :disable_redis => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If `true`, the agent captures Mongo queries in transaction traces.'
+          :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).')
         },
-        :'mongo.obfuscate_queries' => {
-          :default => true,
+        :disable_resque => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If `true`, the agent obfuscates Mongo queries in transaction traces.'
+          :deprecated => true,
+          :allowed_from_server => false,
+          :description => deprecated_description(:'instrumentation.resque', 'If `true`, disables [Resque instrumentation](/docs/agents/ruby-agent/background-jobs/resque-instrumentation).')
         },
-        :'error_collector.enabled' => {
-          :default => true,
+        :disable_samplers => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If `true`, the agent captures traced errors and error count metrics.'
+          :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).'
         },
-        :'error_collector.capture_attributes' => {
-          :default => true,
+        :disable_sequel_instrumentation => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Use [`error_collector.attributes.enabled`](#error_collector-attributes-enabled) instead.'
+          :description => 'If `true`, disables [Sequel instrumentation](/docs/agents/ruby-agent/frameworks/sequel-instrumentation).'
         },
-        :'error_collector.ignore_errors' => {
-          :default => 'ActionController::RoutingError,Sinatra::NotFound',
+        :disable_sidekiq => {
+          :default => false,
           :public => true,
-          :type => String,
-          :deprecated => true,
-          :allowed_from_server => true,
-          :dynamic_name => true,
-          :description => <<-DESCRIPTION
-Use `error_collector.ignore_classes` instead. Specify a comma-delimited list of error classes that the agent should ignore.
-
-    <Callout variant="caution">
-      Server side configuration takes precedence for this setting over all environment configurations. This differs from all other configuration settings where environment variable take precedence over server side configuration.
-    </Callout>
-          DESCRIPTION
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'If `true`, disables [Sidekiq instrumentation](/docs/agents/ruby-agent/background-jobs/sidekiq-instrumentation).'
         },
-        :'error_collector.ignore_classes' => {
-          :default => [],
+        :disable_sinatra => {
+          :default => false,
           :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
+          :type => Boolean,
+          :deprecated => true,
+          :allowed_from_server => false,
+          :description => deprecated_description(:'instrumentation.sinatra', 'If `true` , disables [Sinatra instrumentation](/docs/agents/ruby-agent/frameworks/sinatra-support).')
         },
-        :'error_collector.ignore_messages' => {
-          :default => {},
+        :disable_sinatra_auto_middleware => {
+          :default => false,
           :public => true,
-          :type => Hash,
-          :allowed_from_server => true,
-          :dynamic_name => true,
+          :type => Boolean,
+          :allowed_from_server => false,
           :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.
+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="caution">
-    This option can't be set via environment variable.
-  </Callout>
+    <Callout variant="important">
+      Cross application tracing is deprecated in favor of [distributed tracing](https://docs.newrelic.com/docs/apm/distributed-tracing/getting-started/introduction-distributed-tracing). Distributed tracing is on by default for Ruby agent versions 8.0.0 and above. Middlewares are not required to support distributed tracing.
+
+      To continue using cross application tracing, update the following options in your `newrelic.yml` configuration file:
+
+      ```
+      # newrelic.yml
+
+        cross_application_tracer:
+          enabled: true
+        distributed_tracing:
+          enabled: false
+      ```
+    </Callout>
           DESCRIPTION
         },
-        :'error_collector.ignore_status_codes' => {
-          :default => '',
+        :disable_typhoeus => {
+          :default => false,
           :public => true,
-          :type => String,
-          :allowed_from_server => true,
+          :type => Boolean,
           :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.'
+          :deprecated => true,
+          :allowed_from_server => false,
+          :description => deprecated_description(:'instrumentation.typhoeus', 'If `true`, the agent won\'t install instrumentation for the typhoeus gem.')
         },
-        :'error_collector.expected_classes' => {
-          :default => [],
+        :disable_view_instrumentation => {
+          :default => false,
           :public => true,
-          :type => Array,
-          :allowed_from_server => true,
-          :dynamic_name => true,
-          :description => <<-DESCRIPTION
-A list of error classes that the agent should treat as expected.
-
-  <Callout variant="caution">
-    This option can't be set via environment variable.
-  </Callout>
-          DESCRIPTION
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'If `true`, disables view instrumentation.'
         },
-        :'error_collector.expected_messages' => {
-          :default => {},
+        :disable_vm_sampler => {
+          :default => false,
           :public => true,
-          :type => Hash,
-          :allowed_from_server => true,
+          :type => Boolean,
           :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
+          :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).'
         },
-        :'error_collector.expected_status_codes' => {
-          :default => '',
+        # Distributed tracing
+        :'distributed_tracing.enabled' => {
+          :default => true,
           :public => true,
-          :type => String,
+          :type => Boolean,
           :allowed_from_server => true,
-          :dynamic_name => true,
-          :description => 'A comma separated list of status codes, possibly including ranges. Errors associated with these status codes, where applicable, will be treated as expected.'
-        },
-        :'error_collector.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.'
+          :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.'
         },
-        :'error_collector.capture_events' => {
-          :default => value_of(:'error_collector.enabled'),
-          :documentation_default => true,
+        # Elasticsearch
+        :'elasticsearch.capture_queries' => {
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :dynamic_name => true,
-          :description => 'If `true`, the agent collects [TransactionError events](/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights).'
+          :description => 'If `true`, the agent captures Elasticsearch queries in transaction traces.'
         },
-        :'error_collector.max_event_samples_stored' => {
-          :default => 100,
+        :'elasticsearch.obfuscate_queries' => {
+          :default => true,
           :public => true,
-          :type => Integer,
+          :type => Boolean,
           :allowed_from_server => true,
-          :description => 'Defines the maximum number of [TransactionError events](/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights) reported per harvest cycle.'
+          :description => 'If `true`, the agent obfuscates Elasticsearch queries in transaction traces.'
         },
-        :'rum.enabled' => {
+        # Heroku
+        :'heroku.use_dyno_names' => {
           :default => true,
-          :public => false,
+          :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'Enable or disable page load timing (sometimes referred to as real user monitoring or RUM).'
+          :allowed_from_server => false,
+          :description => 'If `true`, the agent uses Heroku dyno names as the hostname.'
         },
-        :browser_key => {
-          :default => '',
-          :public => false,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'Real user monitoring license key for the browser timing header.'
+        :'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>).'
         },
-        :beacon => {
+        # Infinite tracing
+        :'infinite_tracing.trace_observer.host' => {
           :default => '',
-          :public => false,
+          :public => true,
           :type => String,
-          :allowed_from_server => true,
-          :description => 'Beacon for real user monitoring.'
+          :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."
         },
-        :error_beacon => {
-          :default => '',
-          :public => false,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'Error beacon for real user monitoring.'
+        :'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"
         },
-        :application_id => {
-          :default => '',
-          :public => false,
+        # Instrumentation
+        :'instrumentation.active_support_logger' => {
+          :default => instrumentation_value_from_boolean(:'application_logging.enabled'),
+          :documentation_default => 'auto',
+          :dynamic_name => true,
+          :public => true,
           :type => String,
-          :allowed_from_server => true,
-          :description => 'Application ID for real user monitoring.'
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of ActiveSupport::Logger at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :js_agent_file => {
-          :default => '',
-          :public => false,
+        :'instrumentation.bunny' => {
+          :default => instrumentation_value_of(:disable_bunny),
+          :documentation_default => 'auto',
+          :public => true,
           :type => String,
-          :allowed_from_server => true,
-          :description => 'JavaScript agent file for real user monitoring.'
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of bunny at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :'browser_monitoring.auto_instrument' => {
-          :default => value_of(:'rum.enabled'),
-          :documentation_default => true,
+        :'instrumentation.curb' => {
+          :default => instrumentation_value_of(:disable_curb),
+          :documentation_default => 'auto',
           :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).'
+          :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].'
         },
-        :'browser_monitoring.capture_attributes' => {
-          :default => false,
+        :'instrumentation.delayed_job' => {
+          :default => instrumentation_value_of(:disable_dj),
+          :documentation_default => 'auto',
           :public => true,
-          :type => Boolean,
-          :deprecated => true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Use [`browser_monitoring.attributes.enabled`](#browser_monitoring-attributes-enabled) instead.'
+          :description => 'Controls auto-instrumentation of Delayed Job at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :'browser_monitoring.loader' => {
-          :default => DefaultSource.browser_monitoring_loader,
-          :public => false,
+        :'instrumentation.elasticsearch' => {
+          :default => 'auto',
+          :public => true,
           :type => String,
-          :allowed_from_server => true,
-          :description => 'Type of JavaScript agent loader to use for browser monitoring instrumentation.'
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of the elasticsearch library at start up. May be one of [auto|prepend|chain|disabled].'
         },
-        :'browser_monitoring.loader_version' => {
-          :default => '',
-          :public => false,
+        :'instrumentation.excon' => {
+          :default => instrumentation_value_of(:disable_excon),
+          :documentation_default => 'enabled',
+          :public => :true,
           :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).)'
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => "Controls auto-instrumentation of Excon at start up.  May be one of [enabled|disabled]."
         },
-        :'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,
+        :'instrumentation.grape' => {
+          :default => instrumentation_value_of(:disable_grape_instrumentation),
+          :documentation_default => 'auto',
+          :public => :true,
           :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 Grape at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :"cross_application_tracer.enabled" => {
-          :default => false,
+        :'instrumentation.grpc_client' => {
+          :default => instrumentation_value_of(:disable_grpc_client),
+          :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/) when `distributed_tracing.enabled` is set to `false`.'
-          )
-        },
-        :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.'
+          :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].'
         },
-        :'thread_profiler.enabled' => {
-          :default => DefaultSource.thread_profiler_enabled,
-          :documentation_default => false,
+        :'instrumentation.grpc.host_denylist' => {
+          :default => [],
           :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'
+          :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.*")
         },
-        :marshaller => {
-          :default => 'json',
+        :'instrumentation.grpc_server' => {
+          :default => instrumentation_value_of(:disable_grpc_server),
+          :documentation_default => 'auto',
           :public => true,
           :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => '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,
-          :deprecated => true,
-          :allowed_from_server => true,
-          :description => deprecated_description(:'transaction_events.enabled', 'If `true`, enables analytics event sampling.')
-        },
-        :'analytics_events.max_samples_stored' => {
-          :default => 1200,
-          :public => true,
-          :type => Integer,
-          :deprecated => true,
-          :allowed_from_server => true,
-          :description => deprecated_description(:'transaction_events.max_samples_stored', 'Defines the maximum number of request events reported from a single harvest.')
-        },
-        :'transaction_events.enabled' => {
-          :default => value_of(:'analytics_events.enabled'),
-          :documentation_default => true,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If `true`, enables transaction event sampling.'
-        },
-        :'transaction_events.max_samples_stored' => {
-          :default => value_of(:'analytics_events.max_samples_stored'),
-          :documentation_default => 1200,
-          :public => true,
-          :type => Integer,
-          :allowed_from_server => true,
-          :description => 'Defines the maximum number of transaction events reported from a single harvest.'
+          :description => 'Controls auto-instrumentation of gRPC servers at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :'analytics_events.capture_attributes' => {
-          :default => true,
+        :'instrumentation.httpclient' => {
+          :default => instrumentation_value_of(:disable_httpclient),
+          :documentation_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 HTTPClient at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :backport_fast_active_record_connection_lookup => {
-          :default => false,
+        :'instrumentation.httprb' => {
+          :default => instrumentation_value_of(:disable_httprb),
+          :documentation_default => 'auto',
           :public => true,
-          :type => Boolean,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Backports the faster ActiveRecord connection lookup introduced in Rails 6, which improves agent performance when instrumenting ActiveRecord. Note that this setting may not be compatible with other gems that patch ActiveRecord.'
+          :description => 'Controls auto-instrumentation of http.rb gem at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :disable_vm_sampler => {
-          :default => false,
+        :'instrumentation.logger' => {
+          :default => instrumentation_value_from_boolean(:'application_logging.enabled'),
+          :documentation_default => 'auto',
           :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 Ruby standard library Logger at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :disable_memory_sampler => {
-          :default => false,
+        :'instrumentation.memcache' => {
+          :default => instrumentation_value_of(:disable_dalli),
+          :documentation_default => 'auto',
           :public => true,
-          :type => Boolean,
+          :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 dalli gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :disable_cpu_sampler => {
-          :default => false,
+        :'instrumentation.memcached' => {
+          :default => instrumentation_value_of(:disable_memcached),
+          :documentation_default => 'auto',
           :public => true,
-          :type => Boolean,
+          :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 memcached gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :disable_delayed_job_sampler => {
-          :default => false,
+        :'instrumentation.memcache_client' => {
+          :default => instrumentation_value_of(:disable_memcache_client),
+          :documentation_default => 'auto',
           :public => true,
-          :type => Boolean,
+          :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 memcache-client gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :disable_active_record_notifications => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
+        :'instrumentation.mongo' => {
+          :default => instrumentation_value_of(:disable_mongo),
+          :documentation_default => 'enabled',
+          :public => :true,
+          :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'If `true`, disables instrumentation for ActiveRecord 4, 5, and 6.'
+          :description => "Controls auto-instrumentation of Mongo at start up.  May be one of [enabled|disabled]."
         },
-        :disable_bunny => {
-          :default => false,
+        :'instrumentation.net_http' => {
+          :default => instrumentation_value_of(:disable_net_http, :prepend_net_instrumentation),
+          :documentation_default => 'auto',
           :public => true,
-          :type => Boolean,
-          :deprecated => 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 Net::HTTP at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :disable_curb => {
-          :default => false,
+        :'instrumentation.puma_rack' => {
+          :default => instrumentation_value_of(:disable_puma_rack), # TODO: MAJOR VERSION - change to value_of(:'instrumentation.rack') when we remove :disable_puma_rack in 8.0)
+          :documentation_default => 'auto',
           :public => true,
-          :type => Boolean,
-          :deprecated => 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 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_excon => {
-          :default => false,
+        :'instrumentation.puma_rack_urlmap' => {
+          :default => instrumentation_value_of(:disable_puma_rack_urlmap), # TODO: MAJOR VERSION - change to value_of(:'instrumentation.rack_urlmap') when we remove :disable_puma_rack_urlmap in 8.0)
+          :documentation_default => 'auto',
           :public => true,
-          :type => Boolean,
+          :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 Puma::Rack::URLMap at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :'instrumentation.excon' => {
-          :default => instrumentation_value_of(:disable_excon),
-          :documentation_default => 'enabled',
-          :public => :true,
+        :'instrumentation.rack' => {
+          :default => instrumentation_value_of(:disable_rack),
+          :documentation_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 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_httpclient => {
-          :default => false,
+        :'instrumentation.rack_urlmap' => {
+          :default => instrumentation_value_of(:disable_rack_urlmap),
+          :documentation_default => 'auto',
           :public => true,
-          :type => Boolean,
+          :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 Rack::URLMap at start up.  May be one of [auto|prepend|chain|disabled].'
         },
-        :disable_net_http => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
+        :'instrumentation.rake' => {
+          :default => instrumentation_value_of(:disable_rake),
+          :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 rake at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :disable_rack => {
-          :default => false,
+        :'instrumentation.redis' => {
+          :default => instrumentation_value_of(:disable_redis),
+          :documentation_default => 'auto',
           :public => true,
-          :type => Boolean,
+          :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 Redis at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :disable_rack_urlmap => {
-          :default => false,
+        :'instrumentation.resque' => {
+          :default => instrumentation_value_of(:disable_resque),
+          :documentation_default => 'auto',
           :public => true,
-          :type => Boolean,
+          :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 resque at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :disable_puma_rack => {
-          :default => value_of(:disable_rack),
-          :documentation_default => false,
-          :public => true,
-          :type => Boolean,
+        :'instrumentation.sinatra' => {
+          :default => instrumentation_value_of(:disable_sinatra),
+          :documentation_default => 'auto',
+          :public => :true,
+          :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.puma_rack', 'If `true`, prevents the agent from hooking into the `to_app` method in Puma::Rack::Builder to find gems to instrument during application startup.')
+          :description => "Controls auto-instrumentation of Sinatra at start up.  May be one of [auto|prepend|chain|disabled]."
         },
-        :disable_puma_rack_urlmap => {
-          :default => value_of(:disable_rack_urlmap),
-          :documentation_default => false,
+        :'instrumentation.thread' => {
+          :default => 'auto',
           :public => true,
-          :type => Boolean,
+          :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.puma_rack_urlmap', 'If `true`, prevents the agent from hooking into Puma::Rack::URLMap to install middleware tracing.')
+          :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_typhoeus => {
+        :'instrumentation.thread.tracing' => {
           :default => false,
           :public => true,
           :type => Boolean,
-          :dynamic_name => true,
-          :deprecated => true,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.typhoeus', 'If `true`, the agent won\'t install instrumentation for the typhoeus gem.')
+          :description => "Controls auto-instrumentation of the Thread class at start up to automatically add tracing to all Threads created in the application."
         },
-        :disable_httprb => {
-          :default => false,
+        :'instrumentation.tilt' => {
+          :default => "auto",
           :public => true,
-          :type => Boolean,
+          :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.')
+          :description => 'Controls auto-instrumentation of the Tilt template rendering library at start up. May be one of [auto|prepend|chain|disabled].'
         },
-        :disable_middleware_instrumentation => {
-          :default => false,
+        :'instrumentation.typhoeus' => {
+          :default => instrumentation_value_of(:disable_typhoeus),
+          :documentation_default => 'auto',
           :public => true,
-          :type => Boolean,
+          :type => String,
+          :dynamic_name => true,
           :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,
+        # Message tracer
+        :'message_tracer.segment_parameters.enabled' => {
+          :default => true,
+          :public => true,
           :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'Internal name for controlling Rails 3+ middleware instrumentation'
+          :allowed_from_server => true,
+          :description => 'If `true`, the agent will collect metadata about messages and attach them as segment parameters.'
         },
-        :'heroku.use_dyno_names' => {
+        # Mongo
+        :'mongo.capture_queries' => {
           :default => true,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'If `true`, the agent uses Heroku dyno names as the hostname.'
+          :allowed_from_server => true,
+          :description => 'If `true`, the agent captures Mongo queries in transaction traces.'
         },
-        :'heroku.dyno_name_prefixes_to_shorten' => {
-          :default => %w[scheduler run],
+        :'mongo.obfuscate_queries' => {
+          :default => true,
           :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>).'
+          :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,
@@ -1945,35 +1837,37 @@ A map of error classes to a list of messages. When an error of one of the classe
           :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).'
         },
-        :labels => {
-          :default => '',
+        # Rake
+        :'rake.tasks' => {
+          :default => [],
           :public => true,
-          :type => String,
+          :type => Array,
           :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>`.'
-        },
-        :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.'
+          :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].'
         },
-        :keep_alive_timeout => {
-          :default => 60,
-          :public => false,
+        :'rake.connect_timeout' => {
+          :default => 10,
+          :public => true,
           :type => Integer,
-          :allowed_from_server => true,
-          :description => 'Timeout for keep alive on TCP connection to collector if supported by Ruby version. Only used in conjunction when aggressive_keepalive is enabled.'
+          :allowed_from_server => false,
+          :description => 'Timeout for waiting on connect to complete before a rake task'
         },
-        :ca_bundle_path => {
-          :default => nil,
-          :allow_nil => true,
+        # Resque
+        :'resque.capture_params' => {
+          :default => false,
           :public => true,
-          :type => String,
+          :type => Boolean,
           :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."
+          :dynamic_name => true,
+          :deprecated => true,
+          :description => 'If `true`, enables the capture of job arguments for transaction traces and traced errors in Resque.'
         },
+        # Rules
         :'rules.ignore_url_regexes' => {
           :default => [],
           :public => true,
@@ -1982,408 +1876,549 @@ A map of error classes to a list of messages. When an error of one of the classe
           :transform => DefaultSource.method(:convert_to_regexp_list),
           :description => 'Define transactions you want the agent to ignore, by specifying a list of patterns matching the URI you want to ignore. See documentation on (ignoring specific transactions)[https://docs.newrelic.com/docs/agents/ruby-agent/api-guides/ignoring-specific-transactions/#config-ignoring] for more details.'
         },
-        :'synthetics.traces_limit' => {
-          :default => 20,
-          :public => false,
-          :type => Integer,
+        # Sidekiq
+        :'sidekiq.capture_params' => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :dynamic_name => true,
+          :deprecated => true,
+          :description => 'If `true`, enables the capture of job arguments for transaction traces and traced errors in Sidekiq.'
+        },
+        # Slow SQL
+        :'slow_sql.enabled' => {
+          :default => value_of(:'transaction_tracer.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 [slow SQL queries](/docs/apm/applications-menu/monitoring/viewing-slow-query-details).'
         },
-        :'synthetics.events_limit' => {
-          :default => 200,
-          :public => false,
-          :type => Integer,
+        :'slow_sql.explain_threshold' => {
+          :default => value_of(:'transaction_tracer.explain_threshold'),
+          :documentation_default => 0.5,
+          :public => true,
+          :type => Float,
           :allowed_from_server => true,
-          :description => 'Maximum number of synthetics transaction events to hold for a given harvest'
+          :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.'
         },
-        :'custom_insights_events.enabled' => {
-          :default => true,
+        :'slow_sql.explain_enabled' => {
+          :default => value_of(:'transaction_tracer.explain_enabled'),
+          :documentation_default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => 'If `true`, the agent captures [custom events](/docs/insights/new-relic-insights/adding-querying-data/inserting-custom-events-new-relic-apm-agents).'
+          :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.'
         },
-        :'custom_insights_events.max_samples_stored' => {
-          :default => 1000,
+        :'slow_sql.record_sql' => {
+          :default => value_of(:'transaction_tracer.record_sql'),
+          :documentation_default => 'obfuscated',
           :public => true,
-          :type => Integer,
+          :type => String,
           :allowed_from_server => true,
-          :description => 'Specify a maximum number of custom events to buffer in memory at a time.',
-          :dynamic_name => true
+          :description => 'Defines an obfuscation level for slow SQL queries. Valid options are `obfuscated`, `raw`, or `none`).'
         },
-        :'application_logging.enabled' => {
-          :default => true,
+        :'slow_sql.use_longer_sql_id' => {
+          :default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'If `true`, enables log decoration and the collection of log events and metrics.'
+          :allowed_from_server => true,
+          :description => 'Generate a longer sql_id for slow SQL traces. sql_id is used for aggregation of similar queries.'
         },
-        :'application_logging.forwarding.enabled' => {
+        # Span events
+        :'span_events.enabled' => {
           :default => true,
           :public => true,
           :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, enables span event sampling.'
+        },
+        :'span_events.queue_size' => {
+          :default => 10_000,
+          :public => true,
+          :type => Integer,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent captures log records emitted by your application.'
+          :external => :infinite_tracing,
+          :description => "Sets the maximum number of span events to buffer when streaming to the trace observer."
         },
-        :'application_logging.forwarding.max_samples_stored' => {
-          :default => 10000,
+        :'span_events.max_samples_stored' => {
+          :default => 2000,
           :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
+          :description => 'Defines the maximum number of span events reported from a single harvest. Any Integer between 1 and 10000 is valid.'
         },
-        :'application_logging.metrics.enabled' => {
-          :default => true,
+        # Strip exception messages
+        :'strip_exception_messages.enabled' => {
+          :default => value_of(:high_security),
+          :documentation_default => false,
           :public => true,
           :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'If `true`, the agent captures metrics related to logging for your application.'
+          :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).'
         },
-        :'application_logging.local_decorating.enabled' => {
-          :default => false,
+        :'strip_exception_messages.allowed_classes' => {
+          :default => '',
           :public => true,
-          :type => Boolean,
+          :type => String,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent decorates logs with metadata to link to entities, hosts, traces, and spans.'
+          :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"`.'
         },
-        :'code_level_metrics.enabled' => {
-          :default => true,
+        # Thread profiler
+        :'thread_profiler.enabled' => {
+          :default => DefaultSource.thread_profiler_enabled,
+          :documentation_default => false,
           :public => true,
           :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/'
+          :description => 'If `true`, enables use of the [thread profiler](/docs/apm/applications-menu/events/thread-profiler-tool).'
         },
-        :'instrumentation.active_support_logger' => {
-          :default => instrumentation_value_from_boolean(:'application_logging.enabled'),
-          :documentation_default => 'auto',
-          :dynamic_name => true,
+        # Utilization
+        :'utilization.detect_aws' => {
+          :default => true,
           :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].'
-        },
-        :disable_grape_instrumentation => {
-          :default => false,
-          :public => false,
           :type => Boolean,
           :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.grape',
-            'If `true`, the agent won\'t install Grape instrumentation.')
+          :dynamic_name => true,
+          :description => 'If `true`, the agent automatically detects that it is running in an AWS environment.'
         },
-        :disable_grape => {
-          :default => false,
+        :'utilization.detect_azure' => {
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.grape',
-            'If `true`, the agent won\'t install Grape instrumentation.')
-        },
-        :'instrumentation.grape' => {
-          :default => instrumentation_value_of(:disable_grape_instrumentation),
-          :documentation_default => 'auto',
-          :public => :true,
-          :type => String,
           :dynamic_name => true,
-          :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Grape at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'If `true`, the agent automatically detects that it is running in an Azure environment.'
         },
-        :'attributes.enabled' => {
+        :'utilization.detect_docker' => {
           :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `true`, enables capture of attributes for all destinations.'
+          :description => 'If `true`, the agent automatically detects that it is running in Docker.'
         },
-        :'transaction_tracer.attributes.enabled' => {
-          :default => value_of(:'transaction_tracer.capture_attributes'),
-          :documentation_default => true,
+        :'utilization.detect_gcp' => {
+          :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 Google Cloud Platform environment.'
         },
-        :'transaction_events.attributes.enabled' => {
-          :default => value_of(:'analytics_events.capture_attributes'),
-          :documentation_default => true,
+        :'utilization.detect_kubernetes' => {
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent captures attributes from transaction events.'
+          :description => 'If `true`, the agent automatically detects that it is running in Kubernetes.'
         },
-        :'error_collector.attributes.enabled' => {
-          :default => value_of(:'error_collector.capture_attributes'),
-          :documentation_default => true,
+        :'utilization.detect_pcf' => {
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent captures attributes from error collection.'
+          :dynamic_name => true,
+          :description => 'If `true`, the agent automatically detects that it is running in a Pivotal Cloud Foundry environment.'
         },
-        :'browser_monitoring.attributes.enabled' => {
-          :default => value_of(:'browser_monitoring.capture_attributes'),
-          :documentation_default => false,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'If `true`, the agent captures attributes from browser monitoring.'
+        # Private
+        :account_id => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'The account id associated with your application.'
         },
-        :'span_events.attributes.enabled' => {
+        :aggressive_keepalive => {
           :default => true,
-          :public => true,
+          :public => false,
           :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If true, attempt to keep the TCP connection to the collector alive between harvests.'
+        },
+        :api_host => {
+          :default => DefaultSource.api_host,
+          :public => false,
+          :type => String,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent captures attributes on span events.'
+          :description => 'API host for New Relic.'
         },
-        :'transaction_segments.attributes.enabled' => {
-          :default => true,
-          :public => true,
+        :api_port => {
+          :default => value_of(:port),
+          :public => false,
+          :type => Integer,
+          :allowed_from_server => false,
+          :description => 'Port for the New Relic API host.'
+        },
+        :application_id => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'Application ID for real user monitoring.'
+        },
+        :beacon => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'Beacon for real user monitoring.'
+        },
+        :browser_key => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'Real user monitoring license key for the browser timing header.'
+        },
+        :'browser_monitoring.loader' => {
+          :default => DefaultSource.browser_monitoring_loader,
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'Type of JavaScript agent loader to use for browser monitoring instrumentation.'
+        },
+        :'browser_monitoring.loader_version' => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'Version of JavaScript agent loader (returned from the New Relic [collector](/docs/apm/new-relic-apm/getting-started/glossary#collector).)'
+        },
+        :'browser_monitoring.debug' => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'Enable or disable debugging version of JavaScript agent loader for browser monitoring instrumentation.'
+        },
+        :'browser_monitoring.ssl_for_http' => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
           :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'Enable or disable HTTPS instrumentation by JavaScript agent on HTTP pages.'
+        },
+        :compressed_content_encoding => {
+          :default => 'gzip',
+          :public => false,
+          :type => String,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent captures attributes on transaction segments.'
+          :description => 'Encoding to use if data needs to be compressed. The options are deflate and gzip.'
         },
-        :'attributes.exclude' => {
-          :default => [],
-          :public => true,
+        :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 exclude from all destinations. Allows `*` as wildcard at end.'
+          :description => "An array of candidate locations for the agent's configuration file."
         },
-        :'transaction_tracer.attributes.exclude' => {
-          :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.'
+        },
+        :disable_grape_instrumentation => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from transaction traces. Allows `*` as wildcard at end.'
+          :deprecated => true,
+          :description => deprecated_description(:'instrumentation.grape',
+            'If `true`, the agent won\'t install Grape instrumentation.')
         },
-        :'transaction_events.attributes.exclude' => {
-          :default => [],
-          :public => true,
-          :type => Array,
+        :dispatcher => {
+          :default => DefaultSource.dispatcher,
+          :public => false,
+          :type => Symbol,
           :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 => 'Autodetected application component that reports metrics to New Relic.'
         },
-        :'error_collector.attributes.exclude' => {
-          :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 exclude from error collection. Allows `*` as wildcard at end.'
+          :description => 'Enable or disable the harvest thread.'
         },
-        :'browser_monitoring.attributes.exclude' => {
-          :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 exclude from browser monitoring. Allows `*` as wildcard at end.'
+          :description => 'Internal name for controlling Rails 3+ middleware instrumentation'
         },
-        :'span_events.attributes.exclude' => {
-          :default => [],
-          :public => true,
-          :type => Array,
+        :disable_rake_instrumentation => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from span events. Allows `*` as wildcard at end.'
+          :deprecated => true,
+          :description => deprecated_description(:'instrumentation.rake', 'Enable or disable Rake instrumentation. Preferred key is `disable_rake`')
         },
-        :'transaction_segments.attributes.exclude' => {
-          :default => [],
-          :public => true,
-          :type => Array,
+        :disable_redis_instrumentation => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from transaction segments. Allows `*` as wildcard at end.'
+          :description => deprecated_description(:'instrumentation.redis', 'Disables installation of Redis instrumentation. Standard key to use is disable_redis.')
         },
-        :'attributes.include' => {
-          :default => [],
-          :public => true,
-          :type => Array,
+        :cross_application_tracing => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
+          :type => Boolean,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in all destinations. Allows `*` as wildcard at end.'
+          :deprecated => true,
+          :description => 'Deprecated in favor of distributed_tracing.enabled'
         },
-        :'transaction_tracer.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 in transaction traces. Allows `*` as wildcard at end.'
+          :description => 'Enable or disable the agent.'
         },
-        :'transaction_events.attributes.include' => {
-          :default => [],
-          :public => true,
-          :type => Array,
+        :encoding_key => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'Encoding key for cross-application tracing.'
+        },
+        :entity_guid => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'The [Entity GUID](/attribute-dictionary/span/entityguid) for the entity running your agent.'
+        },
+        :error_beacon => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'Error beacon for real user monitoring.'
+        },
+        :event_report_period => {
+          :default => 60,
+          :public => false,
+          :type => Integer,
+          :allowed_from_server => true,
+          :description => 'Number of seconds betwixt connections to the New Relic event collection services.'
+        },
+        :'event_report_period.analytic_event_data' => {
+          :default => 60,
+          :public => false,
+          :type => Integer,
+          :dynamic_name => true,
+          :deprecated => true,
+          :allowed_from_server => true,
+          :description => deprecated_description(:'event_report_period.transaction_event_data', 'Number of seconds betwixt connections to the New Relic transaction event collection services.')
+        },
+        :'event_report_period.transaction_event_data' => {
+          :default => value_of(:'event_report_period.analytic_event_data'),
+          :public => false,
+          :type => Integer,
+          :dynamic_name => true,
+          :allowed_from_server => true,
+          :description => 'Number of seconds betwixt connections to the New Relic transaction event collection services.'
+        },
+        :'event_report_period.custom_event_data' => {
+          :default => 60,
+          :public => false,
+          :type => Integer,
+          :dynamic_name => true,
+          :allowed_from_server => true,
+          :description => 'Number of seconds betwixt connections to the New Relic custom event collection services.'
+        },
+        :'event_report_period.error_event_data' => {
+          :default => 60,
+          :public => false,
+          :type => Integer,
+          :dynamic_name => true,
+          :allowed_from_server => true,
+          :description => 'Number of seconds betwixt connections to the New Relic error event collection services.'
+        },
+        :'event_report_period.log_event_data' => {
+          :default => 60,
+          :public => false,
+          :type => Integer,
+          :dynamic_name => true,
+          :allowed_from_server => true,
+          :description => 'Number of seconds betwixt connections to the New Relic log event collection services.'
+        },
+        :'event_report_period.span_event_data' => {
+          :default => 60,
+          :public => false,
+          :type => Integer,
+          :dynamic_name => true,
+          :allowed_from_server => true,
+          :description => 'Number of seconds betwixt connections to the New Relic span event collection services.'
+        },
+        :force_reconnect => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in transaction events. Allows `*` as wildcard at end.'
+          :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.'
         },
-        :'error_collector.attributes.include' => {
-          :default => [],
-          :public => true,
-          :type => Array,
+        :framework => {
+          :default => DefaultSource.framework,
+          :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 framework used to enable framework-specific functionality.'
         },
-        :'browser_monitoring.attributes.include' => {
-          :default => [],
-          :public => true,
-          :type => Array,
+        :host => {
+          :default => DefaultSource.host,
+          :public => false,
+          :type => String,
           :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 => "URI for the New Relic data collection service."
         },
-        :'span_events.attributes.include' => {
-          :default => [],
-          :public => true,
-          :type => Array,
+        :'infinite_tracing.batching' => {
+          :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.'
+          :external => :infinite_tracing,
+          :description => "If true, data sent to the Trace Observer will be batched instead of the default of each " \
+                          "span being sent individually"
         },
-        :'transaction_segments.attributes.include' => {
-          :default => [],
-          :public => true,
-          :type => Array,
+        :'infinite_tracing.compression_level' => {
+          :default => :none,
+          :public => false,
+          :type => Symbol,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include on transaction segments. Allows `*` as wildcard at end.'
+          :external => :infinite_tracing,
+          :description => "Configure the compression level for data sent to the Trace Observer\nMay be one of " \
+                          "[none|low|medium|high]\nBy default, compression is not used (level = none)"
+        },
+        :js_agent_file => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'JavaScript agent file for real user monitoring.'
+        },
+        :js_agent_loader => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :allowed_from_server => true,
+          :description => 'JavaScript agent loader content.'
         },
-        :'custom_attributes.enabled' => {
-          :default => true,
-          :public => true,
+        :js_errors_beta => {
+          :default => false,
+          :public => false,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `false`, custom attributes will not be sent on events.'
+          :deprecated => true,
+          :description => 'Enable or disable beta JavaScript error reporting.'
         },
-        :'utilization.detect_aws' => {
-          :default => true,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :dynamic_name => true,
-          :description => 'If `true`, the agent automatically detects that it is running in an AWS environment.'
+        :keep_alive_timeout => {
+          :default => 60,
+          :public => false,
+          :type => Integer,
+          :allowed_from_server => true,
+          :description => 'Timeout for keep alive on TCP connection to collector if supported by Ruby version. Only used in conjunction when aggressive_keepalive is enabled.'
         },
-        :'utilization.detect_azure' => {
+        :keep_retrying => {
           :default => true,
-          :public => true,
+          :public => false,
           :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => false,
-          :dynamic_name => true,
-          :description => 'If `true`, the agent automatically detects that it is running in an Azure environment.'
+          :description => 'Enable or disable retrying failed connections to the New Relic data collection service.'
         },
-        :'utilization.detect_gcp' => {
-          :default => true,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :dynamic_name => true,
-          :description => 'If `true`, the agent automatically detects that it is running in an Google Cloud Platform environment.'
+        :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.'
         },
-        :'utilization.detect_pcf' => {
+        :normalize_json_string_encodings => {
           :default => true,
-          :public => true,
+          :public => false,
           :type => Boolean,
           :allowed_from_server => false,
-          :dynamic_name => true,
-          :description => 'If `true`, the agent automatically detects that it is running in a Pivotal Cloud Foundry environment.'
+          :description => 'Controls whether to normalize string encodings prior to serializing data for the collector to JSON.'
         },
-        :'utilization.detect_docker' => {
-          :default => true,
-          :public => true,
-          :type => Boolean,
+        :port => {
+          :default => 443,
+          :public => false,
+          :type => Integer,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent automatically detects that it is running in Docker.'
+          :description => 'Port for the New Relic data collection service.'
         },
-        :'utilization.detect_kubernetes' => {
+        :prepend_net_instrumentation => {
           :default => true,
-          :public => true,
+          :public => false,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent automatically detects that it is running in Kubernetes.'
+          :deprecated => true,
+          :description => deprecated_description(:'instrumentation.net_http',
+            'If `true`, uses `Module#prepend` rather than alias_method for Net::HTTP instrumentation.')
         },
-        :'utilization.billing_hostname' => {
+        :primary_application_id => {
           :default => nil,
           :allow_nil => true,
           :public => false,
           :type => String,
-          :allowed_from_server => false,
-          :description => 'The configured server name by a customer.'
-        },
-        :'utilization.logical_processors' => {
-          :default => nil,
-          :allow_nil => true,
-          :public => false,
-          :type => Integer,
-          :allowed_from_server => false,
-          :description => 'The total number of hyper-threaded execution contexts available.'
+          :allowed_from_server => true,
+          :description => 'The primary id associated with your application.'
         },
-        :'utilization.total_ram_mib' => {
-          :default => nil,
-          :allow_nil => true,
+        :put_for_data_send => {
+          :default => false,
           :public => false,
-          :type => Integer,
+          :type => Boolean,
           :allowed_from_server => false,
-          :description => 'This value represents the total amount of memory available to the host (not the process), in mebibytes (1024 squared or 1,048,576 bytes).'
+          :description => 'Use HTTP PUT requests instead of POST.'
         },
-        :'datastore_tracer.instance_reporting.enabled' => {
+        :report_instance_busy => {
           :default => true,
-          :public => true,
+          :public => false,
           :type => Boolean,
           :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 => 'Enable or disable transmission of metrics recording the percentage of time application instances spend servicing requests (duty cycle metrics).'
         },
-        :'datastore_tracer.database_name_reporting.enabled' => {
+        :restart_thread_in_children => {
           :default => true,
-          :public => true,
+          :public => false,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `false`, the agent will not add `database_name` parameter to transaction or slow sql traces.'
+          :description => 'Controls whether to check on running a transaction whether to respawn the harvest thread.'
         },
-        :'clear_transaction_state_after_fork' => {
-          :default => false,
-          :public => true,
+        :'resque.use_ruby_dns' => {
+          :default => true,
+          :public => false,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If `true`, the agent will clear `Tracer::State` in `Agent.drop_buffered_data`.'
-        },
-        :account_id => {
-          :default => nil,
-          :allow_nil => true,
-          :public => false,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'The account id associated with your application.'
-        },
-        :primary_application_id => {
-          :default => nil,
-          :allow_nil => true,
-          :public => false,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'The primary id associated with your application.'
+          :description => 'Replace the libc DNS resolver with the all Ruby resolver Resolv'
         },
-        :'distributed_tracing.enabled' => {
+        :'rum.enabled' => {
           :default => true,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => true,
-          :description => 'Distributed tracing lets you see the path that a request takes through your distributed system. Enabling distributed tracing changes the behavior of some New Relic features, so carefully consult the [transition guide](/docs/transition-guide-distributed-tracing) before you enable this feature.'
-        },
-        :trusted_account_key => {
-          :default => nil,
-          :allow_nil => true,
           :public => false,
-          :type => String,
+          :type => Boolean,
           :allowed_from_server => true,
-          :description => 'A shared key to validate that a distributed trace payload came from a trusted account.'
+          :description => 'Enable or disable page load timing (sometimes referred to as real user monitoring or RUM).'
         },
         :sampling_target => {
           :default => 10,
@@ -2399,72 +2434,93 @@ A map of error classes to a list of messages. When an error of one of the classe
           :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. Any Integer between 1 and 10000 is valid.'
+          :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 => 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."
+          :allowed_from_server => true,
+          :description => 'A shared key to validate that a distributed trace payload came from a trusted account.'
         },
-        :'infinite_tracing.trace_observer.port' => {
-          :default => 443,
-          :public => true,
-          :type => Integer,
+        :'utilization.billing_hostname' => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
+          :type => String,
           :allowed_from_server => false,
-          :external => :infinite_tracing,
-          :description => "Configures the TCP/IP port for the Trace Observer Host"
+          :description => 'The configured server name by a customer.'
         },
-        :'infinite_tracing.compression_level' => {
-          :default => :none,
+        :'utilization.logical_processors' => {
+          :default => nil,
+          :allow_nil => true,
           :public => false,
-          :type => Symbol,
+          :type => Integer,
           :allowed_from_server => false,
-          :external => :infinite_tracing,
-          :description => "Configure the compression level for data sent to the Trace Observer\nMay be one of " \
-                          "[none|low|medium|high]\nBy default, compression is not used (level = none)"
+          :description => 'The total number of hyper-threaded execution contexts available.'
         },
-        :'infinite_tracing.batching' => {
-          :default => false,
+        :'utilization.total_ram_mib' => {
+          :default => nil,
+          :allow_nil => true,
           :public => false,
-          :type => Boolean,
+          :type => Integer,
           :allowed_from_server => false,
-          :external => :infinite_tracing,
-          :description => "If true, data sent to the Trace Observer will be batched instead of the default of each " \
-                          "span being sent individually"
-
+          :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