Skip to content

Commit b548124

Browse files
committed
Revert removal of LogTransportMessageParseFailedSensitive call
- Improve test names
1 parent 46a9df8 commit b548124

3 files changed

Lines changed: 20 additions & 7 deletions

File tree

src/ModelContextProtocol/Client/StreamableHttpClientSessionTransport.cs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,12 +222,25 @@ private async Task ReceiveUnsolicitedMessagesAsync()
222222
}
223223
catch (JsonException ex)
224224
{
225-
LogTransportMessageParseFailed(Name, ex);
225+
LogJsonException(ex, data);
226226
}
227227

228228
return null;
229229
}
230230

231+
private void LogJsonException(JsonException ex, string data)
232+
{
233+
if (_logger.IsEnabled(LogLevel.Trace))
234+
{
235+
LogTransportMessageParseFailedSensitive(Name, data, ex);
236+
}
237+
else
238+
{
239+
LogTransportMessageParseFailed(Name, ex);
240+
}
241+
}
242+
243+
231244
internal static void CopyAdditionalHeaders(HttpRequestHeaders headers, Dictionary<string, string>? additionalHeaders, string? sessionId = null)
232245
{
233246
if (sessionId is not null)

tests/ModelContextProtocol.AspNetCore.Tests/MapMcpStreamableHttpTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public async Task CanConnect_WithMcpClient_AfterCustomizingRoute(string routePat
3737
}
3838

3939
[Fact]
40-
public async Task StreamableHttp_Mode_Should_Work_With_Root_Endpoint()
40+
public async Task StreamableHttpMode_Works_WithRootEndpoint()
4141
{
4242
Builder.Services.AddMcpServer(options =>
4343
{
@@ -63,7 +63,7 @@ public async Task StreamableHttp_Mode_Should_Work_With_Root_Endpoint()
6363
}
6464

6565
[Fact]
66-
public async Task AutoDetect_Mode_Should_Work_With_Root_Endpoint()
66+
public async Task AutoDetectMode_Works_WithRootEndpoint()
6767
{
6868
Builder.Services.AddMcpServer(options =>
6969
{
@@ -89,7 +89,7 @@ public async Task AutoDetect_Mode_Should_Work_With_Root_Endpoint()
8989
}
9090

9191
[Fact]
92-
public async Task AutoDetect_Mode_Should_Work_With_Sse_Endpoint()
92+
public async Task AutoDetectMode_Works_WithSseEndpoint()
9393
{
9494
Assert.SkipWhen(Stateless, "SSE endpoint is disabled in stateless mode.");
9595

@@ -117,7 +117,7 @@ public async Task AutoDetect_Mode_Should_Work_With_Sse_Endpoint()
117117
}
118118

119119
[Fact]
120-
public async Task Sse_Mode_Should_Work_With_Sse_Endpoint()
120+
public async Task SseMode_Works_WithSseEndpoint()
121121
{
122122
Assert.SkipWhen(Stateless, "SSE endpoint is disabled in stateless mode.");
123123

tests/ModelContextProtocol.Tests/Transport/SseClientTransportAutoDetectTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace ModelContextProtocol.Tests.Transport;
77
public class SseClientTransportAutoDetectTests(ITestOutputHelper testOutputHelper) : LoggedTest(testOutputHelper)
88
{
99
[Fact]
10-
public async Task AutoDetect_Should_Use_StreamableHttp_When_Server_Supports_It()
10+
public async Task AutoDetectMode_UsesStreamableHttp_WhenServerSupportsIt()
1111
{
1212
var options = new SseClientTransportOptions
1313
{
@@ -48,7 +48,7 @@ public async Task AutoDetect_Should_Use_StreamableHttp_When_Server_Supports_It()
4848
}
4949

5050
[Fact]
51-
public async Task AutoDetect_Should_Fallback_To_Sse_When_StreamableHttp_Fails()
51+
public async Task AutoDetectMode_FallsBackToSse_WhenStreamableHttpFails()
5252
{
5353
var options = new SseClientTransportOptions
5454
{

0 commit comments

Comments
 (0)