newrelic_rpm 8.16.0 → 9.1.0

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

@@ -29,11 +29,11 @@ module NewRelic
       def self.instrumentation_value_of(disable_key, prepend_key = nil)
         proc do
           if NewRelic::Agent.config[disable_key]
-            "disabled"
+            'disabled'
           elsif prepend_key && !NewRelic::Agent.config[prepend_key]
-            "chain"
+            'chain'
           else
-            "auto"
+            'auto'
           end
         end
       end
@@ -47,7 +47,7 @@ module NewRelic
       # Marks the config option as deprecated in the documentation once generated.
       # Does not appear in logs.
       def self.deprecated_description(new_setting, description)
-        link_ref = new_setting.to_s.tr(".", "-")
+        link_ref = new_setting.to_s.tr('.', '-')
         %{Please see: [#{new_setting}](docs/agents/ruby-agent/configuration/ruby-agent-configuration##{link_ref}). \n\n#{description}}
       end
 
@@ -80,34 +80,35 @@ module NewRelic
           default_settings[:transform] if default_settings
         end
 
-        def self.config_search_paths
+        def self.config_search_paths # rubocop:disable Metrics/AbcSize
           proc {
-            paths = [
-              File.join("config", "newrelic.yml"),
-              File.join("newrelic.yml"),
-              File.join("config", "newrelic.yml.erb"),
-              File.join("newrelic.yml.erb")
-            ]
+            yaml = 'newrelic.yml'
+            config_yaml = File.join('config', yaml)
+            erb = 'newrelic.yml.erb'
+            config_erb = File.join('config', erb)
+
+            paths = [config_yaml, yaml, config_erb, erb]
 
             if NewRelic::Control.instance.root
-              paths << File.join(NewRelic::Control.instance.root, "config", "newrelic.yml")
-              paths << File.join(NewRelic::Control.instance.root, "newrelic.yml")
-              paths << File.join(NewRelic::Control.instance.root, "config", "newrelic.yml.erb")
-              paths << File.join(NewRelic::Control.instance.root, "newrelic.yml.erb")
+              paths << File.join(NewRelic::Control.instance.root, config_yaml)
+              paths << File.join(NewRelic::Control.instance.root, yaml)
+              paths << File.join(NewRelic::Control.instance.root, config_erb)
+              paths << File.join(NewRelic::Control.instance.root, erb)
             end
 
             if ENV['HOME']
-              paths << File.join(ENV['HOME'], ".newrelic", "newrelic.yml")
-              paths << File.join(ENV['HOME'], "newrelic.yml")
-              paths << File.join(ENV['HOME'], ".newrelic", "newrelic.yml.erb")
-              paths << File.join(ENV['HOME'], "newrelic.yml.erb")
+              paths << File.join(ENV['HOME'], '.newrelic', yaml)
+              paths << File.join(ENV['HOME'], yaml)
+              paths << File.join(ENV['HOME'], '.newrelic', erb)
+              paths << File.join(ENV['HOME'], erb)
             end
 
             # If we're packaged for warbler, we can tell from GEM_HOME
-            if ENV["GEM_HOME"] && ENV["GEM_HOME"].end_with?(".jar!")
-              app_name = File.basename(ENV["GEM_HOME"], ".jar!")
-              paths << File.join(ENV["GEM_HOME"], app_name, "config", "newrelic.yml")
-              paths << File.join(ENV["GEM_HOME"], app_name, "config", "newrelic.yml.erb")
+            # the following line needs else branch coverage
+            if ENV['GEM_HOME'] && ENV['GEM_HOME'].end_with?('.jar!') # rubocop:disable Style/SafeNavigation
+              app_name = File.basename(ENV['GEM_HOME'], '.jar!')
+              paths << File.join(ENV['GEM_HOME'], app_name, config_yaml)
+              paths << File.join(ENV['GEM_HOME'], app_name, config_erb)
             end
 
             paths
@@ -176,13 +177,6 @@ module NewRelic
           proc { NewRelic::Agent::Threading::BacktraceService.is_supported? }
         end
 
-        # This check supports the js_errors_beta key we've asked clients to
-        # set. Once JS errors are GA, browser_monitoring.loader can stop
-        # being dynamic.
-        def self.browser_monitoring_loader
-          proc { NewRelic::Agent.config[:js_errors_beta] ? "full" : "rum" }
-        end
-
         def self.transaction_tracer_transaction_threshold
           proc { NewRelic::Agent.config[:apdex_t] * 4 }
         end
@@ -213,11 +207,11 @@ module NewRelic
           # only used for deployment task
           proc do
             api_version = if NewRelic::Agent.config[:api_key].nil? || NewRelic::Agent.config[:api_key].empty?
-              "rpm"
+              'rpm'
             else
-              "api"
+              'api'
             end
-            api_region = "eu." if String(NewRelic::Agent.config[:license_key]).start_with?('eu')
+            api_region = 'eu.' if String(NewRelic::Agent.config[:license_key]).start_with?('eu')
 
             "#{api_version}.#{api_region}newrelic.com"
           end
@@ -348,7 +342,7 @@ module NewRelic
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => 'Your New Relic [license key](/docs/apis/intro-apis/new-relic-api-keys/#ingest-license-key).'
+          :description => 'Your New Relic <LicenseKey />.'
         },
         :log_level => {
           :default => 'info',
@@ -363,19 +357,19 @@ module NewRelic
           :public => true,
           :type => Array,
           :allowed_from_server => false,
-          :description => <<-DESCRIPTION
-An array of ActiveSupport custom event names to subscribe to and instrument. For example,
-  - one.custom.event
-  - another.event
-  - a.third.event
+          :description => <<~DESCRIPTION
+            An array of ActiveSupport custom event names to subscribe to and instrument. For example,
+              - one.custom.event
+              - another.event
+              - a.third.event
           DESCRIPTION
         },
+        # this is only set via server side config
         :apdex_t => {
           :default => 0.5,
-          :public => true,
+          :public => false,
           :type => Float,
           :allowed_from_server => true,
-          :deprecated => true,
           :description => 'For agent versions 3.5.0 or higher, [set your Apdex T via the New Relic UI](/docs/apm/new-relic-apm/apdex/changing-your-apdex-settings).'
         },
         :api_key => {
@@ -412,12 +406,12 @@ An array of ActiveSupport custom event names to subscribe to and instrument. For
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => <<-DESCRIPTION
-When `true`, the agent captures HTTP request parameters and attaches them to transaction traces, traced errors, and [`TransactionError` events](/attribute-dictionary?attribute_name=&events_tids%5B%5D=8241).
+          :description => <<~DESCRIPTION
+            When `true`, the agent captures HTTP request parameters and attaches them to transaction traces, traced errors, and [`TransactionError` events](/attribute-dictionary?attribute_name=&events_tids%5B%5D=8241).
 
-    <Callout variant="caution">
-      When using the `capture_params` setting, the Ruby agent will not attempt to filter secret information. <b>Recommendation:</b> To filter secret information from request parameters, use the [`attributes.include` setting](/docs/agents/ruby-agent/attributes/enable-disable-attributes-ruby) instead. For more information, see the <a href="/docs/agents/ruby-agent/attributes/ruby-attribute-examples#ex_req_params">Ruby attribute examples</a>.
-    </Callout>
+                <Callout variant="caution">
+                  When using the `capture_params` setting, the Ruby agent will not attempt to filter secret information. <b>Recommendation:</b> To filter secret information from request parameters, use the [`attributes.include` setting](/docs/agents/ruby-agent/attributes/enable-disable-attributes-ruby) instead. For more information, see the <a href="/docs/agents/ruby-agent/attributes/ruby-attribute-examples#ex_req_params">Ruby attribute examples</a>.
+                </Callout>
           DESCRIPTION
         },
         :'clear_transaction_state_after_fork' => {
@@ -439,7 +433,7 @@ When `true`, the agent captures HTTP request parameters and attaches them to tra
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
-          :description => "Allows newrelic distributed tracing headers to be suppressed on outbound requests."
+          :description => 'Allows newrelic distributed tracing headers to be suppressed on outbound requests.'
         },
         :force_install_exit_handler => {
           :default => false,
@@ -566,14 +560,6 @@ When `true`, the agent captures HTTP request parameters and attaches them to tra
           :description => 'Defines the maximum number of seconds the agent should spend attempting to connect to the collector.'
         },
         # Transaction tracer
-        :'transaction_tracer.capture_attributes' => {
-          :default => true,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => 'Use [`transaction_tracer.attributes.enabled`](#transaction_tracer-attributes-enabled) instead.'
-        },
         :'transaction_tracer.enabled' => {
           :default => true,
           :public => true,
@@ -639,26 +625,18 @@ When `true`, the agent captures HTTP request parameters and attaches them to tra
           :description => 'Specify a threshold in seconds. Transactions with a duration longer than this threshold are eligible for transaction traces. Specify a float value or the string `apdex_f`.'
         },
         # Error collector
-        :'error_collector.capture_attributes' => {
-          :default => true,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => 'Use [`error_collector.attributes.enabled`](#error_collector-attributes-enabled) instead.'
-        },
         :'error_collector.ignore_classes' => {
-          :default => [],
+          :default => ['ActionController::RoutingError', 'Sinatra::NotFound'],
           :public => true,
           :type => Array,
           :allowed_from_server => true,
           :dynamic_name => true,
-          :description => <<-DESCRIPTION
-A list of error classes that the agent should ignore.
+          :description => <<~DESCRIPTION
+            A list of error classes that the agent should ignore.
 
-  <Callout variant="caution">
-    This option can't be set via environment variable.
-  </Callout>
+              <Callout variant="caution">
+                This option can't be set via environment variable.
+              </Callout>
           DESCRIPTION
         },
         :'error_collector.capture_events' => {
@@ -683,12 +661,12 @@ A list of error classes that the agent should ignore.
           :type => Array,
           :allowed_from_server => true,
           :dynamic_name => true,
-          :description => <<-DESCRIPTION
-A list of error classes that the agent should treat as expected.
+          :description => <<~DESCRIPTION
+            A list of error classes that the agent should treat as expected.
 
-  <Callout variant="caution">
-    This option can't be set via environment variable.
-  </Callout>
+              <Callout variant="caution">
+                This option can't be set via environment variable.
+              </Callout>
           DESCRIPTION
         },
         :'error_collector.expected_messages' => {
@@ -697,12 +675,12 @@ A list of error classes that the agent should treat as expected.
           :type => Hash,
           :allowed_from_server => true,
           :dynamic_name => true,
-          :description => <<-DESCRIPTION
-A map of error classes to a list of messages. When an error of one of the classes specified here occurs, if its error message contains one of the strings corresponding to it here, that error will be treated as expected.
+          :description => <<~DESCRIPTION
+            A map of error classes to a list of messages. When an error of one of the classes specified here occurs, if its error message contains one of the strings corresponding to it here, that error will be treated as expected.
 
-  <Callout variant="caution">
-    This option can't be set via environment variable.
-  </Callout>
+              <Callout variant="caution">
+                This option can't be set via environment variable.
+              </Callout>
           DESCRIPTION
         },
         :'error_collector.expected_status_codes' => {
@@ -713,33 +691,19 @@ A map of error classes to a list of messages. When an error of one of the classe
           :dynamic_name => true,
           :description => 'A comma separated list of status codes, possibly including ranges. Errors associated with these status codes, where applicable, will be treated as expected.'
         },
-        :'error_collector.ignore_errors' => {
-          :default => 'ActionController::RoutingError,Sinatra::NotFound',
-          :public => true,
-          :type => String,
-          :deprecated => true,
-          :allowed_from_server => true,
-          :dynamic_name => true,
-          :description => <<-DESCRIPTION
-Use `error_collector.ignore_classes` instead. Specify a comma-delimited list of error classes that the agent should ignore.
 
-    <Callout variant="caution">
-      Server side configuration takes precedence for this setting over all environment configurations. This differs from all other configuration settings where environment variable take precedence over server side configuration.
-    </Callout>
-          DESCRIPTION
-        },
         :'error_collector.ignore_messages' => {
           :default => {},
           :public => true,
           :type => Hash,
           :allowed_from_server => true,
           :dynamic_name => true,
-          :description => <<-DESCRIPTION
-A map of error classes to a list of messages. When an error of one of the classes specified here occurs, if its error message contains one of the strings corresponding to it here, that error will be ignored.
+          :description => <<~DESCRIPTION
+            A map of error classes to a list of messages. When an error of one of the classes specified here occurs, if its error message contains one of the strings corresponding to it here, that error will be ignored.
 
-  <Callout variant="caution">
-    This option can't be set via environment variable.
-  </Callout>
+              <Callout variant="caution">
+                This option can't be set via environment variable.
+              </Callout>
           DESCRIPTION
         },
         :'error_collector.ignore_status_codes' => {
@@ -773,51 +737,16 @@ A map of error classes to a list of messages. When an error of one of the classe
           :allowed_from_server => true,
           :description => 'If `true`, enables [auto-injection](/docs/browser/new-relic-browser/installation-configuration/adding-apps-new-relic-browser#select-apm-app) of the JavaScript header for page load timing (sometimes referred to as real user monitoring or RUM).'
         },
-        :'browser_monitoring.capture_attributes' => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => 'Use [`browser_monitoring.attributes.enabled`](#browser_monitoring-attributes-enabled) instead.'
-        },
-        # Analytics events
-        :'analytics_events.capture_attributes' => {
-          :default => true,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => 'Use [`transaction_events.attributes.enabled`](#transaction_events-attributes-enabled) instead.'
-        },
-        :'analytics_events.enabled' => {
-          :default => true,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => true,
-          :description => deprecated_description(:'transaction_events.enabled', 'If `true`, enables analytics event sampling.')
-        },
-        :'analytics_events.max_samples_stored' => {
-          :default => 1200,
-          :public => true,
-          :type => Integer,
-          :deprecated => true,
-          :allowed_from_server => true,
-          :description => deprecated_description(:'transaction_events.max_samples_stored', 'Defines the maximum number of request events reported from a single harvest.')
-        },
         # Transaction events
         :'transaction_events.enabled' => {
-          :default => value_of(:'analytics_events.enabled'),
-          :documentation_default => true,
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
           :description => 'If `true`, enables transaction event sampling.'
         },
         :'transaction_events.max_samples_stored' => {
-          :default => value_of(:'analytics_events.max_samples_stored'),
-          :documentation_default => 1200,
+          :default => 1200,
           :public => true,
           :type => Integer,
           :allowed_from_server => true,
@@ -885,8 +814,7 @@ A map of error classes to a list of messages. When an error of one of the classe
           :description => 'Prefix of attributes to include in all destinations. Allows `*` as wildcard at end.'
         },
         :'browser_monitoring.attributes.enabled' => {
-          :default => value_of(:'browser_monitoring.capture_attributes'),
-          :documentation_default => false,
+          :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
@@ -909,8 +837,7 @@ A map of error classes to a list of messages. When an error of one of the classe
           :description => 'Prefix of attributes to include in browser monitoring. Allows `*` as wildcard at end.'
         },
         :'error_collector.attributes.enabled' => {
-          :default => value_of(:'error_collector.capture_attributes'),
-          :documentation_default => true,
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
@@ -956,8 +883,7 @@ A map of error classes to a list of messages. When an error of one of the classe
           :description => 'Prefix of attributes to include on span events. Allows `*` as wildcard at end.'
         },
         :'transaction_events.attributes.enabled' => {
-          :default => value_of(:'analytics_events.capture_attributes'),
-          :documentation_default => true,
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
@@ -1003,8 +929,7 @@ A map of error classes to a list of messages. When an error of one of the classe
           :description => 'Prefix of attributes to include on transaction segments. Allows `*` as wildcard at end.'
         },
         :'transaction_tracer.attributes.enabled' => {
-          :default => value_of(:'transaction_tracer.capture_attributes'),
-          :documentation_default => true,
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
@@ -1035,7 +960,7 @@ A map of error classes to a list of messages. When an error of one of the classe
           :description => 'If `true`, enables an audit log which logs communications with the New Relic [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector).'
         },
         :'audit_log.endpoints' => {
-          :default => [".*"],
+          :default => ['.*'],
           :public => true,
           :type => Array,
           :allowed_from_server => false,
@@ -1213,15 +1138,6 @@ A map of error classes to a list of messages. When an error of one of the classe
           :allowed_from_server => false,
           :description => 'If `true`, disables instrumentation for Active Record 4+'
         },
-        :disable_bunny => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.bunny', 'If `true`, disables instrumentation for the bunny gem.')
-        },
         :disable_cpu_sampler => {
           :default => false,
           :public => true,
@@ -1230,48 +1146,6 @@ A map of error classes to a list of messages. When an error of one of the classe
           :allowed_from_server => false,
           :description => 'If `true`, the agent won\'t sample the CPU usage of the host process.'
         },
-        :disable_curb => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.curb', 'If `true`, disables instrumentation for the curb gem.')
-        },
-        :disable_database_instrumentation => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => 'Use [`disable_sequel_instrumentation`](#disable_sequel_instrumentation) instead.'
-        },
-        :disable_data_mapper => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'If `true`, disables DataMapper instrumentation.'
-        },
-        :disable_dalli => {
-          :default => value_of(:disable_memcache_instrumentation),
-          :documentation_default => false,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcache', 'If `true`, disables instrumentation for the dalli gem.')
-        },
-        :disable_dalli_cas_client => {
-          :default => value_of(:disable_memcache_instrumentation),
-          :documentation_default => false,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcache', "If `true`, disables instrumentation for the dalli gem's additional CAS client support.")
-        },
         :disable_delayed_job_sampler => {
           :default => false,
           :public => true,
@@ -1280,49 +1154,6 @@ A map of error classes to a list of messages. When an error of one of the classe
           :allowed_from_server => false,
           :description => 'If `true`, the agent won\'t measure the depth of Delayed Job queues.'
         },
-        :disable_dj => {
-          :default => false,
-          :public => true,
-          :deprecated => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.delayed_job', 'If `true`, disables [Delayed::Job instrumentation](/docs/agents/ruby-agent/background-jobs/delayedjob).')
-        },
-        :disable_excon => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.excon', 'If `true`, disables instrumentation for the excon gem.')
-        },
-        :disable_memcached => {
-          :default => value_of(:disable_memcache_instrumentation),
-          :documentation_default => false,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcached', 'If `true`, disables instrumentation for the memcached gem.')
-        },
-        :disable_memcache_client => {
-          :default => value_of(:disable_memcache_instrumentation),
-          :documentation_default => false,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcache-client', 'If `true`, disables instrumentation for the memcache-client gem.')
-        },
-        :disable_memcache_instrumentation => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcache', 'If `true`, disables memcache instrumentation.')
-        },
         :disable_gc_profiler => {
           :default => false,
           :public => true,
@@ -1330,42 +1161,6 @@ A map of error classes to a list of messages. When an error of one of the classe
           :allowed_from_server => false,
           :description => 'If `true`, disables the use of GC::Profiler to measure time spent in garbage collection'
         },
-        :disable_grape => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.grape',
-            'If `true`, the agent won\'t install Grape instrumentation.')
-        },
-        :disable_httpclient => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.httpclient', 'If `true`, disables instrumentation for the httpclient gem.')
-        },
-        :disable_httprb => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.httprb', 'If `true`, the agent won\'t install instrumentation for the http.rb gem.')
-        },
-        :disable_mongo => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :dynamic_name => true,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.mongo', 'If `true`, the agent won\'t install [instrumentation for the Mongo gem](/docs/agents/ruby-agent/frameworks/mongo-instrumentation).')
-        },
         :disable_memory_sampler => {
           :default => false,
           :public => true,
@@ -1381,78 +1176,6 @@ A map of error classes to a list of messages. When an error of one of the classe
           :allowed_from_server => false,
           :description => 'If `true`, the agent won\'t wrap third-party middlewares in instrumentation (regardless of whether they are installed via Rack::Builder or Rails).'
         },
-        :disable_net_http => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.net_http',
-            'If `true`, disables instrumentation for Net::HTTP.')
-        },
-        :disable_puma_rack => {
-          :default => value_of(:disable_rack),
-          :documentation_default => false,
-          :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.puma_rack', 'If `true`, prevents the agent from hooking into the `to_app` method in Puma::Rack::Builder to find gems to instrument during application startup.')
-        },
-        :disable_puma_rack_urlmap => {
-          :default => value_of(:disable_rack_urlmap),
-          :documentation_default => false,
-          :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.puma_rack_urlmap', 'If `true`, prevents the agent from hooking into Puma::Rack::URLMap to install middleware tracing.')
-        },
-        :disable_rack => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.rack', 'If `true`, prevents the agent from hooking into the `to_app` method in Rack::Builder to find gems to instrument during application startup.')
-        },
-        :disable_rack_urlmap => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.rack_urlmap', 'If `true`, prevents the agent from hooking into Rack::URLMap to install middleware tracing.')
-        },
-        :disable_rake => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.rake', 'If `true`, disables Rake instrumentation.')
-        },
-        :disable_redis => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.redis', 'If `true`, the agent won\'t install [instrumentation for Redis](/docs/agents/ruby-agent/frameworks/redis-instrumentation).')
-        },
-        :disable_resque => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.resque', 'If `true`, disables [Resque instrumentation](/docs/agents/ruby-agent/background-jobs/resque-instrumentation).')
-        },
         :disable_samplers => {
           :default => false,
           :public => true,
@@ -1474,47 +1197,30 @@ A map of error classes to a list of messages. When an error of one of the classe
           :allowed_from_server => false,
           :description => 'If `true`, disables [Sidekiq instrumentation](/docs/agents/ruby-agent/background-jobs/sidekiq-instrumentation).'
         },
-        :disable_sinatra => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.sinatra', 'If `true` , disables [Sinatra instrumentation](/docs/agents/ruby-agent/frameworks/sinatra-support).')
-        },
         :disable_sinatra_auto_middleware => {
           :default => false,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => <<-DESCRIPTION
-If `true`, disables agent middleware for Sinatra. This middleware is responsible for advanced feature support such as [cross application tracing](/docs/apm/transactions/cross-application-traces/cross-application-tracing), [page load timing](/docs/browser/new-relic-browser/getting-started/new-relic-browser), and [error collection](/docs/apm/applications-menu/events/view-apm-error-analytics).
+          :description => <<~DESCRIPTION
+            If `true`, disables agent middleware for Sinatra. This middleware is responsible for advanced feature support such as [cross application tracing](/docs/apm/transactions/cross-application-traces/cross-application-tracing), [page load timing](/docs/browser/new-relic-browser/getting-started/new-relic-browser), and [error collection](/docs/apm/applications-menu/events/view-apm-error-analytics).
 
-    <Callout variant="important">
-      Cross application tracing is deprecated in favor of [distributed tracing](/docs/apm/distributed-tracing/getting-started/introduction-distributed-tracing). Distributed tracing is on by default for Ruby agent versions 8.0.0 and above. Middlewares are not required to support distributed tracing.
+                <Callout variant="important">
+                  Cross application tracing is deprecated in favor of [distributed tracing](/docs/apm/distributed-tracing/getting-started/introduction-distributed-tracing). Distributed tracing is on by default for Ruby agent versions 8.0.0 and above. Middlewares are not required to support distributed tracing.
 
-      To continue using cross application tracing, update the following options in your `newrelic.yml` configuration file:
+                  To continue using cross application tracing, update the following options in your `newrelic.yml` configuration file:
 
-      ```
-      # newrelic.yml
+                  ```
+                  # newrelic.yml
 
-        cross_application_tracer:
-          enabled: true
-        distributed_tracing:
-          enabled: false
-      ```
-    </Callout>
+                    cross_application_tracer:
+                      enabled: true
+                    distributed_tracing:
+                      enabled: false
+                  ```
+                </Callout>
           DESCRIPTION
         },
-        :disable_typhoeus => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :dynamic_name => true,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.typhoeus', 'If `true`, the agent won\'t install instrumentation for the typhoeus gem.')
-        },
         :disable_view_instrumentation => {
           :default => false,
           :public => true,
@@ -1576,10 +1282,10 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :type => String,
           :allowed_from_server => false,
           :external => :infinite_tracing,
-          :description => "Configures the hostname for the trace observer Host. " \
-            "When configured, enables tail-based sampling by sending all recorded spans " \
-            "to a trace observer for further sampling decisions, irrespective of any usual " \
-            "agent sampling decision."
+          :description => 'Configures the hostname for the trace observer Host. ' \
+            'When configured, enables tail-based sampling by sending all recorded spans ' \
+            'to a trace observer for further sampling decisions, irrespective of any usual ' \
+            'agent sampling decision.'
         },
         :'infinite_tracing.trace_observer.port' => {
           :default => 443,
@@ -1587,7 +1293,7 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :type => Integer,
           :allowed_from_server => false,
           :external => :infinite_tracing,
-          :description => "Configures the TCP/IP port for the trace observer Host"
+          :description => 'Configures the TCP/IP port for the trace observer Host'
         },
         # Instrumentation
         :'instrumentation.active_support_logger' => {
@@ -1600,14 +1306,21 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :description => 'Controls auto-instrumentation of ActiveSupport::Logger at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.bunny' => {
-          :default => instrumentation_value_of(:disable_bunny),
-          :documentation_default => 'auto',
+          :default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
           :description => 'Controls auto-instrumentation of bunny at start up.  May be one of [auto|prepend|chain|disabled].'
         },
+        :'instrumentation.fiber' => {
+          :default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of the Fiber class at start up. May be one of [auto|prepend|chain|disabled].'
+        },
         :'instrumentation.concurrent_ruby' => {
           :default => 'auto',
           :public => true,
@@ -1617,7 +1330,7 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :description => 'Controls auto-instrumentation of the concurrent-ruby library at start up. May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.curb' => {
-          :default => instrumentation_value_of(:disable_curb),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
@@ -1626,7 +1339,7 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :description => 'Controls auto-instrumentation of Curb at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.delayed_job' => {
-          :default => instrumentation_value_of(:disable_dj),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
@@ -1643,22 +1356,21 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :description => 'Controls auto-instrumentation of the elasticsearch library at start up. May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.excon' => {
-          :default => instrumentation_value_of(:disable_excon),
+          :default => 'enabled',
           :documentation_default => 'enabled',
-          :public => :true,
+          :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Excon at start up.  May be one of [enabled|disabled]."
+          :description => 'Controls auto-instrumentation of Excon at start up.  May be one of [enabled|disabled].'
         },
         :'instrumentation.grape' => {
-          :default => instrumentation_value_of(:disable_grape_instrumentation),
-          :documentation_default => 'auto',
-          :public => :true,
+          :default => 'auto',
+          :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Grape at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of Grape at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.grpc_client' => {
           :default => instrumentation_value_of(:disable_grpc_client),
@@ -1687,16 +1399,16 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :description => 'Controls auto-instrumentation of gRPC servers at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.httpclient' => {
-          :default => instrumentation_value_of(:disable_httpclient),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of HTTPClient at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of HTTPClient at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.httprb' => {
-          :default => instrumentation_value_of(:disable_httprb),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
@@ -1714,8 +1426,7 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :description => 'Controls auto-instrumentation of Ruby standard library Logger at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.memcache' => {
-          :default => instrumentation_value_of(:disable_dalli),
-          :documentation_default => 'auto',
+          :default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
@@ -1723,7 +1434,7 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :description => 'Controls auto-instrumentation of dalli gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.memcached' => {
-          :default => instrumentation_value_of(:disable_memcached),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
@@ -1741,36 +1452,36 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :description => 'Controls auto-instrumentation of memcache-client gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.mongo' => {
-          :default => instrumentation_value_of(:disable_mongo),
+          :default => 'enabled',
           :documentation_default => 'enabled',
-          :public => :true,
+          :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Mongo at start up.  May be one of [enabled|disabled]."
+          :description => 'Controls auto-instrumentation of Mongo at start up.  May be one of [enabled|disabled].'
         },
         :'instrumentation.net_http' => {
-          :default => instrumentation_value_of(:disable_net_http, :prepend_net_instrumentation),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Net::HTTP at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of Net::HTTP at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.puma_rack' => {
-          :default => instrumentation_value_of(:disable_puma_rack), # TODO: MAJOR VERSION - change to value_of(:'instrumentation.rack') when we remove :disable_puma_rack in 8.0)
+          :default => value_of(:'instrumentation.rack'),
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Puma::Rack. When enabled, the agent hooks into the " \
-                           "`to_app` method in Puma::Rack::Builder to find gems to instrument during " \
-                           "application startup.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of Puma::Rack. When enabled, the agent hooks into the ' \
+                           '`to_app` method in Puma::Rack::Builder to find gems to instrument during ' \
+                           'application startup.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.puma_rack_urlmap' => {
-          :default => instrumentation_value_of(:disable_puma_rack_urlmap), # TODO: MAJOR VERSION - change to value_of(:'instrumentation.rack_urlmap') when we remove :disable_puma_rack_urlmap in 8.0)
+          :default => value_of(:'instrumentation.rack_urlmap'),
           :documentation_default => 'auto',
           :public => true,
           :type => String,
@@ -1779,18 +1490,18 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :description => 'Controls auto-instrumentation of Puma::Rack::URLMap at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.rack' => {
-          :default => instrumentation_value_of(:disable_rack),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Rack. When enabled, the agent hooks into the " \
-                           "`to_app` method in Rack::Builder to find gems to instrument during " \
-                           "application startup.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of Rack. When enabled, the agent hooks into the ' \
+                           '`to_app` method in Rack::Builder to find gems to instrument during ' \
+                           'application startup.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.rack_urlmap' => {
-          :default => instrumentation_value_of(:disable_rack_urlmap),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
@@ -1799,40 +1510,37 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :description => 'Controls auto-instrumentation of Rack::URLMap at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.rake' => {
-          :default => instrumentation_value_of(:disable_rake),
-          :documentation_default => 'auto',
-          :public => :true,
+          :default => 'auto',
+          :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of rake at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of rake at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.redis' => {
-          :default => instrumentation_value_of(:disable_redis),
-          :documentation_default => 'auto',
+          :default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Redis at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of Redis at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.resque' => {
-          :default => instrumentation_value_of(:disable_resque),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of resque at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of resque at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.sinatra' => {
-          :default => instrumentation_value_of(:disable_sinatra),
-          :documentation_default => 'auto',
-          :public => :true,
+          :default => 'auto',
+          :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Sinatra at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of Sinatra at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.thread' => {
           :default => 'auto',
@@ -1840,24 +1548,24 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of the Thread class at start up to allow the agent to correctly nest spans inside of an asynchronous transaction. This does not enable the agent to automatically trace all threads created (see `instrumentation.thread.tracing`). May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of the Thread class at start up to allow the agent to correctly nest spans inside of an asynchronous transaction. This does not enable the agent to automatically trace all threads created (see `instrumentation.thread.tracing`). May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.thread.tracing' => {
-          :default => false,
+          :default => true,
           :public => true,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of the Thread class at start up to automatically add tracing to all Threads created in the application."
+          :description => 'Controls auto-instrumentation of the Thread class at start up to automatically add tracing to all Threads created in the application.'
         },
         :'thread_ids_enabled' => {
           :default => false,
           :public => false,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => "If enabled, will append the current Thread and Fiber object ids onto the segment names of segments created in Threads and concurrent-ruby"
+          :description => 'If enabled, will append the current Thread and Fiber object ids onto the segment names of segments created in Threads and concurrent-ruby'
         },
         :'instrumentation.tilt' => {
-          :default => "auto",
+          :default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
@@ -1865,13 +1573,13 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :description => 'Controls auto-instrumentation of the Tilt template rendering library at start up. May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.typhoeus' => {
-          :default => instrumentation_value_of(:disable_typhoeus),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => "Controls auto-instrumentation of Typhoeus at start up.  May be one of [auto|prepend|chain|disabled]."
+          :description => 'Controls auto-instrumentation of Typhoeus at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         # Message tracer
         :'message_tracer.segment_parameters.enabled' => {
@@ -1907,12 +1615,17 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
         # Rails
         :'defer_rails_initialization' => {
           :default => false,
-          :public => false,
+          :public => true,
           :type => Boolean,
+          :external => true, # this config is used directly from the ENV variables
           :allowed_from_server => false,
-          :description => 'This configuration option is currently unreachable. Please do not use. ' \
-            'If `true`, when the agent is in an application using Ruby on Rails, it will start after ' \
-            'config/initializers have run.'
+          :description => <<-DESCRIPTION
+            If `true`, when the agent is in an application using Ruby on Rails, it will start after `config/initializers` run.
+
+            <Callout variant="caution">
+              This option may only be set by environment variable.
+            </Callout>
+          DESCRIPTION
         },
         # Rake
         :'rake.tasks' => {
@@ -1934,16 +1647,6 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => false,
           :description => 'Timeout for waiting on connect to complete before a rake task'
         },
-        # Resque
-        :'resque.capture_params' => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :dynamic_name => true,
-          :deprecated => true,
-          :description => 'If `true`, enables the capture of job arguments for transaction traces and traced errors in Resque.'
-        },
         # Rules
         :'rules.ignore_url_regexes' => {
           :default => [],
@@ -1953,16 +1656,6 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :transform => DefaultSource.method(:convert_to_regexp_list),
           :description => 'Define transactions you want the agent to ignore, by specifying a list of patterns matching the URI you want to ignore. For more detail, see [the docs on ignoring specific transactions](/docs/agents/ruby-agent/api-guides/ignoring-specific-transactions/#config-ignoring).'
         },
-        # Sidekiq
-        :'sidekiq.capture_params' => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :dynamic_name => true,
-          :deprecated => true,
-          :description => 'If `true`, enables the capture of job arguments for transaction traces and traced errors in Sidekiq.'
-        },
         # Slow SQL
         :'slow_sql.enabled' => {
           :default => value_of(:'transaction_tracer.enabled'),
@@ -2017,7 +1710,7 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :type => Integer,
           :allowed_from_server => false,
           :external => :infinite_tracing,
-          :description => "Sets the maximum number of span events to buffer when streaming to the trace observer."
+          :description => 'Sets the maximum number of span events to buffer when streaming to the trace observer.'
         },
         :'span_events.max_samples_stored' => {
           :default => 2000,
@@ -2151,7 +1844,7 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :description => 'Real user monitoring license key for the browser timing header.'
         },
         :'browser_monitoring.loader' => {
-          :default => DefaultSource.browser_monitoring_loader,
+          :default => 'rum',
           :public => false,
           :type => String,
           :allowed_from_server => true,
@@ -2207,15 +1900,6 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => true,
           :description => 'Number of seconds betwixt connections to the New Relic data collection service.'
         },
-        :disable_grape_instrumentation => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.grape',
-            'If `true`, the agent won\'t install Grape instrumentation.')
-        },
         :dispatcher => {
           :default => DefaultSource.dispatcher,
           :public => false,
@@ -2237,31 +1921,6 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => false,
           :description => 'Internal name for controlling Rails 3+ middleware instrumentation'
         },
-        :disable_rake_instrumentation => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.rake', 'Enable or disable Rake instrumentation. Preferred key is `disable_rake`')
-        },
-        :disable_redis_instrumentation => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.redis', 'Disables installation of Redis instrumentation. Standard key to use is disable_redis.')
-        },
-        :cross_application_tracing => {
-          :default => nil,
-          :allow_nil => true,
-          :public => false,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => 'Deprecated in favor of distributed_tracing.enabled'
-        },
         :enabled => {
           :default => true,
           :public => false,
@@ -2299,17 +1958,8 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => true,
           :description => 'Number of seconds betwixt connections to the New Relic event collection services.'
         },
-        :'event_report_period.analytic_event_data' => {
-          :default => 60,
-          :public => false,
-          :type => Integer,
-          :dynamic_name => true,
-          :deprecated => true,
-          :allowed_from_server => true,
-          :description => deprecated_description(:'event_report_period.transaction_event_data', 'Number of seconds betwixt connections to the New Relic transaction event collection services.')
-        },
         :'event_report_period.transaction_event_data' => {
-          :default => value_of(:'event_report_period.analytic_event_data'),
+          :default => 60,
           :public => false,
           :type => Integer,
           :dynamic_name => true,
@@ -2367,7 +2017,7 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :public => false,
           :type => String,
           :allowed_from_server => false,
-          :description => "URI for the New Relic data collection service."
+          :description => 'URI for the New Relic data collection service.'
         },
         :'infinite_tracing.batching' => {
           :default => true,
@@ -2376,7 +2026,7 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => false,
           :external => :infinite_tracing,
           :description => "If `true` (the default), data sent to the trace observer is batched\ninstead of sending " \
-                          "each span individually."
+                          'each span individually.'
         },
         :'infinite_tracing.compression_level' => {
           :default => :high,
@@ -2401,14 +2051,6 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => true,
           :description => 'JavaScript agent loader content.'
         },
-        :js_errors_beta => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => 'Enable or disable beta JavaScript error reporting.'
-        },
         :keep_alive_timeout => {
           :default => 60,
           :public => false,
@@ -2416,14 +2058,6 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => true,
           :description => 'Timeout for keep alive on TCP connection to collector if supported by Ruby version. Only used in conjunction when aggressive_keepalive is enabled.'
         },
-        :keep_retrying => {
-          :default => true,
-          :public => false,
-          :type => Boolean,
-          :deprecated => true,
-          :allowed_from_server => false,
-          :description => 'Enable or disable retrying failed connections to the New Relic data collection service.'
-        },
         :max_payload_size_in_bytes => {
           :default => 1000000,
           :public => false,
@@ -2445,15 +2079,6 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => false,
           :description => 'Port for the New Relic data collection service.'
         },
-        :prepend_net_instrumentation => {
-          :default => true,
-          :public => false,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :deprecated => true,
-          :description => deprecated_description(:'instrumentation.net_http',
-            'If `true`, uses `Module#prepend` rather than alias_method for Net::HTTP instrumentation.')
-        },
         :primary_application_id => {
           :default => nil,
           :allow_nil => true,