Merge branch 'partial-granularity-type-support' of github.com:newrelic/newrelic-python-agent into partial-granularity-type-support

Author: hmstepanek

newrelic/api/transaction.py

@@ -285,6 +285,7 @@ def __init__(self, application, enabled=None, source=None):
         self.tracestate = ""
         self._priority = None
         self._sampled = None
+        # Remote parent sampled is set from the W3C parent header or the Newrelic header if no W3C parent header is present.
         self._remote_parent_sampled = None
 
         self._distributed_trace_state = 0
@@ -1020,18 +1021,36 @@ def sampling_algo_compute_sampled_and_priority(self, priority, sampled):
                 priority += 1
         return priority, sampled
 
-    def _compute_sampled_and_priority(self, priority, sampled, remote_parent_sampled_path, remote_parent_sampled_setting, remote_parent_not_sampled_path, remote_parent_not_sampled_setting):
+    def _compute_sampled_and_priority(
+        self,
+        priority,
+        sampled,
+        remote_parent_sampled_path,
+        remote_parent_sampled_setting,
+        remote_parent_not_sampled_path,
+        remote_parent_not_sampled_setting,
+    ):
         if self._remote_parent_sampled is None:
             config = "default"  # Use sampling algo.
             _logger.debug("Sampling decision made based on no remote parent sampling decision present.")
         elif self._remote_parent_sampled:
             setting_path = remote_parent_sampled_path
             config = remote_parent_sampled_setting
-            _logger.debug("Sampling decision made based on remote_parent_sampled=%s and %s=%s.", self._remote_parent_sampled, setting_path, config)
+            _logger.debug(
+                "Sampling decision made based on remote_parent_sampled=%s and %s=%s.",
+                self._remote_parent_sampled,
+                setting_path,
+                config,
+            )
         else:  # self._remote_parent_sampled is False.
             setting_path = remote_parent_not_sampled_path
             config = remote_parent_not_sampled_setting
-            _logger.debug("Sampling decision made based on remote_parent_sampled=%s and %s=%s.", self._remote_parent_sampled, setting_path, config)
+            _logger.debug(
+                "Sampling decision made based on remote_parent_sampled=%s and %s=%s.",
+                self._remote_parent_sampled,
+                setting_path,
+                config,
+            )
         if config == "always_on":
             sampled = True
             priority = 2.0
@@ -1042,7 +1061,9 @@ def _compute_sampled_and_priority(self, priority, sampled, remote_parent_sampled
             if config not in ("default", "adaptive"):
                 _logger.warning("%s=%s is not a recognized value. Using 'default' instead.", setting_path, config)
 
-            _logger.debug("Let adaptive sampler algorithm decide based on sampled=%s and priority=%s.", sampled, priority)
+            _logger.debug(
+                "Let adaptive sampler algorithm decide based on sampled=%s and priority=%s.", sampled, priority
+            )
             priority, sampled = self.sampling_algo_compute_sampled_and_priority(priority, sampled)
         return priority, sampled
 
@@ -1055,14 +1076,18 @@ def _make_sampling_decision(self):
         sampled = self._sampled
         # Compute sampling decision for full granularity.
         if self.settings.distributed_tracing.sampler.full_granularity.enabled:
-            _logger.debug("Full granularity tracing is enabled. Asking if full granularity wants to sample. priority=%s, sampled=%s", priority, sampled)
+            _logger.debug(
+                "Full granularity tracing is enabled. Asking if full granularity wants to sample. priority=%s, sampled=%s",
+                priority,
+                sampled,
+            )
             computed_priority, computed_sampled = self._compute_sampled_and_priority(
                 priority,
                 sampled,
-                remote_parent_sampled_path = "distributed_tracing.sampler.full_granularity.remote_parent_sampled",
-                remote_parent_sampled_setting = self.settings.distributed_tracing.sampler.full_granularity.remote_parent_sampled,
-                remote_parent_not_sampled_path = "distributed_tracing.sampler.full_granularity.remote_parent_not_sampled",
-                remote_parent_not_sampled_setting = self.settings.distributed_tracing.sampler.full_granularity.remote_parent_not_sampled,
+                remote_parent_sampled_path="distributed_tracing.sampler.full_granularity.remote_parent_sampled",
+                remote_parent_sampled_setting=self.settings.distributed_tracing.sampler.full_granularity.remote_parent_sampled,
+                remote_parent_not_sampled_path="distributed_tracing.sampler.full_granularity.remote_parent_not_sampled",
+                remote_parent_not_sampled_setting=self.settings.distributed_tracing.sampler.full_granularity.remote_parent_not_sampled,
             )
             _logger.debug("Full granularity sampling decision was %s with priority=%s.", sampled, priority)
             if computed_sampled or not self.settings.distributed_tracing.sampler.partial_granularity.enabled:
@@ -1077,12 +1102,14 @@ def _make_sampling_decision(self):
             self._priority, self._sampled = self._compute_sampled_and_priority(
                 priority,
                 sampled,
-                remote_parent_sampled_path = "distributed_tracing.sampler.partial_granularity.remote_parent_sampled",
-                remote_parent_sampled_setting = self.settings.distributed_tracing.sampler.partial_granularity.remote_parent_sampled,
-                remote_parent_not_sampled_path = "distributed_tracing.sampler.partial_granularity.remote_parent_not_sampled",
-                remote_parent_not_sampled_setting = self.settings.distributed_tracing.sampler.partial_granularity.remote_parent_not_sampled,
+                remote_parent_sampled_path="distributed_tracing.sampler.partial_granularity.remote_parent_sampled",
+                remote_parent_sampled_setting=self.settings.distributed_tracing.sampler.partial_granularity.remote_parent_sampled,
+                remote_parent_not_sampled_path="distributed_tracing.sampler.partial_granularity.remote_parent_not_sampled",
+                remote_parent_not_sampled_setting=self.settings.distributed_tracing.sampler.partial_granularity.remote_parent_not_sampled,
+            )
+            _logger.debug(
+                "Partial granularity sampling decision was %s with priority=%s.", self._sampled, self._priority
             )
-            _logger.debug("Partial granularity sampling decision was %s with priority=%s.", self._sampled, self._priority)
             self._sampling_decision_made = True
             if self._sampled:
                 self.partial_granularity_sampled = True

newrelic/core/agent_protocol.py

@@ -297,7 +297,9 @@ def _connect_payload(app_name, linked_applications, environment, settings):
         connect_settings["browser_monitoring.loader"] = settings["browser_monitoring.loader"]
         connect_settings["browser_monitoring.debug"] = settings["browser_monitoring.debug"]
         connect_settings["ai_monitoring.enabled"] = settings["ai_monitoring.enabled"]
-        connect_settings["distributed_tracing.sampler.adaptive_sampling_target"] = settings["distributed_tracing.sampler.adaptive_sampling_target"]
+        connect_settings["distributed_tracing.sampler.adaptive_sampling_target"] = settings[
+            "distributed_tracing.sampler.adaptive_sampling_target"
+        ]
 
         security_settings = {}
         security_settings["capture_params"] = settings["capture_params"]

newrelic/core/config.py

@@ -856,14 +856,18 @@ def default_otlp_host(host):
 _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.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
 )
 _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
 )
-_settings.distributed_tracing.sampler.partial_granularity.enabled = _environ_as_bool("NEW_RELIC_DISTRIBUTED_TRACING_SAMPLER_PARTIAL_GRANULARITY_ENABLED", default=False)
+_settings.distributed_tracing.sampler.partial_granularity.enabled = _environ_as_bool(
+    "NEW_RELIC_DISTRIBUTED_TRACING_SAMPLER_PARTIAL_GRANULARITY_ENABLED", default=False
+)
 _settings.distributed_tracing.sampler.partial_granularity.type = os.environ.get(
     "NEW_RELIC_DISTRIBUTED_TRACING_SAMPLER_PARTIAL_GRANULARITY_TYPE", "essential"
 )
@@ -1412,16 +1416,21 @@ def simplify_distributed_tracing_sampler_granularity_settings(settings):
     # 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
+        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
+        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(
             "Improper configuration. Infinite tracing cannot be enabled at the same time as partial granularity tracing. Setting distributed_tracing.sampler.partial_granularity.enabled=False."
         )
         settings.distributed_tracing.sampler.partial_granularity.enabled = False
 
+
 def _remove_ignored_configs(server_settings):
     if not server_settings.get("agent_config"):
         return server_settings

newrelic/core/database_node.py

@@ -279,7 +279,15 @@ def trace_node(self, stats, root, connections):
             start_time=start_time, end_time=end_time, name=name, params=params, children=children, label=None
         )
 
-    def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dict, partial_granularity_sampled=False, ct_exit_spans=None):
+    def span_event(
+        self,
+        settings,
+        base_attrs=None,
+        parent_guid=None,
+        attr_class=dict,
+        partial_granularity_sampled=False,
+        ct_exit_spans=None,
+    ):
         sql = self.formatted
 
         if sql:
@@ -288,4 +296,11 @@ def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dic
 
         self.agent_attributes["db.statement"] = sql
 
-        return super().span_event(settings, base_attrs=base_attrs, parent_guid=parent_guid, attr_class=attr_class, partial_granularity_sampled=partial_granularity_sampled, ct_exit_spans=ct_exit_spans)
+        return super().span_event(
+            settings,
+            base_attrs=base_attrs,
+            parent_guid=parent_guid,
+            attr_class=attr_class,
+            partial_granularity_sampled=partial_granularity_sampled,
+            ct_exit_spans=ct_exit_spans,
+        )

newrelic/core/external_node.py

@@ -169,7 +169,15 @@ def trace_node(self, stats, root, connections):
             start_time=start_time, end_time=end_time, name=name, params=params, children=children, label=None
         )
 
-    def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dict, partial_granularity_sampled=False, ct_exit_spans=None):
+    def span_event(
+        self,
+        settings,
+        base_attrs=None,
+        parent_guid=None,
+        attr_class=dict,
+        partial_granularity_sampled=False,
+        ct_exit_spans=None,
+    ):
         self.agent_attributes["http.url"] = self.http_url
 
         i_attrs = (base_attrs and base_attrs.copy()) or attr_class()
@@ -180,4 +188,11 @@ def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dic
         if self.method:
             i_attrs["http.method"] = self.method
 
-        return super().span_event(settings, base_attrs=i_attrs, parent_guid=parent_guid, attr_class=attr_class, partial_granularity_sampled=partial_granularity_sampled, ct_exit_spans=ct_exit_spans)
+        return super().span_event(
+            settings,
+            base_attrs=i_attrs,
+            parent_guid=parent_guid,
+            attr_class=attr_class,
+            partial_granularity_sampled=partial_granularity_sampled,
+            ct_exit_spans=ct_exit_spans,
+        )

newrelic/core/function_node.py

@@ -114,8 +114,23 @@ def trace_node(self, stats, root, connections):
             start_time=start_time, end_time=end_time, name=name, params=params, children=children, label=self.label
         )
 
-    def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dict, partial_granularity_sampled=False, ct_exit_spans=None):
+    def span_event(
+        self,
+        settings,
+        base_attrs=None,
+        parent_guid=None,
+        attr_class=dict,
+        partial_granularity_sampled=False,
+        ct_exit_spans=None,
+    ):
         i_attrs = (base_attrs and base_attrs.copy()) or attr_class()
         i_attrs["name"] = f"{self.group}/{self.name}"
 
-        return super().span_event(settings, base_attrs=i_attrs, parent_guid=parent_guid, attr_class=attr_class, partial_granularity_sampled=partial_granularity_sampled, ct_exit_spans=ct_exit_spans)
+        return super().span_event(
+            settings,
+            base_attrs=i_attrs,
+            parent_guid=parent_guid,
+            attr_class=attr_class,
+            partial_granularity_sampled=partial_granularity_sampled,
+            ct_exit_spans=ct_exit_spans,
+        )

newrelic/core/loop_node.py

@@ -79,8 +79,23 @@ def trace_node(self, stats, root, connections):
             start_time=start_time, end_time=end_time, name=name, params=params, children=children, label=None
         )
 
-    def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dict, partial_granularity_sampled=False, ct_exit_spans=None):
+    def span_event(
+        self,
+        settings,
+        base_attrs=None,
+        parent_guid=None,
+        attr_class=dict,
+        partial_granularity_sampled=False,
+        ct_exit_spans=None,
+    ):
         i_attrs = (base_attrs and base_attrs.copy()) or attr_class()
         i_attrs["name"] = f"EventLoop/Wait/{self.name}"
 
-        return super().span_event(settings, base_attrs=i_attrs, parent_guid=parent_guid, attr_class=attr_class, partial_granularity_sampled=partial_granularity_sampled, ct_exit_spans=ct_exit_spans)
+        return super().span_event(
+            settings,
+            base_attrs=i_attrs,
+            parent_guid=parent_guid,
+            attr_class=attr_class,
+            partial_granularity_sampled=partial_granularity_sampled,
+            ct_exit_spans=ct_exit_spans,
+        )