newrelic_rpm 9.23.0 → 10.0.0

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

@@ -4,6 +4,8 @@
 
 require 'forwardable'
 require_relative '../../constants'
+require_relative '../instrumentation/active_support_subscriber'
+require_relative 'sampler_config_validator'
 
 module NewRelic
   module Agent
@@ -35,15 +37,6 @@ module NewRelic
       end
 
       class DefaultSource
-        BOOLEAN_MAP = {
-          'true' => true,
-          'yes' => true,
-          'on' => true,
-          'false' => false,
-          'no' => false,
-          'off' => false
-        }.freeze
-
         attr_reader :defaults
 
         extend Forwardable
@@ -73,12 +66,6 @@ module NewRelic
           value_from_defaults(key, :allowlist)
         end
 
-        def self.boolean_for(key, value)
-          string_value = (value.respond_to?(:call) ? value.call : value).to_s
-
-          BOOLEAN_MAP.fetch(string_value, nil)
-        end
-
         def self.default_for(key)
           value_from_defaults(key, :default)
         end
@@ -213,84 +200,21 @@ module NewRelic
           end
         end
 
-        def self.api_host
-          # only used for deployment task
-          proc do
-            api_version = if NewRelic::Agent.config[:api_key].nil? || NewRelic::Agent.config[:api_key].empty?
-              'rpm'
-            else
-              'api'
-            end
-            api_region = 'eu.' if String(NewRelic::Agent.config[:license_key]).start_with?('eu')
-
-            "#{api_version}.#{api_region}newrelic.com"
-          end
-        end
-
-        def self.convert_to_regexp_list(raw_value)
-          value_list = convert_to_list(raw_value)
-          value_list.map do |value|
-            /#{value}/
-          end
-        end
-
-        def self.convert_to_list(value)
-          case value
-          when String
-            value.split(/\s*,\s*/)
-          when Array
-            value
-          else
-            raise ArgumentError.new("Config value '#{value}' couldn't be turned into a list.")
-          end
-        end
-
-        def self.convert_to_hash(value)
-          return value if value.is_a?(Hash)
-
-          if value.is_a?(String)
-            return value.split(',').each_with_object({}) do |item, hash|
-              key, value = item.split('=')
-              hash[key] = value
-            end
-          end
-
-          raise ArgumentError.new(
-            "Config value '#{value}' of " \
-            "class #{value.class} couldn't be turned into a Hash."
-          )
-        end
-
-        SEMICOLON = ';'.freeze
-        def self.convert_to_list_on_semicolon(value)
-          case value
-          when Array then value
-          when String then value.split(SEMICOLON)
-          else NewRelic::EMPTY_ARRAY
-          end
+        def self.convert_to_regexp_list(string_array)
+          string_array.map { |value| /#{value}/ }
         end
 
-        def self.convert_to_constant_list(raw_value)
-          return NewRelic::EMPTY_ARRAY if raw_value.nil? || raw_value.empty?
+        def self.convert_to_constant_list(string_array)
+          return string_array if string_array.empty?
 
-          constants = convert_to_list(raw_value).map! do |class_name|
+          constants = string_array.map! do |class_name|
             const = ::NewRelic::LanguageSupport.constantize(class_name)
-            NewRelic::Agent.logger.warn("Ignoring invalid constant '#{class_name}' in #{raw_value}") unless const
+            NewRelic::Agent.logger.warn("Ignoring invalid constant '#{class_name}' in #{string_array}") unless const
             const
           end
           constants.compact!
           constants
         end
-
-        def self.enforce_fallback(allowed_values: nil, fallback: nil)
-          proc do |configured_value|
-            if allowed_values.any? { |v| v =~ /#{configured_value}/i }
-              configured_value
-            else
-              fallback
-            end
-          end
-        end
       end
 
       AUTOSTART_DENYLISTED_RAKE_TASKS = [
@@ -361,7 +285,8 @@ module NewRelic
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list_on_semicolon),
+          :transform => proc { |v| v.is_a?(String) ? v.split(';') : v },
+          :transformed_type => Array,
           :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`.'
         },
         :license_key => {
@@ -422,14 +347,6 @@ module NewRelic
           :allowed_from_server => true,
           :description => 'For agent versions 3.5.0 or higher, [set your Apdex T via the New Relic UI](/docs/apm/new-relic-apm/apdex/changing-your-apdex-settings).'
         },
-        :api_key => {
-          :default => '',
-          :public => true,
-          :type => String,
-          :allowed_from_server => false,
-          :exclude_from_reported_settings => true,
-          :description => '# DEPRECATED: The `api_key` config setting is now deprecated. Its only use was for the `newrelic deployments` command, which is being removed in agent version 10.0.0.'
-        },
         :backport_fast_active_record_connection_lookup => {
           :default => false,
           :public => true,
@@ -526,6 +443,7 @@ module NewRelic
           :public => true,
           :type => String,
           :allowed_from_server => false,
+          :transformed_type => Hash, # NOTE: :labels is a special case and transformed in manager.rb without a :transform key
           :description => 'A dictionary of [label names](/docs/data-analysis/user-interface-functions/labels-categories-organize-your-apps-servers) and values that will be applied to the data sent from this agent. May also be expressed as a semicolon-delimited `;` string of colon-separated `:` pairs. For example, `Server:One;Data Center:Primary`.'
         },
         :log_file_name => {
@@ -598,13 +516,6 @@ module NewRelic
           :exclude_from_reported_settings => true,
           :description => 'Defines a user for communicating with the New Relic [collector](/docs/using-new-relic/welcome-new-relic/get-started/glossary/#collector) via a proxy server.'
         },
-        :security_policies_token => {
-          :default => '',
-          :public => true,
-          :type => String,
-          :allowed_from_server => false,
-          :description => 'Applies Language Agent Security Policy settings.'
-        },
         :send_data_on_exit => {
           :default => true,
           :public => true,
@@ -877,7 +788,6 @@ module NewRelic
           :default => {},
           :public => true,
           :type => Hash,
-          :transform => DefaultSource.method(:convert_to_hash),
           :allowed_from_server => false,
           :description => 'A hash with key/value pairs to add as custom attributes to all log events forwarded to New Relic. If sending using an environment variable, the value must be formatted like: "key1=value1,key2=value2"'
         },
@@ -892,7 +802,6 @@ module NewRelic
           :default => [],
           :public => true,
           :type => Array,
-          :transform => DefaultSource.method(:convert_to_list),
           :allowed_from_server => false,
           :description => 'A case-insensitive array or comma-delimited string containing the labels to exclude from log records.'
         },
@@ -938,7 +847,6 @@ module NewRelic
           :public => true,
           :type => Array,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => 'Prefix of attributes to exclude from all destinations. Allows `*` as wildcard at end.'
         },
         :'attributes.include' => {
@@ -946,7 +854,6 @@ module NewRelic
           :public => true,
           :type => Array,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => 'Prefix of attributes to include in all destinations. Allows `*` as wildcard at end.'
         },
         :'browser_monitoring.attributes.enabled' => {
@@ -961,7 +868,6 @@ module NewRelic
           :public => true,
           :type => Array,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => 'Prefix of attributes to exclude from browser monitoring. Allows `*` as wildcard at end.'
         },
         :'browser_monitoring.attributes.include' => {
@@ -969,7 +875,6 @@ module NewRelic
           :public => true,
           :type => Array,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => 'Prefix of attributes to include in browser monitoring. Allows `*` as wildcard at end.'
         },
         :'error_collector.attributes.enabled' => {
@@ -984,7 +889,6 @@ module NewRelic
           :public => true,
           :type => Array,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => 'Prefix of attributes to exclude from error collection. Allows `*` as wildcard at end.'
         },
         :'error_collector.attributes.include' => {
@@ -992,7 +896,6 @@ module NewRelic
           :public => true,
           :type => Array,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => 'Prefix of attributes to include in error collection. Allows `*` as wildcard at end.'
         },
         :'span_events.attributes.enabled' => {
@@ -1007,7 +910,6 @@ module NewRelic
           :public => true,
           :type => Array,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => 'Prefix of attributes to exclude from span events. Allows `*` as wildcard at end.'
         },
         :'span_events.attributes.include' => {
@@ -1015,7 +917,6 @@ module NewRelic
           :public => true,
           :type => Array,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => 'Prefix of attributes to include on span events. Allows `*` as wildcard at end.'
         },
         :'transaction_events.attributes.enabled' => {
@@ -1030,7 +931,6 @@ module NewRelic
           :public => true,
           :type => Array,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => 'Prefix of attributes to exclude from transaction events. Allows `*` as wildcard at end.'
         },
         :'transaction_events.attributes.include' => {
@@ -1038,7 +938,6 @@ module NewRelic
           :public => true,
           :type => Array,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => 'Prefix of attributes to include in transaction events. Allows `*` as wildcard at end.'
         },
         :'transaction_segments.attributes.enabled' => {
@@ -1053,7 +952,6 @@ module NewRelic
           :public => true,
           :type => Array,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => 'Prefix of attributes to exclude from transaction segments. Allows `*` as wildcard at end.'
         },
         :'transaction_segments.attributes.include' => {
@@ -1061,7 +959,6 @@ module NewRelic
           :public => true,
           :type => Array,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => 'Prefix of attributes to include on transaction segments. Allows `*` as wildcard at end.'
         },
         :'transaction_tracer.attributes.enabled' => {
@@ -1076,7 +973,6 @@ module NewRelic
           :public => true,
           :type => Array,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => 'Prefix of attributes to exclude from transaction traces. Allows `*` as wildcard at end.'
         },
         :'transaction_tracer.attributes.include' => {
@@ -1084,7 +980,6 @@ module NewRelic
           :public => true,
           :type => Array,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => 'Prefix of attributes to include in transaction traces. Allows `*` as wildcard at end.'
         },
         # Audit log
@@ -1101,6 +996,7 @@ module NewRelic
           :type => Array,
           :allowed_from_server => false,
           :transform => DefaultSource.method(:convert_to_regexp_list),
+          :transformed_type => Array,
           :description => 'List of allowed endpoints to include in audit log.'
         },
         :'audit_log.path' => {
@@ -1156,18 +1052,6 @@ module NewRelic
           :description => "If `true`, the agent will report source code level metrics for traced methods.\n\tSee: " \
                           'https://docs.newrelic.com/docs/apm/agents/ruby-agent/features/ruby-codestream-integration/'
         },
-        # Cross application tracer
-        :"cross_application_tracer.enabled" => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => true,
-          :deprecated => true,
-          :description => deprecated_description(
-            :'distributed_tracing.enabled',
-            '  If `true`, enables [cross-application tracing](/docs/agents/ruby-agent/features/cross-application-tracing-ruby/) when `distributed_tracing.enabled` is set to `false`.'
-          )
-        },
         # Custom attributes
         :'custom_attributes.enabled' => {
           :default => true,
@@ -1182,6 +1066,7 @@ module NewRelic
           :type => Array,
           :allowed_from_server => false,
           :transform => proc { |arr| NewRelic::Agent.add_automatic_method_tracers(arr) },
+          :transformed_type => Array,
           :description => <<~DESCRIPTION
             An array of `CLASS#METHOD` (for instance methods) and/or `CLASS.METHOD` (for class methods) strings representing Ruby methods that the agent can automatically add custom instrumentation to. This doesn't require any modifications of the source code that defines the methods.
 
@@ -1424,20 +1309,7 @@ module NewRelic
           :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).
-
-            \t<Callout variant="important">
-            \t\tCross 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.
-
-            \t\tTo continue using cross application tracing, update the following options in your `newrelic.yml` configuration file:
-
-            \t\t```yaml
-            \t\t\tcross_application_tracer:
-            \t\t\t\tenabled: true
-            \t\t\tdistributed_tracing:
-            \t\t\t\tenabled: false
-            \t\t```
-            \t</Callout>
+            If `true`, disables agent middleware for Sinatra. This middleware is responsible for advanced feature support such as [distributed tracing](/docs/apm/distributed-tracing/getting-started/introduction-distributed-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
         },
         :disable_view_instrumentation => {
@@ -1463,19 +1335,68 @@ module NewRelic
           :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.'
         },
+        :'distributed_tracing.sampler.root' => {
+          :default => 'adaptive',
+          :public => true,
+          :type => String,
+          :allowed_from_server => false,
+          :allowlist => %w[adaptive always_on always_off trace_id_ratio_based],
+          :transform => SamplerConfigValidator.validate_sampler_strategy_with_ratio(
+            :'distributed_tracing.sampler.root',
+            :'distributed_tracing.sampler.root.trace_id_ratio_based.ratio'
+          ),
+          :description => 'This setting controls the behavior of transaction sampling for transactions without a remote parent, traces that originate within this instance of the New Relic agent. Available values are `adaptive` (the default), `always_on`, `always_off`, and `trace_id_ratio_based`.'
+        },
         :'distributed_tracing.sampler.remote_parent_sampled' => {
-          :default => 'default',
+          :default => 'adaptive',
           :public => true,
           :type => String,
-          :allowed_from_server => true,
-          :description => 'This setting controls the behavior of transaction sampling when a remote parent is sampled and the trace flag is set in the traceparent. Available values are `default`, `always_on`, and `always_off`.'
+          :allowed_from_server => false,
+          :allowlist => %w[adaptive always_on always_off trace_id_ratio_based],
+          :transform => SamplerConfigValidator.validate_sampler_strategy_with_ratio(
+            :'distributed_tracing.sampler.remote_parent_sampled',
+            :'distributed_tracing.sampler.remote_parent_sampled.trace_id_ratio_based.ratio'
+          ),
+          :description => 'This setting controls the behavior of transaction sampling when a remote parent is sampled. Available values are `adaptive` (the default), `always_on`, `always_off`, and `trace_id_ratio_based`.'
         },
         :'distributed_tracing.sampler.remote_parent_not_sampled' => {
-          :default => 'default',
+          :default => 'adaptive',
           :public => true,
           :type => String,
-          :allowed_from_server => true,
-          :description => 'This setting controls the behavior of transaction sampling when a remote parent is not sampled and the trace flag is not set in the traceparent. Available values are `default`, `always_on`, and `always_off`.'
+          :allowed_from_server => false,
+          :allowlist => %w[adaptive always_on always_off trace_id_ratio_based],
+          :transform => SamplerConfigValidator.validate_sampler_strategy_with_ratio(
+            :'distributed_tracing.sampler.remote_parent_not_sampled',
+            :'distributed_tracing.sampler.remote_parent_not_sampled.trace_id_ratio_based.ratio'
+          ),
+          :description => 'This setting controls the behavior of transaction sampling when a remote parent is not sampled. Available values are `adaptive` (the default), `always_on`, `always_off`, and `trace_id_ratio_based`.'
+        },
+        :'distributed_tracing.sampler.root.trace_id_ratio_based.ratio' => {
+          :default => nil,
+          :public => false,
+          :type => Float,
+          :allow_nil => true,
+          :allowed_from_server => false,
+          :transform => SamplerConfigValidator.method(:validate_sampling_ratio),
+          :description => 'The ratio used for the trace_id_ratio_based sampling decision for the root sampler. This must be a float between 0.0 and 1.0. If you provide an invalid value, the sampler will not use the trace_id_ratio_based sampler and will return to the default behavior. If you do not provide a value, the sampler will not use the trace_id_ratio_based_sampler and fall back to the default sampler.'
+        },
+        :'distributed_tracing.sampler.remote_parent_sampled.trace_id_ratio_based.ratio' => {
+          :default => nil,
+          :public => false,
+          :type => Float,
+          :allow_nil => true,
+          :allowed_from_server => false,
+          :transform => SamplerConfigValidator.method(:validate_sampling_ratio),
+          :description => 'The ratio used for the trace_id_ratio_based sampling decision for the remote parent sampled sampler. This must be a float between 0.0 and 1.0. If you provide an invalid value, the sampler will not use the trace_id_ratio_based sampler and will return to the default behavior. If you do not provide a value, the sampler will not use the trace_id_ratio_based_sampler and fall back to the default sampler.'
+        },
+        :'distributed_tracing.sampler.remote_parent_not_sampled.trace_id_ratio_based.ratio' => {
+          :default => nil,
+          :public => false,
+          :type => Float,
+          :allow_nil => true,
+          :allowed_from_server => false,
+          :transform => SamplerConfigValidator.method(:validate_sampling_ratio),
+          :description => 'The ratio used for the trace_id_ratio_based sampling decision for the remote parent not sampled sampler. This must be a float between 0.0 and 1.0. If you provide an invalid value or do not provide a value, the sampler will not use the trace_id_ratio_based_sampler and fall back to the default sampler.'
         },
         # Elasticsearch
         :'elasticsearch.capture_cluster_name' => {
@@ -1512,7 +1433,6 @@ module NewRelic
           :public => true,
           :type => Array,
           :allowed_from_server => false,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => 'Ordinarily the agent reports dyno names with a trailing dot and process ID (for example, `worker.3`). You can remove this trailing data by specifying the prefixes you want to report without trailing data (for example, `worker`).'
         },
         # Infinite tracing
@@ -1536,6 +1456,24 @@ module NewRelic
           :description => 'Configures the TCP/IP port for the trace observer Host'
         },
         # Instrumentation
+        :'instrumentation.active_support_notifications.active_support_events' => {
+          :default => NewRelic::Agent::Instrumentation::ActiveSupportSubscriber::EVENT_NAME_TO_METHOD_NAME.keys,
+          :public => true,
+          :type => Array,
+          :allowed_from_server => false,
+          :description => <<~ACTIVE_SUPPORT_EVENTS.chomp.tr("\n", ' ')
+            An allowlist array of Active Support notifications events specific to the Active Support library
+            itself that the agent should subscribe to. The Active Support library specific events focus primarily
+            on caching. Any event name not included in this list will be ignored by the agent. Provide complete event
+            names such as 'cache_fetch_hit.active_support'. Do not provide asterisks or regex patterns, and do not
+            escape any characters with backslashes.
+
+            For a complete list of all possible Active Support event names, see the
+            [list of caching names](https://edgeguides.rubyonrails.org/active_support_instrumentation.html#active-support-caching)
+            and the [list of messages names](https://edgeguides.rubyonrails.org/active_support_instrumentation.html#active-support-messages)
+            from the official Rails documentation.
+          ACTIVE_SUPPORT_EVENTS
+        },
         :'instrumentation.active_support_broadcast_logger' => {
           :default => instrumentation_value_from_boolean(:'application_logging.enabled'),
           :documentation_default => 'auto',
@@ -1728,6 +1666,7 @@ module NewRelic
           :type => Array,
           :allowed_from_server => false,
           :transform => DefaultSource.method(:convert_to_regexp_list),
+          :transformed_type => Array,
           :description => %Q(Specifies a list of hostname patterns separated by commas that will match gRPC hostnames that traffic is to be ignored by New Relic for. New Relic's gRPC client instrumentation will ignore traffic streamed to a host matching any of these patterns, and New Relic's gRPC server instrumentation will ignore traffic for a server running on a host whose hostname matches any of these patterns. By default, no traffic is ignored when gRPC instrumentation is itself enabled. For example, `"private.com$,exception.*"`)
         },
         :'instrumentation.grpc_server' => {
@@ -1945,7 +1884,6 @@ module NewRelic
           type: Array,
           dynamic_name: true,
           allowed_from_server: false,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => <<~DESCRIPTION
             An array of strings to specify which keys inside a Stripe event's `user_data` hash should be reported
             to New Relic. Each string in this array will be turned into a regular expression via `Regexp.new` to
@@ -1958,7 +1896,6 @@ module NewRelic
           type: Array,
           dynamic_name: true,
           allowed_from_server: false,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => <<~DESCRIPTION
             An array of strings to specify which keys and/or values inside a Stripe event's `user_data` hash should
             \tnot be reported to New Relic. Each string in this array will be turned into a regular expression via
@@ -2076,6 +2013,7 @@ module NewRelic
           :type => Array,
           :allowed_from_server => false,
           :transform => DefaultSource.method(:convert_to_regexp_list),
+          :transformed_type => Array,
           :description => 'Specify an Array of Rake tasks to automatically instrument. ' \
           'This configuration option converts the Array to a RegEx list. If you\'d like ' \
           'to allow all tasks by default, use `rake.tasks: [.+]`. No rake tasks will be ' \
@@ -2096,6 +2034,7 @@ module NewRelic
           :type => Array,
           :allowed_from_server => true,
           :transform => DefaultSource.method(:convert_to_regexp_list),
+          :transformed_type => Array,
           :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).'
         },
         # Serverless
@@ -2105,6 +2044,7 @@ module NewRelic
           :type => Boolean,
           :allowed_from_server => false,
           :transform => proc { |bool| NewRelic::Agent::ServerlessHandler.env_var_set? || bool },
+          :transformed_type => Boolean,
           :description => 'If `true`, the agent will operate in a streamlined mode suitable for use with short-lived ' \
                           'serverless functions. NOTE: Only AWS Lambda functions are supported currently and this ' \
                           "option isn't intended for use without [New Relic's Ruby Lambda layer](https://docs.newrelic.com/docs/serverless-function-monitoring/aws-lambda-monitoring/get-started/monitoring-aws-lambda-serverless-monitoring/) offering."
@@ -2225,11 +2165,12 @@ module NewRelic
           :description => 'If true, the agent strips messages from all exceptions except those in the [allowed classes list](#strip_exception_messages-allowed_classes). Enabled automatically in [high security mode](/docs/accounts-partnerships/accounts/security/high-security).'
         },
         :'strip_exception_messages.allowed_classes' => {
-          :default => '',
+          :default => NewRelic::EMPTY_ARRAY,
           :public => true,
-          :type => String,
+          :type => Array,
           :allowed_from_server => false,
           :transform => DefaultSource.method(:convert_to_constant_list),
+          :transformed_type => Array,
           :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"`.'
         },
         # Agent Control
@@ -2326,20 +2267,6 @@ module NewRelic
           :allowed_from_server => true,
           :description => 'If true, attempt to keep the TCP connection to the collector alive between harvests.'
         },
-        :api_host => {
-          :default => DefaultSource.api_host,
-          :public => false,
-          :type => String,
-          :allowed_from_server => false,
-          :description => 'API host for New Relic.'
-        },
-        :api_port => {
-          :default => value_of(:port),
-          :public => false,
-          :type => Integer,
-          :allowed_from_server => false,
-          :description => 'Port for the New Relic API host.'
-        },
         :application_id => {
           :default => '',
           :public => false,
@@ -2404,13 +2331,6 @@ module NewRelic
           :allowed_from_server => false,
           :description => "An array of candidate locations for the agent's configuration file."
         },
-        :cross_process_id => {
-          :default => '',
-          :public => false,
-          :type => String,
-          :allowed_from_server => true,
-          :description => 'Cross process ID for cross-application tracing.'
-        },
         :data_report_period => {
           :default => 60,
           :public => false,
@@ -2452,7 +2372,7 @@ module NewRelic
           :public => false,
           :type => String,
           :allowed_from_server => true,
-          :description => 'Encoding key for cross-application tracing.'
+          :description => 'Encoding key for obfuscating/deobfuscating data sent to/from New Relic.'
         },
         :entity_guid => {
           :default => nil,
@@ -2516,8 +2436,14 @@ module NewRelic
           :allowed_from_server => true,
           :description => 'Number of seconds betwixt connections to the New Relic span event collection services.'
         },
-        # TODO: Sync with the other agents to see what the config should be named, how it should be enabled, how it should be described
         :'opentelemetry.enabled' => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'A global configuration option for disabling all OpenTelemetry signals sent through New Relic. If false, no OpenTelemetry signals will be sent to New Relic. If true, the signal-specific enabled config option (e.g. opentelemetry.traces.enabled) determines whether telemetry of that signal type will be reported to New Relic.'
+        },
+        :'opentelemetry.traces.enabled' => {
           :default => false,
           :public => false,
           :type => Boolean,
@@ -2721,7 +2647,7 @@ module NewRelic
           :public => false,
           :type => Array,
           :allowed_from_server => true,
-          :description => 'List of trusted New Relic account IDs for the purposes of cross-application tracing. Inbound requests from applications including cross-application headers that do not come from an account in this list will be ignored.'
+          :description => 'List of trusted New Relic account IDs for validating Synthetics monitor requests. This is set by the server.'
         },
         :trusted_account_key => {
           :default => nil,
@@ -2806,7 +2732,6 @@ module NewRelic
           :type => Array,
           :external => true,
           :allowed_from_server => true,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => 'Defines API paths the security agent should ignore in IAST scans. Accepts an array of regex patterns matching the URI to ignore. The regex pattern should find a complete match for the URL without the endpoint. For example, `[".*account.*"], [".*/\api\/v1\/.*?\/login"]`'
         },
         :'security.exclude_from_iast_scan.http_request_parameters.header' => {
@@ -2815,7 +2740,6 @@ module NewRelic
           :type => Array,
           :external => true,
           :allowed_from_server => true,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => 'An array of HTTP request headers the security agent should ignore in IAST scans. The array should specify a list of patterns matching the headers to ignore.'
         },
         :'security.exclude_from_iast_scan.http_request_parameters.query' => {
@@ -2824,7 +2748,6 @@ module NewRelic
           :type => Array,
           :external => true,
           :allowed_from_server => true,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => 'An array of HTTP request query parameters the security agent should ignore in IAST scans. The array should specify a list of patterns matching the HTTP request query parameters to ignore.'
         },
         :'security.exclude_from_iast_scan.http_request_parameters.body' => {
@@ -2833,7 +2756,6 @@ module NewRelic
           :type => Array,
           :external => true,
           :allowed_from_server => true,
-          :transform => DefaultSource.method(:convert_to_list),
           :description => 'An array of HTTP request body keys the security agent should ignore in IAST scans.'
         },
         :'security.exclude_from_iast_scan.iast_detection_category.insecure_settings' => {