Colocate LogRequestHandlerCalled with completion/failure logs in HandleMessageAsync

Copilot · stephentoub · Copilot · commit 7b0177558dd9 · 2025-12-13T16:02:18.000Z
Co-authored-by: stephentoub &lt;2642209+stephentoub@users.noreply.github.com&gt;
diff --git a/src/ModelContextProtocol.Core/McpSessionHandler.cs b/src/ModelContextProtocol.Core/McpSessionHandler.cs
@@ -280,6 +280,7 @@ private async Task HandleMessageAsync(JsonRpcMessage message, CancellationToken
             switch (message)
             {
                 case JsonRpcRequest request:
+                    LogRequestHandlerCalled(EndpointName, request.Method);
                     long requestStartingTimestamp = Stopwatch.GetTimestamp();
                     try
                     {
@@ -362,7 +363,6 @@ private void HandleMessageWithId(JsonRpcMessage message, JsonRpcMessageWithId me
             throw new McpProtocolException($"Method '{request.Method}' is not available.", McpErrorCode.MethodNotFound);
         }
 
-        LogRequestHandlerCalled(EndpointName, request.Method);
         JsonNode? result = await handler(request, cancellationToken).ConfigureAwait(false);
 
         await SendMessageAsync(new JsonRpcResponse

Original file line number	Diff line number	Diff line change
`@@ -280,6 +280,7 @@ private async Task HandleMessageAsync(JsonRpcMessage message, CancellationToken`
`280`	`280`	`switch (message)`
`281`	`281`	`{`
`282`	`282`	`case JsonRpcRequest request:`
	`283`	`+ LogRequestHandlerCalled(EndpointName, request.Method);`
`283`	`284`	`long requestStartingTimestamp = Stopwatch.GetTimestamp();`
`284`	`285`	`try`
`285`	`286`	`{`
`@@ -362,7 +363,6 @@ private void HandleMessageWithId(JsonRpcMessage message, JsonRpcMessageWithId me`
`362`	`363`	`throw new McpProtocolException($"Method '{request.Method}' is not available.", McpErrorCode.MethodNotFound);`
`363`	`364`	`}`
`364`	`365`
`365`		`- LogRequestHandlerCalled(EndpointName, request.Method);`
`366`	`366`	`JsonNode? result = await handler(request, cancellationToken).ConfigureAwait(false);`
`367`	`367`
`368`	`368`	`await SendMessageAsync(new JsonRpcResponse`