Merge branch '3.12' into backport-14456-to-3.12

Author: P403n1x87

ddtrace/_trace/_span_pointer.py

@@ -64,7 +64,8 @@ def __post_init__(self):
     def __repr__(self):
         return (
             f"SpanPointer(trace_id={self.trace_id}, span_id={self.span_id}, kind={self.kind}, "
-            f"direction={self.direction}, hash={self.hash}, attributes={self.attributes})"
+            f"direction={self.attributes.get('ptr.dir')}, hash={self.attributes.get('ptr.hash')}, "
+            f"attributes={self.attributes})"
         )
 
 

ddtrace/debugging/_exception/replay.py

@@ -266,12 +266,16 @@ def _capture_tb_frame_for_span(
         return snapshot is not None
 
     def on_span_exception(
-        self, span: Span, _exc_type: t.Type[BaseException], exc: BaseException, tb: t.Optional[TracebackType]
+        self, span: Span, _exc_type: t.Type[BaseException], exc: BaseException, traceback: t.Optional[TracebackType]
     ) -> None:
         if span.get_tag(DEBUG_INFO_TAG) == "true" or not can_capture(span):
             # Debug info for span already captured or no budget to capture
             return
 
+        # Prioritize the traceback from the exception, if available. Some
+        # frameworks (like celery) may modify the traceback object that is
+        # passed to the exception handler.
+        tb = exc.__traceback__ or traceback
         chain, exc_id = unwind_exception_chain(exc, tb)
         if not chain or exc_id is None:
             # No exceptions to capture

releasenotes/notes/fix-er-tb-priority-77dc656bdb2c4802.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    exception replay: fixed an issue that prevented snapshots from retrieving
+    local variables from traceback frames from exception thrown by Celery tasks.

releasenotes/notes/fix-spanpointer-repr-565ebb8e6679ebde.yaml

@@ -0,0 +1,3 @@
+fixes:
+  - |
+    tracing: Fixes a bug where calling __repr__ on SpanPointer objected raised an AttributeError. This caused aws_lambdas to crash when debug logging was enabled.

tests/tracer/test_span.py

@@ -855,6 +855,7 @@ def test_span_pprint():
     root.set_metric("m", 1.0)
     root._add_event("message", {"importance": 10}, 16789898242)
     root.set_link(trace_id=99, span_id=10, attributes={"link.name": "s1_to_s2", "link.kind": "scheduled_by"})
+    root._add_span_pointer("test_kind", _SpanPointerDirection.DOWNSTREAM, "test_hash_123", {"extra": "attr"})
 
     root.finish()
     actual = root._pprint()
@@ -867,9 +868,11 @@ def test_span_pprint():
     assert "metrics={'m': 1.0}" in actual
     assert "events=[SpanEvent(name='message', time=16789898242, attributes={'importance': 10})]" in actual
     assert (
-        "[SpanLink(trace_id=99, span_id=10, attributes={'link.name': 's1_to_s2', 'link.kind': 'scheduled_by'}, "
-        "tracestate=None, flags=None, dropped_attributes=0)]"
+        "SpanLink(trace_id=99, span_id=10, attributes={'link.name': 's1_to_s2', 'link.kind': 'scheduled_by'}, "
+        "tracestate=None, flags=None, dropped_attributes=0)"
     ) in actual
+    assert "SpanPointer(trace_id=0, span_id=0, kind=span-pointer" in actual
+    assert "direction=d, hash=test_hash_123" in actual
     assert (
         f"context=Context(trace_id={root.trace_id}, span_id={root.span_id}, _meta={{}}, "
         "_metrics={}, _span_links=[], _baggage={}, _is_remote=False)"