Fixup

Author: hmstepanek

newrelic/api/transaction.py

@@ -657,7 +657,7 @@ def sampled(self):
     @property
     def ct_sampled(self):
         # If DT doesn't sample it CT will.
-        if not self.sampled and (self._settings.distributed_tracing.drop_inprocess_spans.enabled or self._settings.distributed_tracing.unique_spans.enabled):
+        if not self.sampled and self._settings.distributed_tracing.sampler.partial_granularity.enabled:
             return True
         return False
 

newrelic/config.py

@@ -451,9 +451,6 @@ def _process_configuration(section):
     _process_setting(section, "custom_insights_events.max_attribute_value", "getint", None)
     _process_setting(section, "ml_insights_events.enabled", "getboolean", None)
     _process_setting(section, "distributed_tracing.enabled", "getboolean", None)
-    _process_setting(section, "distributed_tracing.drop_inprocess_spans.enabled", "getboolean", None)
-    _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)

newrelic/core/node_mixin.py

@@ -121,7 +121,7 @@ def span_events(self, settings, base_attrs=None, parent_guid=None, attr_class=di
         if span:  # span will be None if the span is an inprocess span or repeated exit span.
             yield span
             # Compressed spans are always reparented onto the entry span.
-            if not settings.distributed_tracing.unique_spans.enabled or span[0].get("nr.entryPoint"):
+            if not settings.distributed_tracing.sampler.partial_granularity.type == "compact" or span[0].get("nr.entryPoint"):
                 parent_id = self.guid
         for child in self.children:
             for event in child.span_events(  # noqa: UP028