Skip to content

Commit 6f17caa

Browse files
committed
fix(mcp): report request timing and transport failures
Signed-off-by: lorenzozanee <wyz0707@proton.me>
1 parent 64c23fa commit 6f17caa

7 files changed

Lines changed: 439 additions & 104 deletions

File tree

‎src/daemon/application.c‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2144,13 +2144,19 @@ static void application_update_notice_inject(cbm_daemon_application_session_t *s
21442144
char **response_io) {
21452145
cbm_daemon_application_t *application = session->application;
21462146
cbm_mutex_lock(&application->mutex);
2147-
if (session->background_eligible && !session->update_notice_delivered &&
2148-
!session->pending_update_notice && application->update_thread_done &&
2149-
application->update_notice[0] &&
2150-
cbm_mcp_jsonrpc_response_prepend_notice(response_io, application->update_notice)) {
2147+
bool should_inject = session->background_eligible && !session->update_notice_delivered &&
2148+
!session->pending_update_notice && application->update_thread_done &&
2149+
application->update_notice[0];
2150+
bool injected = should_inject &&
2151+
cbm_mcp_jsonrpc_response_prepend_notice(response_io,
2152+
application->update_notice);
2153+
if (injected) {
21512154
session->pending_update_notice = true;
21522155
}
21532156
cbm_mutex_unlock(&application->mutex);
2157+
if (should_inject && !injected) {
2158+
cbm_log_warn("daemon.update_notice.inject_failed", "status", "omitted");
2159+
}
21542160
}
21552161

21562162
static bool application_watch_job_subscription_exists_locked(
@@ -2556,6 +2562,13 @@ static cbm_daemon_runtime_application_status_t application_mcp_request(
25562562
parsed_ok && parsed.has_id && parsed.method && strcmp(parsed.method, "tools/call") == 0;
25572563
char *response = cbm_mcp_server_handle(session->mcp, message);
25582564
free(message);
2565+
if (!response && (!parsed_ok || parsed.has_id)) {
2566+
cbm_log_error("daemon.mcp.response_missing", "status", "error");
2567+
if (parsed_ok) {
2568+
cbm_jsonrpc_request_free(&parsed);
2569+
}
2570+
return CBM_DAEMON_RUNTIME_APPLICATION_HANDLER_ERROR;
2571+
}
25592572
if (initialize_request && application_jsonrpc_success(response)) {
25602573
cbm_mutex_lock(&session->application->mutex);
25612574
session->pending_background_initialize = true;

‎src/foundation/log.c‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -363,17 +363,29 @@ static void copy_path_without_query(const char *path, char *out, size_t outsz) {
363363
}
364364

365365
void cbm_log_mcp_request(const char *method, const char *tool_name, bool is_error,
366-
int64_t duration_us) {
366+
int64_t duration_us, int64_t handler_duration_us,
367+
int64_t response_serialization_us, bool cancelled, bool timed_out) {
367368
char duration_ms[CBM_SZ_32];
369+
char handler_duration_ms[CBM_SZ_32];
370+
char response_serialization_ms[CBM_SZ_32];
368371
snprintf(duration_ms, sizeof(duration_ms), "%" PRId64, duration_us / 1000);
372+
snprintf(handler_duration_ms, sizeof(handler_duration_ms), "%" PRId64,
373+
handler_duration_us / 1000);
374+
snprintf(response_serialization_ms, sizeof(response_serialization_ms), "%" PRId64,
375+
response_serialization_us / 1000);
376+
const char *status = timed_out ? "timeout" : (is_error ? "error" : "ok");
369377
if (tool_name && tool_name[0] != '\0') {
370378
cbm_log(is_error ? CBM_LOG_WARN : CBM_LOG_INFO, "mcp.request", "protocol", "jsonrpc",
371-
"method", method ? method : "", "tool", tool_name, "status",
372-
is_error ? "error" : "ok", "duration_ms", duration_ms, NULL);
379+
"method", method ? method : "", "tool", tool_name, "status", status,
380+
"duration_ms", duration_ms, "handler_duration_ms", handler_duration_ms,
381+
"response_serialization_ms", response_serialization_ms, "cancelled",
382+
cancelled ? "true" : "false", "timed_out", timed_out ? "true" : "false", NULL);
373383
} else {
374384
cbm_log(is_error ? CBM_LOG_WARN : CBM_LOG_INFO, "mcp.request", "protocol", "jsonrpc",
375-
"method", method ? method : "", "status", is_error ? "error" : "ok", "duration_ms",
376-
duration_ms, NULL);
385+
"method", method ? method : "", "status", status, "duration_ms", duration_ms,
386+
"handler_duration_ms", handler_duration_ms, "response_serialization_ms",
387+
response_serialization_ms, "cancelled", cancelled ? "true" : "false", "timed_out",
388+
timed_out ? "true" : "false", NULL);
377389
}
378390
}
379391

‎src/foundation/log.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ void cbm_log_int(CBMLogLevel level, const char *msg, const char *key, int64_t va
9595
/* Operational event helpers. They deliberately avoid request bodies, headers,
9696
* arguments, and query strings. */
9797
void cbm_log_mcp_request(const char *method, const char *tool_name, bool is_error,
98-
int64_t duration_us);
98+
int64_t duration_us, int64_t handler_duration_us,
99+
int64_t response_serialization_us, bool cancelled, bool timed_out);
99100
void cbm_log_http_request(const char *component, const char *method, const char *path, int status,
100101
int64_t duration_ms, size_t request_bytes, size_t response_bytes);
101102

0 commit comments

Comments
 (0)