trodo-python 2.4.0__py3-none-any.whl → 2.5.0__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/otel/wrap_agent.py

@@ -114,12 +114,37 @@ def _aggregate(spans: list[TrodoSpan]) -> Dict[str, Any]:
     }
 
 
+def _mint_anon_distinct_id() -> str:
+    """Mint a server-side anonymous distinct_id for an agent run.
+
+    Mirrors UserIdentity.generateAnonymousDistinctId on the backend
+    (``anon_<ts>_<scope>_<uuid>_<rand>``) so server-SDK anon runs and
+    browser-SDK anon sessions share one prefix the dashboard already
+    filters on.
+
+    Minted client-side (not just server-side) so:
+      * the RunHandle / OTLP span attribute carries the id immediately and
+        downstream ``trodo.feedback(distinct_id=...)`` calls have something
+        to bind to,
+      * users running against an older backend still get a real attributable
+        distinct_id on every ``agent_runs`` row, instead of NULL.
+    """
+    import random
+    import string
+    ts = int(time.time() * 1000)
+    rand = "".join(random.choices(string.ascii_lowercase + string.digits, k=16))
+    return f"anon_{ts}_python_{uuid.uuid4()}_{rand}"
+
+
 class RunHandle:
     """Handle returned by wrap_agent for setting input/output and getting run_id."""
 
-    def __init__(self, run_id: str, agent_name: str) -> None:
+    def __init__(self, run_id: str, agent_name: str, distinct_id: str) -> None:
         self.run_id = run_id
         self.agent_name = agent_name
+        # Always populated — wrap_agent mints anon if caller didn't pass one
+        # so downstream ``trodo.feedback(distinct_id=...)`` always has a target.
+        self.distinct_id = distinct_id
         self.input: Optional[str] = None
         self.output: Optional[str] = None
         self.metadata: Dict[str, Any] = {}
@@ -209,10 +234,16 @@ def start_run(
     to add spans — they flush incrementally via ``append_spans``.
     """
     rid = run_id or str(uuid.uuid4())
+    # Mint anon when missing so the run row is attributable. The minted id
+    # is stamped onto the TrodoRun payload but is not surfaced to the caller —
+    # start_run's signature returns just run_id for backward compat. Callers
+    # who need the distinct_id should pass their own (or use wrap_agent,
+    # whose RunHandle exposes it via handle.distinct_id).
+    effective_distinct_id = distinct_id or _mint_anon_distinct_id()
     run = TrodoRun(
         run_id=rid,
         agent_name=agent_name,
-        distinct_id=distinct_id,
+        distinct_id=effective_distinct_id,
         conversation_id=conversation_id,
         parent_run_id=parent_run_id,
         status="running",
@@ -278,7 +309,11 @@ class wrap_agent:
         self._processor = processor
         self._team_site_id = team_site_id
         self._agent_name = agent_name
-        self._distinct_id = distinct_id
+        # Mint anon when caller didn't pass one. From this point on every
+        # internal path uses self._distinct_id, never the raw constructor
+        # argument, so the run row, OTLP span attribute, and RunHandle all
+        # agree on a single non-null value.
+        self._distinct_id = distinct_id or _mint_anon_distinct_id()
         self._conversation_id = conversation_id
         self._parent_run_id = parent_run_id
         self._metadata = metadata
@@ -312,7 +347,7 @@ class wrap_agent:
         self._started_iso = _now_iso()
         self._started_ms = time.time() * 1000.0
 
-        self.handle = RunHandle(run_id, self._agent_name)
+        self.handle = RunHandle(run_id, self._agent_name, self._distinct_id)
         ctx = ActiveSpanContext(
             run_id=run_id,
             span_id=root_span_id,
@@ -387,8 +422,9 @@ class wrap_agent:
         run_id = _hex_to_uuid(trace_id_hex)
 
         otel_span.set_attribute("trodo.agent_name", self._agent_name)
-        if self._distinct_id:
-            otel_span.set_attribute("trodo.distinct_id", str(self._distinct_id))
+        # self._distinct_id is always set (anon-minted in __init__ when caller
+        # didn't pass one), so the attribute always lands on the OTLP span.
+        otel_span.set_attribute("trodo.distinct_id", str(self._distinct_id))
         if self._conversation_id:
             otel_span.set_attribute("trodo.conversation_id", str(self._conversation_id))
         if self._parent_run_id:
@@ -398,7 +434,7 @@ class wrap_agent:
                 otel_span.set_attribute(f"trodo.metadata.{k}", _serialize_attr(v))
 
         self._otel_span = otel_span
-        self.handle = RunHandle(run_id, self._agent_name)
+        self.handle = RunHandle(run_id, self._agent_name, self._distinct_id)
         return self.handle
 
     def _exit_otel(self, exc_type, exc, tb) -> None:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trodo-python
-Version: 2.4.0
+Version: 2.5.0
 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.5.0.dist-info}/RECORD

@@ -12,20 +12,20 @@ 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
-trodo/otel/wrap_agent.py,sha256=J_ho4O8oOa5ECX4Cft0mJ9e5pzAe3sWOla5awikOVK8,22542
+trodo/otel/wrap_agent.py,sha256=mXEQqqNSiHJY3M0T0QPRkozOONB0dbLBcX5WYT0ddXI,24560
 trodo/queue/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trodo/queue/batch_flusher.py,sha256=4Lg6T3Urwi9U0Q4FpFGPmjDYKg4ZliCTR-ND8BJvWaY,1298
 trodo/queue/event_queue.py,sha256=EVFZrhlq_kwC3jJ2GK0wMhHISf9UzLCZNDnT_aZ2I2A,872
 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.5.0.dist-info/METADATA,sha256=JOZlK8iGa5MyS9B8sVklhM2mVwvI9bKu5UUTFg5c8eI,17882
+trodo_python-2.5.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+trodo_python-2.5.0.dist-info/top_level.txt,sha256=VCQu1CJWFmNsqTs1YxMcw4Mq35Tc3z3uI9RwHEXAayQ,6
+trodo_python-2.5.0.dist-info/RECORD,,