Skip to content

fix: keep MCP payloads and credentials out of logs - #2648

Open
erichare wants to merge 1 commit into
fix/mcp-setup-errorsfrom
fix/mcp-safe-logging
Open

erichare wants to merge 1 commit into
fix/mcp-setup-errorsfrom
fix/mcp-safe-logging

Conversation

@erichare

@erichare erichare commented Oct 19, 2026 •

Copy link
Copy Markdown
Contributor

What this PR does:

Keeps MCP payloads and credentials out of logs. Completion logs and diagnostic traces share one server-generated request ID. One endpoint path controls request logging and access-log exclusion. Context propagation carries the MCP marker through driver and cache callbacks, then restores the worker context. Diagnostic stack traces expire within 15 minutes.

Which issue(s) this PR fixes:

Fixes #2635. Deployment logging checks remain in #2634.

Verification

85 focused tests passed with 0 failures, 0 errors, and 0 skips at d3aeb7051, this PR's commit in the rebuilt stack. The format check found 0 non-complying files out of 1,215. The packaged MCP integration suite was not rerun locally after the rebuild. CI runs the unit and DSE/HCD integration suites on this push.

JAVA_HOME=/Library/Java/JavaVirtualMachines/graalvm-21.jdk/Contents/Home ./mvnw -B -ntp com.spotify.fmt:fmt-maven-plugin:check test -DskipITs -Dxml-format.skip=true -Dsurefire.failIfNoSpecifiedTests=false -Dquarkus.http.test-port=19089 '-Dtest=McpCustomPathLoggingTest,McpDiagnosticLoggingTest,McpEndpointConfigSourceFactoryTest,McpLoggingFilterTest,McpLoggingTest,McpRequestContextProviderTest,McpResourceTest,McpSetupErrorsTest'

Manual client checks were not run.

Checklist

  • Changes manually tested
  • Automated Tests added/updated
  • Documentation added/updated
  • CLA Signed: DataStax CLA

MCP stack

Merges bottom up; row 1 is the bottom of the stack.

# PR Change Issue
1 #2651 Show accepted update syntax in tool schemas Fixes #2631
2 #2658 Describe every tool argument Part of #2604
3 #2645 Close the command context after each call Part of #2629
4 #2653 Return useful errors when setup fails Fixes #2628
5 #2648 Keep payloads and credentials out of logs Fixes #2635
6 #2649 Describe side effects and retry behavior Fixes #2636
7 #2655 Validate commands like the HTTP API Fixes #2632
8 #2656 Test request isolation, document tracing Refs #2629
9 #2657 Reject unapproved browser origins Part of #2630
10 #2659 Serve only protocol 2026-07-28 Part of #2625, #2626
11 #2669 Add opt-in OAuth authentication Refs #2642, #2643

@github-actions

github-actions Bot commented Oct 22, 2026 •

Copy link
Copy Markdown
Contributor

📈 Unit Test Coverage Delta vs Main Branch

Metric Value
Main Branch 56.74%
This PR 57.84%
Delta 🟢 +1.11%
✅ Coverage improved!

@github-actions

github-actions Bot commented Oct 22, 2026 •

Copy link
Copy Markdown
Contributor

Unit Test Coverage Report

Overall Project 57.84% -0.23% 🍏
Files changed 73.66% 🍏

File Coverage
McpRequestLogging.java 100% 🍏
McpRequestContextProvider.java 100% 🍏
McpEndpointConfigSourceFactory.java 98.08% -1.92% 🍏
McpLoggingFilter.java 97.47% -2.53% 🍏
McpResource.java 90.87% -6.32% 🍏
DynamicTTLCache.java 84.12% 🍏
CqlSessionFactory.java 81.49% 🍏
RequestContext.java 56.9% 🍏
GeneralCommandTools.java 22.58% -55.91% ❌
KeyspaceCommandTools.java 0% -70.82% ❌

@github-actions

github-actions Bot commented Oct 22, 2026 •

Copy link
Copy Markdown
Contributor

📈 Integration Test Coverage Delta vs Main Branch (dse69-it)

Metric Value
Main Branch 72.98%
This PR 73.07%
Delta 🟢 +0.09%
✅ Coverage improved!

@github-actions

github-actions Bot commented Oct 22, 2026 •

Copy link
Copy Markdown
Contributor

Integration Test Coverage Report (dse69-it)

Overall Project 73.07% -0.12% 🍏
Files changed 86.04% 🍏

File Coverage
KeyspaceCommandTools.java 100% 🍏
GeneralCommandTools.java 100% 🍏
McpRequestContextProvider.java 91.43% -8.57% 🍏
RequestContext.java 89.39% 🍏
McpRequestLogging.java 89.13% -10.87% 🍏
McpResource.java 84.19% -7.91% 🍏
McpLoggingFilter.java 80.3% -19.7% 🍏
McpEndpointConfigSourceFactory.java 78.85% -21.15% 🍏
CqlSessionFactory.java 72.49% -5.14% ❌
DynamicTTLCache.java 71.73% 🍏

@github-actions

github-actions Bot commented Oct 22, 2026 •

Copy link
Copy Markdown
Contributor

📈 Integration Test Coverage Delta vs Main Branch (hcd-it)

Metric Value
Main Branch 74.33%
This PR 74.42%
Delta 🟢 +0.09%
✅ Coverage improved!

@github-actions

github-actions Bot commented Oct 22, 2026 •

Copy link
Copy Markdown
Contributor

Integration Test Coverage Report (hcd-it)

Overall Project 74.42% -0.12% 🍏
Files changed 86.04% 🍏

File Coverage
KeyspaceCommandTools.java 100% 🍏
GeneralCommandTools.java 100% 🍏
McpRequestContextProvider.java 91.43% -8.57% 🍏
RequestContext.java 89.39% 🍏
McpRequestLogging.java 89.13% -10.87% 🍏
McpResource.java 84.19% -7.91% 🍏
McpLoggingFilter.java 80.3% -19.7% 🍏
McpEndpointConfigSourceFactory.java 78.85% -21.15% 🍏
CqlSessionFactory.java 72.49% -5.14% ❌
DynamicTTLCache.java 71.73% 🍏

@erichare
erichare added this pull request to stack #2660 October 23, 2026 22:14
@erichare
erichare removed this pull request from stack #2660 October 27, 2026 23:11
@erichare
erichare added this pull request to stack #2667 October 27, 2026 23:12
@erichare
erichare force-pushed the fix/mcp-safe-logging branch from 4917f92 to 439a80f Compare October 27, 2026 23:54

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

1 participant