Merge branch 'main' into smolagents-instrumentation

Author: braelyn-ai

agentops/__init__.py

@@ -14,19 +14,29 @@
 
 from typing import List, Optional, Union, Dict, Any
 from agentops.client import Client
-from agentops.sdk.core import TracingCore, TraceContext
-from agentops.sdk.decorators import trace, session, agent, task, workflow, operation
+from agentops.sdk.core import TraceContext, tracer
+from agentops.sdk.decorators import trace, session, agent, task, workflow, operation, tool
+from agentops.enums import TraceState, SUCCESS, ERROR, UNSET
+from opentelemetry.trace.status import StatusCode
 
 from agentops.logging.config import logger
+import threading
 
-# Client global instance; one per process runtime
-_client = Client()
+# Thread-safe client management
+_client_lock = threading.Lock()
+_client = None
 
 
 def get_client() -> Client:
-    """Get the singleton client instance"""
+    """Get the singleton client instance in a thread-safe manner"""
     global _client
 
+    # Double-checked locking pattern for thread safety
+    if _client is None:
+        with _client_lock:
+            if _client is None:
+                _client = Client()
+
     return _client
 
 
@@ -106,24 +116,31 @@ def init(
     elif default_tags:
         merged_tags = default_tags
 
-    return _client.init(
-        api_key=api_key,
-        endpoint=endpoint,
-        app_url=app_url,
-        max_wait_time=max_wait_time,
-        max_queue_size=max_queue_size,
-        default_tags=merged_tags,
-        trace_name=trace_name,
-        instrument_llm_calls=instrument_llm_calls,
-        auto_start_session=auto_start_session,
-        auto_init=auto_init,
-        skip_auto_end_session=skip_auto_end_session,
-        env_data_opt_out=env_data_opt_out,
-        log_level=log_level,
-        fail_safe=fail_safe,
-        exporter_endpoint=exporter_endpoint,
+    # Prepare initialization arguments
+    init_kwargs = {
+        "api_key": api_key,
+        "endpoint": endpoint,
+        "app_url": app_url,
+        "max_wait_time": max_wait_time,
+        "max_queue_size": max_queue_size,
+        "default_tags": merged_tags,
+        "trace_name": trace_name,
+        "instrument_llm_calls": instrument_llm_calls,
+        "auto_start_session": auto_start_session,
+        "auto_init": auto_init,
+        "skip_auto_end_session": skip_auto_end_session,
+        "env_data_opt_out": env_data_opt_out,
+        "log_level": log_level,
+        "fail_safe": fail_safe,
+        "exporter_endpoint": exporter_endpoint,
         **kwargs,
-    )
+    }
+
+    # Get the current client instance (creates new one if needed)
+    client = get_client()
+
+    # Initialize the client directly
+    return client.init(**init_kwargs)
 
 
 def configure(**kwargs):
@@ -173,7 +190,8 @@ def configure(**kwargs):
     if invalid_params:
         logger.warning(f"Invalid configuration parameters: {invalid_params}")
 
-    _client.configure(**kwargs)
+    client = get_client()
+    client.configure(**kwargs)
 
 
 def start_trace(
@@ -190,25 +208,26 @@ def start_trace(
     Returns:
         A TraceContext object containing the span and context token, or None if SDK not initialized.
     """
-    tracing_core = TracingCore.get_instance()
-    if not tracing_core.initialized:
+    if not tracer.initialized:
         # Optionally, attempt to initialize the client if not already, or log a more severe warning.
         # For now, align with legacy start_session that would try to init.
         # However, explicit init is preferred before starting traces.
         logger.warning("AgentOps SDK not initialized. Attempting to initialize with defaults before starting trace.")
         try:
             init()  # Attempt to initialize with environment variables / defaults
-            if not tracing_core.initialized:
+            if not tracer.initialized:
                 logger.error("SDK initialization failed. Cannot start trace.")
                 return None
         except Exception as e:
             logger.error(f"SDK auto-initialization failed during start_trace: {e}. Cannot start trace.")
             return None
 
-    return tracing_core.start_trace(trace_name=trace_name, tags=tags)
+    return tracer.start_trace(trace_name=trace_name, tags=tags)
 
 
-def end_trace(trace_context: Optional[TraceContext] = None, end_state: str = "Success") -> None:
+def end_trace(
+    trace_context: Optional[TraceContext] = None, end_state: Union[TraceState, StatusCode, str] = TraceState.SUCCESS
+) -> None:
     """
     Ends a trace (its root span) and finalizes it.
     If no trace_context is provided, ends all active session spans.
@@ -217,11 +236,10 @@ def end_trace(trace_context: Optional[TraceContext] = None, end_state: str = "Su
         trace_context: The TraceContext object returned by start_trace. If None, ends all active traces.
         end_state: The final state of the trace (e.g., "Success", "Failure", "Error").
     """
-    tracing_core = TracingCore.get_instance()
-    if not tracing_core.initialized:
+    if not tracer.initialized:
         logger.warning("AgentOps SDK not initialized. Cannot end trace.")
         return
-    tracing_core.end_trace(trace_context=trace_context, end_state=end_state)
+    tracer.end_trace(trace_context=trace_context, end_state=end_state)
 
 
 __all__ = [
@@ -247,4 +265,13 @@ def end_trace(trace_context: Optional[TraceContext] = None, end_state: str = "Su
     "task",
     "workflow",
     "operation",
+    "tracer",
+    "tool",
+    # Trace state enums
+    "TraceState",
+    "SUCCESS",
+    "ERROR",
+    "UNSET",
+    # OpenTelemetry status codes (for advanced users)
+    "StatusCode",
 ]

agentops/client/client.py

@@ -7,7 +7,7 @@
 from agentops.instrumentation import instrument_all
 from agentops.logging import logger
 from agentops.logging.config import configure_logging, intercept_opentelemetry_logging
-from agentops.sdk.core import TracingCore, TraceContext
+from agentops.sdk.core import TraceContext, tracer
 from agentops.legacy import Session
 
 # Global variables to hold the client's auto-started trace and its legacy session wrapper
@@ -24,10 +24,9 @@ def _end_init_trace_atexit():
     if _client_init_trace_context is not None:
         logger.debug("Auto-ending client's init trace during shutdown.")
         try:
-            # Use TracingCore to end the trace directly
-            tracing_core = TracingCore.get_instance()
-            if tracing_core.initialized and _client_init_trace_context.span.is_recording():
-                tracing_core.end_trace(_client_init_trace_context, end_state="Shutdown")
+            # Use global tracer to end the trace directly
+            if tracer.initialized and _client_init_trace_context.span.is_recording():
+                tracer.end_trace(_client_init_trace_context, end_state="Shutdown")
         except Exception as e:
             logger.warning(f"Error ending client's init trace during shutdown: {e}")
         finally:
@@ -83,7 +82,7 @@ def init(self, **kwargs: Any) -> None:  # Return type updated to None
             self._initialized = False
             if self._init_trace_context and self._init_trace_context.span.is_recording():
                 logger.warning("Ending previously auto-started trace due to re-initialization.")
-                TracingCore.get_instance().end_trace(self._init_trace_context, "Reinitialized")
+                tracer.end_trace(self._init_trace_context, "Reinitialized")
             self._init_trace_context = None
             self._legacy_session_for_init_trace = None
 
@@ -105,7 +104,7 @@ def init(self, **kwargs: Any) -> None:  # Return type updated to None
         try:
             response = self.api.v3.fetch_auth_token(self.config.api_key)
             if response is None:
-                # If auth fails, we cannot proceed with TracingCore initialization that depends on project_id
+                # If auth fails, we cannot proceed with tracer initialization that depends on project_id
                 logger.error("Failed to fetch auth token. AgentOps SDK will not be initialized.")
                 return None  # Explicitly return None if auth fails
         except Exception as e:
@@ -118,8 +117,7 @@ def init(self, **kwargs: Any) -> None:  # Return type updated to None
         tracing_config = self.config.dict()
         tracing_config["project_id"] = response["project_id"]
 
-        tracing_core = TracingCore.get_instance()
-        tracing_core.initialize_from_config(tracing_config, jwt=response["token"])
+        tracer.initialize_from_config(tracing_config, jwt=response["token"])
 
         if self.config.instrument_llm_calls:
             instrument_all()
@@ -136,7 +134,7 @@ def init(self, **kwargs: Any) -> None:  # Return type updated to None
             if self._init_trace_context is None or not self._init_trace_context.span.is_recording():
                 logger.debug("Auto-starting init trace.")
                 trace_name = self.config.trace_name or "default"
-                self._init_trace_context = tracing_core.start_trace(
+                self._init_trace_context = tracer.start_trace(
                     trace_name=trace_name,
                     tags=list(self.config.default_tags) if self.config.default_tags else None,
                     is_init_trace=True,
@@ -163,9 +161,9 @@ def init(self, **kwargs: Any) -> None:  # Return type updated to None
 
                 else:
                     logger.error("Failed to start the auto-init trace.")
-                    # Even if auto-start fails, core services up to TracingCore might be initialized.
-                    # Set self.initialized to True if TracingCore is up, but return None.
-                    self._initialized = tracing_core.initialized
+                    # Even if auto-start fails, core services up to the tracer might be initialized.
+                    # Set self.initialized to True if tracer is up, but return None.
+                    self._initialized = tracer.initialized
                     return None  # Failed to start trace
 
             self._initialized = True  # Successfully initialized and auto-trace started (if configured)

agentops/enums.py

@@ -0,0 +1,36 @@
+"""
+AgentOps enums for user-friendly API.
+
+This module provides simple enums that users can import from agentops
+without needing to know about OpenTelemetry internals.
+"""
+
+from enum import Enum
+from opentelemetry.trace.status import StatusCode
+
+
+class TraceState(Enum):
+    """
+    Enum for trace end states.
+
+    This provides a user-friendly interface that maps to OpenTelemetry StatusCode internally.
+    Users can simply use agentops.TraceState.SUCCESS instead of importing OpenTelemetry.
+    """
+
+    SUCCESS = StatusCode.OK
+    ERROR = StatusCode.ERROR
+    UNSET = StatusCode.UNSET
+
+    def __str__(self) -> str:
+        """Return the name for string representation."""
+        return self.name
+
+    def to_status_code(self) -> StatusCode:
+        """Convert to OpenTelemetry StatusCode."""
+        return self.value
+
+
+# For backward compatibility, also provide these as module-level constants
+SUCCESS = TraceState.SUCCESS
+ERROR = TraceState.ERROR
+UNSET = TraceState.UNSET

agentops/helpers/system.py

@@ -10,6 +10,46 @@
 from agentops.helpers.version import get_agentops_version
 
 
+def get_imported_libraries():
+    """
+    Get the top-level imported libraries in the current script.
+
+    Returns:
+        list: List of imported libraries
+    """
+    user_libs = []
+
+    builtin_modules = {
+        "builtins",
+        "sys",
+        "os",
+        "_thread",
+        "abc",
+        "io",
+        "re",
+        "types",
+        "collections",
+        "enum",
+        "math",
+        "datetime",
+        "time",
+        "warnings",
+    }
+
+    try:
+        main_module = sys.modules.get("__main__")
+        if main_module and hasattr(main_module, "__dict__"):
+            for name, obj in main_module.__dict__.items():
+                if isinstance(obj, type(sys)) and hasattr(obj, "__name__"):
+                    mod_name = obj.__name__.split(".")[0]
+                    if mod_name and not mod_name.startswith("_") and mod_name not in builtin_modules:
+                        user_libs.append(mod_name)
+    except Exception as e:
+        logger.debug(f"Error getting imports: {e}")
+
+    return user_libs
+
+
 def get_sdk_details():
     try:
         return {