Fix ruff format errors, move _get_sdk_version to utils.py, remove set_request_context from BaggageBuilder

Co-authored-by: nikhilNava <211831449+nikhilNava@users.noreply.github.com>

Author: Copilot

libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/inference_scope.py

@@ -122,9 +122,7 @@ def __init__(
         # Set request metadata if provided
         if request and request.source_metadata:
             self.set_tag_maybe(CHANNEL_NAME_KEY, request.source_metadata.name)
-            self.set_tag_maybe(
-                CHANNEL_LINK_KEY, request.source_metadata.description
-            )
+            self.set_tag_maybe(CHANNEL_LINK_KEY, request.source_metadata.description)
 
     def record_input_messages(self, messages: List[str]) -> None:
         """Records the input messages for telemetry tracking.

libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/invoke_agent_scope.py

@@ -131,9 +131,7 @@ def __init__(
         if request:
             if request.source_metadata:
                 self.set_tag_maybe(CHANNEL_NAME_KEY, request.source_metadata.name)
-                self.set_tag_maybe(
-                    CHANNEL_LINK_KEY, request.source_metadata.description
-                )
+                self.set_tag_maybe(CHANNEL_LINK_KEY, request.source_metadata.description)
 
             self.set_tag_maybe(
                 GEN_AI_EXECUTION_TYPE_KEY,

libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/middleware/baggage_builder.py

@@ -226,27 +226,6 @@ def _set(self, key: str, value: str | None) -> None:
         if value is not None and value.strip():
             self._pairs[key] = value
 
-    @staticmethod
-    def set_request_context(
-        tenant_id: str | None = None,
-        agent_id: str | None = None,
-    ) -> "BaggageScope":
-        """Convenience method to begin a request baggage scope with common fields.
-
-        Args:
-            tenant_id: The tenant ID
-            agent_id: The agent ID
-
-        Returns:
-            A context manager that restores the previous baggage on exit
-        """
-        return (
-            BaggageBuilder()
-            .tenant_id(tenant_id)
-            .agent_id(agent_id)
-            .build()
-        )
-
 
 class BaggageScope:
     """Context manager for baggage scope.

libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/opentelemetry_scope.py

@@ -44,7 +44,7 @@
     TELEMETRY_SDK_VERSION_KEY,
     TENANT_ID_KEY,
 )
-from .utils import parse_parent_id_to_context
+from .utils import get_sdk_version, parse_parent_id_to_context
 
 if TYPE_CHECKING:
     from .agent_details import AgentDetails
@@ -91,20 +91,6 @@ def _datetime_to_ns(dt: datetime | None) -> int | None:
             return None
         return int(dt.timestamp() * 1_000_000_000)
 
-    @staticmethod
-    def _get_sdk_version() -> str:
-        """Get the SDK version from package metadata.
-
-        Returns:
-            The SDK version string, or "0.0.0-unknown" if not found
-        """
-        try:
-            from importlib.metadata import version
-
-            return version("microsoft-agents-a365-observability-core")
-        except Exception:
-            return "0.0.0-unknown"
-
     def __init__(
         self,
         kind: str,
@@ -184,7 +170,7 @@ def __init__(
                 # Set telemetry SDK attributes
                 self._span.set_attribute(TELEMETRY_SDK_NAME_KEY, TELEMETRY_SDK_NAME_VALUE)
                 self._span.set_attribute(TELEMETRY_SDK_LANGUAGE_KEY, TELEMETRY_SDK_LANGUAGE_VALUE)
-                self._span.set_attribute(TELEMETRY_SDK_VERSION_KEY, self._get_sdk_version())
+                self._span.set_attribute(TELEMETRY_SDK_VERSION_KEY, get_sdk_version())
 
                 # Set agent details if provided
                 if agent_details:

libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/utils.py

@@ -9,6 +9,7 @@
 import warnings
 from collections.abc import Callable, Hashable, Iterable, Iterator, Mapping
 from enum import Enum
+from importlib.metadata import PackageNotFoundError, version
 from ipaddress import AddressValueError, ip_address
 from threading import RLock
 from typing import Any, Generic, TypeVar, cast
@@ -299,6 +300,18 @@ def wrapper(*args, **kwargs):
     return decorator
 
 
+def get_sdk_version() -> str:
+    """Get the SDK version from package metadata.
+
+    Returns:
+        The SDK version string, or "0.0.0-unknown" if not found
+    """
+    try:
+        return version("microsoft-agents-a365-observability-core")
+    except PackageNotFoundError:
+        return "0.0.0-unknown"
+
+
 def validate_and_normalize_ip(ip_string: str | None) -> str | None:
     """Validate and normalize an IP address string.
 

libraries/microsoft-agents-a365-observability-hosting/microsoft_agents_a365/observability/hosting/middleware/output_logging_middleware.py

@@ -193,12 +193,8 @@ async def handler(
             # Set additional attributes on the scope
             output_scope.set_tag_maybe(GEN_AI_CONVERSATION_ID_KEY, conversation_id)
             output_scope.set_tag_maybe(GEN_AI_EXECUTION_TYPE_KEY, execution_type)
-            output_scope.set_tag_maybe(
-                CHANNEL_NAME_KEY, source_metadata.get("name")
-            )
-            output_scope.set_tag_maybe(
-                CHANNEL_LINK_KEY, source_metadata.get("description")
-            )
+            output_scope.set_tag_maybe(CHANNEL_NAME_KEY, source_metadata.get("name"))
+            output_scope.set_tag_maybe(CHANNEL_LINK_KEY, source_metadata.get("description"))
 
             if caller_details:
                 output_scope.set_tag_maybe(GEN_AI_CALLER_ID_KEY, caller_details.caller_id)

tests/observability/core/test_baggage_builder.py

@@ -241,9 +241,7 @@ def test_source_metadata_description_method(self):
         # Should set channel description baggage through delegation
         with self.builder.source_metadata_description("test-description").build():
             current_baggage = baggage.get_all()
-            self.assertEqual(
-                current_baggage.get(CHANNEL_LINK_KEY), "test-description"
-            )
+            self.assertEqual(current_baggage.get(CHANNEL_LINK_KEY), "test-description")
 
     def test_session_id_method(self):
         """Test session_id method sets session ID baggage."""

tests/observability/extensions/agentframework/integration/test_agentframework_trace_processor.py

@@ -201,7 +201,10 @@ def _validate_span_attributes(self, agent365_config):
                 assert attributes[TENANT_ID_KEY] == agent365_config["tenant_id"]
 
             # Check for LLM spans (generation spans)
-            if GEN_AI_PROVIDER_NAME_KEY in attributes and attributes[GEN_AI_PROVIDER_NAME_KEY] == "openai":
+            if (
+                GEN_AI_PROVIDER_NAME_KEY in attributes
+                and attributes[GEN_AI_PROVIDER_NAME_KEY] == "openai"
+            ):
                 if GEN_AI_REQUEST_MODEL_KEY in attributes:
                     llm_spans_found += 1
                     # Validate LLM span attributes

tests/observability/extensions/openai/integration/test_openai_trace_processor.py

@@ -322,7 +322,10 @@ def _validate_span_attributes(self, agent365_config):
                 assert attributes[GEN_AI_AGENT_ID_KEY] == agent365_config["agent_id"]
 
             # Check for LLM spans (generation spans)
-            if GEN_AI_PROVIDER_NAME_KEY in attributes and attributes[GEN_AI_PROVIDER_NAME_KEY] == "openai":
+            if (
+                GEN_AI_PROVIDER_NAME_KEY in attributes
+                and attributes[GEN_AI_PROVIDER_NAME_KEY] == "openai"
+            ):
                 if GEN_AI_REQUEST_MODEL_KEY in attributes:
                     llm_spans_found += 1
                     # Validate LLM span attributes
@@ -369,7 +372,10 @@ def _validate_tool_span_attributes(self, agent365_config):
                 assert attributes[GEN_AI_AGENT_ID_KEY] == agent365_config["agent_id"]
 
             # Check for LLM spans (generation spans)
-            if GEN_AI_PROVIDER_NAME_KEY in attributes and attributes[GEN_AI_PROVIDER_NAME_KEY] == "openai":
+            if (
+                GEN_AI_PROVIDER_NAME_KEY in attributes
+                and attributes[GEN_AI_PROVIDER_NAME_KEY] == "openai"
+            ):
                 if GEN_AI_REQUEST_MODEL_KEY in attributes:
                     llm_spans_found += 1
                     print(f"✓ Found LLM span with model: {attributes[GEN_AI_REQUEST_MODEL_KEY]}")