trodo-python 2.4.0__tar.gz → 2.4.1__tar.gz

{trodo_python-2.4.0 → trodo_python-2.4.1}/PKG-INFO

@@ -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 → trodo_python-2.4.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "trodo-python"
-version = "2.4.0"
+version = "2.4.1"
 description = "Trodo Analytics SDK for Python — server-side event tracking"
 readme = "README.md"
 license = { text = "ISC" }

trodo_python-2.4.1/tests/test_auto_instrument_fixes.py

@@ -0,0 +1,111 @@
+"""Mirror of trodo-node 2.4.3 bridge fixes for the Python SDK.
+
+Covers:
+  1. duration_ms is rounded to an integer.
+  2. Active run is recovered from on_start-stamped attributes when
+     contextvars are empty at on_end (httpx async-context loss).
+  3. Internal trodo.* attributes are stripped from the persisted span.
+"""
+
+from types import SimpleNamespace
+from unittest.mock import MagicMock
+
+import pytest
+
+from trodo.otel.auto_instrument import _OtelAdapter, otel_span_to_trodo_span
+from trodo.otel.context import (
+    ActiveSpanContext,
+    get_active_context,
+    run_with_context,
+)
+
+
+RUN_ID = "11111111-1111-1111-1111-111111111111"
+ROOT_SPAN_ID = "22222222-2222-2222-2222-222222222222"
+
+
+def _fake_otel_span(start_ns=None, end_ns=None, attrs=None, span_id_int=0xABCD1234ABCD1234, parent_span_id_int=None):
+    span_context = SimpleNamespace(span_id=span_id_int)
+    parent = SimpleNamespace(span_id=parent_span_id_int) if parent_span_id_int else None
+    return SimpleNamespace(
+        name="anthropic.messages.create",
+        get_span_context=lambda: span_context,
+        attributes=attrs or {},
+        start_time=start_ns,
+        end_time=end_ns,
+        status=None,
+        parent=parent,
+    )
+
+
+def _ctx():
+    return ActiveSpanContext(
+        run_id=RUN_ID,
+        span_id=ROOT_SPAN_ID,
+        parent_span_id=None,
+        team_site_id="site-1",
+        processor=None,  # type: ignore[arg-type]
+    )
+
+
+class TestDurationRounding:
+    def test_fractional_ns_delta_rounds_to_integer(self):
+        # 1000ms + 0.999888 fractional ms via nanos delta
+        otel = _fake_otel_span(start_ns=1_000_000_000, end_ns=2_000_999_888)
+        with run_with_context(_ctx()):
+            span = otel_span_to_trodo_span(otel)
+        assert span is not None
+        assert isinstance(span.duration_ms, int)
+        assert span.duration_ms == 1001
+
+    def test_missing_times_leaves_duration_none(self):
+        otel = _fake_otel_span(start_ns=None, end_ns=None)
+        with run_with_context(_ctx()):
+            span = otel_span_to_trodo_span(otel)
+        assert span.duration_ms is None
+
+
+class TestOnStartStamping:
+    def test_on_start_stamps_run_id_when_context_is_alive(self):
+        adapter = _OtelAdapter(processor=MagicMock())
+        live_span = MagicMock()
+        with run_with_context(_ctx()):
+            adapter.on_start(live_span, None)
+        live_span.set_attribute.assert_any_call("trodo.run_id", RUN_ID)
+        live_span.set_attribute.assert_any_call("trodo.parent_span_id", ROOT_SPAN_ID)
+
+    def test_recovers_run_from_stamped_attrs_when_contextvars_empty(self):
+        # Simulate the failure mode: span fires on_end outside any wrap_agent.
+        assert get_active_context() is None
+        otel = _fake_otel_span(
+            start_ns=1_000_000_000,
+            end_ns=2_000_000_000,
+            attrs={
+                "trodo.run_id": RUN_ID,
+                "trodo.parent_span_id": ROOT_SPAN_ID,
+                "gen_ai.request.model": "claude-3-7",
+            },
+        )
+        span = otel_span_to_trodo_span(otel)
+        assert span is not None
+        assert span.run_id == RUN_ID
+        assert span.parent_span_id == ROOT_SPAN_ID
+
+    def test_strips_trodo_attrs_from_persisted_span(self):
+        otel = _fake_otel_span(
+            start_ns=1_000_000_000,
+            end_ns=2_000_000_000,
+            attrs={
+                "trodo.run_id": RUN_ID,
+                "trodo.parent_span_id": ROOT_SPAN_ID,
+                "gen_ai.request.model": "gpt-4",
+            },
+        )
+        span = otel_span_to_trodo_span(otel)
+        assert "trodo.run_id" not in (span.attributes or {})
+        assert "trodo.parent_span_id" not in (span.attributes or {})
+        assert (span.attributes or {}).get("gen_ai.request.model") == "gpt-4"
+
+    def test_drops_span_when_no_run_id_anywhere(self):
+        otel = _fake_otel_span(start_ns=1, end_ns=2, attrs={})
+        assert otel_span_to_trodo_span(otel) is None

{trodo_python-2.4.0 → trodo_python-2.4.1}/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_python-2.4.0 → trodo_python-2.4.1}/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 → trodo_python-2.4.1}/trodo_python.egg-info/PKG-INFO

@@ -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 → trodo_python-2.4.1}/trodo_python.egg-info/SOURCES.txt

@@ -1,5 +1,6 @@
 README.md
 pyproject.toml
+tests/test_auto_instrument_fixes.py
 tests/test_cross_process_session.py
 tests/test_end_run.py
 tests/test_processor_methods.py