Add scope and domain override support for observability

Co-authored-by: sergioescalera <8428450+sergioescalera@users.noreply.github.com>

Author: Copilot

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

@@ -6,6 +6,7 @@
 
 import json
 import logging
+import os
 import threading
 import time
 from collections.abc import Callable, Sequence
@@ -86,8 +87,12 @@ def export(self, spans: Sequence[ReadableSpan]) -> SpanExportResult:
                 body = json.dumps(payload, separators=(",", ":"), ensure_ascii=False)
 
                 # Resolve endpoint + token
-                discovery = PowerPlatformApiDiscovery(self._cluster_category)
-                endpoint = discovery.get_tenant_island_cluster_endpoint(tenant_id)
+                domain_override = os.getenv("A365_OBSERVABILITY_DOMAIN_OVERRIDE")
+                if domain_override:
+                    endpoint = domain_override
+                else:
+                    discovery = PowerPlatformApiDiscovery(self._cluster_category)
+                    endpoint = discovery.get_tenant_island_cluster_endpoint(tenant_id)
                 endpoint_path = (
                     f"/maven/agent365/service/agents/{agent_id}/traces"
                     if self._use_s2s_endpoint

libraries/microsoft-agents-a365-runtime/microsoft_agents_a365/runtime/environment_utils.py

@@ -21,10 +21,14 @@ def get_observability_authentication_scope() -> list[str]:
     """
     Returns the scope for authenticating to the observability service based on the current environment.
 
+    The scope can be overridden via the A365_OBSERVABILITY_SCOPE_OVERRIDE environment variable
+    to enable testing against pre-production environments.
+
     Returns:
         list[str]: The authentication scope for the current environment.
     """
-    return [PROD_OBSERVABILITY_SCOPE]
+    override_scope = os.getenv("A365_OBSERVABILITY_SCOPE_OVERRIDE")
+    return [override_scope] if override_scope else [PROD_OBSERVABILITY_SCOPE]
 
 
 def is_development_environment() -> bool:

tests/observability/core/test_agent365_exporter.py

@@ -384,6 +384,87 @@ def test_exporter_is_internal(self):
             "Exporter class should be prefixed with underscore to indicate it's private/internal",
         )
 
+    def test_export_uses_domain_override_when_env_var_set(self):
+        """Test that domain override is used when A365_OBSERVABILITY_DOMAIN_OVERRIDE is set."""
+        # Arrange
+        override_domain = "override.example.com"
+        import os
+
+        os.environ["A365_OBSERVABILITY_DOMAIN_OVERRIDE"] = override_domain
+
+        try:
+            spans = [self._create_mock_span("override_test_span")]
+
+            # Mock the PowerPlatformApiDiscovery class (should not be called when override is set)
+            with patch(
+                "microsoft_agents_a365.observability.core.exporters.agent365_exporter.PowerPlatformApiDiscovery"
+            ) as mock_discovery_class:
+                # Mock the _post_with_retries method
+                with patch.object(
+                    self.exporter, "_post_with_retries", return_value=True
+                ) as mock_post:
+                    # Act
+                    result = self.exporter.export(spans)
+
+                    # Assert
+                    self.assertEqual(result, SpanExportResult.SUCCESS)
+                    mock_post.assert_called_once()
+
+                    # Verify the call arguments - should use override domain
+                    args, kwargs = mock_post.call_args
+                    url, body, headers = args
+
+                    self.assertIn(override_domain, url)
+                    self.assertIn("/maven/agent365/agents/test-agent-456/traces", url)
+
+                    # Verify PowerPlatformApiDiscovery was not instantiated
+                    mock_discovery_class.assert_not_called()
+
+        finally:
+            # Cleanup
+            del os.environ["A365_OBSERVABILITY_DOMAIN_OVERRIDE"]
+
+    def test_export_uses_default_domain_when_no_override(self):
+        """Test that default domain resolution is used when no override is set."""
+        # Arrange
+        import os
+
+        # Ensure override is not set
+        if "A365_OBSERVABILITY_DOMAIN_OVERRIDE" in os.environ:
+            del os.environ["A365_OBSERVABILITY_DOMAIN_OVERRIDE"]
+
+        spans = [self._create_mock_span("default_domain_span")]
+
+        # Mock the PowerPlatformApiDiscovery class
+        with patch(
+            "microsoft_agents_a365.observability.core.exporters.agent365_exporter.PowerPlatformApiDiscovery"
+        ) as mock_discovery_class:
+            mock_discovery = Mock()
+            mock_discovery.get_tenant_island_cluster_endpoint.return_value = "default-endpoint.com"
+            mock_discovery_class.return_value = mock_discovery
+
+            # Mock the _post_with_retries method
+            with patch.object(self.exporter, "_post_with_retries", return_value=True) as mock_post:
+                # Act
+                result = self.exporter.export(spans)
+
+                # Assert
+                self.assertEqual(result, SpanExportResult.SUCCESS)
+                mock_post.assert_called_once()
+
+                # Verify the call arguments - should use default domain
+                args, kwargs = mock_post.call_args
+                url, body, headers = args
+
+                self.assertIn("default-endpoint.com", url)
+                self.assertIn("/maven/agent365/agents/test-agent-456/traces", url)
+
+                # Verify PowerPlatformApiDiscovery was called
+                mock_discovery_class.assert_called_once_with("test")
+                mock_discovery.get_tenant_island_cluster_endpoint.assert_called_once_with(
+                    "test-tenant-123"
+                )
+
 
 if __name__ == "__main__":
     unittest.main()

tests/runtime/test_environment_utils.py

@@ -18,6 +18,23 @@ def test_get_observability_authentication_scope():
     assert result == [PROD_OBSERVABILITY_SCOPE]
 
 
+def test_get_observability_authentication_scope_with_override(monkeypatch):
+    """Test get_observability_authentication_scope returns override when env var is set."""
+    override_scope = "https://override.example.com/.default"
+    monkeypatch.setenv("A365_OBSERVABILITY_SCOPE_OVERRIDE", override_scope)
+
+    result = get_observability_authentication_scope()
+    assert result == [override_scope]
+
+
+def test_get_observability_authentication_scope_without_override(monkeypatch):
+    """Test get_observability_authentication_scope returns default when env var is not set."""
+    monkeypatch.delenv("A365_OBSERVABILITY_SCOPE_OVERRIDE", raising=False)
+
+    result = get_observability_authentication_scope()
+    assert result == [PROD_OBSERVABILITY_SCOPE]
+
+
 @pytest.mark.parametrize(
     "env_value,expected",
     [