Merge pull request #6 from microsoft/nikhilc/AddIntegrationTests

add integration tests

Author: nikhilNava

.github/workflows/ci.yml

@@ -112,9 +112,20 @@ jobs:
       run: |
         A365_SDK_VERSION=${{ needs.version-number.outputs.PYTHON_PACKAGE_VERSION }} uv build --all-packages --wheel
 
-    - name: Run tests
+    - name: Run unit tests
       run: |
-        uv run --frozen python -m pytest tests/ -v --tb=short
+        uv run --frozen python -m pytest tests/ -v --tb=short -m "not integration"
+
+    - name: Run integration tests
+      # Only run integration tests if secrets are available
+      if: ${{ vars.RUN_INTEGRATION_TESTS == 'true' }}
+      run: |
+        uv run --frozen python -m pytest tests/integration/ -v --tb=short -m integration
+      env:
+        AZURE_OPENAI_API_KEY: ${{ secrets.AZURE_OPENAI_API_KEY }}
+        AZURE_OPENAI_ENDPOINT: ${{ vars.AZURE_OPENAI_ENDPOINT }}
+        AZURE_OPENAI_DEPLOYMENT: ${{ vars.AZURE_OPENAI_DEPLOYMENT }}
+        AZURE_OPENAI_API_VERSION: ${{ vars.AZURE_OPENAI_API_VERSION }}        
 
     # Copy package and samples to drop folder
     - name: Copy package and samples to drop folder

libraries/microsoft-agents-a365-observability-extensions-langchain/README.md

@@ -44,7 +44,7 @@ The Microsoft Agent 365 LangChain Observability Extensions automatically instrum
 
 ```python
 from microsoft_agents_a365.observability.core.config import configure
-from microsoft_agents_a365.observability.extensions.langchain import KairoInstrumentorLangChain
+from microsoft_agents_a365.observability.extensions.langchain import CustomLangChainInstrumentor
 
 # Configure observability
 configure(
@@ -53,7 +53,7 @@ configure(
 )
 
 # Enable automatic instrumentation
-instrumentor = KairoInstrumentorLangChain()
+instrumentor = CustomLangChainInstrumentor()
 instrumentor.instrument()
 
 # Your LangChain code is now automatically traced
@@ -84,7 +84,7 @@ instrumentor.instrument()
 ```properties
 # Core observability settings
 ENABLE_OBSERVABILITY=true
-ENABLE_KAIRO_EXPORTER=true
+ENABLE_A365_OBSERVABILITY_EXPORTER=true
 PYTHON_ENVIRONMENT=production
 
 # LangChain-specific settings  

libraries/microsoft-agents-a365-observability-extensions-langchain/microsoft_agents_a365/observability/extensions/langchain/tracer_instrumentor.py

@@ -9,15 +9,15 @@
 import langchain_core
 import opentelemetry.trace as optel_trace
 from langchain_core.callbacks import BaseCallbackManager
-from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
-from opentelemetry.trace import Span
-from wrapt import wrap_function_wrapper
-
 from microsoft_agents_a365.observability.core.config import (
     get_tracer,
     get_tracer_provider,
     is_configured,
 )
+from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from opentelemetry.trace import Span
+from wrapt import wrap_function_wrapper
+
 from microsoft_agents_a365.observability.extensions.langchain.tracer import CustomLangChainTracer
 
 _INSTRUMENTS: str = "langchain_core >= 0.1.0"
@@ -48,7 +48,7 @@ def _instrument(self, **kwargs: Any) -> None:
         tracer_name: str | None = kwargs.get("tracer_name")
         tracer_version: str | None = kwargs.get("tracer_version")
 
-        # Prefer the Kairo tracer; fall back to OpenTelemetry’s default if needed.
+        # Prefer the Agent365 tracer; fall back to OpenTelemetry’s default if needed.
         try:
             tracer = get_tracer(tracer_name, tracer_version)
         except Exception:

libraries/microsoft-agents-a365-observability-extensions-langchain/pyproject.toml

@@ -37,7 +37,7 @@ dependencies = [
 Homepage = "https://github.com/microsoft/Agent365"
 Repository = "https://github.com/microsoft/Agent365"
 Issues = "https://github.com/microsoft/Agent365/issues"
-Documentation = "https://github.com/microsoft/Agent365/tree/main/python/microsoft_kairo/observability/wrappers/langchain"
+Documentation = "https://github.com/microsoft/Agent365-python/tree/main/libraries/microsoft-agents-a365-observability-extensions-langchain"
 
 [project.optional-dependencies]
 dev = [

libraries/microsoft-agents-a365-observability-extensions-openai/README.md

@@ -45,7 +45,7 @@ The Microsoft Agent 365 OpenAI Agents Observability Extensions automatically ins
 
 ```python
 from microsoft_agents_a365.observability.core.config import configure
-from microsoft_agents_a365.observability.extensions.openai_agents import KairoInstrumentorOpenAIAgents
+from microsoft_agents_a365.observability.extensions.openai_agents import OpenAIAgentsTraceInstrumentor
 
 # Configure observability
 configure(
@@ -54,7 +54,7 @@ configure(
 )
 
 # Enable automatic instrumentation
-instrumentor = KairoInstrumentorOpenAIAgents()
+instrumentor = OpenAIAgentsTraceInstrumentor()
 instrumentor.instrument()
 
 # Your OpenAI Agents code is now automatically traced

libraries/microsoft-agents-a365-observability-extensions-openai/microsoft_agents_a365/observability/extensions/openai/__init__.py

@@ -1,9 +1,9 @@
 # Copyright (c) Microsoft. All rights reserved.
 
 """
-Wraps the OpenAI Agents SDK tracer to integrate with our Kairo Telemetry Solution.
+Wraps the OpenAI Agents SDK tracer to integrate with our Agent365 Telemetry Solution.
 """
 
-from .trace_instrumentor import KairoInstrumentorOpenAIAgents
+from .trace_instrumentor import OpenAIAgentsTraceInstrumentor
 
-__all__ = ["KairoInstrumentorOpenAIAgents"]
+__all__ = ["OpenAIAgentsTraceInstrumentor"]

libraries/microsoft-agents-a365-observability-extensions-openai/microsoft_agents_a365/observability/extensions/openai/trace_instrumentor.py

@@ -8,11 +8,10 @@
 
 import opentelemetry.trace as optel_trace
 from agents import set_trace_processors
+from microsoft_agents_a365.observability.core import get_tracer, get_tracer_provider, is_configured
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.trace import Tracer
 
-from microsoft_agents_a365.observability.core import get_tracer, get_tracer_provider, is_configured
-
 from .trace_processor import OpenAIAgentsTraceProcessor
 
 logging.basicConfig(level=logging.INFO)
@@ -21,51 +20,51 @@
 _instruments = ("openai-agents >= 0.2.6",)
 
 
-class KairoInstrumentorOpenAIAgents(BaseInstrumentor):
+class OpenAIAgentsTraceInstrumentor(BaseInstrumentor):
     """
-    Custom Trace Processor for OpenAI Agents SDK using Kairo.
-    Forwards OpenAI Agents SDK traces and spans to Kairo's tracing scopes.
+    Custom Trace Processor for OpenAI Agents SDK using Agent365.
+    Forwards OpenAI Agents SDK traces and spans to Agent365's tracing scopes.
 
     ```
     """
 
     def __init__(self):
-        """Initialize the KairoInstrumentorOpenAIAgents.
-        Raises: RuntimeError: If Kairo is not configured.
+        """Initialize the OpenAIAgentsTraceInstrumentor.
+        Raises: RuntimeError: If Agent365 is not configured.
         """
-        # Verify if Kairo is configured
-        kairo_status = is_configured()
-        if not kairo_status:
+        # Verify if Agent365 is configured
+        Agent365_status = is_configured()
+        if not Agent365_status:
             raise RuntimeError(
-                "Kairo is not configured yet. Please configure Kairo before initializing this instrumentor."
+                "Agent365 is not configured yet. Please configure Agent365 before initializing this instrumentor."
             )
         super().__init__()
 
     def instrumentation_dependencies(self) -> Collection[str]:
         return _instruments
 
     def _instrument(self, **kwargs: Any) -> None:
-        """Instruments the OpenAI Agents SDK with Kairo tracing."""
+        """Instruments the OpenAI Agents SDK with Agent365 tracing."""
         tracer_name = kwargs["tracer_name"] if kwargs.get("tracer_name") else None
         tracer_version = kwargs["tracer_version"] if kwargs.get("tracer_version") else None
 
-        # Get the configured Kairo Tracer
+        # Get the configured Agent365 Tracer
         try:
             tracer = get_tracer(tracer_name, tracer_version)
         except Exception:
             # fallback
             tracer = optel_trace.get_tracer(tracer_name, tracer_version)
 
-        # Get the configured Kairo Tracer Provider instance
+        # Get the configured Agent365 Tracer Provider instance
         try:
             get_tracer_provider()
         except Exception:
             # fallback
             optel_trace.get_tracer_provider()
 
-        kairo_tracer = cast(Tracer, tracer)
+        agent365_tracer = cast(Tracer, tracer)
 
-        set_trace_processors([OpenAIAgentsTraceProcessor(kairo_tracer)])
+        set_trace_processors([OpenAIAgentsTraceProcessor(agent365_tracer)])
 
     def _uninstrument(self, **kwargs: Any) -> None:
         pass

libraries/microsoft-agents-a365-observability-extensions-openai/pyproject.toml

@@ -36,7 +36,7 @@ dependencies = [
 Homepage = "https://github.com/microsoft/Agent365"
 Repository = "https://github.com/microsoft/Agent365"
 Issues = "https://github.com/microsoft/Agent365/issues"
-Documentation = "https://github.com/microsoft/Agent365/tree/main/python/microsoft_kairo/observability/wrappers/openai_agents"
+Documentation = "https://github.com/microsoft/Agent365-python/tree/main/libraries/microsoft-agents-a365-observability-extensions-openai"
 
 [project.optional-dependencies]
 dev = [

libraries/microsoft-agents-a365-observability-extensions-semantickernel/README.md

@@ -46,7 +46,7 @@ The Microsoft Agent 365 Semantic Kernel Observability Extensions automatically i
 
 ```python
 from microsoft_agents_a365.observability.core.config import configure
-from microsoft_agents_a365.observability.extensions.semantic_kernel import KairoInstrumentorSemanticKernel
+from microsoft_agents_a365.observability.extensions.semantic_kernel import SemanticKernelInstrumentor
 
 # Configure observability
 configure(
@@ -55,7 +55,7 @@ configure(
 )
 
 # Enable automatic instrumentation
-instrumentor = KairoInstrumentorSemanticKernel()
+instrumentor = SemanticKernelInstrumentor()
 instrumentor.instrument()
 
 # Your Semantic Kernel code is now automatically traced

libraries/microsoft-agents-a365-observability-extensions-semantickernel/microsoft_agents_a365/observability/extensions/semantickernel/trace_instrumentor.py

@@ -5,9 +5,9 @@
 from collections.abc import Collection
 from typing import Any
 
+from microsoft_agents_a365.observability.core.config import get_tracer_provider, is_configured
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 
-from microsoft_agents_a365.observability.core.config import get_tracer_provider, is_configured
 from microsoft_agents_a365.observability.extensions.semantickernel.span_processor import (
     SemanticKernelSpanProcessor,
 )
@@ -28,7 +28,7 @@ class SemanticKernelInstrumentor(BaseInstrumentor):
     def __init__(self):
         if not is_configured():
             raise RuntimeError(
-                "Kairo (or your telemetry config) is not initialized. Configure it before instrumenting."
+                "Agent365 (or your telemetry config) is not initialized. Configure it before instrumenting."
             )
         super().__init__()