Add support for partial granularity config

Author: hmstepanek

newrelic/config.py

@@ -319,6 +319,55 @@ def _process_setting(section, option, getter, mapper):
         _raise_configuration_error(section, option)
 
 
+def _process_distributed_tracing_sampler_setting(section, option, getter, mapper):
+    try:
+        # The type of a value is dictated by the getter
+        # function supplied.
+        value = getattr(_config_object, getter)(section, option)
+        # The getter parsed the value okay but want to
+        # pass this through a mapping function to change
+        # it to internal value suitable for internal
+        # settings object. This is usually one where the
+        # value was a string.
+        if mapper:
+            value = mapper(value)
+        # 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.split(".")
+        sampler_settings_fields = fields[0:2]
+
+        for field in sampler_settings_fields:
+            target = getattr(target, field)
+        if len(fields) == 2:
+            setattr(target, "_sampler", value)
+        if len(fields) >= 3:
+            sampler_settings_obj = target
+            sampler_value = fields[2]
+            sampler_subsettings = fields[2:]
+            for field in sampler_subsettings[:-1]:
+                target = getattr(target, field)
+            setattr(target, sampler_subsettings[-1], value)
+            breakpoint()
+            existing_sampler_value = getattr(sampler_settings_obj, "_sampler", None)
+            if existing_sampler_value is None:
+                setattr(sampler_settings_obj, "_sampler", sampler_value)
+            elif existing_sampler_value != sampler_value:
+                raise RuntimeError
+        # 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, value))
+    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.
@@ -407,11 +456,12 @@ def _process_configuration(section):
     _process_setting(section, "distributed_tracing.unique_spans.enabled", "getboolean", None)
     _process_setting(section, "distributed_tracing.minimize_attributes.enabled", "getboolean", None)
     _process_setting(section, "distributed_tracing.exclude_newrelic_header", "getboolean", 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_setting(section, "distributed_tracing.sampler.partial_granularity.enabled", "getboolean", None)
+    _process_distributed_tracing_sampler_setting(section, "distributed_tracing.sampler.remote_parent_sampled", "get", None)
+    _process_distributed_tracing_sampler_setting(section, "distributed_tracing.sampler.remote_parent_not_sampled", "get", None)
+    _process_distributed_tracing_sampler_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)
+    _process_setting(section, "distributed_tracing.sampler.partial_granularity.remote_parent_sampled.adaptive.sampling_target", "get", None)
     _process_setting(section, "distributed_tracing.sampler.partial_granularity.remote_parent_not_sampled", "get", None)
     _process_setting(section, "span_events.enabled", "getboolean", None)
     _process_setting(section, "span_events.max_samples_stored", "getint", None)

newrelic/core/config.py

@@ -338,6 +338,42 @@ class DistributedTracingSamplerSettings(Settings):
 
 
 class DistributedTracingSamplerPartialGranularitySettings(Settings):
+    @property
+    def remote_parent_sampled(self):
+        return self._remote_parent_sampled
+
+    @remote_parent_sampled.setter
+    def remote_parent_sampled(self, value):
+        if isinstance(value, str):
+            self._remote_parent_sampled._sampler = value
+        else:
+            self._remote_parent_sampled = value
+
+    @property
+    def remote_parent_not_sampled(self):
+        return self._remote_parent_not_sampled
+
+    @remote_parent_not_sampled.setter
+    def remote_parent_not_sampled(self, value):
+        if isinstance(value, str):
+            self._remote_parent_not_sampled._sampler = value
+        else:
+            self._remote_parent_not_sampled = value
+
+
+class DistributedTracingSamplerPartialGranularityRemoteParentSampledSettings(Settings):
+    _sampler = "default"
+
+
+class DistributedTracingSamplerPartialGranularityRemoteParentSampledAdaptiveSettings(Settings):
+    pass
+
+
+class DistributedTracingSamplerPartialGranularityRemoteParentNotSampledSettings(Settings):
+    _sampler = "default"
+
+
+class DistributedTracingSamplerPartialGranularityRemoteParentNotSampledAdaptiveSettings(Settings):
     pass
 
 
@@ -510,11 +546,12 @@ class EventHarvestConfigHarvestLimitSettings(Settings):
 _settings.datastore_tracer.instance_reporting = DatastoreTracerInstanceReportingSettings()
 _settings.debug = DebugSettings()
 _settings.distributed_tracing = DistributedTracingSettings()
-_settings.distributed_tracing.drop_inprocess_spans = DistributedTracingDropInprocessSpansSettings()
-_settings.distributed_tracing.unique_spans = DistributedTracingUniqueSpansSettings()
-_settings.distributed_tracing.minimize_attributes = DistributedTracingMinimizeAttributesSettings()
 _settings.distributed_tracing.sampler = DistributedTracingSamplerSettings()
 _settings.distributed_tracing.sampler.partial_granularity = DistributedTracingSamplerPartialGranularitySettings()
+_settings.distributed_tracing.sampler.partial_granularity.remote_parent_sampled = DistributedTracingSamplerPartialGranularityRemoteParentSampledSettings()
+_settings.distributed_tracing.sampler.partial_granularity.remote_parent_sampled.adaptive = DistributedTracingSamplerPartialGranularityRemoteParentSampledAdaptiveSettings()
+_settings.distributed_tracing.sampler.partial_granularity.remote_parent_not_sampled = DistributedTracingSamplerPartialGranularityRemoteParentNotSampledSettings()
+_settings.distributed_tracing.sampler.partial_granularity.remote_parent_not_sampled.adaptive = DistributedTracingSamplerPartialGranularityRemoteParentNotSampledAdaptiveSettings()
 _settings.error_collector = ErrorCollectorSettings()
 _settings.error_collector.attributes = ErrorCollectorAttributesSettings()
 _settings.event_harvest_config = EventHarvestConfigSettings()
@@ -855,10 +892,10 @@ def default_otlp_host(host):
 _settings.distributed_tracing.sampler.partial_granularity.type = os.environ.get(
     "NEW_RELIC_DISTRIBUTED_TRACING_SAMPLER_PARTIAL_GRANULARITY_TYPE", "essential"
 )
-_settings.distributed_tracing.sampler.partial_granularity.remote_parent_sampled = os.environ.get(
+_settings.distributed_tracing.sampler.partial_granularity.remote_parent_sampled._sampler = os.environ.get(
     "NEW_RELIC_DISTRIBUTED_TRACING_SAMPLER_PARTIAL_GRANULARITY_REMOTE_PARENT_SAMPLED", "default"
 )
-_settings.distributed_tracing.sampler.partial_granularity.remote_parent_not_sampled = os.environ.get(
+_settings.distributed_tracing.sampler.partial_granularity.remote_parent_not_sampled._sampler = os.environ.get(
     "NEW_RELIC_DISTRIBUTED_TRACING_SAMPLER_PARTIAL_GRANULARITY_REMOTE_PARENT_NOT_SAMPLED", "default"
 )
 _settings.distributed_tracing.exclude_newrelic_header = False