mcp-log-query-server 3.3.0 → 3.4.0

package/index.js

@@ -670,25 +670,43 @@ async function handleToolCall(name, args) {
 
         console.error(`[MCP] 追踪日志: traceId=${traceId}, namespace=${targetNamespace || 'default'}, 服务数=${servicesToSearch.length}`);
 
+        const TRACE_TOTAL_TIMEOUT = 50000;  // 总耗时上限 50s
+        const TRACE_PER_SERVICE = 10000;    // 单服务超时 10s
+        const traceStart = Date.now();
         const results = [];
+        let searched = 0;
+        let skipped = 0;
+
         for (const serviceName of servicesToSearch) {
+          // 总耗时检查
+          if (Date.now() - traceStart > TRACE_TOTAL_TIMEOUT) {
+            skipped = servicesToSearch.length - searched;
+            console.error(`[MCP] trace_log 总耗时超过 ${TRACE_TOTAL_TIMEOUT}ms，跳过剩余 ${skipped} 个服务`);
+            break;
+          }
+
           const service = findService(serviceName, targetNamespace);
-          if (!service) continue;
+          if (!service) { searched++; continue; }
 
           try {
             const command = `grep -i -C ${contextLines} "${traceId}"`;
-            const result = await queryLog(service, command);
+            const result = await queryLog(service, command, { timeout: TRACE_PER_SERVICE });
 
             if (result && result.trim() && !result.includes('未找到')) {
               results.push({ service: serviceName, namespace: service.namespace, logs: result });
             }
           } catch (err) {
-            console.error(`[MCP] 搜索 ${serviceName} 失败: ${err.message}`);
+            // 快速跳过失败/超时的服务
+            console.error(`[MCP] ${serviceName} 跳过: ${err.message.substring(0, 80)}`);
           }
+          searched++;
         }
 
+        const elapsed = Date.now() - traceStart;
+        const timeNote = skipped > 0 ? `\n**注意**: 已搜索 ${searched}/${servicesToSearch.length} 个服务（耗时 ${elapsed}ms，跳过 ${skipped} 个）` : '';
+
         if (results.length === 0) {
-          return { content: [{ type: 'text', text: `## TraceId 追踪结果\n\n**traceId**: ${traceId}\n**namespace**: ${targetNamespace || '默认'}\n\n❌ 未在任何服务中找到匹配的日志` }] };
+          return { content: [{ type: 'text', text: `## TraceId 追踪结果\n\n**traceId**: ${traceId}\n**namespace**: ${targetNamespace || '默认'}\n\n❌ 未在已搜索的 ${searched} 个服务中找到匹配的日志${timeNote}` }] };
         }
 
         const output = results.map(r => `### ${r.service} (${r.namespace})\n\`\`\`\n${r.logs}\n\`\`\``).join('\n\n');
@@ -696,7 +714,7 @@ async function handleToolCall(name, args) {
         return {
           content: [{
             type: 'text',
-            text: `## TraceId 追踪结果\n\n**traceId**: ${traceId}\n**namespace**: ${targetNamespace || '默认'}\n**匹配服务数**: ${results.length}\n\n${output}`
+            text: `## TraceId 追踪结果\n\n**traceId**: ${traceId}\n**namespace**: ${targetNamespace || '默认'}\n**匹配服务数**: ${results.length}${timeNote}\n\n${output}`
           }]
         };
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-log-query-server",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "MCP Server for querying server logs via SSH jump host and Grafana Loki API",
   "main": "index.js",
   "type": "module",