trodo-python 2.4.0__py3-none-any.whl → 2.4.1__py3-none-any.whl

trodo/otel/auto_instrument.py

@@ -34,11 +34,17 @@ def _infer_kind(attrs: Dict[str, Any]) -> str:
     return "generic"
 
 
+_ATTR_TRODO_RUN_ID = "trodo.run_id"
+_ATTR_TRODO_PARENT_SPAN_ID = "trodo.parent_span_id"
+
+
 def otel_span_to_trodo_span(otel_span: Any) -> Optional[TrodoSpan]:
-    """Translate an OTel ReadableSpan to our TrodoSpan using GenAI semconv."""
-    ctx = get_active_context()
-    if ctx is None:
-        return None  # span emitted outside of wrap_agent — drop
+    """Translate an OTel ReadableSpan to our TrodoSpan using GenAI semconv.
+
+    Recovers the active run from on_start-stamped attributes when contextvars
+    have been clobbered by httpx/asyncio context loss at span end. Mirrors
+    the trodo-node 2.4.3 bridge behaviour.
+    """
     try:
         span_ctx = (
             otel_span.get_span_context()
@@ -53,15 +59,36 @@ def otel_span_to_trodo_span(otel_span: Any) -> Optional[TrodoSpan]:
         return None
     span_id = f"{span_id_int:016x}" if isinstance(span_id_int, int) else str(span_id_int)
 
+    attrs = dict(getattr(otel_span, "attributes", {}) or {})
+
+    # Prefer on_start-stamped run/parent so async-context loss can't drop
+    # auto-instrumented LLM spans.
+    stamped_run_id = attrs.get(_ATTR_TRODO_RUN_ID)
+    stamped_parent_span_id = attrs.get(_ATTR_TRODO_PARENT_SPAN_ID)
+
+    ctx = get_active_context()
+    run_id = stamped_run_id if isinstance(stamped_run_id, str) else (ctx.run_id if ctx else None)
+    if not run_id:
+        return None  # emitted outside any wrap_agent — drop
+
     parent = getattr(otel_span, "parent", None)
-    parent_span_id: Optional[str] = None
+    otel_parent_span_id: Optional[str] = None
     if parent is not None:
         pid = getattr(parent, "span_id", None)
-        parent_span_id = f"{pid:016x}" if isinstance(pid, int) else str(pid) if pid else None
-    if parent_span_id is None:
-        parent_span_id = ctx.span_id
+        otel_parent_span_id = (
+            f"{pid:016x}" if isinstance(pid, int) else str(pid) if pid else None
+        )
 
-    attrs = dict(getattr(otel_span, "attributes", {}) or {})
+    if isinstance(stamped_parent_span_id, str):
+        parent_span_id: Optional[str] = stamped_parent_span_id
+    elif otel_parent_span_id:
+        parent_span_id = otel_parent_span_id
+    else:
+        parent_span_id = ctx.span_id if ctx else None
+
+    # Strip the internal attrs so they don't leak into the persisted span.
+    attrs.pop(_ATTR_TRODO_RUN_ID, None)
+    attrs.pop(_ATTR_TRODO_PARENT_SPAN_ID, None)
     kind = _infer_kind(attrs)
 
     start_time = getattr(otel_span, "start_time", None)
@@ -70,7 +97,9 @@ def otel_span_to_trodo_span(otel_span: Any) -> Optional[TrodoSpan]:
     ended_at = _hr_to_iso(end_time)
     duration_ms = None
     if start_time and end_time:
-        duration_ms = max(0, int((end_time - start_time) / 1e6))
+        # round-half-to-even semantics are fine here; the constraint is
+        # "integer ms" matching the agent_spans.duration_ms column.
+        duration_ms = max(0, round((end_time - start_time) / 1e6))
 
     status = getattr(otel_span, "status", None)
     status_code = getattr(status, "status_code", None)
@@ -104,7 +133,7 @@ def otel_span_to_trodo_span(otel_span: Any) -> Optional[TrodoSpan]:
 
     return TrodoSpan(
         span_id=span_id,
-        run_id=ctx.run_id,
+        run_id=run_id,
         parent_span_id=parent_span_id,
         kind=kind,
         name=getattr(otel_span, "name", kind),
@@ -131,7 +160,20 @@ class _OtelAdapter:
         self._processor = processor
 
     def on_start(self, span: Any, parent_context: Any = None) -> None:
-        pass
+        # Stamp active run/parent ids while contextvars are still alive.
+        # See otel_span_to_trodo_span() docstring for the failure mode this
+        # guards against (async-context loss across httpx await boundaries).
+        ctx = get_active_context()
+        if ctx is None:
+            return
+        try:
+            set_attr = getattr(span, "set_attribute", None)
+            if callable(set_attr):
+                set_attr(_ATTR_TRODO_RUN_ID, ctx.run_id)
+                if ctx.span_id:
+                    set_attr(_ATTR_TRODO_PARENT_SPAN_ID, ctx.span_id)
+        except Exception:
+            pass  # never break user code
 
     def on_end(self, span: Any) -> None:
         trodo_span = otel_span_to_trodo_span(span)

trodo/otel/helpers.py

@@ -320,14 +320,19 @@ def track_mcp(
     span_id = str(_uuid.uuid4())
     conv_id = session_id or str(_uuid.uuid4())
 
+    # Coerce duration to a non-negative integer. agent_spans.duration_ms is an
+    # integer column and callers occasionally pass floats from time.perf_counter()
+    # deltas — without this, fractional values 500 the ingest.
+    if isinstance(duration_ms, (int, float)) and duration_ms > 0:
+        duration_ms = int(round(duration_ms))
+    else:
+        duration_ms = 0
+
     now = datetime.now(timezone.utc)
     if ended_at is None:
         ended_at = now.isoformat()
     if started_at is None:
-        offset_ms = duration_ms if isinstance(duration_ms, int) and duration_ms > 0 else 0
-        started_at = (now - timedelta(milliseconds=offset_ms)).isoformat()
-    if duration_ms is None:
-        duration_ms = 0
+        started_at = (now - timedelta(milliseconds=duration_ms)).isoformat()
 
     status = "error" if error else "ok"
     if error:

{trodo_python-2.4.0.dist-info → trodo_python-2.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trodo-python
-Version: 2.4.0
+Version: 2.4.1
 Summary: Trodo Analytics SDK for Python — server-side event tracking
 License: ISC
 Keywords: analytics,tracking,trodo,server-side

{trodo_python-2.4.0.dist-info → trodo_python-2.4.1.dist-info}/RECORD

@@ -12,9 +12,9 @@ trodo/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trodo/managers/group_manager.py,sha256=ki3Se3qEoSZfREX63oeDeBmEfZF-ISHLE8azEtLg0tM,3542
 trodo/managers/people_manager.py,sha256=mMVnx40Mlifx6NGgChvohC9ViK6dQu2mkXNHbV8pK1E,2882
 trodo/otel/__init__.py,sha256=yiRFXWUU45bAM2CV37XeO7zf1hmnmjufdP4XO50yEyE,624
-trodo/otel/auto_instrument.py,sha256=J_neFxvO-3YACUvtetY4RdM8xYA_79SZUgPry6hXrm8,9434
+trodo/otel/auto_instrument.py,sha256=7uKhir0o0Mo_od1H2oMf5PHZovcUocHtgV18mRm2Erc,11193
 trodo/otel/context.py,sha256=iJ1rE42-SbO8VZHAxhIl2ZJXgNwLIVps5xLg8GKgfFc,1165
-trodo/otel/helpers.py,sha256=_ImekkJOWWT0pD8Vm1NuKBIps4wjCjx-72SUu7MpAyk,16172
+trodo/otel/helpers.py,sha256=IEAHxAEN-Bvv_ZODrmRzC6PCGGhGTXU7IPcp6iO2nbA,16405
 trodo/otel/processor.py,sha256=jVZkslZlw50G5uRAa7-GMRgn_yvae58EmlWTZL8tMkQ,6285
 trodo/otel/register.py,sha256=YV2EnkUoa-_54YAuChOe-Mg28UUKg8JO7-qhVP9G6u4,7644
 trodo/otel/transport.py,sha256=hzZz8gwSMGJ8CxdijmLn1Ljt18owr9XTWy13DLbwYbw,2441
@@ -25,7 +25,7 @@ trodo/queue/event_queue.py,sha256=EVFZrhlq_kwC3jJ2GK0wMhHISf9UzLCZNDnT_aZ2I2A,87
 trodo/session/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trodo/session/server_session.py,sha256=4bQZc_Zxktmu8RVoyh0qI7tvr8AKsHI5xkGf3jEpWVE,2005
 trodo/session/session_manager.py,sha256=JrgH1VeicmtlxPR4dXEuJbxhi23OelkgwW3-9Slv80o,2525
-trodo_python-2.4.0.dist-info/METADATA,sha256=E-lbxpb5rFqecvK342J_gDgpg3QSSM_jfyYi2O0a1mk,17882
-trodo_python-2.4.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-trodo_python-2.4.0.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
-trodo_python-2.4.0.dist-info/RECORD,,
+trodo_python-2.4.1.dist-info/METADATA,sha256=_V5plcgVHmz0vb9S9fQXgivuVvmsYs2Aict8OViy5FU,17882
+trodo_python-2.4.1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+trodo_python-2.4.1.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
+trodo_python-2.4.1.dist-info/RECORD,,