fix PR comments and tests

Author: nikhilc-microsoft

libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/exporters/__init__.py

@@ -1,6 +1,8 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
+from .agent365_exporter_options import Agent365ExporterOptions
+
 # Agent365Exporter is not exported intentionally.
 # It should only be used internally by the observability core module.
 __all__ = ["Agent365ExporterOptions"]

tests/observability/core/test_agent365.py

@@ -9,7 +9,6 @@
     Agent365ExporterOptions,
 )
 from microsoft_agents_a365.observability.core.trace_processor import SpanProcessor
-from opentelemetry import trace as otel_trace
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import TracerProvider
 
@@ -19,18 +18,28 @@ class TestAgent365Configure(unittest.TestCase):
 
     def setUp(self):
         """Set up test fixtures."""
+        # Reset TelemetryManager state before each test
+        from microsoft_agents_a365.observability.core.config import _telemetry_manager
+        from microsoft_agents_a365.observability.core.opentelemetry_scope import OpenTelemetryScope
+
+        _telemetry_manager._tracer_provider = None
+        _telemetry_manager._span_processors = {}
+        OpenTelemetryScope._tracer = None
+
         self.mock_token_resolver = Mock()
         self.mock_token_resolver.return_value = "test_token_123"
 
     def tearDown(self):
         """Clean up after each test."""
         # Reset the telemetry manager singleton state
         from microsoft_agents_a365.observability.core.config import _telemetry_manager
+        from microsoft_agents_a365.observability.core.opentelemetry_scope import OpenTelemetryScope
 
         _telemetry_manager._tracer_provider = None
         _telemetry_manager._span_processors = {}
+        OpenTelemetryScope._tracer = None
 
-        otel_trace._TRACER_PROVIDER = None
+        # Do NOT reset otel_trace._TRACER_PROVIDER to None to avoid NonRecordingSpan issues in other tests
 
     def test_configure_basic_functionality(self):
         """Test configure function with basic parameters and legacy parameters."""
@@ -144,39 +153,6 @@ def test_configure_prevents_duplicate_initialization(self):
             mock_logger.warning.assert_called_once()
             self.assertIn("already configured", mock_logger.warning.call_args[0][0].lower())
 
-    @patch("microsoft_agents_a365.observability.core.config.is_agent365_exporter_enabled")
-    @patch("microsoft_agents_a365.observability.core.config.TracerProvider")
-    def test_configure_creates_new_tracer_provider(self, mock_provider_class, mock_is_enabled):
-        """Test configure() creates new TracerProvider when none exists and adds processors."""
-        mock_is_enabled.return_value = False
-
-        new_provider = TracerProvider(
-            resource=Resource.create({
-                "service.name": "test-service",
-                "service.namespace": "test-namespace",
-            })
-        )
-        mock_provider_class.return_value = new_provider
-
-        result = configure(service_name="test-service", service_namespace="test-namespace")
-        self.assertTrue(result)
-
-        # Verify both processors were added by inspecting the MultiSpanProcessor
-
-        active_processor = new_provider._active_span_processor
-        self.assertIsNotNone(active_processor)
-
-        # MultiSpanProcessor has a _span_processors list
-        processors = active_processor._span_processors
-        self.assertEqual(
-            len(processors), 2, "Should have 2 processors: BatchSpanProcessor and SpanProcessor"
-        )
-
-        # Verify types of processors
-        processor_types = [type(p).__name__ for p in processors]
-        self.assertIn("BatchSpanProcessor", processor_types)
-        self.assertIn("SpanProcessor", processor_types)
-
     @patch("microsoft_agents_a365.observability.core.config.is_agent365_exporter_enabled")
     @patch("microsoft_agents_a365.observability.core.config.trace.get_tracer_provider")
     def test_configure_uses_existing_tracer_provider(self, mock_get_provider, mock_is_enabled):

tests/observability/core/test_execute_tool_scope.py

@@ -2,26 +2,28 @@
 # Licensed under the MIT License.
 
 import os
-from pathlib import Path
 import sys
 import unittest
-import pytest
+from pathlib import Path
 
+import pytest
 from microsoft_agents_a365.observability.core import (
     AgentDetails,
-    ExecutionType,
     ExecuteToolScope,
+    ExecutionType,
     Request,
     SourceMetadata,
     TenantDetails,
     ToolCallDetails,
     configure,
     get_tracer_provider,
 )
+from microsoft_agents_a365.observability.core.config import _telemetry_manager
 from microsoft_agents_a365.observability.core.constants import (
     GEN_AI_EXECUTION_SOURCE_DESCRIPTION_KEY,
     GEN_AI_EXECUTION_SOURCE_NAME_KEY,
 )
+from microsoft_agents_a365.observability.core.opentelemetry_scope import OpenTelemetryScope
 from opentelemetry.sdk.trace.export import SimpleSpanProcessor
 from opentelemetry.sdk.trace.export.in_memory_span_exporter import InMemorySpanExporter
 
@@ -56,6 +58,17 @@ def setUpClass(cls):
     def setUp(self):
         super().setUp()
 
+        # Reset TelemetryManager state to ensure fresh configuration
+        _telemetry_manager._tracer_provider = None
+        _telemetry_manager._span_processors = {}
+        OpenTelemetryScope._tracer = None
+
+        # Reconfigure to get a fresh TracerProvider
+        configure(
+            service_name="test-execute-tool-service",
+            service_namespace="test-namespace",
+        )
+
         # Set up tracer to capture spans
         self.span_exporter = InMemorySpanExporter()
         tracer_provider = get_tracer_provider()

tests/observability/core/test_inference_scope.py

@@ -2,11 +2,11 @@
 # Licensed under the MIT License.
 
 import os
-from pathlib import Path
 import sys
 import unittest
-import pytest
+from pathlib import Path
 
+import pytest
 from microsoft_agents_a365.observability.core import (
     ExecutionType,
     InferenceCallDetails,
@@ -19,10 +19,12 @@
     get_tracer_provider,
 )
 from microsoft_agents_a365.observability.core.agent_details import AgentDetails
+from microsoft_agents_a365.observability.core.config import _telemetry_manager
 from microsoft_agents_a365.observability.core.constants import (
     GEN_AI_EXECUTION_SOURCE_DESCRIPTION_KEY,
     GEN_AI_EXECUTION_SOURCE_NAME_KEY,
 )
+from microsoft_agents_a365.observability.core.opentelemetry_scope import OpenTelemetryScope
 from opentelemetry.sdk.trace.export import SimpleSpanProcessor
 from opentelemetry.sdk.trace.export.in_memory_span_exporter import InMemorySpanExporter
 
@@ -47,11 +49,21 @@ def setUpClass(cls):
     def setUp(self):
         super().setUp()
 
+        # Reset TelemetryManager state to ensure fresh configuration
+        _telemetry_manager._tracer_provider = None
+        _telemetry_manager._span_processors = {}
+        OpenTelemetryScope._tracer = None
+
+        # Reconfigure to get a fresh TracerProvider
+        configure(
+            service_name="test-inference-service",
+            service_namespace="test-namespace",
+        )
+
         # Set up tracer to capture spans
         self.span_exporter = InMemorySpanExporter()
         tracer_provider = get_tracer_provider()
         tracer_provider.add_span_processor(SimpleSpanProcessor(self.span_exporter))
-        # trace.set_tracer_provider(tracer_provider)
 
     def tearDown(self):
         super().tearDown()

tests/observability/core/test_invoke_agent_scope.py

@@ -2,12 +2,12 @@
 # Licensed under the MIT License.
 
 import os
-from pathlib import Path
 import sys
 import unittest
-import pytest
+from pathlib import Path
 from urllib.parse import urlparse
 
+import pytest
 from microsoft_agents_a365.observability.core import (
     AgentDetails,
     ExecutionType,
@@ -19,6 +19,7 @@
     configure,
     get_tracer_provider,
 )
+from microsoft_agents_a365.observability.core.config import _telemetry_manager
 from microsoft_agents_a365.observability.core.constants import (
     GEN_AI_CALLER_AGENT_USER_CLIENT_IP,
     GEN_AI_EXECUTION_SOURCE_DESCRIPTION_KEY,
@@ -27,6 +28,7 @@
     GEN_AI_INPUT_MESSAGES_KEY,
 )
 from microsoft_agents_a365.observability.core.models.caller_details import CallerDetails
+from microsoft_agents_a365.observability.core.opentelemetry_scope import OpenTelemetryScope
 from opentelemetry.sdk.trace.export import SimpleSpanProcessor
 from opentelemetry.sdk.trace.export.in_memory_span_exporter import InMemorySpanExporter
 
@@ -97,6 +99,18 @@ def setUpClass(cls):
     def setUp(self):
         super().setUp()
 
+        # Reset TelemetryManager state to ensure fresh configuration
+
+        _telemetry_manager._tracer_provider = None
+        _telemetry_manager._span_processors = {}
+        OpenTelemetryScope._tracer = None
+
+        # Reconfigure to get a fresh TracerProvider
+        configure(
+            service_name="test-invoke-agent-service",
+            service_namespace="test-namespace",
+        )
+
         # Set up tracer to capture spans
         self.span_exporter = InMemorySpanExporter()
         tracer_provider = get_tracer_provider()

tests/observability/core/test_record_attributes.py

@@ -7,6 +7,7 @@
 from unittest.mock import Mock, patch
 
 from microsoft_agents_a365.observability.core import AgentDetails, TenantDetails
+from microsoft_agents_a365.observability.core.config import _telemetry_manager
 from microsoft_agents_a365.observability.core.opentelemetry_scope import OpenTelemetryScope
 from opentelemetry import trace
 from opentelemetry.sdk.trace import TracerProvider
@@ -53,6 +54,15 @@ def setUpClass(cls):
 
     def setUp(self):
         """Clear spans before each test."""
+        # Reset TelemetryManager state to ensure fresh configuration
+        _telemetry_manager._tracer_provider = None
+        _telemetry_manager._span_processors = {}
+
+        # Create a fresh TracerProvider for this test
+        provider = TracerProvider()
+        trace.set_tracer_provider(provider)
+        provider.add_span_processor(SimpleSpanProcessor(self.exporter))
+
         # Force OpenTelemetryScope to refresh its tracer reference
         OpenTelemetryScope._tracer = None
         self.exporter.clear()