log-foundry 0.3.1.dev1__tar.gz → 0.3.1.dev2__tar.gz

{log_foundry-0.3.1.dev1 → log_foundry-0.3.1.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: log-foundry
-Version: 0.3.1.dev1
+Version: 0.3.1.dev2
 Summary: Generate logs for your console and JSON events for downstream consumption.
 License-Expression: MIT
 License-File: LICENSE

{log_foundry-0.3.1.dev1 → log_foundry-0.3.1.dev2}/pyproject.toml

@@ -20,7 +20,7 @@ dependencies = [
 ]
 
 # Optional features. Install with: pip install log-foundry[aws]
-version = "0.3.1.dev1"
+version = "0.3.1.dev2"
 
 [project.optional-dependencies]
 aws = ["boto3>=1.34"]              # SQSSink, SNSSink, KinesisSink, FirehoseSink

{log_foundry-0.3.1.dev1 → log_foundry-0.3.1.dev2}/src/log_foundry/decorator.py

@@ -39,7 +39,7 @@ from log_foundry.ids import (
     new_trace_id,
     parse_traceparent,
 )
-from log_foundry.model import Span, end_event, start_event
+from log_foundry.model import Span, backfill_baggage, end_event, start_event
 from log_foundry.worker import Worker
 
 __all__ = ["trace", "continue_trace"]
@@ -245,8 +245,16 @@ def _flush(span: Span) -> None:
 
 
 def _close_span(span: Span, status: str, exc: BaseException | None) -> None:
-    """Append the end event (so the flushed queue is complete), then flush."""
+    """Append the end event, complete the boundary events' baggage, then flush.
+
+    Every path — sync, async, and the error path — closes through here, which is what makes one
+    backfill call enough to cover all three.
+    """
     span.events.append(end_event(span, status, exc))
+    # SPEC-015: the boundary events were built with the baggage known at their construction —
+    # empty for `span.start`, which is buffered before the body runs. Complete them from the
+    # baggage live *now*, while the batch is still ours.
+    backfill_baggage(span, context.get_baggage())
     _flush(span)
 
 

{log_foundry-0.3.1.dev1 → log_foundry-0.3.1.dev2}/src/log_foundry/model.py

@@ -13,7 +13,7 @@ import traceback
 from dataclasses import dataclass, field
 from datetime import datetime, timezone
 
-__all__ = ["Span", "build_event", "start_event", "end_event"]
+__all__ = ["Span", "build_event", "start_event", "end_event", "backfill_baggage"]
 
 # Auto-generated span-boundary event messages. Tests assert on contract fields
 # (``status``, ``trace_id``), never on this text — rename freely.
@@ -104,3 +104,32 @@ def end_event(
             "stack": "".join(traceback.format_exception(type(exc), exc, exc.__traceback__)),
         }
     return event
+
+
+def backfill_baggage(span: Span, baggage: dict[str, object]) -> None:
+    """Merge the span's final baggage into its buffered **boundary** events.
+
+    ``@trace`` buffers ``span.start`` before the body runs, so baggage the body sets on its first
+    line did not exist when that event was built — and :func:`build_event` snapshots ``fields``
+    into each event dict, so a later value has to be written back. Same structural reason as
+    :func:`~log_foundry.decorator._reparent_current_span`. The whole span flushes as one batch at
+    close, so this completes the events before any of them is emitted.
+
+    Boundary events only. An ``info`` emitted before ``set_baggage`` genuinely did not carry it,
+    and rewriting a record of a moment would be a lie; merging over mid-span events would also let
+    baggage override a per-call field, inverting :func:`build_event`'s precedence. Boundary events
+    describe the span as a whole and carry no per-call fields, so baggage correctly wins there over
+    ``cfg.defaults`` and ``span.defaults``.
+
+    The baggage is a parameter rather than read from ``context``: this module does not know where
+    the current span lives (arch §6).
+    """
+    if not baggage:
+        return
+    for event in span.events:
+        # Matched on the message constants, not a position — that ``span.start`` is index 0 is an
+        # implementation detail of when it happens to be appended.
+        if event.get("message") in (_START_MESSAGE, _END_MESSAGE):
+            fields = event.get("fields")
+            if isinstance(fields, dict):
+                event["fields"] = {**fields, **baggage}