address pr comments

Author: nikhilc-microsoft

libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/models/messages.py

@@ -66,7 +66,7 @@ class ToolCallRequestPart:
 
     name: str
     id: str | None = None
-    arguments: dict[str, object] | list[object] | None = None
+    arguments: dict[str, object] | list[object] | str | None = None
     type: str = field(default="tool_call", init=False)
 
 

libraries/microsoft-agents-a365-observability-extensions-agentframework/docs/design.md

@@ -55,5 +55,5 @@ microsoft_agents_a365/observability/extensions/agentframework/
 
 ## Dependencies
 
-- `agent-framework-azure-ai` - Microsoft Agents SDK
+- `agent-framework` - Microsoft Agents SDK
 - `microsoft-agents-a365-observability-core` - Core observability

libraries/microsoft-agents-a365-observability-extensions-agentframework/microsoft_agents_a365/observability/extensions/agentframework/message_mapper.py

@@ -55,6 +55,7 @@ def map_input_messages(messages_json: str) -> str | None:
     try:
         raw = json.loads(messages_json)
     except (json.JSONDecodeError, TypeError):
+        logger.debug("Failed to parse input messages JSON: %s", messages_json[:200])
         return None
 
     if not isinstance(raw, list):
@@ -88,6 +89,7 @@ def map_output_messages(messages_json: str) -> str | None:
     try:
         raw = json.loads(messages_json)
     except (json.JSONDecodeError, TypeError):
+        logger.debug("Failed to parse output messages JSON: %s", messages_json[:200])
         return None
 
     if not isinstance(raw, list):

libraries/microsoft-agents-a365-observability-extensions-agentframework/microsoft_agents_a365/observability/extensions/agentframework/trace_instrumentor.py

@@ -23,7 +23,7 @@
 # -----------------------------
 # 3) The Instrumentor class
 # -----------------------------
-_instruments = ("agent-framework-azure-ai >= 1.0.0rc1",)
+_instruments = ("agent-framework >= 1.0.0",)
 
 
 class AgentFrameworkInstrumentor(BaseInstrumentor):

libraries/microsoft-agents-a365-observability-extensions-langchain/microsoft_agents_a365/observability/extensions/langchain/message_mapper.py

@@ -193,6 +193,7 @@ def _extract_parts(msg: BaseMessage | Mapping[str, Any]) -> list[MessagePart]:
                 try:
                     args_str = json.dumps(args) if not isinstance(args, str) else args
                 except (TypeError, ValueError):
+                    logger.debug("Failed to serialize tool call args for '%s': %s", name, args)
                     args_str = str(args)
 
             parts.append(

tests/observability/extensions/langchain/integration/test_observability_pipeline.py

@@ -7,9 +7,20 @@
   InvokeAgentScope → Inference (auto-instrumented) → ToolExecution (auto-instrumented)
 
 The CustomLangChainInstrumentor automatically creates inference spans for LLM
-calls and execute_tool spans for tool runs. Wrapping the entire call in
-InvokeAgentScope makes all auto-instrumented spans children of the invoke_agent
-span (since separate_trace_from_runtime_context defaults to False).
+calls and execute_tool spans for tool runs.  Its built-in message mapper
+converts LangChain messages into the versioned A365 message format
+(``{"version": "0.1.0", "messages": [...]}``) on ``gen_ai.input.messages``
+and ``gen_ai.output.messages`` span attributes.
+
+Wrapping the entire call in InvokeAgentScope makes all auto-instrumented spans
+children of the invoke_agent span (since ``separate_trace_from_runtime_context``
+defaults to ``False``).
+
+Note: the message-format assertions accept both the versioned dict structure
+*and* a raw JSON list.  The raw-list branch exists for backward compatibility
+with older instrumentation versions or third-party LangChain instrumentors that
+emit ``gen_ai.*.messages`` as plain JSON arrays before the A365 mapper was
+integrated.
 """
 
 import json
@@ -101,7 +112,7 @@ class TestLangChainObservabilityPipeline:
 
     Verifies that wrapping LangChain calls inside InvokeAgentScope
     produces a single trace with correct parent-child span hierarchy,
-    operation names, and A365 message format attributes.
+    operation names, and A365 versioned message format attributes.
     """
 
     @pytest.fixture(autouse=True)
@@ -302,6 +313,9 @@ async def test_pipeline_invoke_agent_with_tool_call(
             print(f"\n✓ Found {len(tool_spans)} tool execution spans")
 
         # --- 8. A365 message format on inference spans ---
+        # The A365 mapper emits the versioned format {"version": "0.1.0", "messages": [...]}.
+        # Older or third-party instrumentors may emit a raw JSON list instead;
+        # the raw-list branch is kept for backward compatibility.
         for inf_span in inference_spans:
             attrs = dict(inf_span.attributes or {})
             if GEN_AI_INPUT_MESSAGES_KEY in attrs: