trodo-python 2.10.4__tar.gz → 2.10.6__tar.gz

{trodo_python-2.10.4 → trodo_python-2.10.6}/PKG-INFO

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

{trodo_python-2.10.4 → trodo_python-2.10.6}/pyproject.toml

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

{trodo_python-2.10.4 → trodo_python-2.10.6}/trodo/__init__.py

@@ -40,7 +40,7 @@ Downstream microservice (join the caller's run instead of making a new one):
 
 from __future__ import annotations
 
-__version__ = "2.10.4"
+__version__ = "2.10.6"
 
 from typing import Any, Callable, Dict, List, Optional, Union
 

{trodo_python-2.10.4 → trodo_python-2.10.6}/trodo/api/http_client.py

@@ -47,6 +47,24 @@ class HttpClient:
                 self._log(f"Retry {attempt + 1} after {delay}s (status {resp.status_code})")
                 time.sleep(delay)
                 return self._request(path, body, attempt + 1)
+            if resp.status_code >= 400:
+                # Surface non-2xx responses to on_error — a 4xx means the
+                # payload was REJECTED and the data is gone; before this it
+                # was fully silent (on_error only saw network errors), which
+                # made ingest-schema bugs invisible to callers.
+                detail = ""
+                try:
+                    detail = resp.text[:300]
+                except Exception:
+                    pass
+                self._log(f"HTTP {resp.status_code} on {path}: {detail}")
+                if self.on_error:
+                    try:
+                        self.on_error(
+                            RuntimeError(f"trodo-python: POST {path} -> HTTP {resp.status_code}: {detail}")
+                        )
+                    except Exception:
+                        pass
             try:
                 return resp.json()
             except Exception:

{trodo_python-2.10.4 → trodo_python-2.10.6}/trodo/otel/auto_instrument.py

@@ -58,6 +58,24 @@ _ATTR_TRODO_RUN_ID = "trodo.run_id"
 _ATTR_TRODO_PARENT_SPAN_ID = "trodo.parent_span_id"
 
 
+def _span_id_to_uuid(span_id: Optional[str]) -> Optional[str]:
+    """Convert an OTel hex span id into UUID format. Mirrors trodo-node's
+    spanIdToUuid: 16-hex OTel ids are left-zero-padded into the same UUID
+    address space as our uuid4-minted ids. Without this the bridge sent raw
+    16-hex into agent_spans' Postgres uuid columns -> the ingest 400'd and
+    the WHOLE run payload (run row + every span) was silently dropped, so
+    Python auto-instrumented runs never landed."""
+    if not span_id:
+        return span_id
+    h = str(span_id).replace("-", "").lower()
+    if len(h) == 32:
+        return f"{h[0:8]}-{h[8:12]}-{h[12:16]}-{h[16:20]}-{h[20:32]}"
+    if len(h) == 16:
+        p = "0000000000000000" + h
+        return f"{p[0:8]}-{p[8:12]}-{p[12:16]}-{p[16:20]}-{p[20:32]}"
+    return span_id
+
+
 def otel_span_to_trodo_span(otel_span: Any) -> Optional[TrodoSpan]:
     """Translate an OTel ReadableSpan to our TrodoSpan using GenAI semconv.
 
@@ -77,7 +95,8 @@ def otel_span_to_trodo_span(otel_span: Any) -> Optional[TrodoSpan]:
     span_id_int = getattr(span_ctx, "span_id", None)
     if not span_id_int:
         return None
-    span_id = f"{span_id_int:016x}" if isinstance(span_id_int, int) else str(span_id_int)
+    span_id_hex = f"{span_id_int:016x}" if isinstance(span_id_int, int) else str(span_id_int)
+    span_id = _span_id_to_uuid(span_id_hex)
 
     attrs = dict(getattr(otel_span, "attributes", {}) or {})
 
@@ -95,7 +114,7 @@ def otel_span_to_trodo_span(otel_span: Any) -> Optional[TrodoSpan]:
     otel_parent_span_id: Optional[str] = None
     if parent is not None:
         pid = getattr(parent, "span_id", None)
-        otel_parent_span_id = (
+        otel_parent_span_id = _span_id_to_uuid(
             f"{pid:016x}" if isinstance(pid, int) else str(pid) if pid else None
         )
 
@@ -201,12 +220,30 @@ def otel_span_to_trodo_span(otel_span: Any) -> Optional[TrodoSpan]:
     )
 
 
-class _OtelAdapter:
+# Subclass the REAL SpanProcessor when the sdk is importable (it always is on
+# the path that registers the adapter — enable_auto_instrument requires it).
+# Duck-typing broke on opentelemetry-sdk >= 1.43: the provider calls
+# `sp._on_ending(span)` on every span end, so a processor without the base
+# class raises AttributeError INSIDE USER CODE at span.end().
+try:  # pragma: no cover — exercised implicitly by every auto-instrument test
+    from opentelemetry.sdk.trace import SpanProcessor as _SpanProcessorBase
+except Exception:
+    _SpanProcessorBase = object  # type: ignore[assignment,misc]
+
+
+class _OtelAdapter(_SpanProcessorBase):  # type: ignore[valid-type,misc]
     """Adapter matching opentelemetry.sdk.trace.SpanProcessor interface."""
 
     def __init__(self, processor: TrodoSpanProcessor) -> None:
+        try:
+            super().__init__()
+        except TypeError:
+            pass
         self._processor = processor
 
+    def on_ending(self, span: Any) -> None:  # sdk >= 1.43 hook — no mutation needed
+        return None
+
     def on_start(self, span: Any, parent_context: Any = None) -> None:
         # Stamp active run/parent ids while contextvars are still alive.
         # See otel_span_to_trodo_span() docstring for the failure mode this

{trodo_python-2.10.4 → trodo_python-2.10.6}/trodo_python.egg-info/PKG-INFO

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