Merge remote-tracking branch 'origin/main' into hybim-717

# Conflicts:
#	src/galileo/__future__/metric.py
#	src/galileo/__init__.py
#	src/galileo/exceptions.py
#	src/galileo/handlers/agent_control/__init__.py
#	src/galileo/handlers/langchain/__init__.py
#	src/galileo/handlers/openai_agents/__init__.py
#	src/splunk_ao/__future__/__init__.py
#	src/splunk_ao/agent_control.py
#	src/splunk_ao/configuration.py
#	src/splunk_ao/datasets.py
#	src/splunk_ao/decorator.py
#	src/splunk_ao/experiment.py
#	src/splunk_ao/experiment_tags.py
#	src/splunk_ao/experiments.py
#	src/splunk_ao/export.py
#	src/splunk_ao/handlers/agent_control/bridge.py
#	src/splunk_ao/handlers/base_async_handler.py
#	src/splunk_ao/handlers/base_handler.py
#	src/splunk_ao/handlers/crewai/handler.py
#	src/splunk_ao/handlers/langchain/async_handler.py
#	src/splunk_ao/handlers/langchain/handler.py
#	src/splunk_ao/handlers/langchain/middleware.py
#	src/splunk_ao/handlers/openai_agents/handler.py
#	src/splunk_ao/integration.py
#	src/splunk_ao/job_progress.py
#	src/splunk_ao/jobs.py
#	src/splunk_ao/log_stream.py
#	src/splunk_ao/log_streams.py
#	src/splunk_ao/logger/__init__.py
#	src/splunk_ao/logger/logger.py
#	src/splunk_ao/metric.py
#	src/splunk_ao/metrics.py
#	src/splunk_ao/middleware/tracing.py
#	src/splunk_ao/openai/__init__.py
#	src/splunk_ao/openai/extractors.py
#	src/splunk_ao/openai/response_generator.py
#	src/splunk_ao/otel.py
#	src/splunk_ao/project.py
#	src/splunk_ao/projects.py
#	src/splunk_ao/prompt.py
#	src/splunk_ao/prompts.py
#	src/splunk_ao/protect.py
#	src/splunk_ao/provider.py
#	src/splunk_ao/runs.py
#	src/splunk_ao/scorers.py
#	src/splunk_ao/search.py
#	src/splunk_ao/stages.py
#	src/splunk_ao/traces.py
#	src/splunk_ao/types.py
#	src/splunk_ao/utils/datasets.py
#	src/splunk_ao/utils/env_helpers.py
#	src/splunk_ao/utils/metrics.py
#	src/splunk_ao/utils/singleton.py
#	tests/conftest.py
#	tests/schemas/test_metrics.py
#	tests/test_agent_control.py
#	tests/test_agent_control_bridge.py
#	tests/test_async_base_handler.py
#	tests/test_backward_compat_future.py
#	tests/test_base_handler.py
#	tests/test_config.py
#	tests/test_configuration.py
#	tests/test_crewai_handler.py
#	tests/test_deprecations.py
#	tests/test_experiment.py
#	tests/test_experiments.py
#	tests/test_integration.py
#	tests/test_langchain.py
#	tests/test_langchain_async.py
#	tests/test_langchain_middleware.py
#	tests/test_log_stream.py
#	tests/test_log_streams_metrics.py
#	tests/test_log_streams_pagination.py
#	tests/test_logger_batch.py
#	tests/test_logger_distributed.py
#	tests/test_logger_timestamps.py
#	tests/test_metric.py
#	tests/test_metric_types.py
#	tests/test_middleware_tracing.py
#	tests/test_openai.py
#	tests/test_openai_agents.py
#	tests/test_openai_agents_utils.py
#	tests/test_otel.py
#	tests/test_project.py
#	tests/test_prompt.py
#	tests/test_traces_client_headers.py
#	tests/testutils/setup.py

Author: keith-decker

examples/langgraph/basic_langgraph.py

@@ -17,7 +17,7 @@
 from langgraph.graph.message import add_messages
 from typing_extensions import TypedDict
 
-from splunk_ao.handlers.langchain import GalileoCallback
+from splunk_ao.handlers.langchain import SplunkAOCallback
 
 
 class State(TypedDict):
@@ -45,4 +45,4 @@ def node2(state: State) -> dict:
 graph = graph_builder.compile()
 
 graph.get_graph().print_ascii()
-graph.invoke({"messages": [{"role": "user", "content": "hi!"}]}, config={"callbacks": [GalileoCallback()]})
+graph.invoke({"messages": [{"role": "user", "content": "hi!"}]}, config={"callbacks": [SplunkAOCallback()]})

examples/langgraph/with_openai.py

@@ -15,7 +15,7 @@
 from langgraph.graph.message import add_messages
 from typing_extensions import TypedDict
 
-from splunk_ao.handlers.langchain import GalileoCallback
+from splunk_ao.handlers.langchain import SplunkAOCallback
 
 
 class State(TypedDict):
@@ -42,4 +42,4 @@ def chatbot(state: State) -> dict:
 
 graph.get_graph().print_ascii()
 
-graph.invoke({"messages": [{"role": "user", "content": "hi!"}]}, {"callbacks": [GalileoCallback()]})
+graph.invoke({"messages": [{"role": "user", "content": "hi!"}]}, {"callbacks": [SplunkAOCallback()]})

galileo-a2a/examples/two_agent_demo.py

@@ -48,7 +48,7 @@
 from langgraph.graph import END, START, StateGraph
 from opentelemetry.instrumentation.langchain import LangchainInstrumentor
 from opentelemetry.sdk.trace import TracerProvider
-from splunk_ao.otel import GalileoSpanProcessor, add_galileo_span_processor
+from splunk_ao.otel import SplunkAOSpanProcessor, add_galileo_span_processor
 from starlette.applications import Starlette
 from typing_extensions import TypedDict
 
@@ -61,7 +61,7 @@
 # ---------------------------------------------------------------------------
 
 provider = TracerProvider()
-add_galileo_span_processor(provider, GalileoSpanProcessor())
+add_galileo_span_processor(provider, SplunkAOSpanProcessor())
 A2AInstrumentor().instrument(tracer_provider=provider, agent_name="orchestrator")
 LangchainInstrumentor().instrument(tracer_provider=provider)
 

galileo-a2a/src/galileo_a2a/instrumentor.py

@@ -32,11 +32,11 @@ class A2AInstrumentor(BaseInstrumentor):  # type: ignore[misc]
     Example::
 
         from opentelemetry.sdk.trace import TracerProvider
-        from splunk_ao.otel import GalileoSpanProcessor, add_galileo_span_processor
+        from splunk_ao.otel import SplunkAOSpanProcessor, add_galileo_span_processor
         from galileo_a2a import A2AInstrumentor
 
         provider = TracerProvider()
-        add_galileo_span_processor(provider, GalileoSpanProcessor())
+        add_galileo_span_processor(provider, SplunkAOSpanProcessor())
         A2AInstrumentor().instrument(tracer_provider=provider, agent_name="my-agent")
 
         # To disable message content capture (e.g. for PII compliance):

galileo-adk/src/galileo_adk/observer.py

@@ -11,7 +11,7 @@
 from uuid import UUID
 
 from splunk_ao import galileo_context
-from splunk_ao.handlers.base_handler import GalileoBaseHandler
+from splunk_ao.handlers.base_handler import SplunkAOBaseHandler
 from splunk_ao.schema.trace import TracesIngestRequest
 from splunk_ao.utils.serialization import serialize_to_str
 
@@ -148,7 +148,7 @@ def __init__(
         if ingestion_hook:
             trace_builder = TraceBuilder(ingestion_hook=ingestion_hook)
             self._trace_builder = trace_builder
-            self._handler = GalileoBaseHandler(
+            self._handler = SplunkAOBaseHandler(
                 galileo_logger=trace_builder,  # type: ignore[arg-type]
                 start_new_trace=True,
                 flush_on_chain_end=True,
@@ -157,7 +157,7 @@ def __init__(
         else:
             self._trace_builder = None
             galileo_logger = galileo_context.get_logger_instance(project=project, log_stream=log_stream)
-            self._handler = GalileoBaseHandler(
+            self._handler = SplunkAOBaseHandler(
                 galileo_logger=galileo_logger,
                 start_new_trace=True,
                 flush_on_chain_end=True,
@@ -171,7 +171,7 @@ def __init__(
         self._session_root_invocation: dict[str, str] = {}
 
     @property
-    def handler(self) -> GalileoBaseHandler:
+    def handler(self) -> SplunkAOBaseHandler:
         """Access the underlying handler."""
         return self._handler
 

galileo-adk/src/galileo_adk/span_manager.py

@@ -7,7 +7,7 @@
 from typing import Any
 from uuid import UUID
 
-from splunk_ao.handlers.base_handler import GalileoBaseHandler
+from splunk_ao.handlers.base_handler import SplunkAOBaseHandler
 
 from galileo_adk.types import RunContext
 
@@ -18,7 +18,7 @@
 class SpanManager:
     """Manages span creation and hierarchy for Galileo observability."""
 
-    def __init__(self, handler: GalileoBaseHandler) -> None:
+    def __init__(self, handler: SplunkAOBaseHandler) -> None:
         self._handler = handler
         self._run_contexts: dict[str, RunContext] = {}
 

galileo-adk/src/galileo_adk/trace_builder.py

@@ -1,7 +1,7 @@
 """Lightweight trace builder for ingestion hook mode.
 
 This module provides a TraceBuilder class that implements the same interface as
-GalileoLogger for trace building, but without requiring Galileo credentials or
+SplunkAOLogger for trace building, but without requiring Galileo credentials or
 backend connectivity.
 
 When using `ingestion_hook`, the plugin can build traces locally and pass them
@@ -46,10 +46,10 @@ def _handle_async_hook_result(task: asyncio.Task) -> None:
 class TraceBuilder(TracesLogger):
     """Lightweight trace builder for ingestion hook mode.
 
-    Inherits trace-building logic from TracesLogger (same base as GalileoLogger).
+    Inherits trace-building logic from TracesLogger (same base as SplunkAOLogger).
     No Galileo credentials or backend connection required.
 
-    This class provides the same interface as GalileoLogger for:
+    This class provides the same interface as SplunkAOLogger for:
     - Starting traces and adding spans (llm, tool, workflow, agent, retriever)
     - Managing parent span hierarchy
     - Flushing traces (calls ingestion_hook instead of API)
@@ -150,8 +150,8 @@ def start_trace(
     ) -> LoggedTrace:
         """Create a new trace and add it to the list of traces.
 
-        This method mirrors GalileoLogger.start_trace() for API compatibility
-        with GalileoBaseHandler.
+        This method mirrors SplunkAOLogger.start_trace() for API compatibility
+        with SplunkAOBaseHandler.
 
         Parameters
         ----------
@@ -228,7 +228,7 @@ def add_workflow_span(
         """Add a workflow span to the current parent.
 
         This method wraps TracesLogger.add_workflow_span() to accept
-        `metadata` parameter (for GalileoBaseHandler compatibility).
+        `metadata` parameter (for SplunkAOBaseHandler compatibility).
         """
         parent = self.current_parent()
         span = LoggedWorkflowSpan(
@@ -269,7 +269,7 @@ def add_agent_span(
         """Add an agent span to the current parent.
 
         This method wraps TracesLogger.add_agent_span() to accept
-        `metadata` parameter (for GalileoBaseHandler compatibility).
+        `metadata` parameter (for SplunkAOBaseHandler compatibility).
         """
         parent = self.current_parent()
         span = LoggedAgentSpan(
@@ -318,7 +318,7 @@ def add_llm_span(
         """Add an LLM span to the current parent.
 
         This method wraps TracesLogger.add_llm_span() to accept
-        `metadata` parameter (for GalileoBaseHandler compatibility).
+        `metadata` parameter (for SplunkAOBaseHandler compatibility).
         """
         span = LoggedLlmSpan(
             input=input,
@@ -365,7 +365,7 @@ def add_tool_span(
         """Add a tool span to the current parent.
 
         This method wraps TracesLogger.add_tool_span() to accept
-        `metadata` parameter (for GalileoBaseHandler compatibility).
+        `metadata` parameter (for SplunkAOBaseHandler compatibility).
         """
         return super().add_tool_span(
             id=uuid.uuid4(),
@@ -400,7 +400,7 @@ def add_retriever_span(
         """Add a retriever span to the current parent.
 
         This method wraps TracesLogger.add_retriever_span() to accept
-        `metadata` parameter (for GalileoBaseHandler compatibility).
+        `metadata` parameter (for SplunkAOBaseHandler compatibility).
         """
         documents = convert_to_documents(output, "output")
         redacted_documents = convert_to_documents(redacted_output, "redacted_output")

galileo-adk/tests/conftest.py

@@ -8,9 +8,9 @@
 from galileo_core.constants.routes import Routes as CoreRoutes
 from galileo_core.schemas.core.user import User
 from galileo_core.schemas.core.user_role import UserRole
+from splunk_ao.config import SplunkAOConfig
+from splunk_ao.utils.singleton import SplunkAOLoggerSingleton
 from test_support.config import fast_config_validation
-from splunk_ao.config import GalileoPythonConfig
-from splunk_ao.utils.singleton import GalileoLoggerSingleton
 
 # Note: The mock_request fixture is automatically provided by galileo_core[testing] extras
 
@@ -123,7 +123,7 @@ def mock_log_streams(mock_request: Callable) -> Generator[None, None, None]:
 
 @pytest.fixture
 def mock_sessions(mock_request: Callable) -> Generator[None, None, None]:
-    """Mock the sessions endpoints used by GalileoLogger.start_session().
+    """Mock the sessions endpoints used by SplunkAOLogger.start_session().
 
     Endpoints:
     - POST /projects/{project_id}/sessions/search - search sessions
@@ -163,17 +163,17 @@ def set_validated_config(
 ) -> Generator[None, None, None]:
     """Automatically set up validated config for tests."""
     # Reset any existing config state
-    if GalileoPythonConfig._instance is not None:
-        GalileoPythonConfig._instance.reset()
+    if SplunkAOConfig._instance is not None:
+        SplunkAOConfig._instance.reset()
     # Reset any cached loggers from previous tests
-    GalileoLoggerSingleton().reset_all()
+    SplunkAOLoggerSingleton().reset_all()
 
     # Bypass the slow async validation round-trips for the build only; the
     # endpoints are already mocked above, so this only removes event-loop cost
     # (notably the ~11x slower Windows IOCP poll on Python 3.11+).
     with fast_config_validation():
-        config = GalileoPythonConfig.get(console_url="http://fake.test:8088", api_key="api-1234567890")
+        config = SplunkAOConfig.get(console_url="http://fake.test:8088", api_key="api-1234567890")
     yield
     # Clean up after test
-    GalileoLoggerSingleton().reset_all()
+    SplunkAOLoggerSingleton().reset_all()
     config.reset()

galileo-adk/tests/test_plugin.py

@@ -40,7 +40,7 @@ def test_init_with_ingestion_hook_without_env_vars(self, monkeypatch: pytest.Mon
         traces: list = []
         plugin = GalileoADKPlugin(ingestion_hook=lambda r: traces.extend(r.traces))
 
-        # Then: plugin initializes successfully with TraceBuilder (not GalileoLogger)
+        # Then: plugin initializes successfully with TraceBuilder (not SplunkAOLogger)
         assert plugin._observer is not None
         assert plugin._observer._trace_builder is not None
         assert plugin._observer._trace_builder._ingestion_hook is not None

galileo-adk/tests/test_trace_builder.py

@@ -176,15 +176,15 @@ def test_add_retriever_span(self, builder_with_trace: TraceBuilder) -> None:
         # When: adding a retriever span
         span = builder.add_retriever_span(
             input="search query",
-            output=[],  # TraceBuilder uses 'output' (same as GalileoLogger API)
+            output=[],  # TraceBuilder uses 'output' (same as SplunkAOLogger API)
         )
 
         # Then: span is created
         assert span is not None
 
     def test_add_retriever_span_with_string_output(self, builder_with_trace: TraceBuilder) -> None:
         # Given: a trace builder with an active trace and string output
-        # (this is what GalileoBaseHandler passes after serialize_to_str)
+        # (this is what SplunkAOBaseHandler passes after serialize_to_str)
         builder = builder_with_trace
 
         # When: adding a retriever span with a string output