@@ -20936,6 +20936,11 @@ bool cbm_mcp_jsonrpc_response_prepend_notice(char **response_io, const char *not
2093620936 return true;
2093720937}
2093820938
20939+ static long long mcp_elapsed_us(struct timespec start, struct timespec end) {
20940+ return ((long long)(end.tv_sec - start.tv_sec) * MCP_S_TO_US) +
20941+ ((long long)(end.tv_nsec - start.tv_nsec) / MCP_MS_TO_US);
20942+ }
20943+
2093920944char *cbm_mcp_server_handle(cbm_mcp_server_t *srv, const char *line) {
2094020945 cbm_jsonrpc_request_t req = {0};
2094120946 if (cbm_jsonrpc_parse(line, &req) < 0) {
@@ -20966,7 +20971,11 @@ char *cbm_mcp_server_handle(cbm_mcp_server_t *srv, const char *line) {
2096620971 cbm_clock_gettime(CLOCK_MONOTONIC, &req_t0);
2096720972 char *result_json = NULL;
2096820973 char *request_error_json = NULL;
20969- bool request_logged = false;
20974+ char *request_tool_name = NULL;
20975+ long long handler_duration_us = 0;
20976+ bool request_is_error = false;
20977+ bool request_cancelled = false;
20978+ bool request_timed_out = false;
2097020979
2097120980 if (strcmp(req.method, "initialize") == 0) {
2097220981 result_json = cbm_mcp_initialize_response_for_profile(req.params_raw, srv->tool_profile);
@@ -20993,6 +21002,7 @@ char *cbm_mcp_server_handle(cbm_mcp_server_t *srv, const char *line) {
2099321002 char *tool_name = req.params_raw ? cbm_mcp_get_tool_name(req.params_raw) : NULL;
2099421003 char *tool_args =
2099521004 req.params_raw ? cbm_mcp_get_arguments(req.params_raw) : heap_strdup("{}");
21005+ request_tool_name = tool_name;
2099621006 srv->active_request_id = req.id;
2099721007 free(srv->active_request_id_str);
2099821008 srv->active_request_id_str = req.id_str ? heap_strdup(req.id_str) : NULL;
@@ -21005,16 +21015,15 @@ char *cbm_mcp_server_handle(cbm_mcp_server_t *srv, const char *line) {
2100521015 srv->active_request_id_str = NULL;
2100621016 struct timespec t1;
2100721017 cbm_clock_gettime(CLOCK_MONOTONIC, &t1);
21008- long long dur_us = ((long long)(t1.tv_sec - t0.tv_sec) * MCP_S_TO_US) +
21009- ((long long)(t1.tv_nsec - t0.tv_nsec) / MCP_MS_TO_US);
21018+ long long dur_us = mcp_elapsed_us(t0, t1);
2101021019 bool is_err = (result_json != NULL) && (strstr(result_json, "\"isError\":true") != NULL);
2101121020 cbm_diag_record_query(dur_us, is_err);
21012- long long request_dur_us = ((long long)(t1.tv_sec - req_t0.tv_sec) * MCP_S_TO_US) +
21013- ((long long)(t1.tv_nsec - req_t0.tv_nsec) / MCP_MS_TO_US);
21014- cbm_log_mcp_request(req.method, tool_name, is_err, request_dur_us);
21015- request_logged = true;
21021+ handler_duration_us = mcp_elapsed_us(req_t0, t1);
21022+ request_is_error = is_err;
21023+ request_cancelled = mcp_request_cancelled(srv);
21024+ request_timed_out =
21025+ result_json && strstr(result_json, "\"code\":\"request_timeout\"") != NULL;
2101621026
21017- free(tool_name);
2101821027 free(tool_args);
2101921028 } else {
2102021029 /* Echo the original id (string or numeric, issue #253) on the error. */
@@ -21026,14 +21035,20 @@ char *cbm_mcp_server_handle(cbm_mcp_server_t *srv, const char *line) {
2102621035 .id_str = req.id_str,
2102721036 .error_json = err_obj,
2102821037 };
21029- char *err = cbm_jsonrpc_format_response(&err_resp);
2103021038 struct timespec t1;
2103121039 cbm_clock_gettime(CLOCK_MONOTONIC, &t1);
21032- long long dur_us = ((long long)(t1.tv_sec - req_t0.tv_sec) * MCP_S_TO_US) +
21033- ((long long)(t1.tv_nsec - req_t0.tv_nsec) / MCP_MS_TO_US);
21040+ long long handler_us = mcp_elapsed_us(req_t0, t1);
21041+ struct timespec serialize_t0;
21042+ cbm_clock_gettime(CLOCK_MONOTONIC, &serialize_t0);
21043+ char *err = cbm_jsonrpc_format_response(&err_resp);
21044+ struct timespec serialize_t1;
21045+ cbm_clock_gettime(CLOCK_MONOTONIC, &serialize_t1);
21046+ long long serialization_us = mcp_elapsed_us(serialize_t0, serialize_t1);
21047+ long long duration_us = mcp_elapsed_us(req_t0, serialize_t1);
2103421048 /* server/discover is the modern connect probe. -32601 stays so the
2103521049 * client falls back to initialize; that miss is not an error (#2433). */
21036- cbm_log_mcp_request(req.method, NULL, strcmp(req.method, "server/discover") != 0, dur_us);
21050+ cbm_log_mcp_request(req.method, NULL, strcmp(req.method, "server/discover") != 0,
21051+ duration_us, handler_us, serialization_us, false, false);
2103721052 cbm_mcp_server_request_scope_end(srv);
2103821053 cbm_jsonrpc_request_free(&req);
2103921054 return err;
@@ -21045,32 +21060,42 @@ char *cbm_mcp_server_handle(cbm_mcp_server_t *srv, const char *line) {
2104521060 .id_str = req.id_str,
2104621061 .error_json = request_error_json,
2104721062 };
21063+ struct timespec serialize_t0;
21064+ cbm_clock_gettime(CLOCK_MONOTONIC, &serialize_t0);
2104821065 char *err = cbm_jsonrpc_format_response(&err_resp);
21049- struct timespec t1;
21050- cbm_clock_gettime(CLOCK_MONOTONIC, &t1);
21051- long long dur_us = ((long long)(t1.tv_sec - req_t0.tv_sec) * MCP_S_TO_US) +
21052- ((long long)(t1.tv_nsec - req_t0.tv_nsec) / MCP_MS_TO_US);
21053- cbm_log_mcp_request(req.method, NULL, true, dur_us);
21066+ struct timespec serialize_t1;
21067+ cbm_clock_gettime(CLOCK_MONOTONIC, &serialize_t1);
21068+ long long handler_us = mcp_elapsed_us(req_t0, serialize_t0);
21069+ long long serialization_us = mcp_elapsed_us(serialize_t0, serialize_t1);
21070+ long long duration_us = mcp_elapsed_us(req_t0, serialize_t1);
21071+ cbm_log_mcp_request(req.method, NULL, true, duration_us, handler_us, serialization_us,
21072+ false, false);
2105421073 free(request_error_json);
2105521074 cbm_mcp_server_request_scope_end(srv);
2105621075 cbm_jsonrpc_request_free(&req);
2105721076 return err;
2105821077 }
2105921078
21060- if (!request_logged) {
21061- struct timespec t1;
21062- cbm_clock_gettime(CLOCK_MONOTONIC, &t1);
21063- long long dur_us = ((long long)(t1.tv_sec - req_t0.tv_sec) * MCP_S_TO_US) +
21064- ((long long)(t1.tv_nsec - req_t0.tv_nsec) / MCP_MS_TO_US);
21065- cbm_log_mcp_request(req.method, NULL, false, dur_us);
21066- }
21067-
2106821079 cbm_jsonrpc_response_t resp = {
2106921080 .id = req.id,
2107021081 .id_str = req.id_str,
2107121082 .result_json = result_json,
2107221083 };
21084+ struct timespec serialize_t0;
21085+ cbm_clock_gettime(CLOCK_MONOTONIC, &serialize_t0);
2107321086 char *out = cbm_jsonrpc_format_response(&resp);
21087+ struct timespec serialize_t1;
21088+ cbm_clock_gettime(CLOCK_MONOTONIC, &serialize_t1);
21089+ long long serialization_us = mcp_elapsed_us(serialize_t0, serialize_t1);
21090+ long long duration_us = mcp_elapsed_us(req_t0, serialize_t1);
21091+ request_is_error = request_is_error || out == NULL;
21092+ if (!request_tool_name) {
21093+ handler_duration_us = duration_us - serialization_us;
21094+ }
21095+ cbm_log_mcp_request(req.method, request_tool_name, request_is_error, duration_us,
21096+ handler_duration_us, serialization_us, request_cancelled,
21097+ request_timed_out);
21098+ free(request_tool_name);
2107421099 free(result_json);
2107521100 cbm_mcp_server_request_scope_end(srv);
2107621101 cbm_jsonrpc_request_free(&req);
0 commit comments