newrelic_rpm 6.15.0 → 8.0.0

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

@@ -15,6 +15,37 @@ module NewRelic
         end
       end
 
+      # Combines potentially two properties into one.
+      # Given the example:
+      #    :disable_net_http and :prepend_net_instrumentation
+      #    if :disable_net_http is true, then returned value is "disabled"
+      #    if :prepend_net_instrumentation is false, then returned value is "chain"
+      #    otherwise, "auto" is returned.
+      #
+      # Intent is:
+      #     - if user sets disable_xxx property, then don't instrument
+      #     - if user set prepend to `false` then we use method_alias chaining
+      #     - auto, when returned means, try to use prepend unless conflicting gems discovered
+      #
+      def self.instrumentation_value_of(disable_key, prepend_key=nil)
+        Proc.new do
+          if NewRelic::Agent.config[disable_key]
+            "disabled"
+          elsif prepend_key && !NewRelic::Agent.config[prepend_key]
+            "chain"
+          else
+            "auto"
+          end
+        end
+      end
+
+      # Marks the config option as deprecated in the documentation once generated.
+      # Does not appear in logs.
+      def self.deprecated_description new_setting, description
+        link_ref = new_setting.to_s.gsub(".", "-")
+        %{Please see: [#{new_setting}](docs/agents/ruby-agent/configuration/ruby-agent-configuration##{link_ref}). \n\n#{description}}
+      end
+
       class Boolean
         def self.===(o)
           TrueClass === o or FalseClass === o
@@ -91,7 +122,6 @@ module NewRelic
           Proc.new {
             case
             when defined?(::NewRelic::TEST) then :test
-            when defined?(::Merb) && defined?(::Merb::Plugins) then :merb
             when defined?(::Rails::VERSION)
               case Rails::VERSION::MAJOR
               when 0..2
@@ -101,7 +131,8 @@ module NewRelic
               when 4..6
                 :rails_notifications
               else
-                ::NewRelic::Agent.logger.error "Detected unsupported Rails version #{Rails::VERSION::STRING}"
+                ::NewRelic::Agent.logger.warn "Detected untested Rails version #{Rails::VERSION::STRING}"
+                :rails_notifications
               end
             when defined?(::Sinatra) && defined?(::Sinatra::Base) then :sinatra
             when defined?(::NewRelic::IA) then :external
@@ -295,14 +326,14 @@ module NewRelic
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Your New Relic <a href="https://docs.newrelic.com/docs/accounts-partnerships/accounts/account-setup/license-key">license key</a>.'
+          :description => 'Your New Relic [license key](/docs/accounts-partnerships/accounts/account-setup/license-key).'
         },
         :agent_enabled => {
           :default => DefaultSource.agent_enabled,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, allows the Ruby agent to run.'
+          :description => 'If `true`, allows the Ruby agent to run.'
         },
         :enabled => {
           :default => true,
@@ -318,7 +349,7 @@ module NewRelic
           :type => String,
           :allowed_from_server => false,
           :transform => DefaultSource.method(:convert_to_list_on_semicolon),
-          :description => 'Specify the <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/installation-configuration/name-your-application">application name</a> used to aggregate data in the New Relic UI. To report data to <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/installation-configuration/using-multiple-names-app">multiple apps at the same time</a>, specify a list of names separated by a semicolon <code>;</code>. For example, <code>MyApp</code> or <code>MyStagingApp;Instance1</code>.'
+          :description => 'Specify the [application name](/docs/apm/new-relic-apm/installation-configuration/name-your-application) used to aggregate data in the New Relic UI. To report data to [multiple apps at the same time](/docs/apm/new-relic-apm/installation-configuration/using-multiple-names-app), specify a list of names separated by a semicolon `;`. For example, `MyApp` or `MyStagingApp;Instance1`.'
         },
         :entity_guid => {
           :default => nil,
@@ -326,35 +357,35 @@ module NewRelic
           :public => true,
           :type => String,
           :allowed_from_server => true,
-          :description => 'The <a href="https://docs.newrelic.com/attribute-dictionary/span/entityguid">Entity GUID</a> for the entity running this agent.'
+          :description => 'The [Entity GUID](/attribute-dictionary/span/entityguid) for the entity running this agent.'
         },
         :monitor_mode => {
           :default => value_of(:enabled),
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'When <code>true</code>, the agent transmits data about your app to the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a>.'
+          :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,
           :allowed_from_server => false,
-          :description => 'Used in tests for agent to start up but not connect to collector. Formerly used <code>developer_mode</code> in test config for this purpose.'
+          :description => 'Used in tests for agent to start up but not connect to collector. Formerly used `developer_mode` in test config for this purpose.'
         },
         :log_level => {
           :default => 'info',
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Sets the level of detail of log messages. Possible log levels, in increasing verbosity, are: <code>error</code>, <code>warn</code>, <code>info</code> or <code>debug</code>.'
+          :description => 'Sets the level of detail of log messages. Possible log levels, in increasing verbosity, are: `error`, `warn`, `info` or `debug`.'
         },
         :high_security => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, enables <a href="https://docs.newrelic.com/docs/accounts-partnerships/accounts/security/high-security">high security mode</a>. Ensure you understand the implications of high security mode before enabling this setting.'
+          :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.'
         },
         :security_policies_token => {
           :default => '',
@@ -369,7 +400,7 @@ module NewRelic
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Defines a host for communicating with the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a> via a proxy server.'
+          :description => '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.'
         },
         :proxy_port => {
           :default => 8080,
@@ -377,7 +408,7 @@ module NewRelic
           :public => true,
           :type => Integer,
           :allowed_from_server => false,
-          :description => 'Defines a port for communicating with the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a> via a proxy server.'
+          :description => '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.'
         },
         :proxy_user => {
           :default => nil,
@@ -386,7 +417,7 @@ module NewRelic
           :type => String,
           :allowed_from_server => false,
           :exclude_from_reported_settings => true,
-          :description => 'Defines a user for communicating with the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a> via a proxy server.'
+          :description => '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.'
         },
         :proxy_pass => {
           :default => nil,
@@ -395,27 +426,26 @@ module NewRelic
           :type => String,
           :allowed_from_server => false,
           :exclude_from_reported_settings => true,
-          :description => 'Defines a password for communicating with the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a> via a proxy server.'
+          :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.'
         },
         :capture_params => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'When <code>true</code>, the agent captures HTTP request parameters ' \
+          :description => 'When `true`, the agent captures HTTP request parameters ' \
             'and attaches them to transaction traces, traced errors, and ' \
-            '<a href="https://docs.newrelic.com/attribute-dictionary?attribute_name=&events_tids%5B%5D=8241">'\
-            '<code>TransactionError</code> events.' \
+            '[`TransactionError` events](/attribute-dictionary?attribute_name=&events_tids%5B%5D=8241)'\
             "\n" \
             '<div class="callout-warning">' \
             "\n" \
-            '<p>When using the <code>capture_params</code> setting, the Ruby agent will not attempt ' \
+            'When using the `capture_params` setting, the Ruby agent will not attempt ' \
             'to filter secret information. <b>Recommendation:</b> To filter secret information from ' \
-            'request parameters, use the <a href="/docs/agents/ruby-agent/attributes/enable-disable-attributes-ruby">' \
-            '<code>attributes.include</code> setting</a> instead. For more information, see the ' \
+            'request parameters, use the [`attributes.include` setting](/docs/agents/ruby-agent/attributes/enable-disable-attributes-ruby) ' \
+            'instead. For more information, see the ' \
             '<a href="/docs/agents/ruby-agent/attributes/ruby-attribute-examples#ex_req_params">' \
             'Ruby attribute examples</a>.' \
-            "</p>\n" \
+            "\n" \
             '</div>'
         },
         :config_path => {
@@ -446,73 +476,43 @@ module NewRelic
           :allowed_from_server => false,
           :description => 'Autodetected application framework used to enable framework-specific functionality.'
         },
-        :'autostart.blacklisted_constants' => {
-          :default => 'Rails::Console',
-          :public => true,
-          :type => String,
-          :allowed_from_server => false,
-          :description => 'Deprecated.  ' \
-              'For agent versions 6.8.0 or higher, ' \
-              'use <a href="#autostart-denylisted_constants"><code>' \
-                'autostart.denylisted_constants' \
-              '</code></a> instead.'
-        },
         :'autostart.denylisted_constants' => {
           :default => 'Rails::Console',
           :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 <code>,</code>. For example, <code>Rails::Console,UninstrumentedBackgroundJob</code>.'
-        },
-        :'autostart.blacklisted_executables' => {
-          :default => 'irb,rspec',
-          :public => true,
-          :type => String,
-          :allowed_from_server => false,
-          :description => 'Deprecated.  ' \
-              'For agent versions 6.8.0 or higher, ' \
-              'use <a href="#autostart-denylisted_executables"><code>' \
-                'autostart.denylisted_executables' \
-              '</code></a> instead.'
+          :description => 'Specify a list of constants that should prevent the agent from starting automatically. Separate individual constants with a comma `,`. For example, `Rails::Console,UninstrumentedBackgroundJob`.'
         },
         :'autostart.denylisted_executables' => {
-          :default => value_of(:'autostart.blacklisted_executables'),
-          :public => true,
-          :type => String,
-          :allowed_from_server => false,
-          :description => 'Defines a comma-delimited list of executables that the agent should not instrument. For example, <code>rake,my_ruby_script.rb</code>.'
-        },
-        :'autostart.blacklisted_rake_tasks' => {
-          :default => AUTOSTART_DENYLISTED_RAKE_TASKS,
+          :default => 'irb,rspec',
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Deprecated.  ' \
-              'For agent versions 6.8.0 or higher, ' \
-              'use <a href="#autostart-denylisted_rake_tasks"><code>' \
-                'autostart.denylisted_rake_tasks' \
-              '</code></a> instead.'
+          :description => 'Defines a comma-delimited list of executables that the agent should not instrument. For example, `rake,my_ruby_script.rb`.'
         },
         :'autostart.denylisted_rake_tasks' => {
-          :default => value_of(:'autostart.blacklisted_rake_tasks'),
+          :default => AUTOSTART_DENYLISTED_RAKE_TASKS,
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Defines a comma-delimited list of Rake tasks that the agent should not instrument. For example, <code>assets:precompile,db:migrate</code>.'
+          :description => 'Defines a comma-delimited list of Rake tasks that the agent should not instrument. For example, `assets:precompile,db:migrate`.'
         },
+
         :disable_rake => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables Rake instrumentation.'
+          :deprecated => true,
+          :description => deprecated_description(:'instrumentation.rake', 'If `true`, disables Rake instrumentation.')
         },
         :disable_rake_instrumentation => {
           :default => false,
           :public => false,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Enable or disable Rake instrumentation. Preferred key is `disable_rake`'
+          :deprecated => true,
+          :description => deprecated_description(:'instrumentation.rake', 'Enable or disable Rake instrumentation. Preferred key is `disable_rake`')
         },
         :'rake.tasks' => {
           :default => [],
@@ -535,27 +535,14 @@ module NewRelic
           :type => Float,
           :allowed_from_server => true,
           :deprecated => true,
-          :description => 'Deprecated. For agent versions 3.5.0 or higher, <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/apdex/changing-your-apdex-settings">set your Apdex T via the New Relic UI</a>.'
+          :description => 'Deprecated. 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).'
         },
         :'strip_exception_messages.enabled' => {
           :default => value_of(:high_security),
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If true, the agent strips messages from all exceptions except those in the <a href="#strip_exception_messages-allowlist">allowlist</a>. Enabled automatically in <a href="https://docs.newrelic.com/docs/accounts-partnerships/accounts/security/high-security">high security mode</a>.'
-        },
-        :'strip_exception_messages.whitelist' => {
-          :default => '',
-          :public => true,
-          :type => String,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_constant_list),
-          :description => 'Deprecated.  ' \
-              'For agent versions 6.8.0 or higher, ' \
-              'use <a href="#strip_exception_messages.allowed_classes"><code>' \
-                'strip_exception_messages.allowed_classes' \
-              '</code></a> instead.'
+          :description => 'If true, the agent strips messages from all exceptions except those in the [allowlist](#strip_exception_messages-allowlist). Enabled automatically in [high security mode](/docs/accounts-partnerships/accounts/security/high-security).'
         },
         :'strip_exception_messages.allowed_classes' => {
           :default => '',
@@ -563,7 +550,7 @@ module NewRelic
           :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 <a href="#strip_exception_messages-enabled">strip_exception_messages</a> is <code>true</code>. Separate exceptions with a comma. For example, <code>"ImportantException,PreserveMessageException"</code>.'
+          :description => 'Specify a list of exceptions you do not want the agent to strip when [strip_exception_messages](#strip_exception_messages-enabled) is `true`. Separate exceptions with a comma. For example, `"ImportantException,PreserveMessageException"`.'
         },
         :host => {
           :default => DefaultSource.host,
@@ -598,14 +585,14 @@ module NewRelic
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'When set to <code>true</code>, forces a synchronous connection to the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a> during application startup. For very short-lived processes, this helps ensure the New Relic agent has time to report.'
+          :description => 'When set to `true`, forces a synchronous connection to the New Relic [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector) during application startup. For very short-lived processes, this helps ensure the New Relic agent has time to report.'
         },
         :send_data_on_exit => {
           :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, enables the exit handler that sends data to the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a> before shutting down.'
+          :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.'
         },
         :max_payload_size_in_bytes => {
           :default => 1000000,
@@ -709,11 +696,11 @@ module NewRelic
           :type => Boolean,
           :allowed_from_server => false,
           :description => 'Forces the exit handler that sends all cached data to collector ' \
-            'before shuttng down to be installed regardless of detecting scenarios where it generally should not be. ' \
+            '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 ' \
-            'is also installed in those circumstances.  Note: `send_data_on_exit` should also be set to `true` in  tandem with this setting.'
+            '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.'
         },
         :force_reconnect => {
           :default => false,
@@ -748,7 +735,7 @@ module NewRelic
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, enables an audit log which logs communications with the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a>.'
+          :description => 'If `true`, enables an audit log which logs communications with the New Relic [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector).'
         },
         :'audit_log.path' => {
           :default => DefaultSource.audit_log_path,
@@ -770,49 +757,53 @@ module NewRelic
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables the collection of sampler metrics. Sampler metrics are metrics that are not event-based (such as CPU time or memory usage).'
+          :description => 'If `true`, disables the collection of sampler metrics. Sampler metrics are metrics that are not event-based (such as CPU time or memory usage).'
         },
         :disable_resque => {
           :default => false,
           :public => true,
           :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables <a href="https://docs.newrelic.com/docs/agents/ruby-agent/background-jobs/resque-instrumentation">Resque instrumentation</a>.'
+          :description => deprecated_description(:'instrumentation.resque', 'If `true`, disables [Resque instrumentation](/docs/agents/ruby-agent/background-jobs/resque-instrumentation).')
         },
         :disable_sidekiq => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables <a href="https://docs.newrelic.com/docs/agents/ruby-agent/background-jobs/sidekiq-instrumentation">Sidekiq instrumentation</a>.'
+          :description => 'If `true`, disables [Sidekiq instrumentation](/docs/agents/ruby-agent/background-jobs/sidekiq-instrumentation).'
         },
         :disable_dj => {
           :default => false,
           :public => true,
+          :deprecated => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables <a href="https://docs.newrelic.com/docs/agents/ruby-agent/background-jobs/delayedjob">Delayed::Job instrumentation</a>.'
+          :description => deprecated_description(:'instrumentation.delayed_job', 'If `true`, disables [Delayed::Job instrumentation](/docs/agents/ruby-agent/background-jobs/delayedjob).'
+          )
         },
         :disable_sinatra => {
           :default => false,
           :public => true,
           :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'If <code>true</code> , disables <a href="https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/sinatra-support">Sinatra instrumentation</a>.'
+          :description => deprecated_description(:'instrumentation.sinatra', 'If `true` , disables [Sinatra instrumentation](/docs/agents/ruby-agent/frameworks/sinatra-support).' )
         },
         :disable_sinatra_auto_middleware => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables agent middleware for Sinatra. This middleware is responsible for advanced feature support such as <a href="https://docs.newrelic.com/docs/apm/transactions/cross-application-traces/cross-application-tracing">cross application tracing</a>, <a href="https://docs.newrelic.com/docs/browser/new-relic-browser/getting-started/new-relic-browser">page load timing</a>, and <a href="https://docs.newrelic.com/docs/apm/applications-menu/events/view-apm-error-analytics">error collection</a>.'
+          :description => 'If `true`, 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).'
         },
         :disable_view_instrumentation => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables view instrumentation.'
+          :description => 'If `true`, disables view instrumentation.'
         },
         :disable_harvest_thread => {
           :default => false,
@@ -833,28 +824,187 @@ module NewRelic
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables active record instrumentation.'
+          :description => 'If `true`, disables active record instrumentation.'
         },
         :prepend_active_record_instrumentation => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, uses Module.prepend rather than alias_method for ActiveRecord instrumentation.'
+          :description => 'If `true`, uses `Module#prepend` rather than `alias_method` for ActiveRecord instrumentation.'
         },
         :prepend_net_instrumentation => {
-          :default => false,
-          :public => true,
+          :default => true,
+          :public => false,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, uses Module.prepend rather than alias_method for Net::HTTP instrumentation.'
+          :deprecated => true,
+          :description => deprecated_description(:'instrumentation.net_http',
+            'If `true`, uses `Module#prepend` rather than alias_method for Net::HTTP instrumentation.'
+          )
+        },
+        :'instrumentation.net_http' => {
+          :default => instrumentation_value_of(:disable_net_http, :prepend_net_instrumentation),
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => "Controls auto-instrumentation of Net::HTTP at start up.  May be one of [auto|prepend|chain|disabled]."
+        },
+        :'instrumentation.typhoeus' => {
+          :default => instrumentation_value_of(:disable_typhoeus),
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => "Controls auto-instrumentation of Typhoeus at start up.  May be one of [auto|prepend|chain|disabled]."
+        },
+        :'instrumentation.bunny' => {
+          :default => instrumentation_value_of(:disable_bunny),
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of bunny at start up.  May be one of [auto|prepend|chain|disabled].'
+        },
+        :'instrumentation.httprb' => {
+          :default => instrumentation_value_of(:disable_httprb),
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of http.rb gem at start up.  May be one of [auto|prepend|chain|disabled].'
+        },
+        :'instrumentation.resque' => {
+          :default => instrumentation_value_of(:disable_resque),
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => "Controls auto-instrumentation of resque at start up.  May be one of [auto|prepend|chain|disabled]."
+        },
+        :'instrumentation.redis' => {
+          :default => instrumentation_value_of(:disable_redis),
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => "Controls auto-instrumentation of Redis at start up.  May be one of [auto|prepend|chain|disabled]."
+        },
+        :'instrumentation.rake' => {
+          :default => instrumentation_value_of(:disable_rake),
+          :public => :true,
+          :type => String,
+          :dynamic_name => true,
+          :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),
+          :public => :true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => "Controls auto-instrumentation of Mongo at start up.  May be one of [enabled|disabled]."
+        },
+        :'instrumentation.delayed_job' => {
+          :default => instrumentation_value_of(:disable_dj),
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of Delayed Job at start up.  May be one of [auto|prepend|chain|disabled].'
+        },
+        :'instrumentation.httpclient' => {
+          :default => instrumentation_value_of(:disable_httpclient),
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => "Controls auto-instrumentation of HTTPClient at start up.  May be one of [auto|prepend|chain|disabled]."
+        },
+        :'instrumentation.curb' => {
+          :default => instrumentation_value_of(:disable_curb),
+          :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),
+          :public => :true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => "Controls auto-instrumentation of Sinatra at start up.  May be one of [auto|prepend|chain|disabled]."
+        },
+        :'instrumentation.rack' => {
+          :default      => instrumentation_value_of(:disable_rack),
+          :public       => true,
+          :type         => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description  => "Controls auto-instrumentation of Rack. When enabled, the agent hooks into the " \
+                           "`to_app` method in Rack::Builder to find gems to instrument during " \
+                           "application startup.  May be one of [auto|prepend|chain|disabled]."
+        },
+        :'instrumentation.rack_urlmap' => {
+          :default      => instrumentation_value_of(:disable_rack_urlmap),
+          :public       => true,
+          :type         => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description  => 'Controls auto-instrumentation of Rack::URLMap at start up.  May be one of [auto|prepend|chain|disabled].'
+        },
+        :'instrumentation.puma_rack' => {
+          :default      => instrumentation_value_of(:disable_puma_rack),  # TODO: change to value_of(:'instrumentation.rack') when we remove :disable_puma_rack in 8.0)
+          :public       => true,
+          :type         => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description  => "Controls auto-instrumentation of Puma::Rack. When enabled, the agent hooks into the " \
+                           "`to_app` method in Puma::Rack::Builder to find gems to instrument during " \
+                           "application startup.  May be one of [auto|prepend|chain|disabled]."
+        },
+        :'instrumentation.puma_rack_urlmap' => {
+          :default      => instrumentation_value_of(:disable_puma_rack_urlmap),  # TODO: change to value_of(:'instrumentation.rack_urlmap') when we remove :disable_puma_rack_urlmap in 8.0)
+          :public       => true,
+          :type         => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description  => 'Controls auto-instrumentation of Puma::Rack::URLMap at start up.  May be one of [auto|prepend|chain|disabled].'
+        },
+        :'instrumentation.memcached' => {
+          :default => instrumentation_value_of(:disable_memcached),
+          :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].'
+        },
+        :'instrumentation.memcache_client' => {
+          :default => instrumentation_value_of(:disable_memcache_client),
+          :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].'
+        },
+        :'instrumentation.memcache' => {
+          :default => instrumentation_value_of(:disable_dalli),
+          :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].'
         },
         :disable_data_mapper => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables DataMapper instrumentation.'
+          :description => 'If `true`, disables DataMapper instrumentation.'
         },
         :disable_activejob => {
           :default => false,
@@ -862,7 +1012,7 @@ module NewRelic
           :type => Boolean,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables ActiveJob instrumentation.'
+          :description => 'If `true`, disables ActiveJob instrumentation.'
         },
         :disable_action_cable_instrumentation => {
           :default => false,
@@ -870,7 +1020,7 @@ module NewRelic
           :type => Boolean,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables Action Cable instrumentation.'
+          :description => 'If `true`, disables Action Cable instrumentation.'
         },
         :disable_active_storage => {
           :default => false,
@@ -878,49 +1028,54 @@ module NewRelic
           :type => Boolean,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables ActiveStorage instrumentation.'
+          :description => 'If `true`, disables ActiveStorage instrumentation.'
         },
         :disable_memcached => {
           :default => value_of(:disable_memcache_instrumentation),
           :public => true,
           :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables instrumentation for the memcached gem.'
+          :description => deprecated_description(:'instrumentation.memcached', 'If `true`, disables instrumentation for the memcached gem.')
         },
         :disable_memcache_client => {
           :default => value_of(:disable_memcache_instrumentation),
           :public => true,
           :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables instrumentation for the memcache-client gem.'
+          :description => deprecated_description(:'instrumentation.memcache-client', 'If `true`, disables instrumentation for the memcache-client gem.')
         },
         :disable_dalli => {
           :default => value_of(:disable_memcache_instrumentation),
           :public => true,
           :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables instrumentation for the dalli gem.'
+          :description => deprecated_description(:'instrumentation.memcache', 'If `true`, disables instrumentation for the dalli gem.')
         },
         :disable_dalli_cas_client => {
           :default => value_of(:disable_memcache_instrumentation),
           :public => true,
           :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description => "If <code>true</code>, disables instrumentation for the dalli gem\'s additional CAS client support."
+          :description => deprecated_description(:'instrumentation.memcache', "If `true`, disables instrumentation for the dalli gem\'s additional CAS client support.")
         },
         :disable_memcache_instrumentation => {
           :default => false,
           :public => true,
           :type => Boolean,
+          :deprecated => true,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables memcache instrumentation.'
+          :description => deprecated_description(:'instrumentation.memcache', 'If `true`, disables memcache instrumentation.')
         },
         :disable_gc_profiler => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables the use of GC::Profiler to measure time spent in garbage collection'
+          :description => 'If `true`, disables the use of GC::Profiler to measure time spent in garbage collection'
         },
         :'sidekiq.capture_params' => {
           :default => false,
@@ -929,7 +1084,7 @@ module NewRelic
           :allowed_from_server => false,
           :dynamic_name => true,
           :deprecated => true,
-          :description => 'If <code>true</code>, enables the capture of job arguments for transaction traces and traced errors in Sidekiq.'
+          :description => 'If `true`, enables the capture of job arguments for transaction traces and traced errors in Sidekiq.'
         },
         :'resque.capture_params' => {
           :default => false,
@@ -938,7 +1093,7 @@ module NewRelic
           :allowed_from_server => false,
           :dynamic_name => true,
           :deprecated => true,
-          :description => 'If <code>true</code>, enables the capture of job arguments for transaction traces and traced errors in Resque.'
+          :description => 'If `true`, enables the capture of job arguments for transaction traces and traced errors in Resque.'
         },
         :'resque.use_ruby_dns' => {
           :default => true,
@@ -959,37 +1114,37 @@ module NewRelic
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => 'If <code>true</code>, enables collection of <a href="https://docs.newrelic.com/docs/apm/traces/transaction-traces/transaction-traces">transaction traces</a>.'
+          :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 <code><a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#apdex_f">apdex_f</a></code>.'
+          :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.</p>
+          :description => 'Obfuscation level for SQL queries reported in transaction trace nodes.
 
-  <p>By default, this is set to <code>obfuscated</code>, which strips out the numeric and string literals.</p>
+  By default, this is set to `obfuscated`, which strips out the numeric and string literals.
 
   <ul>
-    <li>If you do not want the agent to capture query information, set this to <code>none</code>.</li>
-    <li>If you want the agent to capture all query information in its original form, set this to <code>raw</code>.</li>
-    <li>When you enable <a href="/docs/agents/manage-apm-agents/configuration/high-security-mode">high security mode</a>, this is automatically set to <code>obfuscated</code>.</li>
+    <li>If you do not want the agent to capture query information, set this to `none`.</li>
+    <li>If you want the agent to capture all query information in its original form, set this to `raw`.</li>
+    <li>When you enable [high security mode](/docs/agents/manage-apm-agents/configuration/high-security-mode), this is automatically set to `obfuscated`.</li>
   </ul>
-  <p>' # Doc generator will wrap this in <p>...</p>
+  '
         },
         :'transaction_tracer.record_redis_arguments' => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent records Redis command arguments in transaction traces.'
+          :description => 'If `true`, the agent records Redis command arguments in transaction traces.'
         },
         :'transaction_tracer.capture_attributes' => {
           :default => true,
@@ -997,21 +1152,21 @@ module NewRelic
           :type => Boolean,
           :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Deprecated; use <a href="#transaction_tracer-attributes-enabled"><code>transaction_tracer.attributes.enabled</code></a> instead.'
+          :description => 'Deprecated; use [`transaction_tracer.attributes.enabled`](#transaction_tracer-attributes-enabled) instead.'
         },
         :'transaction_tracer.explain_threshold' => {
           :default => 0.5,
           :public => true,
           :type => Float,
           :allowed_from_server => true,
-          :description => 'Threshold (in seconds) above which the agent will collect explain plans. Relevant only when <code><a href="#transaction_tracer.explain_enabled">explain_enabled</a></code> is 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.explain_enabled' => {
           :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => 'If <code>true</code>, enables the collection of explain plans in transaction traces. This setting will also apply to explain plans in slow SQL traces if <a href="#slow_sql-explain_enabled"><code>slow_sql.explain_enabled</code></a> is not set separately.'
+          :description => 'If `true`, enables the collection of explain plans in transaction traces. This setting will also apply to explain plans in slow SQL traces if [`slow_sql.explain_enabled`](#slow_sql-explain_enabled) is not set separately.'
         },
         :'transaction_tracer.stack_trace_threshold' => {
           :default => 0.5,
@@ -1032,7 +1187,7 @@ module NewRelic
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, disables <a href="https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/sequel-instrumentation">Sequel instrumentation</a>.'
+          :description => 'If `true`, disables [Sequel instrumentation](/docs/agents/ruby-agent/frameworks/sequel-instrumentation).'
         },
         :disable_database_instrumentation => {
           :default => false,
@@ -1040,7 +1195,7 @@ module NewRelic
           :type => Boolean,
           :allowed_from_server => false,
           :deprecated => true,
-          :description => 'Deprecated; use <a href="#disable_sequel_instrumentation"><code>disable_sequel_instrumentation</code></a> instead.'
+          :description => 'Deprecated; use [`disable_sequel_instrumentation`](#disable_sequel_instrumentation) instead.'
         },
         :disable_mongo => {
           :default      => false,
@@ -1048,56 +1203,59 @@ module NewRelic
           :type         => Boolean,
           :allowed_from_server => false,
           :dynamic_name => true,
-          :description  => 'If <code>true</code>, the agent won\'t install <a href="https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/mongo-instrumentation">instrumentation for the Mongo gem</a>.'
+          :deprecated   => true,
+          :description  => deprecated_description(:'instrumentation.mongo', 'If `true`, the agent won\'t install [instrumentation for the Mongo gem](/docs/agents/ruby-agent/frameworks/mongo-instrumentation).')
         },
         :disable_redis => {
           :default      => false,
           :public       => true,
           :type         => Boolean,
+          :deprecated   => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t install <a href="https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/redis-instrumentation">instrumentation for Redis</a>.'
+          :description  => deprecated_description(:'instrumentation.redis', 'If `true`, the agent won\'t install [instrumentation for Redis](/docs/agents/ruby-agent/frameworks/redis-instrumentation).')
         },
         :disable_redis_instrumentation => {
           :default      => false,
           :public       => false,
           :type         => Boolean,
+          :deprecated   => true,
           :allowed_from_server => false,
-          :description  => 'Disables installation of Redis instrumentation. Standard key to use is disable_redis.'
+          :description  => deprecated_description(:'instrumentation.redis', 'Disables installation of Redis instrumentation. Standard key to use is disable_redis.')
         },
         :'message_tracer.segment_parameters.enabled' => {
           :default      => true,
           :public       => true,
           :type         => Boolean,
           :allowed_from_server => true,
-          :description  => 'If <code>true</code>, the agent will collect metadata about messages and attach them as segment parameters.'
+          :description  => 'If `true`, the agent will collect metadata about messages and attach them as segment parameters.'
         },
         :'slow_sql.enabled' => {
           :default => value_of(:'transaction_tracer.enabled'),
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => 'If <code>true</code>, the agent collects <a href="https://docs.newrelic.com/docs/apm/applications-menu/monitoring/viewing-slow-query-details">slow SQL queries</a>.'
+          :description => 'If `true`, the agent collects [slow SQL queries](/docs/apm/applications-menu/monitoring/viewing-slow-query-details).'
         },
         :'slow_sql.explain_threshold' => {
           :default => value_of(:'transaction_tracer.explain_threshold'),
           :public => true,
           :type => Float,
           :allowed_from_server => true,
-          :description => 'Specify a threshold in seconds. The agent collects <a href="https://docs.newrelic.com/docs/apm/applications-menu/monitoring/viewing-slow-query-details">slow SQL queries</a> and explain plans that exceed this threshold.'
+          :description => 'Specify a threshold in seconds. The agent collects [slow SQL queries](/docs/apm/applications-menu/monitoring/viewing-slow-query-details) and explain plans that exceed this threshold.'
         },
         :'slow_sql.explain_enabled' => {
           :default => value_of(:'transaction_tracer.explain_enabled'),
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => 'If <code>true</code>, the agent collects explain plans in slow SQL queries. If this setting is omitted, the <a href="#transaction_tracer-explain_enabled"><code>transaction_tracer.explain_enabled</code></a> setting will be applied as the default setting for explain plans in slow SQL as well.'
+          :description => 'If `true`, the agent collects explain plans in slow SQL queries. If this setting is omitted, the [`transaction_tracer.explain_enabled`](#transaction_tracer-explain_enabled) setting will be applied as the default setting for explain plans in slow SQL as well.'
         },
         :'slow_sql.record_sql' => {
           :default => value_of(:'transaction_tracer.record_sql'),
           :public => true,
           :type => String,
           :allowed_from_server => true,
-          :description => 'Defines an obfuscation level for slow SQL queries. Valid options are <code>obfuscated</code>, <code>raw</code>, or <code>none</code>).'
+          :description => 'Defines an obfuscation level for slow SQL queries. Valid options are `obfuscated`, `raw`, or `none`).'
         },
         :'slow_sql.use_longer_sql_id' => {
           :default => false,
@@ -1111,21 +1269,21 @@ module NewRelic
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => 'If <code>true</code>, the agent captures Mongo queries in transaction traces.'
+          :description => 'If `true`, the agent captures Mongo queries in transaction traces.'
         },
         :'mongo.obfuscate_queries' => {
           :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => 'If <code>true</code>, the agent obfuscates Mongo queries in transaction traces.'
+          :description => 'If `true`, the agent obfuscates Mongo queries in transaction traces.'
         },
         :'error_collector.enabled' => {
           :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => 'If <code>true</code>, the agent captures traced errors and error count metrics.'
+          :description => 'If `true`, the agent captures traced errors and error count metrics.'
         },
         :'error_collector.capture_attributes' => {
           :default => true,
@@ -1133,14 +1291,63 @@ module NewRelic
           :type => Boolean,
           :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Deprecated; use <a href="#error_collector-attributes-enabled"><code>error_collector.attributes.enabled</code></a> instead.'
+          :description => 'Deprecated; use [`error_collector.attributes.enabled`](#error_collector-attributes-enabled) instead.'
         },
         :'error_collector.ignore_errors' => {
           :default => 'ActionController::RoutingError,Sinatra::NotFound',
           :public => true,
           :type => String,
           :allowed_from_server => true,
-          :description => 'Specify a comma-delimited list of error classes that the agent should ignore.'
+          :dynamic_name => true,
+          :description => 'DEPRECATED; use `error_collector.ignore_classes` instead. Specify a comma-delimited list of error classes that the agent should ignore.'
+        },
+        :'error_collector.ignore_classes' => {
+          :default => [],
+          :public => true,
+          :type => Array,
+          :allowed_from_server => true,
+          :dynamic_name => true,
+          :description => 'A list of error classes that the agent should ignore. *Note: this setting cannot be set via environment variable.*'
+        },
+        :'error_collector.ignore_messages' => {
+          :default => {},
+          :public => true,
+          :type => Hash,
+          :allowed_from_server => true,
+          :dynamic_name => true,
+          :description => 'A map of error classes to a list of messages. When an error of one of the classes specified here occurs, if its error message contains one of the strings corresponding to it here, that error will be ignored. *Note: this setting cannot be set via environment variable.*'
+        },
+        :'error_collector.ignore_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 ignored.'
+        },
+        :'error_collector.expected_classes' => {
+          :default => [],
+          :public => true,
+          :type => Array,
+          :allowed_from_server => true,
+          :dynamic_name => true,
+          :description => 'A list of error classes that the agent should treat as expected. *Note: this setting cannot be set via environment variable.*'
+        },
+        :'error_collector.expected_messages' => {
+          :default => {},
+          :public => true,
+          :type => Hash,
+          :allowed_from_server => true,
+          :dynamic_name => true,
+          :description => 'A map of error classes to a list of messages. When an error of one of the classes specified here occurs, if its error message contains one of the strings corresponding to it here, that error will be treated as expected. *Note: this setting cannot be set via environment variable.*'
+        },
+        :'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.max_backtrace_frames' => {
           :default => 50,
@@ -1155,14 +1362,14 @@ module NewRelic
           :type => Boolean,
           :allowed_from_server => true,
           :dynamic_name => true,
-          :description => 'If <code>true</code>, the agent collects <a href="https://docs.newrelic.com/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights">TransactionError events</a>.'
+          :description => 'If `true`, the agent collects [TransactionError events](/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights).'
         },
         :'error_collector.max_event_samples_stored' => {
           :default => 100,
           :public => true,
           :type => Integer,
           :allowed_from_server => true,
-          :description => 'Defines the maximum number of <a href="https://docs.newrelic.com/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights">TransactionError events</a> sent to Insights per harvest cycle.'
+          :description => 'Defines the maximum number of [TransactionError events](/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights) sent to Insights per harvest cycle.'
         },
         :'rum.enabled' => {
           :default => true,
@@ -1211,7 +1418,7 @@ module NewRelic
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => 'If <code>true</code>, enables <a href="https://docs.newrelic.com/docs/browser/new-relic-browser/installation-configuration/adding-apps-new-relic-browser#select-apm-app">auto-injection</a> of the JavaScript header for page load timing (sometimes referred to as real user monitoring or RUM).'
+          :description => 'If `true`, enables [auto-injection](/docs/browser/new-relic-browser/installation-configuration/adding-apps-new-relic-browser#select-apm-app) of the JavaScript header for page load timing (sometimes referred to as real user monitoring or RUM).'
         },
         :'browser_monitoring.capture_attributes' => {
           :default => false,
@@ -1219,7 +1426,7 @@ module NewRelic
           :type => Boolean,
           :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Deprecated; use <a href="#browser_monitoring-attributes-enabled"><code>browser_monitoring.attributes.enabled</code></a> instead.'
+          :description => 'Deprecated; use [`browser_monitoring.attributes.enabled`](#browser_monitoring-attributes-enabled) instead.'
         },
         :'browser_monitoring.loader' => {
           :default => DefaultSource.browser_monitoring_loader,
@@ -1233,7 +1440,7 @@ module NewRelic
           :public => false,
           :type => String,
           :allowed_from_server => true,
-          :description => 'Version of JavaScript agent loader (returned from the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a>.)'
+          :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,
@@ -1273,11 +1480,15 @@ module NewRelic
           :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.'
         },
         :"cross_application_tracer.enabled" => {
-          :default => Proc.new { !NewRelic::Agent.config[:'distributed_tracing.enabled'] },
+          :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => 'If <code>true</code>, enables <a href="https://docs.newrelic.com/docs/apm/transactions/cross-application-traces/cross-application-tracing">cross-application tracing</a>.'
+          :deprecated => true,
+          :description => deprecated_description(
+            :'distributed_tracing-enabled',
+            'If `true`, enables [cross-application tracing](/docs/agents/ruby-agent/features/cross-application-tracing-ruby/)'
+          )
         },
         :cross_application_tracing => {
           :default => nil,
@@ -1286,7 +1497,7 @@ module NewRelic
           :type => Boolean,
           :allowed_from_server => false,
           :deprecated => true,
-          :description => 'Deprecated in favor of cross_application_tracer.enabled'
+          :description => 'Deprecated in favor of distributed_tracing.enabled'
         },
         :encoding_key => {
           :default => '',
@@ -1307,7 +1518,7 @@ module NewRelic
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => 'If <code>true</code>, enables use of the <a href="https://docs.newrelic.com/docs/apm/applications-menu/events/thread-profiler-tool">thread profiler</a>.'
+          :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,
@@ -1321,14 +1532,14 @@ module NewRelic
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Specifies a marshaller for transmitting data to the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a>. Currently <code>json</code> is the only valid value for this setting.'
+          :description => 'Specifies a marshaller for transmitting data to the New Relic [collector](/docs/apm/new-relic-apm/getting-started/glossary#collector). Currently `json` is the only valid value for this setting.'
         },
         :'analytics_events.enabled' => {
           :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => 'If <code>true</code>, enables analytics event sampling.'
+          :description => 'If `true`, enables analytics event sampling.'
         },
         :'analytics_events.max_samples_stored' => {
           :default => 1200,
@@ -1343,7 +1554,7 @@ module NewRelic
           :type => Boolean,
           :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Deprecated; use <a href="#transaction_events-attributes-enabled"><code>transaction_events.attributes.enabled</code></a> instead.'
+          :description => 'Deprecated; use [`transaction_events.attributes.enabled`](#transaction_events-attributes-enabled) instead.'
         },
         :restart_thread_in_children => {
           :default => true,
@@ -1372,7 +1583,7 @@ module NewRelic
           :type         => Boolean,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t <a href="https://docs.newrelic.com/docs/agents/ruby-agent/features/ruby-vm-measurements">sample performance measurements from the Ruby VM</a>.'
+          :description  => 'If `true`, the agent won\'t [sample performance measurements from the Ruby VM](/docs/agents/ruby-agent/features/ruby-vm-measurements).'
         },
         :disable_memory_sampler => {
           :default      => false,
@@ -1380,7 +1591,7 @@ module NewRelic
           :type         => Boolean,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t sample the memory usage of the host process.'
+          :description  => 'If `true`, the agent won\'t sample the memory usage of the host process.'
         },
         :disable_cpu_sampler => {
           :default      => false,
@@ -1388,7 +1599,7 @@ module NewRelic
           :type         => Boolean,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t sample the CPU usage of the host process.'
+          :description  => 'If `true`, the agent won\'t sample the CPU usage of the host process.'
         },
         :disable_delayed_job_sampler => {
           :default      => false,
@@ -1396,33 +1607,7 @@ module NewRelic
           :type         => Boolean,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t measure the depth of Delayed Job queues.'
-        },
-        :disable_active_record_4 => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :deprecated   => true,
-          :description  => 'Deprecated.  ' \
-              'For agent versions 6.3 or higher, ' \
-              'use <a href="#disable_active_record_notifications"><code>' \
-                'disable_active_record_notifications' \
-              '</code></a> instead.'
-        },
-        :disable_active_record_5 => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :deprecated   => true,
-          :description  => 'Deprecated.  ' \
-              'For agent versions 6.3 or higher, ' \
-              'use <a href="#disable_active_record_notifications"><code>' \
-                'disable_active_record_notifications' \
-              '</code></a> instead.'
+          :description  => 'If `true`, the agent won\'t measure the depth of Delayed Job queues.'
         },
         :disable_active_record_notifications => {
           :default      => false,
@@ -1430,39 +1615,51 @@ module NewRelic
           :type         => Boolean,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, disables instrumentation for ActiveRecord 4, 5, and 6.'
+          :description  => 'If `true`, disables instrumentation for ActiveRecord 4, 5, and 6.'
         },
         :disable_bunny => {
           :default      => false,
           :public       => true,
           :type         => Boolean,
+          :deprecated   => true,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, disables instrumentation for the bunny gem.'
+          :description  => deprecated_description(:'instrumentation.bunny', 'If `true`, disables instrumentation for the bunny gem.')
         },
         :disable_curb => {
           :default      => false,
           :public       => true,
           :type         => Boolean,
+          :deprecated => true,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, disables instrumentation for the curb gem.'
+          :description  =>  deprecated_description(:'instrumentation.curb', 'If `true`, disables instrumentation for the curb gem.' )
         },
         :disable_excon => {
           :default      => false,
           :public       => true,
           :type         => Boolean,
           :dynamic_name => true,
+          :deprecated   => true,
+          :allowed_from_server => false,
+          :description  => deprecated_description(:'instrumentation.excon', 'If `true`, disables instrumentation for the excon gem.')
+        },
+        :'instrumentation.excon' => {
+          :default => instrumentation_value_of(:disable_excon),
+          :public => :true,
+          :type => String,
+          :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, disables instrumentation for the excon gem.'
+          :description => "Controls auto-instrumentation of Excon at start up.  May be one of [enabled|disabled]."
         },
         :disable_httpclient => {
           :default      => false,
           :public       => true,
           :type         => Boolean,
           :dynamic_name => true,
+          :deprecated   => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, disables instrumentation for the httpclient gem.'
+          :description  => deprecated_description(:'instrumentation.httpclient', 'If `true`, disables instrumentation for the httpclient gem.')
         },
         :disable_net_http => {
           :default      => false,
@@ -1470,7 +1667,10 @@ module NewRelic
           :type         => Boolean,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, disables instrumentation for Net::HTTP.'
+          :deprecated   => true,
+          :description  => deprecated_description(:'instrumentation.net_http',
+            'If `true`, disables instrumentation for Net::HTTP.'
+          )
         },
         :disable_rack => {
           :default      => false,
@@ -1478,7 +1678,8 @@ module NewRelic
           :type         => Boolean,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, prevents the agent from hooking into the <code>to_app</code> method in Rack::Builder to find gems to instrument during application startup.'
+          :deprecated   => true,
+          :description  => deprecated_description(:'instrumentation.rack',  'If `true`, prevents the agent from hooking into the `to_app` method in Rack::Builder to find gems to instrument during application startup.')
         },
         :disable_rack_urlmap => {
           :default      => false,
@@ -1486,7 +1687,8 @@ module NewRelic
           :type         => Boolean,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, prevents the agent from hooking into Rack::URLMap to install middleware tracing.'
+          :deprecated   => true,
+          :description  => deprecated_description(:'instrumentation.rack_urlmap', 'If `true`, prevents the agent from hooking into Rack::URLMap to install middleware tracing.')
         },
         :disable_puma_rack => {
           :default      => value_of(:disable_rack),
@@ -1494,7 +1696,8 @@ module NewRelic
           :type         => Boolean,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, prevents the agent from hooking into the <code>to_app</code> method in Puma::Rack::Builder to find gems to instrument during application startup.'
+          :deprecated   => true,
+          :description  => deprecated_description(:'instrumentation.puma_rack', 'If `true`, prevents the agent from hooking into the `to_app` method in Puma::Rack::Builder to find gems to instrument during application startup.')
         },
         :disable_puma_rack_urlmap => {
           :default      => value_of(:disable_rack_urlmap),
@@ -1502,30 +1705,33 @@ module NewRelic
           :type         => Boolean,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, prevents the agent from hooking into Puma::Rack::URLMap to install middleware tracing.'
+          :deprecated   => true,
+          :description  => deprecated_description(:'instrumentation.puma_rack_urlmap', 'If `true`, prevents the agent from hooking into Puma::Rack::URLMap to install middleware tracing.')
         },
         :disable_typhoeus => {
           :default      => false,
           :public       => true,
           :type         => Boolean,
           :dynamic_name => true,
+          :deprecated   => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t install instrumentation for the typhoeus gem.'
+          :description  => deprecated_description(:'instrumentation.typhoeus', 'If `true`, the agent won\'t install instrumentation for the typhoeus gem.' )
         },
         :disable_httprb => {
           :default      => false,
           :public       => true,
           :type         => Boolean,
           :dynamic_name => true,
+          :deprecated   => true,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t install instrumentation for the http.rb gem.'
+          :description  => deprecated_description(:'instrumentation.httprb', 'If `true`, the agent won\'t install instrumentation for the http.rb gem.' )
         },
         :disable_middleware_instrumentation => {
           :default      => false,
           :public       => true,
           :type         => Boolean,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t wrap third-party middlewares in instrumentation (regardless of whether they are installed via Rack::Builder or Rails).'
+          :description  => 'If `true`, the agent won\'t wrap third-party middlewares in instrumentation (regardless of whether they are installed via Rack::Builder or Rails).'
         },
         :disable_rails_middleware => {
           :default      => false,
@@ -1539,7 +1745,7 @@ module NewRelic
           :public       => true,
           :type         => Boolean,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent uses Heroku dyno names as the hostname.'
+          :description  => 'If `true`, the agent uses Heroku dyno names as the hostname.'
         },
         :'heroku.dyno_name_prefixes_to_shorten' => {
           :default      => ['scheduler', 'run'],
@@ -1554,14 +1760,14 @@ module NewRelic
           :public       => true,
           :type         => String,
           :allowed_from_server => false,
-          :description  => 'Specify a custom host name for <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/maintenance/add-rename-remove-hosts#display_name">display in the New Relic UI</a>.'
+          :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      => '',
           :public       => true,
           :type         => String,
           :allowed_from_server => false,
-          :description  => 'A dictionary of <a href="/docs/data-analysis/user-interface-functions/labels-categories-organize-your-apps-servers">label names</a> and values that will be applied to the data sent from this agent. May also be expressed as a semicolon-delimited <code>;</code> string of colon-separated <code>:</code> pairs. For example, <code><var>Server</var>:<var>One</var>;<var>Data Center</var>:<var>Primary</var></code>.'
+          :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,
@@ -1591,7 +1797,10 @@ module NewRelic
           :type         => Array,
           :allowed_from_server => true,
           :transform    => DefaultSource.method(:convert_to_regexp_list),
-          :description  => 'Define transactions you want the agent to ignore, by specifying a list of patterns matching the URI you want to ignore.'
+          :description  => 'Define transactions you want the agent to ignore, by specifying a list of patterns matching the URI you want to ignore.' \
+            '*Note:* This will only ignore transaction events, not spans or traces from the same transation. 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,
@@ -1612,7 +1821,7 @@ module NewRelic
           :public       => true,
           :type         => Boolean,
           :allowed_from_server => true,
-          :description  => 'If <code>true</code>, the agent captures <a href="/docs/insights/new-relic-insights/adding-querying-data/inserting-custom-events-new-relic-apm-agents">New Relic Insights custom events</a>.'
+          :description  => 'If `true`, the agent captures [New Relic Insights custom events](/docs/insights/new-relic-insights/adding-querying-data/inserting-custom-events-new-relic-apm-agents).'
         },
         :'custom_insights_events.max_samples_stored' => {
           :default      => 1000,
@@ -1627,63 +1836,77 @@ module NewRelic
           :public       => false,
           :type         => Boolean,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t install Grape instrumentation.'
+          :deprecated   => true,
+          :description  => deprecated_description(:'instrumentation.grape',
+            'If `true`, the agent won\'t install Grape instrumentation.'
+          )
         },
         :disable_grape => {
           :default      => false,
           :public       => true,
           :type         => Boolean,
           :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t install Grape instrumentation.'
+          :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),
+          :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]."
         },
         :'attributes.enabled' => {
           :default     => true,
           :public      => true,
           :type        => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, enables capture of attributes for all destinations.'
+          :description => 'If `true`, enables capture of attributes for all destinations.'
         },
         :'transaction_tracer.attributes.enabled' => {
           :default     => value_of(:'transaction_tracer.capture_attributes'),
           :public      => true,
           :type        => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent captures attributes from transaction traces.'
+          :description => 'If `true`, the agent captures attributes from transaction traces.'
         },
         :'transaction_events.attributes.enabled' => {
           :default     => value_of(:'analytics_events.capture_attributes'),
           :public      => true,
           :type        => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent captures attributes from transaction events.'
+          :description => 'If `true`, the agent captures attributes from transaction events.'
         },
         :'error_collector.attributes.enabled' => {
           :default     => value_of(:'error_collector.capture_attributes'),
           :public      => true,
           :type        => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent captures attributes from error collection.'
+          :description => 'If `true`, the agent captures attributes from error collection.'
         },
         :'browser_monitoring.attributes.enabled' => {
           :default     => value_of(:'browser_monitoring.capture_attributes'),
           :public      => true,
           :type        => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent captures attributes from browser monitoring.'
+          :description => 'If `true`, the agent captures attributes from browser monitoring.'
         },
         :'span_events.attributes.enabled' => {
           :default     => true,
           :public      => true,
           :type        => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent captures attributes on span events.'
+          :description => 'If `true`, the agent captures attributes on span events.'
         },
         :'transaction_segments.attributes.enabled' => {
           :default     => true,
           :public      => true,
           :type        => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent captures attributes on transaction segments.'
+          :description => 'If `true`, the agent captures attributes on transaction segments.'
         },
         :'attributes.exclude' => {
           :default     => [],
@@ -1691,7 +1914,7 @@ module NewRelic
           :type        => Array,
           :allowed_from_server => false,
           :transform   => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from all destinations. Allows <code>*</code> as wildcard at end.'
+          :description => 'Prefix of attributes to exclude from all destinations. Allows `*` as wildcard at end.'
         },
         :'transaction_tracer.attributes.exclude' => {
           :default     => [],
@@ -1699,7 +1922,7 @@ module NewRelic
           :type        => Array,
           :allowed_from_server => false,
           :transform   => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from transaction traces. Allows <code>*</code> as wildcard at end.'
+          :description => 'Prefix of attributes to exclude from transaction traces. Allows `*` as wildcard at end.'
         },
         :'transaction_events.attributes.exclude' => {
           :default     => [],
@@ -1707,7 +1930,7 @@ module NewRelic
           :type        => Array,
           :allowed_from_server => false,
           :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from transaction events. Allows <code>*</code> as wildcard at end.'
+          :description => 'Prefix of attributes to exclude from transaction events. Allows `*` as wildcard at end.'
         },
         :'error_collector.attributes.exclude' => {
           :default     => [],
@@ -1715,7 +1938,7 @@ module NewRelic
           :type        => Array,
           :allowed_from_server => false,
           :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from error collection. Allows <code>*</code> as wildcard at end.'
+          :description => 'Prefix of attributes to exclude from error collection. Allows `*` as wildcard at end.'
         },
         :'browser_monitoring.attributes.exclude' => {
           :default     => [],
@@ -1723,7 +1946,7 @@ module NewRelic
           :type        => Array,
           :allowed_from_server => false,
           :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from browser monitoring. Allows <code>*</code> as wildcard at end.'
+          :description => 'Prefix of attributes to exclude from browser monitoring. Allows `*` as wildcard at end.'
         },
         :'span_events.attributes.exclude' => {
           :default     => [],
@@ -1731,7 +1954,7 @@ module NewRelic
           :type        => Array,
           :allowed_from_server => false,
           :transform   => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from span events. Allows <code>*</code> as wildcard at end.'
+          :description => 'Prefix of attributes to exclude from span events. Allows `*` as wildcard at end.'
         },
         :'transaction_segments.attributes.exclude' => {
           :default     => [],
@@ -1739,7 +1962,7 @@ module NewRelic
           :type        => Array,
           :allowed_from_server => false,
           :transform   => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to exclude from transaction segments. Allows <code>*</code> as wildcard at end.'
+          :description => 'Prefix of attributes to exclude from transaction segments. Allows `*` as wildcard at end.'
         },
         :'attributes.include' => {
           :default     => [],
@@ -1747,7 +1970,7 @@ module NewRelic
           :type        => Array,
           :allowed_from_server => false,
           :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in all destinations. Allows <code>*</code> as wildcard at end.'
+          :description => 'Prefix of attributes to include in all destinations. Allows `*` as wildcard at end.'
         },
         :'transaction_tracer.attributes.include' => {
           :default     => [],
@@ -1755,7 +1978,7 @@ module NewRelic
           :type        => Array,
           :allowed_from_server => false,
           :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in transaction traces. Allows <code>*</code> as wildcard at end.'
+          :description => 'Prefix of attributes to include in transaction traces. Allows `*` as wildcard at end.'
         },
         :'transaction_events.attributes.include' => {
           :default     => [],
@@ -1763,7 +1986,7 @@ module NewRelic
           :type        => Array,
           :allowed_from_server => false,
           :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in transaction events. Allows <code>*</code> as wildcard at end.'
+          :description => 'Prefix of attributes to include in transaction events. Allows `*` as wildcard at end.'
         },
         :'error_collector.attributes.include' => {
           :default     => [],
@@ -1771,7 +1994,7 @@ module NewRelic
           :type        => Array,
           :allowed_from_server => false,
           :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in error collection. Allows <code>*</code> as wildcard at end.'
+          :description => 'Prefix of attributes to include in error collection. Allows `*` as wildcard at end.'
         },
         :'browser_monitoring.attributes.include' => {
           :default     => [],
@@ -1779,7 +2002,7 @@ module NewRelic
           :type        => Array,
           :allowed_from_server => false,
           :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include in browser monitoring. Allows <code>*</code> as wildcard at end.'
+          :description => 'Prefix of attributes to include in browser monitoring. Allows `*` as wildcard at end.'
         },
         :'span_events.attributes.include' => {
           :default     => [],
@@ -1787,7 +2010,7 @@ module NewRelic
           :type        => Array,
           :allowed_from_server => false,
           :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include on span events. Allows <code>*</code> as wildcard at end.'
+          :description => 'Prefix of attributes to include on span events. Allows `*` as wildcard at end.'
         },
         :'transaction_segments.attributes.include' => {
           :default     => [],
@@ -1795,14 +2018,14 @@ module NewRelic
           :type        => Array,
           :allowed_from_server => false,
           :transform    => DefaultSource.method(:convert_to_list),
-          :description => 'Prefix of attributes to include on transaction segments. Allows <code>*</code> as wildcard at end.'
+          :description => 'Prefix of attributes to include on transaction segments. Allows `*` as wildcard at end.'
         },
         :'custom_attributes.enabled' => {
           :default     => true,
           :public      => true,
           :type        => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>false</code>, custom attributes will not be sent on Insights events.'
+          :description => 'If `false`, custom attributes will not be sent on Insights events.'
         },
         :'utilization.detect_aws' => {
           :default     => true,
@@ -1810,7 +2033,7 @@ module NewRelic
           :type        => Boolean,
           :allowed_from_server => false,
           :dynamic_name => true,
-          :description => 'If <code>true</code>, the agent automatically detects that it is running in an AWS environment.'
+          :description => 'If `true`, the agent automatically detects that it is running in an AWS environment.'
         },
         :'utilization.detect_azure' => {
           :default      => true,
@@ -1818,7 +2041,7 @@ module NewRelic
           :type         => Boolean,
           :allowed_from_server => false,
           :dynamic_name => true,
-          :description  => 'If <code>true</code>, the agent automatically detects that it is running in an Azure environment.'
+          :description  => 'If `true`, the agent automatically detects that it is running in an Azure environment.'
         },
         :'utilization.detect_gcp' => {
           :default     => true,
@@ -1826,7 +2049,7 @@ module NewRelic
           :type        => Boolean,
           :allowed_from_server => false,
           :dynamic_name => true,
-          :description => 'If <code>true</code>, the agent automatically detects that it is running in an Google Cloud Platform environment.'
+          :description => 'If `true`, the agent automatically detects that it is running in an Google Cloud Platform environment.'
         },
         :'utilization.detect_pcf' => {
           :default     => true,
@@ -1834,21 +2057,21 @@ module NewRelic
           :type        => Boolean,
           :allowed_from_server => false,
           :dynamic_name => true,
-          :description => 'If <code>true</code>, the agent automatically detects that it is running in a Pivotal Cloud Foundry environment.'
+          :description => 'If `true`, the agent automatically detects that it is running in a Pivotal Cloud Foundry environment.'
         },
         :'utilization.detect_docker' => {
           :default     => true,
           :public      => true,
           :type        => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent automatically detects that it is running in Docker.'
+          :description => 'If `true`, the agent automatically detects that it is running in Docker.'
         },
         :'utilization.detect_kubernetes' => {
           :default     => true,
           :public      => true,
           :type        => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent automatically detects that it is running in Kubernetes.'
+          :description => 'If `true`, the agent automatically detects that it is running in Kubernetes.'
         },
         :'utilization.billing_hostname' => {
           :default     => nil,
@@ -1879,21 +2102,21 @@ module NewRelic
           :public      => true,
           :type        => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>false</code>, the agent will not report datastore instance metrics, nor add <code>host</code> or <code>port_path_or_id</code> parameters to transaction or slow sql traces.'
+          :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.'
         },
         :'datastore_tracer.database_name_reporting.enabled' => {
           :default     => true,
           :public      => true,
           :type        => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>false</code>, the agent will not add <code>database_name</code> parameter to transaction or slow sql traces.'
+          :description => 'If `false`, the agent will not add `database_name` parameter to transaction or slow sql traces.'
         },
         :'clear_transaction_state_after_fork' => {
           :default     => false,
           :public      => true,
           :type        => Boolean,
           :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent will clear <code>Tracer::State</code> in <code>Agent.drop_buffered_data</code>.'
+          :description => 'If `true`, the agent will clear `Tracer::State` in `Agent.drop_buffered_data`.'
         },
         :account_id => {
           :default => nil,
@@ -1912,11 +2135,11 @@ module NewRelic
           :description => 'The primary id associated with this application.'
         },
         :'distributed_tracing.enabled' => {
-          :default     => false,
+          :default     => true,
           :public      => true,
           :type        => Boolean,
-          :allowed_from_server => false,
-          :description => 'Distributed tracing lets you see the path that a request takes through your distributed system. Enabling distributed tracing changes the behavior of some New Relic features, so carefully consult the <a href="https://docs.newrelic.com/docs/transition-guide-distributed-tracing">transition guide</a> before you enable this feature.'
+          :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,
@@ -1945,7 +2168,7 @@ module NewRelic
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => 'If <code>true</code>, enables span event sampling.'
+          :description => 'If `true`, enables span event sampling.'
         },
         :'span_events.queue_size' => {
           :default => 10_000,
@@ -1956,7 +2179,7 @@ module NewRelic
           :description => "Sets the maximum number of span events to buffer when streaming to the trace observer."
         },
         :'span_events.max_samples_stored' => {
-          :default => 1000,
+          :default => 2000,
           :public => true,
           :type => Integer,
           :allowed_from_server => true,