Merge branch 'develop-hybrid-core-tracing' into hybrid-agent-span-links

Author: lrafeei

newrelic/core/attribute.py

@@ -87,9 +87,6 @@
     "message.routingKey",
     "messaging.destination.name",
     "messaging.system",
-    "nr.durations",
-    "nr.ids",
-    "nr.pg",
     "peer.address",
     "peer.hostname",
     "request.headers.accept",

newrelic/core/node_mixin.py

@@ -102,7 +102,7 @@ def _span_event_partial_granularity_reduced(
         # If this is an entry span, add `nr.pg` to indicate transaction is partial
         # granularity sampled.
         if i_attrs.get("nr.entryPoint"):
-            a_attrs["nr.pg"] = True
+            i_attrs["nr.pg"] = True
         # If this is the entry node or an LLM span always return it.
         if i_attrs.get("nr.entryPoint") or i_attrs["name"].startswith("Llm/"):
             ct_exit_spans["kept"] += 1
@@ -143,13 +143,13 @@ def _span_event_partial_granularity_essential(
         # If this is an entry span, add `nr.pg` to indicate transaction is partial
         # granularity sampled.
         if i_attrs.get("nr.entryPoint"):
-            a_attrs["nr.pg"] = True
+            i_attrs["nr.pg"] = True
         # If this is the entry node or an LLM span always return it.
         if i_attrs.get("nr.entryPoint") or i_attrs["name"].startswith("Llm/"):
             ct_exit_spans["kept"] += 1
-            # Only keep `nr.pg`, entity-synthesis, and error agent attributes, and intrinsics.
+            # Only keep entity-synthesis and error agent attributes, and intrinsics.
             a_minimized_attrs = attribute.resolve_agent_attributes(
-                {key: a_attrs[key] for key in exit_span_attrs_present | exit_span_error_attrs_present | {"nr.pg"}},
+                {key: a_attrs[key] for key in exit_span_attrs_present | exit_span_error_attrs_present},
                 settings.attribute_filter,
                 DST_SPAN_EVENTS,
                 attr_class=attr_class,
@@ -195,13 +195,13 @@ def _span_event_partial_granularity_compact(
         # If this is an entry span, add `nr.pg` to indicate transaction is partial
         # granularity sampled.
         if i_attrs.get("nr.entryPoint"):
-            a_attrs["nr.pg"] = True
+            i_attrs["nr.pg"] = True
         # If this is the entry node or an LLM span always return it.
         if i_attrs.get("nr.entryPoint") or i_attrs["name"].startswith("Llm/"):
             ct_exit_spans["kept"] += 1
-            # Only keep `nr.pg`, entity-synthesis, and error agent attributes, and intrinsics.
+            # Only keep entity-synthesis and error agent attributes, and intrinsics.
             a_minimized_attrs = attribute.resolve_agent_attributes(
-                {key: a_attrs[key] for key in exit_span_attrs_present | exit_span_error_attrs_present | {"nr.pg"}},
+                {key: a_attrs[key] for key in exit_span_attrs_present | exit_span_error_attrs_present},
                 settings.attribute_filter,
                 DST_SPAN_EVENTS,
                 attr_class=attr_class,
@@ -227,8 +227,8 @@ def _span_event_partial_granularity_compact(
         # return it.
         if new_exit_span:
             # nr.ids is the list of span guids that share this unqiue exit span.
-            a_minimized_attrs["nr.ids"] = []
-            a_minimized_attrs["nr.durations"] = self.duration
+            i_attrs["nr.ids"] = []
+            i_attrs["nr.durations"] = self.duration
             ct_exit_spans[span_attrs] = [i_attrs, a_minimized_attrs]
             ct_exit_spans["kept"] += 1
             # Only keep entity-synthesis, and error agent attributes, and intrinsics.
@@ -241,31 +241,31 @@ def _span_event_partial_granularity_compact(
             attr_class({key: a_minimized_attrs[key] for key in exit_span_error_attrs_present})
         )
         # Max size for `nr.ids` = 1024. Max length = 63 (each span id is 16 bytes + 8 bytes for list type).
-        if len(ct_exit_spans[span_attrs][1]["nr.ids"]) < 63:
-            ct_exit_spans[span_attrs][1]["nr.ids"].append(self.guid)
+        if len(ct_exit_spans[span_attrs][0]["nr.ids"]) < 63:
+            ct_exit_spans[span_attrs][0]["nr.ids"].append(self.guid)
         else:
             ct_exit_spans["dropped_ids"] += 1
 
         # Compute the new start and end time for all compressed spans and use
         # that to set the duration for all compressed spans.
         current_start_time = ct_exit_spans[span_attrs][0]["timestamp"]
         current_end_time = (
-            ct_exit_spans[span_attrs][0]["timestamp"] / 1000 + ct_exit_spans[span_attrs][1]["nr.durations"]
+            ct_exit_spans[span_attrs][0]["timestamp"] / 1000 + ct_exit_spans[span_attrs][0]["nr.durations"]
         )
         new_start_time = i_attrs["timestamp"]
         new_end_time = i_attrs["timestamp"] / 1000 + i_attrs["duration"]
         set_start_time = min(new_start_time, current_start_time)
         # If the new span starts after the old span's end time or the new span
         # ends before the current span starts; add the durations.
         if current_end_time < new_start_time / 1000 or new_end_time < current_start_time / 1000:
-            set_duration = ct_exit_spans[span_attrs][1]["nr.durations"] + i_attrs["duration"]
+            set_duration = ct_exit_spans[span_attrs][0]["nr.durations"] + i_attrs["duration"]
         # Otherwise, if the new and old span's overlap in time, use the newest
         # end time and subtract the start time from it to calculate the new
         # duration.
         else:
             set_duration = max(current_end_time, new_end_time) - set_start_time / 1000
         ct_exit_spans[span_attrs][0]["timestamp"] = set_start_time
-        ct_exit_spans[span_attrs][1]["nr.durations"] = set_duration
+        ct_exit_spans[span_attrs][0]["nr.durations"] = set_duration
 
     PARTIAL_GRANULARITY_SPAN_EVENT_METHODS = {  # noqa: RUF012
         "reduced": _span_event_partial_granularity_reduced,

newrelic/hooks/hybridagent_opentelemetry.py

@@ -272,6 +272,7 @@ def wrap__get_span(wrapped, instance, args, kwargs):
         value = getattr(properties, _property, None)
         if properties and value:
             params[_property] = value
+
     span = wrapped(*args, **kwargs)
     span.set_attributes(params)
 

tests/agent_features/test_distributed_tracing.py

@@ -143,14 +143,14 @@ def _span_details():
                 user_attrs = captured_event.user_attributes
                 agent_attrs = captured_event.agent_attributes
             else:
-                intrinsics, _, agent_attrs = captured_event
+                intrinsics, _, _ = captured_event
 
             # Find the span by name.
             if not check_value_equals(intrinsics, "name", name):
                 continue
-            assert check_value_length(agent_attrs, "nr.ids", compressed_span_count - 1, mismatches), _span_details()
+            assert check_value_length(intrinsics, "nr.ids", compressed_span_count - 1, mismatches), _span_details()
             assert check_value_between(
-                agent_attrs,
+                intrinsics,
                 "nr.durations",
                 expected_nr_durations_low_bound,
                 expected_nr_durations_high_bound,
@@ -946,16 +946,16 @@ async def call_tests():
     @validate_span_events(
         count=1,  # Entry span.
         exact_intrinsics={
-            "name": "Function/test_distributed_tracing:test_partial_granularity_max_compressed_spans.<locals>._test"
+            "name": "Function/test_distributed_tracing:test_partial_granularity_max_compressed_spans.<locals>._test",
+            "nr.pg": True,
         },
-        exact_agents={"nr.pg": True},
         expected_intrinsics=["duration", "timestamp"],
     )
     @validate_span_events(
         count=1,  # 1 external compressed span.
         exact_intrinsics={"name": "External/localhost:3000/requests/GET"},
+        expected_intrinsics=["nr.durations", "nr.ids"],
         exact_agents={"http.url": "http://localhost:3000/"},
-        expected_agents=["nr.durations", "nr.ids"],
     )
     @validate_compact_span_event(
         name="External/localhost:3000/requests/GET",
@@ -1001,16 +1001,16 @@ async def call_tests():
     @validate_span_events(
         count=1,  # Entry span.
         exact_intrinsics={
-            "name": "Function/test_distributed_tracing:test_partial_granularity_compressed_span_attributes_in_series.<locals>._test"
+            "name": "Function/test_distributed_tracing:test_partial_granularity_compressed_span_attributes_in_series.<locals>._test",
+            "nr.pg": True,
         },
-        exact_agents={"nr.pg": True},
         expected_intrinsics=["duration", "timestamp"],
     )
     @validate_span_events(
         count=1,  # 1 external compressed span.
         exact_intrinsics={"name": "External/localhost:3000/requests/GET"},
+        expected_intrinsics=["nr.durations", "nr.ids"],
         exact_agents={"http.url": "http://localhost:3000/"},
-        expected_agents=["nr.durations", "nr.ids"],
     )
     @validate_compact_span_event(
         name="External/localhost:3000/requests/GET",
@@ -1046,16 +1046,16 @@ def test_partial_granularity_compressed_span_attributes_overlapping():
     @validate_span_events(
         count=1,  # Entry span.
         exact_intrinsics={
-            "name": "Function/test_distributed_tracing:test_partial_granularity_compressed_span_attributes_overlapping.<locals>._test"
+            "name": "Function/test_distributed_tracing:test_partial_granularity_compressed_span_attributes_overlapping.<locals>._test",
+            "nr.pg": True,
         },
-        exact_agents={"nr.pg": True},
         expected_intrinsics=["duration", "timestamp"],
     )
     @validate_span_events(
         count=1,  # 1 external compressed span.
         exact_intrinsics={"name": "External/localhost:3000/requests/GET"},
+        expected_intrinsics=["nr.durations", "nr.ids"],
         exact_agents={"http.url": "http://localhost:3000/"},
-        expected_agents=["nr.durations", "nr.ids"],
     )
     @validate_compact_span_event(
         name="External/localhost:3000/requests/GET",
@@ -1101,9 +1101,9 @@ def foo():
     @validate_span_events(
         count=1,  # Entry span.
         exact_intrinsics={
-            "name": "Function/test_distributed_tracing:test_partial_granularity_reduced_span_attributes.<locals>._test"
+            "name": "Function/test_distributed_tracing:test_partial_granularity_reduced_span_attributes.<locals>._test",
+            "nr.pg": True,
         },
-        exact_agents={"nr.pg": True},
         expected_intrinsics=["duration", "timestamp"],
         expected_agents=["code.function", "code.lineno", "code.namespace"],
     )
@@ -1156,9 +1156,9 @@ def foo():
     @validate_span_events(
         count=1,  # Entry span.
         exact_intrinsics={
-            "name": "Function/test_distributed_tracing:test_partial_granularity_essential_span_attributes.<locals>._test"
+            "name": "Function/test_distributed_tracing:test_partial_granularity_essential_span_attributes.<locals>._test",
+            "nr.pg": True,
         },
-        exact_agents={"nr.pg": True},
         expected_intrinsics=["duration", "timestamp"],
         unexpected_agents=["code.function", "code.lineno", "code.namespace"],
     )
@@ -1491,21 +1491,21 @@ def call_tests():
     @validate_span_events(
         count=1,  # Entry span.
         exact_intrinsics={
-            "name": "Function/test_distributed_tracing:test_partial_granularity_errors_on_compressed_spans.<locals>._test"
+            "name": "Function/test_distributed_tracing:test_partial_granularity_errors_on_compressed_spans.<locals>._test",
+            "nr.pg": True,
         },
-        exact_agents={"nr.pg": True},
         expected_intrinsics=["duration", "timestamp"],
     )
     @validate_span_events(
         count=1,  # 1 external compressed span.
         exact_intrinsics={"name": "External/localhost:3000/requests/GET"},
+        expected_intrinsics=["nr.durations", "nr.ids"],
         exact_agents={
             "http.url": "http://localhost:3000/",
             "error.class": callable_name(Exception),
             "error.message": "Exception 2",
             "error.expected": True,
         },
-        expected_agents=["nr.durations", "nr.ids"],
     )
     @validate_compact_span_event(
         name="External/localhost:3000/requests/GET",
@@ -1554,21 +1554,21 @@ def call_tests():
     @validate_span_events(
         count=1,  # Entry span.
         exact_intrinsics={
-            "name": "Function/test_distributed_tracing:test_partial_granularity_errors_on_compressed_spans_status_overriden.<locals>._test"
+            "name": "Function/test_distributed_tracing:test_partial_granularity_errors_on_compressed_spans_status_overriden.<locals>._test",
+            "nr.pg": True,
         },
-        exact_agents={"nr.pg": True},
         expected_intrinsics=["duration", "timestamp"],
     )
     @validate_span_events(
         count=1,  # 1 external compressed span.
         exact_intrinsics={"name": "External/localhost:3000/requests/GET"},
+        expected_intrinsics=["nr.durations", "nr.ids"],
         exact_agents={
             "http.url": "http://localhost:3000/",
             "error.class": callable_name(Exception),
             "error.message": "Exception 2",
             "error.expected": False,
         },
-        expected_agents=["nr.durations", "nr.ids"],
     )
     @validate_compact_span_event(
         name="External/localhost:3000/requests/GET",