Merge branch 'main' into copilot/add-support-v0111-tests

stephentoub · web-flow · commit a4b9f02950f5 · 2026-01-29T14:34:13.000-05:00
diff --git a/.github/workflows/ci-build-test.yml b/.github/workflows/ci-build-test.yml
@@ -36,7 +36,7 @@ jobs:
 
     steps:
     - name: 📥 Clone the repo
-      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
diff --git a/.github/workflows/ci-code-coverage.yml b/.github/workflows/ci-code-coverage.yml
@@ -10,7 +10,7 @@ jobs:
   publish-coverage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Setup .NET
         uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
         with:
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
@@ -11,7 +11,7 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Install .NET SDK
         uses: actions/setup-dotnet@v5.1.0
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
     - name: .NET Setup
       uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Markup Link Checker (mlc)
         uses: becheran/mlc@7ec24825cefe0c9c8c6bac48430e1f69e3ec356e # v1.2.0
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -45,7 +45,7 @@ jobs:
 
     steps:
     - name: Clone the repo
-      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
@@ -73,7 +73,7 @@ jobs:
       version_suffix_args: ${{ github.event_name != 'release' && format('--version-suffix "{0}"', inputs.version_suffix_override || format('ci.{0}', github.run_number)) || '' }}
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Setup .NET
         uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
@@ -103,7 +103,7 @@ jobs:
       packages: write
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Setup .NET
         uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
@@ -138,7 +138,7 @@ jobs:
       packages: write
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Download build artifacts
         uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
@@ -158,7 +158,7 @@ jobs:
     permissions: { }
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Setup .NET
         uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -77,12 +77,12 @@
     <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.1.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageVersion Include="Moq" Version="4.20.72" />
-    <PackageVersion Include="OpenTelemetry" Version="1.14.0" />
-    <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.14.0" />
-    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
-    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
+    <PackageVersion Include="OpenTelemetry" Version="1.15.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.15.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.0" />
     <PackageVersion Include="Serilog.Extensions.Hosting" Version="10.0.0" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="10.0.0" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
diff --git a/src/ModelContextProtocol.Core/Client/SseClientSessionTransport.cs b/src/ModelContextProtocol.Core/Client/SseClientSessionTransport.cs
@@ -83,6 +83,8 @@ public override async Task SendMessageAsync(
             messageId = messageWithId.Id.ToString();
         }
 
+        LogTransportSendingMessageSensitive(message);
+
         using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, _messageEndpoint);
         StreamableHttpClientSessionTransport.CopyAdditionalHeaders(httpRequestMessage.Headers, _options.AdditionalHeaders, sessionId: null, protocolVersion: null);
         var response = await _httpClient.SendAsync(httpRequestMessage, message, cancellationToken).ConfigureAwait(false);
diff --git a/src/ModelContextProtocol.Core/Client/StreamClientSessionTransport.cs b/src/ModelContextProtocol.Core/Client/StreamClientSessionTransport.cs
@@ -105,6 +105,8 @@ public override async Task SendMessageAsync(JsonRpcMessage message, Cancellation
 
         var json = JsonSerializer.Serialize(message, McpJsonUtilities.JsonContext.Default.JsonRpcMessage);
 
+        LogTransportSendingMessageSensitive(Name, json);
+
         using var _ = await _sendLock.LockAsync(cancellationToken).ConfigureAwait(false);
         try
         {
diff --git a/src/ModelContextProtocol.Core/Client/StreamableHttpClientSessionTransport.cs b/src/ModelContextProtocol.Core/Client/StreamableHttpClientSessionTransport.cs
@@ -75,6 +75,8 @@ internal async Task<HttpResponseMessage> SendHttpRequestAsync(JsonRpcMessage mes
                 $"Call {nameof(McpClient)}.{nameof(McpClient.ResumeSessionAsync)} to resume existing sessions.");
         }
 
+        LogTransportSendingMessageSensitive(message);
+
         using var sendCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, _connectionCts.Token);
         cancellationToken = sendCts.Token;
 
diff --git a/src/ModelContextProtocol.Core/ProcessHelper.cs b/src/ModelContextProtocol.Core/ProcessHelper.cs
@@ -8,36 +8,25 @@ namespace ModelContextProtocol;
 /// </summary>
 internal static class ProcessHelper
 {
-    private static readonly bool _isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-    private static readonly TimeSpan _defaultTimeout = TimeSpan.FromSeconds(30);
-
-    /// <summary>
-    /// Kills a process and all of its child processes (entire process tree).
-    /// </summary>
-    /// <param name="process">The process to terminate along with its child processes.</param>
-    /// <remarks>
-    /// This method uses a default timeout of 30 seconds when waiting for processes to exit.
-    /// On Windows, this uses the "taskkill" command with the /T flag.
-    /// On non-Windows platforms, it recursively identifies and terminates child processes.
-    /// </remarks>
-    public static void KillTree(this Process process) => process.KillTree(_defaultTimeout);
-
     /// <summary>
     /// Kills a process and all of its child processes (entire process tree) with a specified timeout.
     /// </summary>
     /// <param name="process">The process to terminate along with its child processes.</param>
     /// <param name="timeout">The maximum time to wait for the processes to exit.</param>
     /// <remarks>
-    /// On Windows, this uses the "taskkill" command with the /T flag to terminate the process tree.
-    /// On non-Windows platforms, it recursively identifies and terminates child processes.
+    /// On .NET Core 3.0+ this uses <c>Process.Kill(entireProcessTree: true)</c>.
+    /// On .NET Standard 2.0, it uses platform-specific commands (taskkill on Windows, pgrep/kill on Unix).
     /// The method waits for the specified timeout for processes to exit before continuing.
     /// This is particularly useful for applications that spawn child processes (like Node.js)
     /// that wouldn't be terminated automatically when the parent process exits.
     /// </remarks>
     public static void KillTree(this Process process, TimeSpan timeout)
     {
+#if NETSTANDARD2_0
+        // Process.Kill(entireProcessTree) is not available on .NET Standard 2.0.
+        // Use platform-specific commands to kill the process tree.
         var pid = process.Id;
-        if (_isWindows)
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
             RunProcessAndWaitForExit(
                 "taskkill",
@@ -53,50 +42,50 @@ public static void KillTree(this Process process, TimeSpan timeout)
             {
                 KillProcessUnix(childId, timeout);
             }
+
             KillProcessUnix(pid, timeout);
         }
+#else
+        try
+        {
+            process.Kill(entireProcessTree: true);
+        }
+        catch
+        {
+            // Process has already exited
+            return;
+        }
+#endif
 
         // wait until the process finishes exiting/getting killed. 
         // We don't want to wait forever here because the task is already supposed to be dieing, we just want to give it long enough
         // to try and flush what it can and stop. If it cannot do that in a reasonable time frame then we will just ignore it.
         process.WaitForExit((int)timeout.TotalMilliseconds);
     }
 
+#if NETSTANDARD2_0
     private static void GetAllChildIdsUnix(int parentId, ISet<int> children, TimeSpan timeout)
     {
-        var exitcode = RunProcessAndWaitForExit(
-            "pgrep",
-            $"-P {parentId}",
-            timeout,
-            out var stdout);
+        int exitcode = RunProcessAndWaitForExit("pgrep", $"-P {parentId}", timeout, out var stdout);
 
         if (exitcode == 0 && !string.IsNullOrEmpty(stdout))
         {
             using var reader = new StringReader(stdout);
-            while (true)
+            while (reader.ReadLine() is string text)
             {
-                var text = reader.ReadLine();
-                if (text == null)
-                    return;
-
                 if (int.TryParse(text, out var id))
                 {
                     children.Add(id);
+
                     // Recursively get the children
                     GetAllChildIdsUnix(id, children, timeout);
                 }
             }
         }
     }
 
-    private static void KillProcessUnix(int processId, TimeSpan timeout)
-    {
-        RunProcessAndWaitForExit(
-            "kill",
-            $"-TERM {processId}",
-            timeout,
-            out var _);
-    }
+    private static void KillProcessUnix(int processId, TimeSpan timeout) =>
+        RunProcessAndWaitForExit("kill", $"-TERM {processId}", timeout, out _);
 
     private static int RunProcessAndWaitForExit(string fileName, string arguments, TimeSpan timeout, out string? stdout)
     {
@@ -112,19 +101,21 @@ private static int RunProcessAndWaitForExit(string fileName, string arguments, T
 
         stdout = null;
 
-        var process = Process.Start(startInfo);
-        if (process == null)
-            return -1;
-
-        if (process.WaitForExit((int)timeout.TotalMilliseconds))
-        {
-            stdout = process.StandardOutput.ReadToEnd();
-        }
-        else
+        if (Process.Start(startInfo) is { } process)
         {
-            process.Kill();
+            if (process.WaitForExit((int)timeout.TotalMilliseconds))
+            {
+                stdout = process.StandardOutput.ReadToEnd();
+            }
+            else
+            {
+                process.Kill();
+            }
+
+            return process.ExitCode;
         }
 
-        return process.ExitCode;
+        return -1;
     }
+#endif
 }
diff --git a/src/ModelContextProtocol.Core/Protocol/TransportBase.cs b/src/ModelContextProtocol.Core/Protocol/TransportBase.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using System.Diagnostics;
+using System.Text.Json;
 using System.Threading.Channels;
 
 namespace ModelContextProtocol.Protocol;
@@ -166,6 +167,21 @@ protected void SetDisconnected(Exception? error = null)
     [LoggerMessage(Level = LogLevel.Error, Message = "{EndpointName} transport send failed for message ID '{MessageId}'.")]
     private protected partial void LogTransportSendFailed(string endpointName, string messageId, Exception exception);
 
+    [LoggerMessage(Level = LogLevel.Trace, Message = "{EndpointName} transport sending message. Message: '{Message}'.")]
+    private protected partial void LogTransportSendingMessageSensitive(string endpointName, string message);
+
+    /// <summary>
+    /// Logs a sending message at Trace level if trace logging is enabled.
+    /// </summary>
+    /// <param name="message">The JSON-RPC message to log.</param>
+    private protected void LogTransportSendingMessageSensitive(JsonRpcMessage message)
+    {
+        if (_logger.IsEnabled(LogLevel.Trace))
+        {
+            LogTransportSendingMessageSensitive(Name, JsonSerializer.Serialize(message, McpJsonUtilities.JsonContext.Default.JsonRpcMessage));
+        }
+    }
+
     [LoggerMessage(Level = LogLevel.Information, Message = "{EndpointName} transport reading messages.")]
     private protected partial void LogTransportEnteringReadMessagesLoop(string endpointName);
 
diff --git a/src/ModelContextProtocol.Core/Server/StreamServerTransport.cs b/src/ModelContextProtocol.Core/Server/StreamServerTransport.cs
@@ -74,7 +74,9 @@ public override async Task SendMessageAsync(JsonRpcMessage message, Cancellation
 
         try
         {
-            await JsonSerializer.SerializeAsync(_outputStream, message, McpJsonUtilities.DefaultOptions.GetTypeInfo(typeof(JsonRpcMessage)), cancellationToken).ConfigureAwait(false);
+            var json = JsonSerializer.Serialize(message, McpJsonUtilities.JsonContext.Default.JsonRpcMessage);
+            LogTransportSendingMessageSensitive(Name, json);
+            await _outputStream.WriteAsync(Encoding.UTF8.GetBytes(json), cancellationToken).ConfigureAwait(false);
             await _outputStream.WriteAsync(s_newlineBytes, cancellationToken).ConfigureAwait(false);
             await _outputStream.FlushAsync(cancellationToken).ConfigureAwait(false);
         }
diff --git a/tests/ModelContextProtocol.Tests/DiagnosticTests.cs b/tests/ModelContextProtocol.Tests/DiagnosticTests.cs
@@ -32,6 +32,11 @@ await RunConnected(async (client, server) =>
                 var tool = tools.First(t => t.Name == "DoubleValue");
                 await tool.InvokeAsync(new() { ["amount"] = 42 }, TestContext.Current.CancellationToken);
             }, clientToServerLog);
+
+            // Wait for server-side activities to be exported. The server processes messages
+            // via fire-and-forget tasks, so activities may not be immediately available
+            // after the client operation completes.
+            await WaitForAsync(() => activities.Count(a => a.Kind == ActivityKind.Server) >= 4);
         }
 
         Assert.NotEmpty(activities);
@@ -97,6 +102,9 @@ await RunConnected(async (client, server) =>
                 await client.CallToolAsync("Throw", cancellationToken: TestContext.Current.CancellationToken);
                 await Assert.ThrowsAsync<McpProtocolException>(async () => await client.CallToolAsync("does-not-exist", cancellationToken: TestContext.Current.CancellationToken));
             }, []);
+
+            // Wait for server-side activities to be exported.
+            await WaitForAsync(() => activities.Count(a => a.Kind == ActivityKind.Server) >= 4);
         }
 
         Assert.NotEmpty(activities);
@@ -164,6 +172,9 @@ await RunConnected(async (client, server) =>
                     .First(t => t.Name == "DoubleValue");
                 await tool.InvokeAsync(new() { ["amount"] = 42 }, TestContext.Current.CancellationToken);
             }, []);
+
+            // Wait for server-side activities to be exported.
+            await WaitForAsync(() => activities.Count(a => a.Kind == ActivityKind.Server) >= 3);
         }
 
         // The outer activity should have MCP-specific attributes added to it
@@ -215,6 +226,15 @@ private static async Task RunConnected(Func<McpClient, McpServer, Task> action,
 
         await serverTask;
     }
+
+    private static async Task WaitForAsync(Func<bool> condition, int timeoutMs = 10_000)
+    {
+        using var cts = new CancellationTokenSource(timeoutMs);
+        while (!condition())
+        {
+            await Task.Delay(10, cts.Token);
+        }
+    }
 }
 
 public class LoggingStream : Stream
diff --git a/tests/ModelContextProtocol.Tests/EverythingSseServerFixture.cs b/tests/ModelContextProtocol.Tests/EverythingSseServerFixture.cs
diff --git a/tests/ModelContextProtocol.Tests/Transport/StdioServerTransportTests.cs b/tests/ModelContextProtocol.Tests/Transport/StdioServerTransportTests.cs

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,8 @@ public override async Task SendMessageAsync(`
`83`	`83`	`messageId = messageWithId.Id.ToString();`
`84`	`84`	`}`
`85`	`85`
	`86`	`+ LogTransportSendingMessageSensitive(message);`
	`87`	`+`
`86`	`88`	`using var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, _messageEndpoint);`
`87`	`89`	`StreamableHttpClientSessionTransport.CopyAdditionalHeaders(httpRequestMessage.Headers, _options.AdditionalHeaders, sessionId: null, protocolVersion: null);`
`88`	`90`	`var response = await _httpClient.SendAsync(httpRequestMessage, message, cancellationToken).ConfigureAwait(false);`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,8 @@ public override async Task SendMessageAsync(JsonRpcMessage message, Cancellation`
`105`	`105`
`106`	`106`	`var json = JsonSerializer.Serialize(message, McpJsonUtilities.JsonContext.Default.JsonRpcMessage);`
`107`	`107`
	`108`	`+ LogTransportSendingMessageSensitive(Name, json);`
	`109`	`+`
`108`	`110`	`using var _ = await _sendLock.LockAsync(cancellationToken).ConfigureAwait(false);`
`109`	`111`	`try`
`110`	`112`	`{`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,8 @@ internal async Task<HttpResponseMessage> SendHttpRequestAsync(JsonRpcMessage mes`
`75`	`75`	`$"Call {nameof(McpClient)}.{nameof(McpClient.ResumeSessionAsync)} to resume existing sessions.");`
`76`	`76`	`}`
`77`	`77`
	`78`	`+ LogTransportSendingMessageSensitive(message);`
	`79`	`+`
`78`	`80`	`using var sendCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, _connectionCts.Token);`
`79`	`81`	`cancellationToken = sendCts.Token;`
`80`	`82`