diff --git a/HOW_TO_SET_A_VERSION.md b/HOW_TO_SET_A_VERSION.md index b46d6b02..f92155cf 100644 --- a/HOW_TO_SET_A_VERSION.md +++ b/HOW_TO_SET_A_VERSION.md @@ -1,6 +1,6 @@ # How to Set a Version -This document describes how to manage versioning for the Agent365 Python SDK, whether you're creating development builds or official releases. +This document describes how to manage versioning for the Microsoft Agent 365 Python SDK, whether you're creating development builds or official releases. ## Branch Strategy @@ -381,3 +381,4 @@ If you encounter issues with versioning: 2. Verify your Git setup with `git log` and `git describe` 3. Check CI logs for version calculation errors 4. Open an issue with version output and Git status + diff --git a/libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/__init__.py b/libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/__init__.py index 9d81d174..07a1a9f8 100644 --- a/libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/__init__.py +++ b/libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/__init__.py @@ -1,6 +1,6 @@ # Copyright (c) Microsoft. All rights reserved. -# Agent365 Python SDK for OpenTelemetry tracing. +# Microsoft Agent 365 Python SDK for OpenTelemetry tracing. from .agent_details import AgentDetails from .config import ( diff --git a/libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/exporters/agent365_exporter.py b/libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/exporters/agent365_exporter.py index f16c4b9a..efe6c0e3 100644 --- a/libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/exporters/agent365_exporter.py +++ b/libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/exporters/agent365_exporter.py @@ -37,7 +37,7 @@ class Agent365Exporter(SpanExporter): """ - Agent365 span exporter for Agent365: + Agent 365 span exporter for Agent 365: * Partitions spans by (tenantId, agentId) * Builds OTLP-like JSON: resourceSpans -> scopeSpans -> spans * POSTs per group to https://{endpoint}/maven/agent365/agents/{agentId}/traces?api-version=1 diff --git a/libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/exporters/utils.py b/libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/exporters/utils.py index 4d1c75ca..2d57a607 100644 --- a/libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/exporters/utils.py +++ b/libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/exporters/utils.py @@ -66,7 +66,7 @@ def partition_by_identity( def is_agent365_exporter_enabled() -> bool: - """Check if agent365 exporter is enabled.""" + """Check if Agent 365 exporter is enabled.""" # Check environment variable enable_exporter = os.getenv(ENABLE_A365_OBSERVABILITY_EXPORTER, "").lower() return (enable_exporter) in ("true", "1", "yes", "on") diff --git a/libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/middleware/__init__.py b/libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/middleware/__init__.py index 0af5659c..27367a57 100644 --- a/libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/middleware/__init__.py +++ b/libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/middleware/__init__.py @@ -1,6 +1,6 @@ # Copyright (c) Microsoft. All rights reserved. -# Middleware components for Agent365 SDK. +# Middleware components for Microsoft Agent 365 SDK. from .baggage_builder import BaggageBuilder diff --git a/libraries/microsoft-agents-a365-observability-extensions-agentframework/microsoft_agents_a365/observability/extensions/agentframework/trace_instrumentor.py b/libraries/microsoft-agents-a365-observability-extensions-agentframework/microsoft_agents_a365/observability/extensions/agentframework/trace_instrumentor.py index ad7d82fa..c881590a 100644 --- a/libraries/microsoft-agents-a365-observability-extensions-agentframework/microsoft_agents_a365/observability/extensions/agentframework/trace_instrumentor.py +++ b/libraries/microsoft-agents-a365-observability-extensions-agentframework/microsoft_agents_a365/observability/extensions/agentframework/trace_instrumentor.py @@ -28,7 +28,7 @@ class AgentFrameworkInstrumentor(BaseInstrumentor): def __init__(self): if not is_configured(): raise RuntimeError( - "Agent365 (or your telemetry config) is not initialized. Configure it before instrumenting." + "Microsoft Agent 365 (or your telemetry config) is not initialized. Configure it before instrumenting." ) super().__init__() diff --git a/libraries/microsoft-agents-a365-observability-extensions-langchain/microsoft_agents_a365/observability/extensions/langchain/tracer_instrumentor.py b/libraries/microsoft-agents-a365-observability-extensions-langchain/microsoft_agents_a365/observability/extensions/langchain/tracer_instrumentor.py index 4fd843bf..73ebc669 100644 --- a/libraries/microsoft-agents-a365-observability-extensions-langchain/microsoft_agents_a365/observability/extensions/langchain/tracer_instrumentor.py +++ b/libraries/microsoft-agents-a365-observability-extensions-langchain/microsoft_agents_a365/observability/extensions/langchain/tracer_instrumentor.py @@ -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 Agent365 tracer; fall back to OpenTelemetry’s default if needed. + # Prefer the Agent 365 tracer; fall back to OpenTelemetry’s default if needed. try: tracer = get_tracer(tracer_name, tracer_version) except Exception: diff --git a/libraries/microsoft-agents-a365-observability-extensions-openai/microsoft_agents_a365/observability/extensions/openai/__init__.py b/libraries/microsoft-agents-a365-observability-extensions-openai/microsoft_agents_a365/observability/extensions/openai/__init__.py index 1ac30218..72259f15 100644 --- a/libraries/microsoft-agents-a365-observability-extensions-openai/microsoft_agents_a365/observability/extensions/openai/__init__.py +++ b/libraries/microsoft-agents-a365-observability-extensions-openai/microsoft_agents_a365/observability/extensions/openai/__init__.py @@ -1,7 +1,7 @@ # Copyright (c) Microsoft. All rights reserved. """ -Wraps the OpenAI Agents SDK tracer to integrate with our Agent365 Telemetry Solution. +Wraps the OpenAI Agents SDK tracer to integrate with the Microsoft Agent 365 Telemetry Solution. """ from .trace_instrumentor import OpenAIAgentsTraceInstrumentor diff --git a/libraries/microsoft-agents-a365-observability-extensions-openai/microsoft_agents_a365/observability/extensions/openai/trace_instrumentor.py b/libraries/microsoft-agents-a365-observability-extensions-openai/microsoft_agents_a365/observability/extensions/openai/trace_instrumentor.py index 6e8fd0cf..5f8199dd 100644 --- a/libraries/microsoft-agents-a365-observability-extensions-openai/microsoft_agents_a365/observability/extensions/openai/trace_instrumentor.py +++ b/libraries/microsoft-agents-a365-observability-extensions-openai/microsoft_agents_a365/observability/extensions/openai/trace_instrumentor.py @@ -22,21 +22,21 @@ class OpenAIAgentsTraceInstrumentor(BaseInstrumentor): """ - Custom Trace Processor for OpenAI Agents SDK using Agent365. - Forwards OpenAI Agents SDK traces and spans to Agent365's tracing scopes. + Custom Trace Processor for OpenAI Agents SDK using Microsoft Agent 365. + Forwards OpenAI Agents SDK traces and spans to Microsoft Agent 365's tracing scopes. ``` """ def __init__(self): """Initialize the OpenAIAgentsTraceInstrumentor. - Raises: RuntimeError: If Agent365 is not configured. + Raises: RuntimeError: If Microsoft Agent 365 is not configured. """ # Verify if Agent365 is configured Agent365_status = is_configured() if not Agent365_status: raise RuntimeError( - "Agent365 is not configured yet. Please configure Agent365 before initializing this instrumentor." + "Microsoft Agent 365 is not configured yet. Please configure Microsoft Agent 365 before initializing this instrumentor." ) super().__init__() @@ -44,18 +44,18 @@ def instrumentation_dependencies(self) -> Collection[str]: return _instruments def _instrument(self, **kwargs: Any) -> None: - """Instruments the OpenAI Agents SDK with Agent365 tracing.""" + """Instruments the OpenAI Agents SDK with Microsoft Agent 365 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 Agent365 Tracer + # Get the configured Microsoft Agent 365 Tracer try: tracer = get_tracer(tracer_name, tracer_version) except Exception: # fallback tracer = optel_trace.get_tracer(tracer_name, tracer_version) - # Get the configured Agent365 Tracer Provider instance + # Get the configured Microsoft Agent 365 Tracer Provider instance try: get_tracer_provider() except Exception: diff --git a/libraries/microsoft-agents-a365-observability-extensions-semantickernel/microsoft_agents_a365/observability/extensions/semantickernel/trace_instrumentor.py b/libraries/microsoft-agents-a365-observability-extensions-semantickernel/microsoft_agents_a365/observability/extensions/semantickernel/trace_instrumentor.py index 1c986696..1d1b75c6 100644 --- a/libraries/microsoft-agents-a365-observability-extensions-semantickernel/microsoft_agents_a365/observability/extensions/semantickernel/trace_instrumentor.py +++ b/libraries/microsoft-agents-a365-observability-extensions-semantickernel/microsoft_agents_a365/observability/extensions/semantickernel/trace_instrumentor.py @@ -28,7 +28,7 @@ class SemanticKernelInstrumentor(BaseInstrumentor): def __init__(self): if not is_configured(): raise RuntimeError( - "Agent365 (or your telemetry config) is not initialized. Configure it before instrumenting." + "Microsoft Agent 365 (or your telemetry config) is not initialized. Configure it before instrumenting." ) super().__init__() diff --git a/libraries/microsoft-agents-a365-runtime/microsoft_agents_a365/runtime/version_utils.py b/libraries/microsoft-agents-a365-runtime/microsoft_agents_a365/runtime/version_utils.py index 7a471b38..300e6979 100644 --- a/libraries/microsoft-agents-a365-runtime/microsoft_agents_a365/runtime/version_utils.py +++ b/libraries/microsoft-agents-a365-runtime/microsoft_agents_a365/runtime/version_utils.py @@ -2,7 +2,7 @@ # Licensed under the MIT License. """ -Version utilities for Agent365 SDK packages. +Version utilities for Microsoft Agent 365 SDK packages. This module is deprecated. Versioning is now handled automatically by setuptools-git-versioning. See versioning/TARGET-VERSION and diff --git a/tests/observability/core/test_agent365.py b/tests/observability/core/test_agent365.py index c2a6c84e..02bbb32a 100644 --- a/tests/observability/core/test_agent365.py +++ b/tests/observability/core/test_agent365.py @@ -6,8 +6,8 @@ def test_basic_functionality(): - """Test basic Agent365 SDK functionality""" - print("Testing Agent365 SDK...") + """Test basic Microsoft Agent 365 SDK functionality""" + print("Testing Microsoft Agent 365 SDK...") # Test configure function try: diff --git a/tests/observability/core/test_alignment.py b/tests/observability/core/test_alignment.py index 802ac364..5dc45f8a 100644 --- a/tests/observability/core/test_alignment.py +++ b/tests/observability/core/test_alignment.py @@ -170,7 +170,7 @@ def test_span_processor(): def main(): """Run all tests.""" - print("🔍 Testing Agent365 Python SDK alignment with .NET SDK...\n") + print("🔍 Testing Microsoft Agent 365 Python SDK alignment with .NET SDK...\n") try: test_constants_alignment() diff --git a/tests/observability/core/test_baggage_builder.py b/tests/observability/core/test_baggage_builder.py index 290a7281..274232bb 100644 --- a/tests/observability/core/test_baggage_builder.py +++ b/tests/observability/core/test_baggage_builder.py @@ -108,7 +108,7 @@ def test_baggage_propagates_to_child_spans(self): processor = SimpleSpanProcessor(exporter) provider.add_span_processor(processor) - # Also add the Agent365 span processor directly + # Also add the Microsoft Agent 365 span processor directly from microsoft_agents_a365.observability.core.trace_processor.span_processor import ( SpanProcessor as Agent365SpanProcessor, ) diff --git a/tests/observability/core/test_execute_tool_scope.py b/tests/observability/core/test_execute_tool_scope.py index 55be2820..26f9900e 100644 --- a/tests/observability/core/test_execute_tool_scope.py +++ b/tests/observability/core/test_execute_tool_scope.py @@ -18,7 +18,7 @@ class TestExecuteToolScope(unittest.TestCase): @classmethod def setUpClass(cls): """Set up test environment once for all tests.""" - # Configure Agent365 for testing + # Configure Microsoft Agent 365 for testing configure( service_name="test-execute-tool-service", service_namespace="test-namespace", diff --git a/tests/observability/core/test_inference_scope.py b/tests/observability/core/test_inference_scope.py index 2c9c7b94..6743287f 100644 --- a/tests/observability/core/test_inference_scope.py +++ b/tests/observability/core/test_inference_scope.py @@ -21,7 +21,7 @@ class TestInferenceScope(unittest.TestCase): @classmethod def setUpClass(cls): """Set up test environment once for all tests.""" - # Configure Agent365 for testing + # Configure Microsoft Agent 365 for testing configure( service_name="test-inference-service", service_namespace="test-namespace", diff --git a/tests/observability/core/test_invoke_agent_scope.py b/tests/observability/core/test_invoke_agent_scope.py index e923a9db..ac43a9d9 100644 --- a/tests/observability/core/test_invoke_agent_scope.py +++ b/tests/observability/core/test_invoke_agent_scope.py @@ -19,7 +19,7 @@ class TestInvokeAgentScope(unittest.TestCase): @classmethod def setUpClass(cls): """Set up test environment once for all tests.""" - # Configure Agent365 for testing + # Configure Microsoft Agent 365 for testing configure( service_name="test-invoke-agent-service", service_namespace="test-namespace", diff --git a/tests/observability/extensions/agentframework/integration/__init__.py b/tests/observability/extensions/agentframework/integration/__init__.py index f50dabf5..37373b78 100644 --- a/tests/observability/extensions/agentframework/integration/__init__.py +++ b/tests/observability/extensions/agentframework/integration/__init__.py @@ -1,4 +1,4 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. -"""Integration tests for Agent365 Python SDK.""" +"""Integration tests for Microsoft Agent 365 Python SDK.""" diff --git a/tests/observability/extensions/agentframework/integration/conftest.py b/tests/observability/extensions/agentframework/integration/conftest.py index 96362ac1..7085a997 100644 --- a/tests/observability/extensions/agentframework/integration/conftest.py +++ b/tests/observability/extensions/agentframework/integration/conftest.py @@ -49,7 +49,7 @@ def azure_openai_config() -> dict[str, Any]: @pytest.fixture(scope="session") def agent365_config() -> dict[str, Any]: - """Agent365 configuration for integration tests.""" + """Microsoft Agent 365 configuration for integration tests.""" tenant_id = os.getenv("AGENT365_TEST_TENANT_ID", "4d44f041-f91e-4d00-b107-61e47b26f5a8") agent_id = os.getenv("AGENT365_TEST_AGENT_ID", "3bccd52b-daaa-4b11-af40-47443852137c") diff --git a/tests/observability/extensions/langchain/test_wrapper_langchain.py b/tests/observability/extensions/langchain/test_wrapper_langchain.py index b1fff3a7..a5ff15e5 100644 --- a/tests/observability/extensions/langchain/test_wrapper_langchain.py +++ b/tests/observability/extensions/langchain/test_wrapper_langchain.py @@ -39,15 +39,15 @@ def tearDown(self): pass def test_instrumentor_initialization_and_Agent365_integration(self): - """Test 1: Verify InstrumentorForLangChain initializes and integrates with Agent365.""" + """Test 1: Verify InstrumentorForLangChain initializes and integrates with Microsoft Agent 365.""" from microsoft_agents_a365.observability.core.config import get_tracer, is_configured - # Verify Agent365 is configured - self.assertTrue(is_configured(), "Agent365 should be configured") + # Verify Microsoft Agent 365 is configured + self.assertTrue(is_configured(), "Microsoft Agent 365 should be configured") # Get tracer to ensure it works tracer = get_tracer() - self.assertIsNotNone(tracer, "Agent365 tracer should be available") + self.assertIsNotNone(tracer, "Microsoft Agent 365 tracer should be available") # Create instrumentor self._test_instrumentor = CustomLangChainInstrumentor() @@ -67,7 +67,9 @@ def test_instrumentor_initialization_and_Agent365_integration(self): self._test_instrumentor._tracer, "Tracer should be created after initialization" ) - print("✅ Test 1: InstrumentorForLangChain initialization and Agent365 integration works") + print( + "✅ Test 1: InstrumentorForLangChain initialization and Microsoft Agent 365 integration works" + ) def test_instrumentor_get_span_functionality(self): """Test 2: Verify get_span method works correctly with mock data.""" @@ -122,7 +124,7 @@ def test_instrumentor_wrapping_mechanism(self): def run_langchain_tests(): """Run all LangChain wrapper tests with detailed output.""" - print("🧪 Running Agent365 LangChain Instrumentor tests...") + print("🧪 Running Microsoft Agent 365 LangChain Instrumentor tests...") print("=" * 80) # Create test suite diff --git a/tests/observability/extensions/openai/integration/__init__.py b/tests/observability/extensions/openai/integration/__init__.py index 672c50f8..30fd8f65 100644 --- a/tests/observability/extensions/openai/integration/__init__.py +++ b/tests/observability/extensions/openai/integration/__init__.py @@ -1,4 +1,4 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. -"""Integration tests for Agent365 Python SDK.""" +"""Integration tests for Microsoft Agent 365 Python SDK.""" diff --git a/tests/observability/extensions/openai/integration/conftest.py b/tests/observability/extensions/openai/integration/conftest.py index 82faa952..2d99cf44 100644 --- a/tests/observability/extensions/openai/integration/conftest.py +++ b/tests/observability/extensions/openai/integration/conftest.py @@ -49,7 +49,7 @@ def azure_openai_config() -> dict[str, Any]: @pytest.fixture(scope="session") def agent365_config() -> dict[str, Any]: - """Agent365 configuration for integration tests.""" + """Microsoft Agent 365 configuration for integration tests.""" tenant_id = os.getenv("AGENT365_TEST_TENANT_ID", "4d44f041-f91e-4d00-b107-61e47b26f5a8") agent_id = os.getenv("AGENT365_TEST_AGENT_ID", "3bccd52b-daaa-4b11-af40-47443852137c") diff --git a/tests/observability/extensions/openai/test_wrapper_openaiagents.py b/tests/observability/extensions/openai/test_wrapper_openaiagents.py index 3349b2d9..a5852c5a 100644 --- a/tests/observability/extensions/openai/test_wrapper_openaiagents.py +++ b/tests/observability/extensions/openai/test_wrapper_openaiagents.py @@ -13,7 +13,7 @@ class TestOpenAIAgentsTraceInstrumentor(unittest.TestCase): @classmethod def setUpClass(cls): """Set up test environment once for all tests.""" - # Configure Agent365 for testing + # Configure Microsoft Agent 365 for testing configure( service_name="test-service-openaiAgents", service_namespace="test-namespace-openaiAgents", @@ -60,20 +60,20 @@ def test_instrumentor_methods_exist(self): class TestAgent365InstrumentorIntegration(unittest.TestCase): - """Integration tests for the instrumentor with the broader Agent365 system.""" + """Integration tests for the instrumentor with the broader Microsoft Agent 365 system.""" def setUp(self): - """Set up each test with a fresh Agent365 configuration.""" + """Set up each test with a fresh Microsoft Agent 365 configuration.""" configure( service_name="integration-test-service", service_namespace="integration-test-namespace", ) def test_instrumentor_with_Agent365_configured(self): - """Test instrumentor behavior when Agent365 is properly configured.""" + """Test instrumentor behavior when Microsoft Agent 365 is properly configured.""" from microsoft_agents_a365.observability.core import get_tracer, is_configured - # Verify Agent365 is configured + # Verify Microsoft Agent 365 is configured self.assertTrue(is_configured()) # Get tracer to ensure it works @@ -84,12 +84,12 @@ def test_instrumentor_with_Agent365_configured(self): instrumentor = OpenAIAgentsTraceInstrumentor() self.assertIsNotNone(instrumentor) - print("✅ Integration test passed: Instrumentor works with configured Agent365") + print("✅ Integration test passed: Instrumentor works with configured Microsoft Agent 365") def run_comprehensive_tests(): """Run all tests with detailed output.""" - print("🧪 Running comprehensive Agent365 OpenAI Agents Instrumentor tests...") + print("🧪 Running comprehensive Microsoft Agent 365 OpenAI Agents Instrumentor tests...") print("=" * 80) # Create test suite diff --git a/tests/observability/extensions/semantickernel/test_wrapper_semantic_kernel.py b/tests/observability/extensions/semantickernel/test_wrapper_semantic_kernel.py index 7d1ed913..99c9a266 100644 --- a/tests/observability/extensions/semantickernel/test_wrapper_semantic_kernel.py +++ b/tests/observability/extensions/semantickernel/test_wrapper_semantic_kernel.py @@ -19,7 +19,7 @@ class TestSemanticKernelInstrumentor(unittest.TestCase): @classmethod def setUpClass(cls): """Set up test environment once for all tests.""" - # Configure Agent365 for testing + # Configure Microsoft Agent 365 for testing configure( service_name="test-service-semantic-kernel", service_namespace="test-namespace-semantic-kernel", diff --git a/tests/usage_example.py b/tests/usage_example.py index 266a1d32..e091e859 100644 --- a/tests/usage_example.py +++ b/tests/usage_example.py @@ -8,7 +8,7 @@ def main(): - """Demonstrate the aligned Agent365 Python SDK functionality.""" + """Demonstrate the aligned Microsoft Agent 365 Python SDK functionality.""" # Enable telemetry (aligned with .NET SDK environment variable) os.environ["ENABLE_OBSERVABILITY"] = "true" @@ -24,7 +24,7 @@ def main(): configure, ) - print("🚀 Agent365 Python SDK - Aligned with .NET SDK") + print("🚀 Microsoft Agent 365 Python SDK - Aligned with .NET SDK") print("=" * 50) # Configure telemetry (existing function still works) diff --git a/versioning/helper/__init__.py b/versioning/helper/__init__.py index 0f4930f9..40ecc2c3 100644 --- a/versioning/helper/__init__.py +++ b/versioning/helper/__init__.py @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. -"""Agent365 Python SDK setup utilities.""" +"""Microsoft Agent 365 Python SDK setup utilities.""" from .setup_utils import ( get_package_version, diff --git a/versioning/helper/setup_utils.py b/versioning/helper/setup_utils.py index 0ae10711..1f08ca8a 100644 --- a/versioning/helper/setup_utils.py +++ b/versioning/helper/setup_utils.py @@ -2,7 +2,7 @@ # Licensed under the MIT License. """ -Shared utilities for setup.py files across all Agent365 Python SDK packages. +Shared utilities for setup.py files across all Microsoft Agent 365 Python SDK packages. This module provides helper functions to dynamically set internal package versions at build time, ensuring all packages in the monorepo use the exact same version.