Move config consolidation into global settings

Author: hmstepanek

newrelic/config.py

@@ -319,6 +319,47 @@ def _process_setting(section, option, getter, mapper):
         _raise_configuration_error(section, option)
 
 
+def _process_dt_setting(section, option_p1, option_p2, getter):
+    try:
+        # The type of a value is dictated by the getter
+        # function supplied.
+
+        value1 = getattr(_config_object, getter)(section, option_p1)
+        value2 = getattr(_config_object, getter)(section, option_p2)
+
+        # Now need to apply the option from the
+        # configuration file to the internal settings
+        # object. Walk the object path and assign it.
+
+        target = _settings
+        fields = option_p1.split(".", 1)
+
+        while True:
+            if len(fields) == 1:
+                value = value1 or value2 or "default"
+                setattr(target, fields[0], value)
+                break
+            target = getattr(target, fields[0])
+            fields = fields[1].split(".", 1)
+
+        # Cache the configuration so can be dumped out to
+        # log file when whole main configuration has been
+        # processed. This ensures that the log file and log
+        # level entries have been set.
+
+        _cache_object.append((option_p1, value1))
+        _cache_object.append((option_p2, value2))
+
+    except configparser.NoSectionError:
+        pass
+
+    except configparser.NoOptionError:
+        pass
+
+    except Exception:
+        _raise_configuration_error(section, option)
+
+
 # Processing of all the settings for specified section except
 # for log file and log level which are applied separately to
 # ensure they are set as soon as possible.
@@ -405,11 +446,9 @@ def _process_configuration(section):
     _process_setting(section, "distributed_tracing.enabled", "getboolean", None)
     _process_setting(section, "distributed_tracing.exclude_newrelic_header", "getboolean", None)
     _process_setting(section, "distributed_tracing.sampler.adaptive_sampling_target", "getint", None)
-    _process_setting(section, "distributed_tracing.sampler.remote_parent_sampled", "get", None)
-    _process_setting(section, "distributed_tracing.sampler.remote_parent_not_sampled", "get", None)
+    _process_dt_setting(section, "distributed_tracing.sampler.full_granularity.remote_parent_sampled", "distributed_tracing.sampler.remote_parent_sampled", "get")
+    _process_dt_setting(section, "distributed_tracing.sampler.full_granularity.remote_parent_not_sampled", "distributed_tracing.sampler.remote_parent_not_sampled", "get")
     _process_setting(section, "distributed_tracing.sampler.full_granularity.enabled", "getboolean", None)
-    _process_setting(section, "distributed_tracing.sampler.full_granularity.remote_parent_sampled", "get", None)
-    _process_setting(section, "distributed_tracing.sampler.full_granularity.remote_parent_not_sampled", "get", None)
     _process_setting(section, "distributed_tracing.sampler.partial_granularity.enabled", "getboolean", None)
     _process_setting(section, "distributed_tracing.sampler.partial_granularity.type", "get", None)
     _process_setting(section, "distributed_tracing.sampler.partial_granularity.remote_parent_sampled", "get", None)

newrelic/core/config.py

@@ -849,20 +849,18 @@ def default_otlp_host(host):
 _settings.distributed_tracing.sampler.adaptive_sampling_target = _environ_as_int(
     "NEW_RELIC_DISTRIBUTED_TRACING_SAMPLER_ADAPTIVE_SAMPLING_TARGET", default=10
 )
-_settings.distributed_tracing.sampler.remote_parent_sampled = os.environ.get(
-    "NEW_RELIC_DISTRIBUTED_TRACING_SAMPLER_REMOTE_PARENT_SAMPLED", "default"
-)
-_settings.distributed_tracing.sampler.remote_parent_not_sampled = os.environ.get(
-    "NEW_RELIC_DISTRIBUTED_TRACING_SAMPLER_REMOTE_PARENT_NOT_SAMPLED", "default"
-)
 _settings.distributed_tracing.sampler.full_granularity.enabled = _environ_as_bool(
     "NEW_RELIC_DISTRIBUTED_TRACING_SAMPLER_FULL_GRANULARITY_ENABLED", default=True
 )
 _settings.distributed_tracing.sampler.full_granularity.remote_parent_sampled = os.environ.get(
     "NEW_RELIC_DISTRIBUTED_TRACING_SAMPLER_FULL_GRANULARITY_REMOTE_PARENT_SAMPLED", None
+) or os.environ.get(
+    "NEW_RELIC_DISTRIBUTED_TRACING_SAMPLER_REMOTE_PARENT_SAMPLED", "default"
 )
 _settings.distributed_tracing.sampler.full_granularity.remote_parent_not_sampled = os.environ.get(
     "NEW_RELIC_DISTRIBUTED_TRACING_SAMPLER_FULL_GRANULARITY_REMOTE_PARENT_NOT_SAMPLED", None
+) or os.environ.get(
+    "NEW_RELIC_DISTRIBUTED_TRACING_SAMPLER_REMOTE_PARENT_NOT_SAMPLED", "default"
 )
 _settings.distributed_tracing.sampler.partial_granularity.enabled = _environ_as_bool(
     "NEW_RELIC_DISTRIBUTED_TRACING_SAMPLER_PARTIAL_GRANULARITY_ENABLED", default=False
@@ -1408,20 +1406,6 @@ def finalize_application_settings(server_side_config=None, settings=_settings):
 
 
 def simplify_distributed_tracing_sampler_granularity_settings(settings):
-    # Full granularity settings may appear under:
-    # * `distributed_tracing.sampler`
-    # * `distributed_tracing.sampler.full_granularity`
-    # The `distributed_tracing.sampler.full_granularity` path takes precedence.
-    # To simplify logic in the code that uses these settings, store the values that
-    # should be used at the `distributed_tracing.sampler.full_granularity` path.
-    if not settings.distributed_tracing.sampler.full_granularity.remote_parent_sampled:
-        settings.distributed_tracing.sampler.full_granularity.remote_parent_sampled = (
-            settings.distributed_tracing.sampler.remote_parent_sampled
-        )
-    if not settings.distributed_tracing.sampler.full_granularity.remote_parent_not_sampled:
-        settings.distributed_tracing.sampler.full_granularity.remote_parent_not_sampled = (
-            settings.distributed_tracing.sampler.remote_parent_not_sampled
-        )
     # Partial granularity tracing is not available in infinite tracing mode.
     if settings.infinite_tracing.enabled and settings.distributed_tracing.sampler.partial_granularity.enabled:
         _logger.warning(