aiqa-client 0.1.2__py3-none-any.whl → 0.1.3__py3-none-any.whl

aiqa/__init__.py

@@ -1,66 +1,29 @@
 """
 Python client for AIQA server - OpenTelemetry tracing decorators.
-
-IMPORTANT: Before using any AIQA functionality, you must call get_aiqa_client() to initialize
-the client and load environment variables (AIQA_SERVER_URL, AIQA_API_KEY, AIQA_COMPONENT_TAG, etc.).
-
-Example:
-    from dotenv import load_dotenv
-    from aiqa import get_aiqa_client, WithTracing
-    
-    # Load environment variables from .env file (if using one)
-    load_dotenv()
-    
-    # Initialize client (must be called before using WithTracing or other functions)
-    get_aiqa_client()
-    
-    @WithTracing
-    def my_function():
-        return "Hello, AIQA!"
 """
 
 from .tracing import (
     WithTracing,
-    flush_tracing,
+    flush_spans,
     shutdown_tracing,
     set_span_attribute,
     set_span_name,
     get_active_span,
-    get_provider,
-    get_exporter,
-    get_trace_id,
-    get_span_id,
-    create_span_from_trace_id,
-    inject_trace_context,
-    extract_trace_context,
-    set_conversation_id,
-    set_component_tag,
-    get_span,
+    provider,
+    exporter,
 )
-from .client import get_aiqa_client
-from .experiment_runner import ExperimentRunner
 
-__version__ = "0.1.2"
+__version__ = "0.1.3"
 
 __all__ = [
     "WithTracing",
-    "flush_tracing",
+    "flush_spans",
     "shutdown_tracing",
     "set_span_attribute",
     "set_span_name",
     "get_active_span",
-    "get_provider",
-    "get_exporter",
-    "get_aiqa_client",
-    "ExperimentRunner",
-    "get_trace_id",
-    "get_span_id",
-    "create_span_from_trace_id",
-    "inject_trace_context",
-    "extract_trace_context",
-    "set_conversation_id",
-    "set_component_tag",
-    "get_span",
+    "provider",
+    "exporter",
     "__version__",
 ]
 

aiqa/aiqa_exporter.py

@@ -8,12 +8,11 @@ import json
 import logging
 import threading
 import time
-import io
 from typing import List, Dict, Any, Optional
 from opentelemetry.sdk.trace import ReadableSpan
 from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
 
-logger = logging.getLogger("AIQA")
+logger = logging.getLogger(__name__)
 
 
 class AIQASpanExporter(SpanExporter):
@@ -40,7 +39,6 @@ class AIQASpanExporter(SpanExporter):
         self._api_key = api_key
         self.flush_interval_ms = flush_interval_seconds * 1000
         self.buffer: List[Dict[str, Any]] = []
-        self.buffer_span_keys: set = set()  # Track (traceId, spanId) tuples to prevent duplicates (Python 3.8 compatible)
         self.buffer_lock = threading.Lock()
         self.flush_lock = threading.Lock()
         self.shutdown_requested = False
@@ -63,39 +61,21 @@ class AIQASpanExporter(SpanExporter):
     def export(self, spans: List[ReadableSpan]) -> SpanExportResult:
         """
         Export spans to the AIQA server. Adds spans to buffer for async flushing.
-        Deduplicates spans based on (traceId, spanId) to prevent repeated exports.
         """
         if not spans:
             logger.debug("export() called with empty spans list")
             return SpanExportResult.SUCCESS
-        logger.debug(f"AIQA export() called with {len(spans)} spans")
-        # Serialize and add to buffer, deduplicating by (traceId, spanId)
+
+        # Serialize and add to buffer
         with self.buffer_lock:
-            serialized_spans = []
-            duplicates_count = 0
-            for span in spans:
-                serialized = self._serialize_span(span)
-                span_key = (serialized["traceId"], serialized["spanId"])
-                if span_key not in self.buffer_span_keys:
-                    serialized_spans.append(serialized)
-                    self.buffer_span_keys.add(span_key)
-                else:
-                    duplicates_count += 1
-                    logger.debug(f"export() skipping duplicate span: traceId={serialized['traceId']}, spanId={serialized['spanId']}")
-            
+            serialized_spans = [self._serialize_span(span) for span in spans]
             self.buffer.extend(serialized_spans)
             buffer_size = len(self.buffer)
         
-        if duplicates_count > 0:
-            logger.debug(
-                f"export() added {len(serialized_spans)} span(s) to buffer, skipped {duplicates_count} duplicate(s). "
-                f"Total buffered: {buffer_size}"
-            )
-        else:
-            logger.debug(
-                f"export() added {len(spans)} span(s) to buffer. "
-                f"Total buffered: {buffer_size}"
-            )
+        logger.debug(
+            f"export() added {len(spans)} span(s) to buffer. "
+            f"Total buffered: {buffer_size}"
+        )
 
         return SpanExportResult.SUCCESS
 
@@ -158,8 +138,8 @@ class AIQASpanExporter(SpanExporter):
             "duration": self._time_to_tuple(span.end_time - span.start_time) if span.end_time else None,
             "ended": span.end_time is not None,
             "instrumentationLibrary": {
-                "name": self._get_instrumentation_name(),
-                "version": self._get_instrumentation_version(),
+                "name": span.instrumentation_info.name if hasattr(span, "instrumentation_info") else "",
+                "version": span.instrumentation_info.version if hasattr(span, "instrumentation_info") else None,
             },
         }
 
@@ -168,19 +148,6 @@ class AIQASpanExporter(SpanExporter):
         seconds = int(nanoseconds // 1_000_000_000)
         nanos = int(nanoseconds % 1_000_000_000)
         return (seconds, nanos)
-    
-    def _get_instrumentation_name(self) -> str:
-        """Get instrumentation library name - always 'aiqa-tracer'."""
-        from .client import AIQA_TRACER_NAME
-        return AIQA_TRACER_NAME
-    
-    def _get_instrumentation_version(self) -> Optional[str]:
-        """Get instrumentation library version from __version__."""
-        try:
-            from . import __version__
-            return __version__
-        except (ImportError, AttributeError):
-            return None
 
     def _build_request_headers(self) -> Dict[str, str]:
         """Build HTTP headers for span requests."""
@@ -210,38 +177,24 @@ class AIQASpanExporter(SpanExporter):
         Atomically extract and remove all spans from buffer (thread-safe).
         Returns the extracted spans. This prevents race conditions where spans
         are added between extraction and clearing.
-        Note: Does NOT clear buffer_span_keys - that should be done after successful send
-        to avoid unnecessary clearing/rebuilding on failures.
         """
         with self.buffer_lock:
             spans = self.buffer[:]
             self.buffer.clear()
             return spans
-    
-    def _remove_span_keys_from_tracking(self, spans: List[Dict[str, Any]]) -> None:
-        """
-        Remove span keys from tracking set (thread-safe). Called after successful send.
-        """
-        with self.buffer_lock:
-            for span in spans:
-                span_key = (span["traceId"], span["spanId"])
-                self.buffer_span_keys.discard(span_key)
 
     def _prepend_spans_to_buffer(self, spans: List[Dict[str, Any]]) -> None:
         """
         Prepend spans back to buffer (thread-safe). Used to restore spans
-        if sending fails. Rebuilds the span keys tracking set.
+        if sending fails.
         """
         with self.buffer_lock:
             self.buffer[:0] = spans
-            # Rebuild span keys set from current buffer contents
-            self.buffer_span_keys = {(span["traceId"], span["spanId"]) for span in self.buffer}
 
     def _clear_buffer(self) -> None:
         """Clear the buffer (thread-safe)."""
         with self.buffer_lock:
             self.buffer.clear()
-            self.buffer_span_keys.clear()
 
     async def flush(self) -> None:
         """
@@ -265,8 +218,7 @@ class AIQASpanExporter(SpanExporter):
                 logger.warning(
                     f"Skipping flush: AIQA_SERVER_URL is not set. {len(spans_to_flush)} span(s) will not be sent."
                 )
-                # Spans already removed from buffer, clear their keys to free memory
-                self._remove_span_keys_from_tracking(spans_to_flush)
+                # Spans already removed from buffer, nothing to clear
                 return
 
             logger.info(f"flush() sending {len(spans_to_flush)} span(s) to server")
@@ -274,8 +226,6 @@ class AIQASpanExporter(SpanExporter):
                 await self._send_spans(spans_to_flush)
                 logger.info(f"flush() successfully sent {len(spans_to_flush)} span(s) to server")
                 # Spans already removed from buffer during extraction
-                # Now clear their keys from tracking set to free memory
-                self._remove_span_keys_from_tracking(spans_to_flush)
             except RuntimeError as error:
                 if self._is_interpreter_shutdown_error(error):
                     if self.shutdown_requested:
@@ -287,12 +237,12 @@ class AIQASpanExporter(SpanExporter):
                         # Put spans back for retry
                         self._prepend_spans_to_buffer(spans_to_flush)
                     raise
-                logger.error(f"Error flushing spans to server: {error}")
+                logger.error(f"Error flushing spans to server: {error}", exc_info=True)
                 # Put spans back for retry
                 self._prepend_spans_to_buffer(spans_to_flush)
                 raise
             except Exception as error:
-                logger.error(f"Error flushing spans to server: {error}")
+                logger.error(f"Error flushing spans to server: {error}", exc_info=True)
                 # Put spans back for retry
                 self._prepend_spans_to_buffer(spans_to_flush)
                 if self.shutdown_requested:
@@ -321,7 +271,7 @@ class AIQASpanExporter(SpanExporter):
                     logger.debug(f"Auto-flush cycle #{cycle_count} completed, sleeping {self.flush_interval_ms / 1000.0}s")
                     time.sleep(self.flush_interval_ms / 1000.0)
                 except Exception as e:
-                    logger.error(f"Error in auto-flush cycle #{cycle_count}: {e}")
+                    logger.error(f"Error in auto-flush cycle #{cycle_count}: {e}", exc_info=True)
                     logger.debug(f"Auto-flush cycle #{cycle_count} error handled, sleeping {self.flush_interval_ms / 1000.0}s")
                     time.sleep(self.flush_interval_ms / 1000.0)
             
@@ -357,13 +307,9 @@ class AIQASpanExporter(SpanExporter):
             logger.debug("_send_spans() no API key provided")
 
         try:
-            # Pre-serialize JSON to bytes and wrap in BytesIO to avoid blocking event loop
-            json_bytes = json.dumps(spans).encode('utf-8')
-            data = io.BytesIO(json_bytes)
-            
             async with aiohttp.ClientSession() as session:
                 logger.debug(f"_send_spans() POST request starting to {url}")
-                async with session.post(url, data=data, headers=headers) as response:
+                async with session.post(url, json=spans, headers=headers) as response:
                     logger.debug(f"_send_spans() received response: status={response.status}")
                     if not response.ok:
                         error_text = await response.text()
@@ -382,10 +328,10 @@ class AIQASpanExporter(SpanExporter):
                 else:
                     logger.warning(f"_send_spans() interrupted by interpreter shutdown: {e}")
                 raise
-            logger.error(f"_send_spans() RuntimeError: {type(e).__name__}: {e}")
+            logger.error(f"_send_spans() RuntimeError: {type(e).__name__}: {e}", exc_info=True)
             raise
         except Exception as e:
-            logger.error(f"_send_spans() exception: {type(e).__name__}: {e}")
+            logger.error(f"_send_spans() exception: {type(e).__name__}: {e}", exc_info=True)
             raise
 
     def _send_spans_sync(self, spans: List[Dict[str, Any]]) -> None:
@@ -414,7 +360,7 @@ class AIQASpanExporter(SpanExporter):
                 )
             logger.debug(f"_send_spans_sync() successfully sent {len(spans)} spans")
         except Exception as e:
-            logger.error(f"_send_spans_sync() exception: {type(e).__name__}: {e}")
+            logger.error(f"_send_spans_sync() exception: {type(e).__name__}: {e}", exc_info=True)
             raise
 
     def shutdown(self) -> None:
@@ -451,21 +397,17 @@ class AIQASpanExporter(SpanExporter):
                         f"shutdown() skipping final flush: AIQA_SERVER_URL is not set. "
                         f"{len(spans_to_flush)} span(s) will not be sent."
                     )
-                    # Spans already removed from buffer, clear their keys to free memory
-                    self._remove_span_keys_from_tracking(spans_to_flush)
+                    # Spans already removed from buffer
                 else:
                     logger.info(f"shutdown() sending {len(spans_to_flush)} span(s) to server (synchronous)")
                     try:
                         self._send_spans_sync(spans_to_flush)
                         logger.info(f"shutdown() successfully sent {len(spans_to_flush)} span(s) to server")
                         # Spans already removed from buffer during extraction
-                        # Clear their keys from tracking set to free memory
-                        self._remove_span_keys_from_tracking(spans_to_flush)
                     except Exception as e:
-                        logger.error(f"shutdown() failed to send spans: {e}")
+                        logger.error(f"shutdown() failed to send spans: {e}", exc_info=True)
                         # Spans already removed, but process is exiting anyway
                         logger.warning(f"shutdown() {len(spans_to_flush)} span(s) were not sent due to error")
-                        # Keys will remain in tracking set, but process is exiting so memory will be freed
             else:
                 logger.debug("shutdown() no spans to flush")