Azure · singankit · May 4, 2026 · May 4, 2026 · May 4, 2026 · May 5, 2026
@@ -188,11 +188,14 @@ def __init__(
 
         # Observability (logging + tracing) --------------------------------
         _conn_str = applicationinsights_connection_string or self.config.appinsights_connection_string
+        _env_val = os.environ.get("OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT", "true")
+        _sensitive_data = _env_val.lower() not in ("false", "0")
         if configure_observability is not None:
             try:
                 configure_observability(
                     connection_string=_conn_str,
                     log_level=log_level,
+                    enable_sensitive_data=_sensitive_data,
                 )
             except ValueError:
                 raise  # invalid log_level etc. — user should fix their config
@@ -284,6 +287,13 @@ async def _lifespan(_app: Starlette) -> AsyncGenerator[None, None]:  # noqa: RUF
             **kwargs,
         )
 
+        # Extract W3C trace context (traceparent/tracestate) and baggage
+        # from incoming HTTP requests so that any spans created downstream
+        # (e.g. by MAF / agent-framework) are children of the caller's trace.
+        # We do NOT create a SERVER span ourselves — we only propagate context.
+        from azure.ai.agentserver.core._tracing import TraceContextMiddleware  # pylint: disable=import-outside-toplevel
+        self.add_middleware(TraceContextMiddleware)
+
     # ------------------------------------------------------------------
     # Server version (x-platform-server header)
     # ------------------------------------------------------------------
@@ -326,56 +336,6 @@ def _build_server_version(self) -> str:
     # Tracing (for protocol subclasses)
     # ------------------------------------------------------------------
 
-    #: Default instrumentation scope for tracing spans.
-    #: Protocol subclasses should override this per the spec.
-    _INSTRUMENTATION_SCOPE = "Azure.AI.AgentServer"
-
-    @contextlib.contextmanager
-    def request_span(
-        self,
-        headers: Any,
-        request_id: str,
-        operation: str,
-        *,
-        operation_name: Optional[str] = None,
-        session_id: str = "",
-        end_on_exit: bool = True,
-    ) -> Any:
-        """Create a request-scoped span with this host's identity attributes.
-
-        Delegates to :func:`_tracing.request_span` with pre-populated
-        agent identity from environment variables.
-
-        :param headers: HTTP request headers.
-        :type headers: any
-        :param request_id: The request/invocation ID.
-        :type request_id: str
-        :param operation: Span operation (e.g. ``"invoke_agent"``).
-        :type operation: str
-        :keyword operation_name: Optional ``gen_ai.operation.name`` value.
-        :paramtype operation_name: str or None
-        :keyword session_id: Session ID.
-        :paramtype session_id: str
-        :keyword end_on_exit: Whether to end the span when the context exits.
-        :paramtype end_on_exit: bool
-        :return: Context manager yielding the OTel span.
-        :rtype: any
-        """
-        with _tracing.request_span(
-            headers,
-            request_id,
-            operation,
-            agent_id=self.config.agent_id,
-            agent_name=self.config.agent_name,
-            agent_version=self.config.agent_version,
-            project_id=self.config.project_id,
-            operation_name=operation_name,
-            session_id=session_id,
-            end_on_exit=end_on_exit,
-            instrumentation_scope=self._INSTRUMENTATION_SCOPE,
-        ) as span:
-            yield span
-
     # ------------------------------------------------------------------
     # Shutdown handler (server-level lifecycle)
     # ------------------------------------------------------------------

@@ -24,6 +24,9 @@
 
 _ENV_FOUNDRY_AGENT_NAME = "FOUNDRY_AGENT_NAME"
 _ENV_FOUNDRY_AGENT_VERSION = "FOUNDRY_AGENT_VERSION"
+_ENV_FOUNDRY_AGENT_INSTANCE_CLIENT_ID = "FOUNDRY_AGENT_INSTANCE_CLIENT_ID"
+_ENV_FOUNDRY_AGENT_BLUEPRINT_CLIENT_ID = "FOUNDRY_AGENT_BLUEPRINT_CLIENT_ID"
+_ENV_FOUNDRY_AGENT_TENANT_ID = "FOUNDRY_AGENT_TENANT_ID"
 _ENV_FOUNDRY_HOSTING_ENVIRONMENT = "FOUNDRY_HOSTING_ENVIRONMENT"
 _ENV_FOUNDRY_PROJECT_ENDPOINT = "FOUNDRY_PROJECT_ENDPOINT"
 _ENV_FOUNDRY_PROJECT_ARM_ID = "FOUNDRY_PROJECT_ARM_ID"
@@ -283,6 +286,46 @@ def resolve_agent_version() -> str:
     return os.environ.get(_ENV_FOUNDRY_AGENT_VERSION, "")
 
 
+def resolve_agent_id() -> str:
+    """Resolve the agent ID.
+
+    Resolution order:
+    1. ``FOUNDRY_AGENT_INSTANCE_CLIENT_ID`` environment variable.
+    2. ``<agent_name>:<agent_version>`` if both are set.
+    3. ``<agent_name>`` if only name is set.
+    4. Empty string if nothing is available.
+
+    :return: The resolved agent ID, or an empty string if not determinable.
+    :rtype: str
+    """
+    agent_id = os.environ.get(_ENV_FOUNDRY_AGENT_INSTANCE_CLIENT_ID, "")
+    if agent_id:
+        return agent_id
+    agent_name = os.environ.get(_ENV_FOUNDRY_AGENT_NAME, "")
+    agent_version = os.environ.get(_ENV_FOUNDRY_AGENT_VERSION, "")
+    if agent_name and agent_version:
+        return f"{agent_name}:{agent_version}"
+    return agent_name
+
+
+def resolve_agent_blueprint_id() -> str:
+    """Resolve the agent blueprint client ID from the ``FOUNDRY_AGENT_BLUEPRINT_CLIENT_ID`` environment variable.
+
+    :return: The agent blueprint client ID, or an empty string if not set.
+    :rtype: str
+    """
+    return os.environ.get(_ENV_FOUNDRY_AGENT_BLUEPRINT_CLIENT_ID, "")
+
+
+def resolve_agent_tenant_id() -> str:
+    """Resolve the agent tenant ID from the ``FOUNDRY_AGENT_TENANT_ID`` environment variable.
+
+    :return: The agent tenant ID, or an empty string if not set.
+    :rtype: str
+    """
+    return os.environ.get(_ENV_FOUNDRY_AGENT_TENANT_ID, "")
+
+
 def resolve_project_id() -> str:
     """Resolve the Foundry project ARM resource ID from the ``FOUNDRY_PROJECT_ARM_ID`` environment variable.
 

@@ -19,6 +19,8 @@ class Constants:
     # Tracing
     APPLICATIONINSIGHTS_CONNECTION_STRING = "APPLICATIONINSIGHTS_CONNECTION_STRING"
     OTEL_EXPORTER_OTLP_ENDPOINT = "OTEL_EXPORTER_OTLP_ENDPOINT"
+    FOUNDRY_AGENT365_TRACING_ENABLED = "FOUNDRY_AGENT365_TRACING_ENABLED"
+    OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT = "OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT"
 
     # SSE keep-alive
     SSE_KEEPALIVE_INTERVAL = "SSE_KEEPALIVE_INTERVAL"