diff --git a/dotnet/src/InternalUtilities/src/Diagnostics/ModelDiagnostics.cs b/dotnet/src/InternalUtilities/src/Diagnostics/ModelDiagnostics.cs
index 02f531dbe9b5..31aa442787c0 100644
--- a/dotnet/src/InternalUtilities/src/Diagnostics/ModelDiagnostics.cs
+++ b/dotnet/src/InternalUtilities/src/Diagnostics/ModelDiagnostics.cs
@@ -365,12 +365,16 @@ void TryAddTag(string key, string tag)
     /// </summary>
     private static object ToGenAIConventionsFormat(ChatMessageContent chatMessage)
     {
+        // Check for FunctionResultContent to extract tool_call_id for correlation
+        var functionResult = chatMessage.Items.OfType<FunctionResultContent>().FirstOrDefault();
+
         return new
         {
             role = chatMessage.Role.ToString(),
-            name = chatMessage.AuthorName,
+            name = functionResult?.FunctionName ?? chatMessage.AuthorName,
             content = chatMessage.Content,
             tool_calls = ToGenAIConventionsFormat(chatMessage.Items),
+            tool_call_id = functionResult?.CallId,
         };
     }