microsoft-agents-a365-observability-hosting 0.2.1.dev42__tar.gz → 0.2.1.dev44__tar.gz

{microsoft_agents_a365_observability_hosting-0.2.1.dev42 → microsoft_agents_a365_observability_hosting-0.2.1.dev44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-a365-observability-hosting
-Version: 0.2.1.dev42
+Version: 0.2.1.dev44
 Summary: Hosting components for Agent 365 observability
 Author-email: Microsoft <support@microsoft.com>
 License: MIT

{microsoft_agents_a365_observability_hosting-0.2.1.dev42 → microsoft_agents_a365_observability_hosting-0.2.1.dev44}/microsoft_agents_a365/observability/hosting/__init__.py

@@ -10,12 +10,15 @@ from .middleware.observability_hosting_manager import (
     ObservabilityHostingManager,
     ObservabilityHostingOptions,
 )
-from .middleware.output_logging_middleware import A365_PARENT_SPAN_KEY, OutputLoggingMiddleware
+from .middleware.output_logging_middleware import (
+    A365_PARENT_TRACEPARENT_KEY,
+    OutputLoggingMiddleware,
+)
 
 __all__ = [
     "BaggageMiddleware",
     "OutputLoggingMiddleware",
-    "A365_PARENT_SPAN_KEY",
+    "A365_PARENT_TRACEPARENT_KEY",
     "ObservabilityHostingManager",
     "ObservabilityHostingOptions",
 ]

{microsoft_agents_a365_observability_hosting-0.2.1.dev42 → microsoft_agents_a365_observability_hosting-0.2.1.dev44}/microsoft_agents_a365/observability/hosting/middleware/__init__.py

@@ -3,12 +3,12 @@
 
 from .baggage_middleware import BaggageMiddleware
 from .observability_hosting_manager import ObservabilityHostingManager, ObservabilityHostingOptions
-from .output_logging_middleware import A365_PARENT_SPAN_KEY, OutputLoggingMiddleware
+from .output_logging_middleware import A365_PARENT_TRACEPARENT_KEY, OutputLoggingMiddleware
 
 __all__ = [
     "BaggageMiddleware",
     "OutputLoggingMiddleware",
-    "A365_PARENT_SPAN_KEY",
+    "A365_PARENT_TRACEPARENT_KEY",
     "ObservabilityHostingManager",
     "ObservabilityHostingOptions",
 ]

{microsoft_agents_a365_observability_hosting-0.2.1.dev42 → microsoft_agents_a365_observability_hosting-0.2.1.dev44}/microsoft_agents_a365/observability/hosting/middleware/output_logging_middleware.py

@@ -14,16 +14,17 @@ from microsoft_agents_a365.observability.core.agent_details import AgentDetails
 from microsoft_agents_a365.observability.core.constants import (
     CHANNEL_LINK_KEY,
     CHANNEL_NAME_KEY,
-    GEN_AI_CALLER_ID_KEY,
-    GEN_AI_CALLER_NAME_KEY,
-    GEN_AI_CALLER_UPN_KEY,
     GEN_AI_CONVERSATION_ID_KEY,
     GEN_AI_EXECUTION_TYPE_KEY,
+    USER_EMAIL_KEY,
+    USER_ID_KEY,
+    USER_NAME_KEY,
 )
 from microsoft_agents_a365.observability.core.models.caller_details import CallerDetails
 from microsoft_agents_a365.observability.core.models.response import Response
 from microsoft_agents_a365.observability.core.spans_scopes.output_scope import OutputScope
 from microsoft_agents_a365.observability.core.tenant_details import TenantDetails
+from microsoft_agents_a365.observability.core.utils import extract_context_from_headers
 
 from ..scope_helpers.utils import (
     get_execution_type_pair,
@@ -31,8 +32,8 @@ from ..scope_helpers.utils import (
 
 logger = logging.getLogger(__name__)
 
-A365_PARENT_SPAN_KEY = "A365ParentSpanId"
-"""TurnState key for the parent span reference."""
+# TurnState key for the parent trace context (W3C traceparent string).
+A365_PARENT_TRACEPARENT_KEY = "A365ParentTraceparent"
 
 
 def _derive_agent_details(context: TurnContext) -> AgentDetails | None:
@@ -82,10 +83,10 @@ def _derive_conversation_id(context: TurnContext) -> str | None:
     return conv.id if conv else None
 
 
-def _derive_source_metadata(
+def _derive_channel(
     context: TurnContext,
 ) -> dict[str, str | None]:
-    """Derive source metadata (channel name and description) from TurnContext."""
+    """Derive channel (name and link) from TurnContext."""
     channel_id = getattr(context.activity, "channel_id", None)
     channel_name: str | None = None
     sub_channel: str | None = None
@@ -95,7 +96,7 @@ def _derive_source_metadata(
         elif hasattr(channel_id, "channel"):
             channel_name = channel_id.channel
             sub_channel = channel_id.sub_channel
-    return {"name": channel_name, "description": sub_channel}
+    return {"name": channel_name, "link": sub_channel}
 
 
 def _derive_execution_type(context: TurnContext) -> str | None:
@@ -109,7 +110,7 @@ def _derive_execution_type(context: TurnContext) -> str | None:
 class OutputLoggingMiddleware:
     """Middleware that creates :class:`OutputScope` spans for outgoing messages.
 
-    Links to a parent span when :data:`A365_PARENT_SPAN_KEY` is set in
+    Links to a parent span when :data:`A365_PARENT_TRACEPARENT_KEY` is set in
     ``turn_state``.
 
     **Privacy note:** Outgoing message content is captured verbatim as span
@@ -130,7 +131,7 @@ class OutputLoggingMiddleware:
 
         caller_details = _derive_caller_details(context)
         conversation_id = _derive_conversation_id(context)
-        source_metadata = _derive_source_metadata(context)
+        channel = _derive_channel(context)
         execution_type = _derive_execution_type(context)
 
         context.on_send_activities(
@@ -140,7 +141,7 @@ class OutputLoggingMiddleware:
                 tenant_details,
                 caller_details,
                 conversation_id,
-                source_metadata,
+                channel,
                 execution_type,
             )
         )
@@ -154,7 +155,7 @@ class OutputLoggingMiddleware:
         tenant_details: TenantDetails,
         caller_details: CallerDetails | None,
         conversation_id: str | None,
-        source_metadata: dict[str, str | None],
+        channel: dict[str, str | None],
         execution_type: str | None,
     ) -> Callable:
         """Create a send handler that wraps outgoing messages in OutputScope spans.
@@ -175,31 +176,34 @@ class OutputLoggingMiddleware:
                 await send_next()
                 return
 
-            parent_id: str | None = turn_context.turn_state.get(A365_PARENT_SPAN_KEY)
-            if not parent_id:
+            traceparent: str | None = turn_context.turn_state.get(A365_PARENT_TRACEPARENT_KEY)
+            parent_context = None
+            if traceparent:
+                parent_context = extract_context_from_headers({"traceparent": traceparent})
+            else:
                 logger.warning(
-                    "[OutputLoggingMiddleware] No parent span ref in turn_state under "
+                    "[OutputLoggingMiddleware] No traceparent in turn_state under "
                     "'%s'. OutputScope will not be linked to a parent.",
-                    A365_PARENT_SPAN_KEY,
+                    A365_PARENT_TRACEPARENT_KEY,
                 )
 
             output_scope = OutputScope.start(
                 agent_details=agent_details,
                 tenant_details=tenant_details,
                 response=Response(messages=messages),
-                parent_id=parent_id,
+                parent_context=parent_context,
             )
 
             # 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, channel.get("name"))
+            output_scope.set_tag_maybe(CHANNEL_LINK_KEY, channel.get("link"))
 
             if caller_details:
-                output_scope.set_tag_maybe(GEN_AI_CALLER_ID_KEY, caller_details.caller_id)
-                output_scope.set_tag_maybe(GEN_AI_CALLER_UPN_KEY, caller_details.caller_upn)
-                output_scope.set_tag_maybe(GEN_AI_CALLER_NAME_KEY, caller_details.caller_name)
+                output_scope.set_tag_maybe(USER_ID_KEY, caller_details.caller_id)
+                output_scope.set_tag_maybe(USER_EMAIL_KEY, caller_details.caller_upn)
+                output_scope.set_tag_maybe(USER_NAME_KEY, caller_details.caller_name)
 
             try:
                 await send_next()

{microsoft_agents_a365_observability_hosting-0.2.1.dev42 → microsoft_agents_a365_observability_hosting-0.2.1.dev44}/microsoft_agents_a365/observability/hosting/scope_helpers/populate_baggage.py

@@ -11,9 +11,9 @@ from microsoft_agents_a365.observability.core.middleware.baggage_builder import
 
 from .utils import (
     get_caller_pairs,
+    get_channel_pairs,
     get_conversation_pairs,
     get_execution_type_pair,
-    get_source_metadata_pairs,
     get_target_agent_pairs,
     get_tenant_id_pair,
 )
@@ -27,7 +27,7 @@ def _iter_all_pairs(turn_context: TurnContext) -> Iterator[tuple[str, Any]]:
     yield from get_execution_type_pair(activity)
     yield from get_target_agent_pairs(activity)
     yield from get_tenant_id_pair(activity)
-    yield from get_source_metadata_pairs(activity)
+    yield from get_channel_pairs(activity)
     yield from get_conversation_pairs(activity)
 
 

{microsoft_agents_a365_observability_hosting-0.2.1.dev42 → microsoft_agents_a365_observability_hosting-0.2.1.dev44}/microsoft_agents_a365/observability/hosting/scope_helpers/populate_invoke_agent_scope.py

@@ -9,9 +9,9 @@ from microsoft_agents_a365.observability.core.invoke_agent_scope import InvokeAg
 
 from .utils import (
     get_caller_pairs,
+    get_channel_pairs,
     get_conversation_pairs,
     get_execution_type_pair,
-    get_source_metadata_pairs,
     get_target_agent_pairs,
     get_tenant_id_pair,
 )
@@ -39,7 +39,7 @@ def populate(scope: InvokeAgentScope, turn_context: TurnContext) -> InvokeAgentS
     scope.record_attributes(get_execution_type_pair(activity))
     scope.record_attributes(get_target_agent_pairs(activity))
     scope.record_attributes(get_tenant_id_pair(activity))
-    scope.record_attributes(get_source_metadata_pairs(activity))
+    scope.record_attributes(get_channel_pairs(activity))
     scope.record_attributes(get_conversation_pairs(activity))
 
     if activity.text:

{microsoft_agents_a365_observability_hosting-0.2.1.dev42 → microsoft_agents_a365_observability_hosting-0.2.1.dev44}/microsoft_agents_a365/observability/hosting/scope_helpers/utils.py

@@ -9,16 +9,16 @@ from microsoft_agents_a365.observability.core.constants import (
     CHANNEL_NAME_KEY,
     GEN_AI_AGENT_AUID_KEY,
     GEN_AI_AGENT_DESCRIPTION_KEY,
+    GEN_AI_AGENT_EMAIL_KEY,
     GEN_AI_AGENT_ID_KEY,
     GEN_AI_AGENT_NAME_KEY,
-    GEN_AI_AGENT_UPN_KEY,
-    GEN_AI_CALLER_ID_KEY,
-    GEN_AI_CALLER_NAME_KEY,
-    GEN_AI_CALLER_UPN_KEY,
     GEN_AI_CONVERSATION_ID_KEY,
     GEN_AI_CONVERSATION_ITEM_LINK_KEY,
     GEN_AI_EXECUTION_TYPE_KEY,
     TENANT_ID_KEY,
+    USER_EMAIL_KEY,
+    USER_ID_KEY,
+    USER_NAME_KEY,
 )
 from microsoft_agents_a365.observability.core.execution_type import ExecutionType
 
@@ -38,9 +38,9 @@ def get_caller_pairs(activity: Activity) -> Iterator[tuple[str, Any]]:
     frm = activity.from_property
     if not frm:
         return
-    yield GEN_AI_CALLER_ID_KEY, frm.aad_object_id
-    yield GEN_AI_CALLER_NAME_KEY, frm.name
-    yield GEN_AI_CALLER_UPN_KEY, frm.agentic_user_id
+    yield USER_ID_KEY, frm.aad_object_id
+    yield USER_NAME_KEY, frm.name
+    yield USER_EMAIL_KEY, frm.agentic_user_id
 
 
 def get_execution_type_pair(activity: Activity) -> Iterator[tuple[str, Any]]:
@@ -63,7 +63,7 @@ def get_target_agent_pairs(activity: Activity) -> Iterator[tuple[str, Any]]:
     yield GEN_AI_AGENT_ID_KEY, activity.get_agentic_instance_id()
     yield GEN_AI_AGENT_NAME_KEY, rec.name
     yield GEN_AI_AGENT_AUID_KEY, rec.aad_object_id
-    yield GEN_AI_AGENT_UPN_KEY, activity.get_agentic_user()
+    yield GEN_AI_AGENT_EMAIL_KEY, activity.get_agentic_user()
     yield (
         GEN_AI_AGENT_DESCRIPTION_KEY,
         rec.role,
@@ -74,12 +74,12 @@ def get_tenant_id_pair(activity: Activity) -> Iterator[tuple[str, Any]]:
     yield TENANT_ID_KEY, activity.recipient.tenant_id
 
 
-def get_source_metadata_pairs(activity: Activity) -> Iterator[tuple[str, Any]]:
+def get_channel_pairs(activity: Activity) -> Iterator[tuple[str, Any]]:
     """
-    Generate source metadata pairs from activity, handling both string and ChannelId object cases.
+    Generate channel pairs from activity, handling both string and ChannelId object cases.
 
     :param activity: The activity object (Activity instance or dict)
-    :return: Iterator of (key, value) tuples for source metadata
+    :return: Iterator of (key, value) tuples for channel information
     """
     # Handle channel_id (can be string or ChannelId object)
     channel_id = activity.channel_id

{microsoft_agents_a365_observability_hosting-0.2.1.dev42 → microsoft_agents_a365_observability_hosting-0.2.1.dev44}/microsoft_agents_a365_observability_hosting.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-a365-observability-hosting
-Version: 0.2.1.dev42
+Version: 0.2.1.dev44
 Summary: Hosting components for Agent 365 observability
 Author-email: Microsoft <support@microsoft.com>
 License: MIT