@awarecorp/mcp-logger 0.0.4 β 0.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli/main.js +1 -1
- package/dist/cli/mcp-message-logger.js +1 -1
- package/dist/core/config.js +1 -1
- package/dist/core/span-builder.js +1 -1
- package/dist/core/telemetry.js +1 -1
- package/dist/core/types.d.ts +2 -0
- package/dist/index.js +1 -1
- package/dist/sdk/index.js +1 -1
- package/dist/sdk/instrumentation.js +1 -1
- package/package.json +7 -6
package/dist/cli/main.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
function e(e){return!y.includes(e)}function s(){return I}function r(){return C}async function t(){if(q)try{await q.shutdown(),q=null,I=null,S=!1,C=null}catch(e){console.error("[MCP Logger] Error shutting down telemetry:",e)}}function o(e,s){for(const[r,t]of Object.entries(s))null!=t&&e.setAttribute(r,t)}function n(e,s=1e4){try{const r=JSON.stringify(e);return r.length>s?r.slice(0,s)+"... (truncated)":r}catch(e){return null}}function i(e,s){return e.startsWith("resources/")?{type:e.split("/")[1],uri:s?.uri||s?.path||s?.resource}:e.startsWith("prompts/")?{type:"prompt",uri:s?.name||s?.promptId}:"tools/call"===e?{type:"tool",uri:s?.name}:s?.resourceType&&s?.resourceUri?{type:s.resourceType,uri:s.resourceUri}:{type:void 0,uri:void 0}}function c(e,s,r,t){const o=function(e){if(e){const s=e["user-agent"]||e["User-Agent"];if(s){const e=s.match(/^([^\/]+)\/([^\s]+)/);if(e)return{name:e[1],version:e[2]}}}return{name:void 0,version:void 0}}(t),n=(u=`${o.name||"unknown"}-${o.version||"0"}`,R.has(u)||R.set(u,"session-"+ ++O),R.get(u)),c=function(e,s){const r=`${e}-${s}`;return M.has(r)||M.set(r,"conv-"+ ++w),M.get(r)}(n,e),a=function(e,s){return e?.userId||e?.user_id?e.userId||e.user_id:s?s["x-user-id"]||s["X-User-Id"]:void 0}(s,t),p=function(e){if(e?.permission||e?.permissionLevel)return e.permission||e.permissionLevel}(s),m=i(e,s);var u;m.uri&&function(e){const s=(N.get(e)||0)+1;N.set(e,s)}(m.uri);const d=function(e,s){return void 0!==e?.cost?e.cost:void 0!==s?.cost?s.cost:void 0}(s,r),l={};return n&&(l.sessionId=n),c&&(l.conversationId=c),a&&(l.userId=a),o.name&&(l.clientName=o.name),o.version&&(l.clientVersion=o.version),p&&(l.permissionLevel=p),void 0!==d&&(l.cost=d),l}function a(e,s){const r=i(e,s);if(!r.uri)return{};const t=N.get(r.uri)||0;return{resourceType:r.type,resourceUri:r.uri,resourceAccessCount:t}}import{spawn as p}from"child_process";import{program as m}from"commander";import{NodeSDK as u}from"@opentelemetry/sdk-node";import{OTLPTraceExporter as d}from"@opentelemetry/exporter-trace-otlp-http";import{Resource as l}from"@opentelemetry/resources";import{trace as g,SpanStatusCode as h}from"@opentelemetry/api";import{Transform as f}from"stream";const v="1.0.0",y=["notifications/initialized"];let q=null,I=null,S=!1,C=null;class L extends f{buffer="";direction;logger;debug;constructor(e,s,r=!1){super(),this.direction=e,this.logger=s,this.debug=r}_transform(e,s,r){try{this.push(e),this.buffer+=e.toString(),this.buffer.length>1e6&&(this.debug&&console.error("[mcp-logger CLI] Buffer size exceeded, clearing..."),this.buffer=""),this.tryParseMessages(),r()}catch(e){r(e)}}tryParseMessages(){const e=this.buffer.split("\n");this.buffer=e.pop()||"";for(const s of e){const e=s.trim();if(e)try{const s=JSON.parse(e);this.handleMessage(s)}catch(s){this.debug&&console.error("[mcp-logger CLI] Failed to parse:",e.slice(0,100))}}}handleMessage(e){console.error("[mcp-logger CLI] Handling message:",JSON.stringify(e).slice(0,100)),"request"===this.direction&&e.method?this.logger.onRequest(e):"response"===this.direction&&(void 0===e.id||e.method?e.method&&!e.id&&this.logger.onNotification(e):this.logger.onResponse(e))}_flush(e){try{if(this.buffer.trim())try{const e=JSON.parse(this.buffer);this.handleMessage(e)}catch(e){this.debug&&console.error("[mcp-logger CLI] Failed to parse final buffer")}if(this.debug){const e=this.logger.getStats();console.error("[mcp-logger CLI] Stream closed. Pending requests: "+e.pending)}e()}catch(s){e(s)}}}const R=new Map;let O=0;const M=new Map;let w=0;const N=new Map;class E{pendingRequests=new Map;debug;TIMEOUT=3e4;constructor(e=!1){this.debug=e}onRequest(s){if(this.debug&&console.error(`[mcp-logger CLI] π₯ REQUEST: method="${s.method}", id=${s.id}, params=${JSON.stringify(s.params)?.slice(0,100)}`),e(s.method)){if(!s.id)return this.debug&&console.error(`[mcp-logger CLI] π Notification detected: ${s.method} β Creating request-only span`),void this.createRequestOnlySpan(s,Date.now());this.pendingRequests.set(s.id,{request:s,timestamp:Date.now()}),this.debug&&console.error(`[mcp-logger CLI] Request stored: ${s.method} (ID: ${s.id})`),setTimeout(()=>this.cleanupStale(s.id),this.TIMEOUT)}else this.debug&&console.error("[mcp-logger CLI] π« Skipping excluded method: "+s.method)}onResponse(e){if(this.debug&&console.error(`[mcp-logger CLI] π€ RESPONSE: id=${e.id}, hasResult=${!!e.result}, result=${JSON.stringify(e.result)?.slice(0,100)}, hasError=${!!e.error}`),!e.id)return void(this.debug&&console.error("[mcp-logger CLI] Response without ID, skipping"));const s=this.pendingRequests.get(e.id);if(!s)return this.debug&&console.error(`[mcp-logger CLI] βοΈ No matching request for response ID: ${e.id} β Creating response-only span`),void this.createResponseOnlySpan(e,Date.now());const r=Date.now(),t=r-s.timestamp;this.debug&&console.error(`[mcp-logger CLI] β
Pairing success: ${s.request.method} (${t}ms)`),this.createPairedSpan(s.request,e,s.timestamp,r,t),this.pendingRequests.delete(e.id)}onNotification(s){this.debug&&console.error(`[mcp-logger CLI] π’ NOTIFICATION (ServerβClient): method="${s.method}", params=${JSON.stringify(s.params)?.slice(0,100)}`),e(s.method)?this.createResponseOnlySpan({jsonrpc:"2.0",id:`notification-${Date.now()}-${Math.random().toString(36).slice(2,8)}`,method:s.method},Date.now()):this.debug&&console.error("[mcp-logger CLI] π« Skipping excluded method: "+s.method)}createPairedSpan(e,t,i,p,m){const u=c(e.method,e.params,t.result,void 0);!function(e){const t=s();if(!t)return void console.error("[MCP Logger] Tracer not initialized, cannot create span");const i="mcp."+e.method;t.startActiveSpan(i,s=>{try{const t={"mcp.source":e.source,"mcp.transport":e.transport,"mcp.request.id":e.request.id+"","mcp.request.method":e.method,"mcp.request.timestamp":e.request.timestamp,"mcp.request.params":n(e.request.params)||"{}","mcp.request.params.size":JSON.stringify(e.request.params||{}).length,"mcp.response.id":e.request.id+"","mcp.response.timestamp":e.response.timestamp,"mcp.duration_ms":e.duration};if("tools/call"===e.method&&e.request.params){const s=e.request.params.name,r=e.request.params.arguments;if(s&&(t["mcp.tool.name"]=s),r){const e=n(r);e&&(t["mcp.tool.arguments"]=e,t["mcp.tool.arguments.size"]=JSON.stringify(r).length)}}if(void 0!==e.response.result){const s=n(e.response.result);s&&(t["mcp.response.result"]=s,t["mcp.response.result.size"]=JSON.stringify(e.response.result).length)}if(e.request.headers){const s=n(e.request.headers);s&&(t["mcp.headers"]=s,t["mcp.headers.size"]=JSON.stringify(e.request.headers).length)}if("cli"===e.source){const e=r();e&&(t["mcp.cli.server"]=JSON.stringify({command:e.command,args:e.args,env:e.env}))}const i=e.contextMetadata||c(e.method,e.request.params,e.response.result,e.request.headers);i.sessionId&&(t["mcp.session.id"]=i.sessionId),i.conversationId&&(t["mcp.conversation.id"]=i.conversationId),i.userId&&(t["mcp.user.id"]=i.userId),i.clientName&&(t["mcp.client.name"]=i.clientName),i.clientVersion&&(t["mcp.client.version"]=i.clientVersion),i.permissionLevel&&(t["mcp.permission.level"]=i.permissionLevel),void 0!==i.cost&&(t["mcp.cost"]=i.cost);const p=a(e.method,e.request.params);if(p.resourceType&&(t["mcp.resource.type"]=p.resourceType),p.resourceUri&&(t["mcp.resource.uri"]=p.resourceUri),p.resourceAccessCount&&(t["mcp.resource.access_count"]=p.resourceAccessCount),e.customEvents&&e.customEvents.length>0&&(t["mcp.events"]=JSON.stringify(e.customEvents),t["mcp.events.count"]=e.customEvents.length,e.customEvents.forEach(e=>{s.addEvent("custom."+(e.level||"info"),{message:e.message,metadata:JSON.stringify(e.metadata||{}),timestamp:e.timestamp||Date.now()})})),e.response.error){let r;t["mcp.error"]=!0,r=e.response.error instanceof Error?e.response.error.message:"string"==typeof e.response.error?e.response.error:n(e.response.error)||"Unknown error",t["mcp.error.message"]=r,e.response.error instanceof Error&&s.recordException(e.response.error),s.setStatus({code:h.ERROR,message:r})}else s.setStatus({code:h.OK});o(s,t)}catch(e){console.error("[MCP Logger] Error creating paired span:",e),s.setStatus({code:h.ERROR,message:e+""})}finally{s.end()}})}({method:e.method,source:"cli",transport:"stdio",request:{id:e.id,timestamp:i,params:e.params},response:{timestamp:p,result:t.result,error:t.error},duration:m,contextMetadata:u})}cleanupStale(e){const s=this.pendingRequests.get(e);s&&Date.now()-s.timestamp>this.TIMEOUT&&(this.debug&&console.error(`[mcp-logger CLI] β° Request timeout: ${s.request.method} (ID: ${e}) β Creating request-only span`),this.createRequestOnlySpan(s.request,s.timestamp),this.pendingRequests.delete(e))}createRequestOnlySpan(e,t){const i=c(e.method,e.params,void 0,void 0);!function(e){const t=s();if(!t)return void console.error("[MCP Logger] Tracer not initialized, cannot create span");const i="mcp."+e.method;t.startActiveSpan(i,s=>{try{const t={"mcp.source":e.source,"mcp.transport":e.transport,"mcp.request.id":e.request.id+"","mcp.request.method":e.method,"mcp.request.timestamp":e.request.timestamp,"mcp.request.params":n(e.request.params)||"{}","mcp.request.params.size":JSON.stringify(e.request.params||{}).length};if("tools/call"===e.method&&e.request.params){const s=e.request.params.name,r=e.request.params.arguments;if(s&&(t["mcp.tool.name"]=s),r){const e=n(r);e&&(t["mcp.tool.arguments"]=e,t["mcp.tool.arguments.size"]=JSON.stringify(r).length)}}if("cli"===e.source){const e=r();e&&(t["mcp.cli.server"]=JSON.stringify({command:e.command,args:e.args,env:e.env}))}const i=e.contextMetadata||c(e.method,e.request.params,void 0,e.request.headers);i.sessionId&&(t["mcp.session.id"]=i.sessionId),i.conversationId&&(t["mcp.conversation.id"]=i.conversationId),i.userId&&(t["mcp.user.id"]=i.userId),i.clientName&&(t["mcp.client.name"]=i.clientName),i.clientVersion&&(t["mcp.client.version"]=i.clientVersion),i.permissionLevel&&(t["mcp.permission.level"]=i.permissionLevel),void 0!==i.cost&&(t["mcp.cost"]=i.cost);const p=a(e.method,e.request.params);p.resourceType&&(t["mcp.resource.type"]=p.resourceType),p.resourceUri&&(t["mcp.resource.uri"]=p.resourceUri),p.resourceAccessCount&&(t["mcp.resource.access_count"]=p.resourceAccessCount),s.setStatus({code:h.OK}),o(s,t)}catch(e){console.error("[MCP Logger] Error creating request-only span:",e),s.setStatus({code:h.ERROR,message:e+""})}finally{s.end()}})}({method:e.method,source:"cli",transport:"stdio",request:{id:e.id,timestamp:t,params:e.params},contextMetadata:i})}createResponseOnlySpan(e,t){const i=c(e.method||"unknown",void 0,e.result,void 0);!function(e){const t=s();if(!t)return void console.error("[MCP Logger] Tracer not initialized, cannot create span");const i="mcp."+e.method;t.startActiveSpan(i,s=>{try{const t={"mcp.source":e.source,"mcp.transport":e.transport,"mcp.response.id":e.response.id+"","mcp.response.method":e.method,"mcp.response.timestamp":e.response.timestamp};if(void 0!==e.response.result){const s=n(e.response.result);s&&(t["mcp.response.result"]=s,t["mcp.response.result.size"]=JSON.stringify(e.response.result).length)}if(e.response.error){let r;t["mcp.error"]=!0,r=e.response.error instanceof Error?e.response.error.message:"string"==typeof e.response.error?e.response.error:n(e.response.error)||"Unknown error",t["mcp.error.message"]=r,e.response.error instanceof Error&&s.recordException(e.response.error),s.setStatus({code:h.ERROR,message:r})}else s.setStatus({code:h.OK});if("cli"===e.source){const e=r();e&&(t["mcp.cli.server"]=JSON.stringify({command:e.command,args:e.args,env:e.env}))}const i=e.contextMetadata||c(e.method,void 0,e.response.result,void 0);i.sessionId&&(t["mcp.session.id"]=i.sessionId),i.conversationId&&(t["mcp.conversation.id"]=i.conversationId),i.userId&&(t["mcp.user.id"]=i.userId),i.clientName&&(t["mcp.client.name"]=i.clientName),i.clientVersion&&(t["mcp.client.version"]=i.clientVersion),i.permissionLevel&&(t["mcp.permission.level"]=i.permissionLevel),void 0!==i.cost&&(t["mcp.cost"]=i.cost),o(s,t)}catch(e){console.error("[MCP Logger] Error creating response-only span:",e),s.setStatus({code:h.ERROR,message:e+""})}finally{s.end()}})}({method:e.method||"same_request_method",source:"cli",transport:"stdio",response:{id:e.id,timestamp:t,result:e.result,error:e.error},contextMetadata:i})}getStats(){return{pending:this.pendingRequests.size}}clear(){this.debug&&console.error(`[mcp-logger CLI] Clearing ${this.pendingRequests.size} pending requests`),this.pendingRequests.clear()}}m.name("mcp-logger").description("Add observability to any MCP server without code changes").version("1.0.0").requiredOption("-k, --api-key <key>","Aware API key").option("-s, --service-name <name>","Service name for identification").option("-e, --endpoint <url>","Custom OTLP endpoint").argument("<command...>","MCP server command to wrap").action(async(e,s)=>{try{const r=!1;!function(e){if(S)return I;const s=e.endpoint||"https://aware.mcypher.com/v1/traces",r=e.serviceName||"mcp-server-"+Math.random().toString(36).slice(2,8);q=new u({resource:new l({"service.name":r,"service.version":v}),traceExporter:new d({url:s,headers:{"x-api-key":e.apiKey}})}),q.start(),I=g.getTracer("mcp-logger",v),S=!0;const o=async()=>{await t()};process.once("SIGTERM",o),process.once("SIGINT",o)}({...s,debug:r}),console.error("[MCP Logger CLI] Starting MCP server:",e.join(" "));const[o,...n]=e;!function(e,s){C={command:e,args:s,env:{}}}(o,n);const i=p(o,n,{stdio:["pipe","pipe","inherit"],env:{...process.env,MCP_LOGGER_ENABLED:"true"}}),c=new E(r),a=new L("request",c,r);process.stdin.pipe(a).pipe(i.stdin);const m=new L("response",c,r);i.stdout.pipe(m).pipe(process.stdout),i.on("error",async e=>{console.error("[MCP Logger CLI] Failed to start MCP server:",e),c.clear(),await t(),process.exit(1)}),i.on("exit",async(e,s)=>{console.error(`[MCP Logger CLI] MCP server exited with code ${e}, signal ${s}`),c.clear(),await t(),process.exit(e||0)});let h=!1;const f=async e=>{h||(h=!0,console.error(`[MCP Logger CLI] Received ${e}, shutting down...`),i.kill(e),await Promise.race([new Promise(e=>i.once("exit",e)),new Promise(e=>setTimeout(e,5e3))]),await t(),process.exit(0))};process.on("SIGTERM",()=>f("SIGTERM")),process.on("SIGINT",()=>f("SIGINT"))}catch(e){console.error("[MCP Logger CLI] Fatal error:",e),await t(),process.exit(1)}}),m.parse();
|
|
2
|
+
function e(e){return!O.includes(e)}function s(){return C}function r(){return P}function t(e){T=e}function o(){return T||"unknown"}async function n(){if(w)try{await w.shutdown(),w=null,C=null,L=!1,P=null,T=null}catch(e){console.error("[MCP Logger] Error shutting down telemetry:",e)}}function i(e,s){for(const[r,t]of Object.entries(s))null!=t&&e.setAttribute(r,t)}function c(e,s=1e4){try{const r=JSON.stringify(e);return r.length>s?r.slice(0,s)+"... (truncated)":r}catch(e){return null}}function a(e,s){return e.startsWith("resources/")?{type:e.split("/")[1],uri:s?.uri||s?.path||s?.resource}:e.startsWith("prompts/")?{type:"prompt",uri:s?.name||s?.promptId}:"tools/call"===e?{type:"tool",uri:s?.name}:s?.resourceType&&s?.resourceUri?{type:s.resourceType,uri:s.resourceUri}:{type:void 0,uri:void 0}}function p(e,s,r,t){const o=function(e){if(e){const s=e["user-agent"]||e["User-Agent"];if(s){const e=s.match(/^([^\/]+)\/([^\s]+)/);if(e)return{name:e[1],version:e[2]}}}return{name:void 0,version:void 0}}(t),n=function(e){if(!x.has(e)){const s=R();x.set(e,s)}return x.get(e)}(`${o.name||"unknown"}-${o.version||"0"}`),i=function(e,s){const r=`${e}-${s}`;return $.has(r)||$.set(r,"conv-"+ ++k),$.get(r)}(n,e),c=function(e,s){return e?.userId||e?.user_id?e.userId||e.user_id:s?s["x-user-id"]||s["X-User-Id"]:void 0}(s,t),p=function(e){if(e?.permission||e?.permissionLevel)return e.permission||e.permissionLevel}(s),m=a(e,s);m.uri&&function(e){const s=(_.get(e)||0)+1;_.set(e,s)}(m.uri);const u=function(e,s){return void 0!==e?.cost?e.cost:void 0!==s?.cost?s.cost:void 0}(s,r),d={};return n&&(d.sessionId=n),i&&(d.conversationId=i),c&&(d.userId=c),o.name&&(d.clientName=o.name),o.version&&(d.clientVersion=o.version),p&&(d.permissionLevel=p),void 0!==u&&(d.cost=u),d}function m(e,s){const r=a(e,s);if(!r.uri)return{};const t=_.get(r.uri)||0;return{resourceType:r.type,resourceUri:r.uri,resourceAccessCount:t}}import{spawn as u,execSync as d}from"child_process";import{program as l}from"commander";import{NodeSDK as g}from"@opentelemetry/sdk-node";import{OTLPTraceExporter as f}from"@opentelemetry/exporter-trace-otlp-http";import{Resource as h}from"@opentelemetry/resources";import{trace as v,SpanStatusCode as y}from"@opentelemetry/api";import{readFileSync as I}from"fs";import{fileURLToPath as S}from"url";import{dirname as q,join as E}from"path";import{Transform as N}from"stream";import{ulid as R}from"ulid";const M={ENDPOINT:"https://aware.mcypher.com/v1/traces",SDK_VERSION:function(){try{const e=S(import.meta.url),s=q(e),r=E(s,"..","..","package.json");return JSON.parse(I(r,"utf-8")).version||"1.0.0"}catch(e){return console.error("[MCP Logger] Failed to read package version:",e),"1.0.0"}}(),SERVICE_NAME_PREFIX:"mcp-server"},O=["notifications/initialized"];let w=null,C=null,L=!1,P=null,T=null;class b extends N{buffer="";direction;logger;debug;constructor(e,s,r=!1){super(),this.direction=e,this.logger=s,this.debug=r}_transform(e,s,r){try{this.push(e),this.buffer+=e.toString(),this.buffer.length>1e6&&(this.debug&&console.error("[mcp-logger CLI] Buffer size exceeded, clearing..."),this.buffer=""),this.tryParseMessages(),r()}catch(e){r(e)}}tryParseMessages(){const e=this.buffer.split("\n");this.buffer=e.pop()||"";for(const s of e){const e=s.trim();if(e)try{const s=JSON.parse(e);this.handleMessage(s)}catch(s){this.debug&&console.error("[mcp-logger CLI] Failed to parse:",e.slice(0,100))}}}handleMessage(e){console.error("[mcp-logger CLI] Handling message:",JSON.stringify(e).slice(0,100)),"request"===this.direction&&e.method?this.logger.onRequest(e):"response"===this.direction&&(void 0===e.id||e.method?e.method&&!e.id&&this.logger.onNotification(e):this.logger.onResponse(e))}_flush(e){try{if(this.buffer.trim())try{const e=JSON.parse(this.buffer);this.handleMessage(e)}catch(e){this.debug&&console.error("[mcp-logger CLI] Failed to parse final buffer")}if(this.debug){const e=this.logger.getStats();console.error("[mcp-logger CLI] Stream closed. Pending requests: "+e.pending)}e()}catch(s){e(s)}}}const x=new Map,$=new Map;let k=0;const _=new Map;class A{pendingRequests=new Map;debug;TIMEOUT=3e4;constructor(e=!1){this.debug=e}onRequest(s){e(s.method)&&(s.id?(this.pendingRequests.set(s.id,{request:s,timestamp:Date.now()}),setTimeout(()=>this.cleanupStale(s.id),this.TIMEOUT)):this.createRequestOnlySpan(s,Date.now()))}onResponse(e){if(!e.id)return;const s=this.pendingRequests.get(e.id);if("initialize"===s?.request.method)if(e.result?.serverInfo?.version)t(e.result.serverInfo.version);else{const s=e.result?.capabilities?.implementation?.version;s&&t(s)}if(!s)return void this.createResponseOnlySpan(e,Date.now());const r=Date.now(),o=r-s.timestamp;this.createPairedSpan(s.request,e,s.timestamp,r,o),this.pendingRequests.delete(e.id)}onNotification(s){e(s.method)&&this.createResponseOnlySpan({jsonrpc:"2.0",id:`notification-${Date.now()}-${Math.random().toString(36).slice(2,8)}`,method:s.method},Date.now())}createPairedSpan(e,t,n,a,u){const d=p(e.method,e.params,t.result,void 0);!function(e){const t=s();if(!t)return void console.error("[MCP Logger] Tracer not initialized, cannot create span");const n="mcp."+e.method;t.startActiveSpan(n,s=>{try{const t={"mcp.source":e.source,"mcp.transport":e.transport,"mcp.request.id":e.request.id+"","mcp.request.method":e.method,"mcp.request.timestamp":e.request.timestamp,"mcp.request.params":c(e.request.params)||"{}","mcp.request.params.size":JSON.stringify(e.request.params||{}).length,"mcp.response.id":e.request.id+"","mcp.response.timestamp":e.response.timestamp,"mcp.duration_ms":e.duration};if("tools/call"===e.method&&e.request.params){const s=e.request.params.name,r=e.request.params.arguments;if(s&&(t["mcp.tool.name"]=s),r){const e=c(r);e&&(t["mcp.tool.arguments"]=e,t["mcp.tool.arguments.size"]=JSON.stringify(r).length)}}if(void 0!==e.response.result){const s=c(e.response.result);s&&(t["mcp.response.result"]=s,t["mcp.response.result.size"]=JSON.stringify(e.response.result).length)}if(e.request.headers){const s=c(e.request.headers);s&&(t["mcp.headers"]=s,t["mcp.headers.size"]=JSON.stringify(e.request.headers).length)}if("cli"===e.source){const e=r();e&&(t["mcp.cli.server"]=JSON.stringify({command:e.command,args:e.args,env:e.env}));const s=o();t["mcp.server.version"]=s}const n=e.contextMetadata||p(e.method,e.request.params,e.response.result,e.request.headers);n.sessionId&&(t["mcp.session.id"]=n.sessionId),n.conversationId&&(t["mcp.conversation.id"]=n.conversationId),n.sessionId&&n.conversationId&&(t["mcp.trace.id"]=`${n.sessionId}:${n.conversationId}`),n.userId&&(t["mcp.user.id"]=n.userId),n.clientName&&(t["mcp.client.name"]=n.clientName),n.clientVersion&&(t["mcp.client.version"]=n.clientVersion),n.permissionLevel&&(t["mcp.permission.level"]=n.permissionLevel),void 0!==n.cost&&(t["mcp.cost"]=n.cost);const a=m(e.method,e.request.params);if(a.resourceType&&(t["mcp.resource.type"]=a.resourceType),a.resourceUri&&(t["mcp.resource.uri"]=a.resourceUri),a.resourceAccessCount&&(t["mcp.resource.access_count"]=a.resourceAccessCount),e.customEvents&&e.customEvents.length>0&&(t["mcp.events"]=JSON.stringify(e.customEvents),t["mcp.events.count"]=e.customEvents.length,e.customEvents.forEach(e=>{s.addEvent("custom."+(e.level||"info"),{message:e.message,metadata:JSON.stringify(e.metadata||{}),timestamp:e.timestamp||Date.now()})})),e.response.error){let r;t["mcp.error"]=!0,r=e.response.error instanceof Error?e.response.error.message:"string"==typeof e.response.error?e.response.error:c(e.response.error)||"Unknown error",t["mcp.error.message"]=r,e.response.error instanceof Error&&s.recordException(e.response.error),s.setStatus({code:y.ERROR,message:r})}else s.setStatus({code:y.OK});i(s,t)}catch(e){console.error("[MCP Logger] Error creating paired span:",e),s.setStatus({code:y.ERROR,message:e+""})}finally{s.end()}})}({method:e.method,source:"cli",transport:"stdio",request:{id:e.id,timestamp:n,params:e.params},response:{timestamp:a,result:t.result,error:t.error},duration:u,contextMetadata:d})}cleanupStale(e){const s=this.pendingRequests.get(e);s&&Date.now()-s.timestamp>this.TIMEOUT&&(this.createRequestOnlySpan(s.request,s.timestamp),this.pendingRequests.delete(e))}createRequestOnlySpan(e,t){const n=p(e.method,e.params,void 0,void 0);!function(e){const t=s();if(!t)return void console.error("[MCP Logger] Tracer not initialized, cannot create span");const n="mcp."+e.method;t.startActiveSpan(n,s=>{try{const t={"mcp.source":e.source,"mcp.transport":e.transport,"mcp.request.id":e.request.id+"","mcp.request.method":e.method,"mcp.request.timestamp":e.request.timestamp,"mcp.request.params":c(e.request.params)||"{}","mcp.request.params.size":JSON.stringify(e.request.params||{}).length};if("tools/call"===e.method&&e.request.params){const s=e.request.params.name,r=e.request.params.arguments;if(s&&(t["mcp.tool.name"]=s),r){const e=c(r);e&&(t["mcp.tool.arguments"]=e,t["mcp.tool.arguments.size"]=JSON.stringify(r).length)}}if("cli"===e.source){const e=r();e&&(t["mcp.cli.server"]=JSON.stringify({command:e.command,args:e.args,env:e.env}));const s=o();t["mcp.server.version"]=s}const n=e.contextMetadata||p(e.method,e.request.params,void 0,e.request.headers);n.sessionId&&(t["mcp.session.id"]=n.sessionId),n.conversationId&&(t["mcp.conversation.id"]=n.conversationId),n.sessionId&&n.conversationId&&(t["mcp.trace.id"]=`${n.sessionId}:${n.conversationId}`),n.userId&&(t["mcp.user.id"]=n.userId),n.clientName&&(t["mcp.client.name"]=n.clientName),n.clientVersion&&(t["mcp.client.version"]=n.clientVersion),n.permissionLevel&&(t["mcp.permission.level"]=n.permissionLevel),void 0!==n.cost&&(t["mcp.cost"]=n.cost);const a=m(e.method,e.request.params);a.resourceType&&(t["mcp.resource.type"]=a.resourceType),a.resourceUri&&(t["mcp.resource.uri"]=a.resourceUri),a.resourceAccessCount&&(t["mcp.resource.access_count"]=a.resourceAccessCount),s.setStatus({code:y.OK}),i(s,t)}catch(e){console.error("[MCP Logger] Error creating request-only span:",e),s.setStatus({code:y.ERROR,message:e+""})}finally{s.end()}})}({method:e.method,source:"cli",transport:"stdio",request:{id:e.id,timestamp:t,params:e.params},contextMetadata:n})}createResponseOnlySpan(e,t){const n=p(e.method||"unknown",void 0,e.result,void 0);!function(e){const t=s();if(!t)return void console.error("[MCP Logger] Tracer not initialized, cannot create span");const n="mcp."+e.method;t.startActiveSpan(n,s=>{try{const t={"mcp.source":e.source,"mcp.transport":e.transport,"mcp.response.id":e.response.id+"","mcp.response.method":e.method,"mcp.response.timestamp":e.response.timestamp};if(void 0!==e.response.result){const s=c(e.response.result);s&&(t["mcp.response.result"]=s,t["mcp.response.result.size"]=JSON.stringify(e.response.result).length)}if(e.response.error){let r;t["mcp.error"]=!0,r=e.response.error instanceof Error?e.response.error.message:"string"==typeof e.response.error?e.response.error:c(e.response.error)||"Unknown error",t["mcp.error.message"]=r,e.response.error instanceof Error&&s.recordException(e.response.error),s.setStatus({code:y.ERROR,message:r})}else s.setStatus({code:y.OK});if("cli"===e.source){const e=r();e&&(t["mcp.cli.server"]=JSON.stringify({command:e.command,args:e.args,env:e.env}));const s=o();t["mcp.server.version"]=s}const n=e.contextMetadata||p(e.method,void 0,e.response.result,void 0);n.sessionId&&(t["mcp.session.id"]=n.sessionId),n.conversationId&&(t["mcp.conversation.id"]=n.conversationId),n.sessionId&&n.conversationId&&(t["mcp.trace.id"]=`${n.sessionId}:${n.conversationId}`),n.userId&&(t["mcp.user.id"]=n.userId),n.clientName&&(t["mcp.client.name"]=n.clientName),n.clientVersion&&(t["mcp.client.version"]=n.clientVersion),n.permissionLevel&&(t["mcp.permission.level"]=n.permissionLevel),void 0!==n.cost&&(t["mcp.cost"]=n.cost),i(s,t)}catch(e){console.error("[MCP Logger] Error creating response-only span:",e),s.setStatus({code:y.ERROR,message:e+""})}finally{s.end()}})}({method:e.method||"same_request_method",source:"cli",transport:"stdio",response:{id:e.id,timestamp:t,result:e.result,error:e.error},contextMetadata:n})}getStats(){return{pending:this.pendingRequests.size}}clear(){this.pendingRequests.clear()}}l.name("mcp-logger").description("Add observability to any MCP server without code changes").version("1.0.0").requiredOption("-k, --api-key <key>","Aware API key").option("-s, --service-name <name>","Service name for identification").option("-e, --endpoint <url>","Custom OTLP endpoint").argument("<command...>","MCP server command to wrap").action(async(e,s)=>{try{const r=!1;!function(e){if(L)return C;const s=e.endpoint||M.ENDPOINT,r=e.serviceName||`${M.SERVICE_NAME_PREFIX}-${Math.random().toString(36).slice(2,8)}`;w=new g({resource:new h({"service.name":r,"service.version":M.SDK_VERSION}),traceExporter:new f({url:s,headers:{"x-api-key":e.apiKey}})}),w.start(),C=v.getTracer("mcp-logger",M.SDK_VERSION),L=!0;const t=async()=>{await n()};process.once("SIGTERM",t),process.once("SIGINT",t)}({...s,debug:r}),console.error("[MCP Logger CLI] Starting MCP server:",e.join(" "));const[o,...i]=e,c=function(e){for(const s of e){const e=s.match(/^(@[^@]+\/[^@]+)@(.+)$/);if(e)return{packageName:e[1],version:e[2]};const r=s.match(/^([^@]+)@(.+)$/);if(r)return{packageName:r[1],version:r[2]};const t=s.match(/^(@[^@]+\/[^@]+)$/);if(t)return{packageName:t[1],version:"latest"};if(s.match(/^[a-z0-9-]+$/)&&!s.includes("/"))return{packageName:s,version:"latest"}}return null}(i);if(c){let e=c.version;if("latest"===c.version){const s="uvx"===o?"pip":"npm",r=function(e,s){try{let r;r="pip"===s?"pip index versions "+e:`npm view ${e} version --json`;const t=d(r,{encoding:"utf-8",timeout:5e3,stdio:["pipe","pipe","pipe"]});if("pip"===s){const e=t.match(/Available versions:\s*([^\n]+)/);return e?e[1].split(",").map(e=>e.trim())[0]:null}{const e=t.trim().replace(/^["']|["']$/g,""),s=e.match(/^(\d+\.\d+\.\d+(?:-[\w.]+)?)/);return s?s[1]:e}}catch(e){return null}}(c.packageName,s);r&&(e=r)}t(e)}!function(e,s){P={command:e,args:s,env:{}}}(o,i);const a=u(o,i,{stdio:["pipe","pipe","inherit"],env:{...process.env,MCP_LOGGER_ENABLED:"true"}}),p=new A(r),m=new b("request",p,r);process.stdin.pipe(m).pipe(a.stdin);const l=new b("response",p,r);a.stdout.pipe(l).pipe(process.stdout),a.on("error",async e=>{console.error("[MCP Logger CLI] Failed to start MCP server:",e),p.clear(),await n(),process.exit(1)}),a.on("exit",async(e,s)=>{console.error(`[MCP Logger CLI] MCP server exited with code ${e}, signal ${s}`),p.clear(),await n(),process.exit(e||0)});let y=!1;const I=async e=>{y||(y=!0,console.error(`[MCP Logger CLI] Received ${e}, shutting down...`),a.kill(e),await Promise.race([new Promise(e=>a.once("exit",e)),new Promise(e=>setTimeout(e,5e3))]),await n(),process.exit(0))};process.on("SIGTERM",()=>I("SIGTERM")),process.on("SIGINT",()=>I("SIGINT"))}catch(e){console.error("[MCP Logger CLI] Fatal error:",e),await n(),process.exit(1)}}),l.parse();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
function e(e){return!
|
|
1
|
+
function e(e){return!a.includes(e)}function t(e,t,r,n){const o=function(e){if(!p.has(e)){const t=i();p.set(e,t)}return p.get(e)}("unknown-0"),s=function(e,t){const r=`${e}-${t}`;return u.has(r)||u.set(r,"conv-"+ ++c),u.get(r)}(o,e),a=function(e){if(e?.userId||e?.user_id)return e.userId||e.user_id}(t),m=function(e){if(e?.permission||e?.permissionLevel)return e.permission||e.permissionLevel}(t),l=function(e,t){return e.startsWith("resources/")?{type:e.split("/")[1],uri:t?.uri||t?.path||t?.resource}:e.startsWith("prompts/")?{type:"prompt",uri:t?.name||t?.promptId}:"tools/call"===e?{type:"tool",uri:t?.name}:t?.resourceType&&t?.resourceUri?{type:t.resourceType,uri:t.resourceUri}:{type:void 0,uri:void 0}}(e,t);l.uri&&function(e){const t=(d.get(e)||0)+1;d.set(e,t)}(l.uri);const h=function(e,t){return void 0!==e?.cost?e.cost:void 0!==t?.cost?t.cost:void 0}(t,r),g={};return o&&(g.sessionId=o),s&&(g.conversationId=s),a&&(g.userId=a),m&&(g.permissionLevel=m),void 0!==h&&(g.cost=h),g}import{readFileSync as r}from"fs";import{fileURLToPath as n}from"url";import{dirname as o,join as s}from"path";import"@opentelemetry/api";import"@opentelemetry/sdk-node";import"@opentelemetry/exporter-trace-otlp-http";import"@opentelemetry/resources";import{ulid as i}from"ulid";!function(){try{const e=n(import.meta.url),t=o(e),i=s(t,"..","..","package.json");return JSON.parse(r(i,"utf-8")).version||"1.0.0"}catch(e){return console.error("[MCP Logger] Failed to read package version:",e),"1.0.0"}}();const a=["notifications/initialized"],p=new Map,u=new Map;let c=0;const d=new Map;class m{pendingRequests=new Map;debug;TIMEOUT=3e4;constructor(e=!1){this.debug=e}onRequest(t){e(t.method)&&(t.id?(this.pendingRequests.set(t.id,{request:t,timestamp:Date.now()}),setTimeout(()=>this.cleanupStale(t.id),this.TIMEOUT)):this.createRequestOnlySpan(t,Date.now()))}onResponse(e){if(!e.id)return;const t=this.pendingRequests.get(e.id);if("initialize"===t?.request.method&&(e.result?.serverInfo?.version?e.result.serverInfo.version:e.result),!t)return void this.createResponseOnlySpan(e,Date.now());const r=Date.now(),n=r-t.timestamp;this.createPairedSpan(t.request,e,t.timestamp,r,n),this.pendingRequests.delete(e.id)}onNotification(t){e(t.method)&&this.createResponseOnlySpan({jsonrpc:"2.0",id:`notification-${Date.now()}-${Math.random().toString(36).slice(2,8)}`,method:t.method},Date.now())}createPairedSpan(e,r,n,o,s){t(e.method,e.params,r.result),e.method,e.id,e.params,r.result,r.error,console.error("[MCP Logger] Tracer not initialized, cannot create span")}cleanupStale(e){const t=this.pendingRequests.get(e);t&&Date.now()-t.timestamp>this.TIMEOUT&&(this.createRequestOnlySpan(t.request,t.timestamp),this.pendingRequests.delete(e))}createRequestOnlySpan(e,r){t(e.method,e.params,void 0),e.method,e.id,e.params,console.error("[MCP Logger] Tracer not initialized, cannot create span")}createResponseOnlySpan(e,r){t(e.method||"unknown",void 0,e.result),e.method,e.id,e.result,e.error,console.error("[MCP Logger] Tracer not initialized, cannot create span")}getStats(){return{pending:this.pendingRequests.size}}clear(){this.pendingRequests.clear()}}export{m as MCPMessageLogger};
|
package/dist/core/config.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
function
|
|
1
|
+
function r(r){return!a.includes(r)}import{readFileSync as t}from"fs";import{fileURLToPath as o}from"url";import{dirname as e,join as i}from"path";const n={ENDPOINT:"https://aware.mcypher.com/v1/traces",SDK_VERSION:function(){try{const r=o(import.meta.url),n=e(r),a=i(n,"..","..","package.json");return JSON.parse(t(a,"utf-8")).version||"1.0.0"}catch(r){return console.error("[MCP Logger] Failed to read package version:",r),"1.0.0"}}(),SERVICE_NAME_PREFIX:"mcp-server"},a=["notifications/initialized"];export{n as CONFIG,r as shouldTrackMethod};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
function
|
|
1
|
+
function r(r){console.error("[MCP Logger] Tracer not initialized, cannot create span")}function e(r){console.error("[MCP Logger] Tracer not initialized, cannot create span")}function o(r){console.error("[MCP Logger] Tracer not initialized, cannot create span")}import"@opentelemetry/api";import"@opentelemetry/sdk-node";import"@opentelemetry/exporter-trace-otlp-http";import"@opentelemetry/resources";import{readFileSync as t}from"fs";import{fileURLToPath as n}from"url";import{dirname as i,join as a}from"path";import"ulid";!function(){try{const r=n(import.meta.url),e=i(r),o=a(e,"..","..","package.json");return JSON.parse(t(o,"utf-8")).version||"1.0.0"}catch(r){return console.error("[MCP Logger] Failed to read package version:",r),"1.0.0"}}();export{r as createPairedSpan,e as createRequestOnlySpan,o as createResponseOnlySpan};
|
package/dist/core/telemetry.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
function e(e){if(
|
|
1
|
+
function e(e){if(I)return e.debug&&console.error("[MCP Logger] Telemetry already initialized, returning existing tracer"),S;const r=e.endpoint||y.ENDPOINT,o=e.serviceName||`${y.SERVICE_NAME_PREFIX}-${Math.random().toString(36).slice(2,8)}`;e.debug&&(console.error("[MCP Logger] Initializing telemetry..."),console.error("[MCP Logger] Endpoint: "+r),console.error("[MCP Logger] Service: "+o)),E=new s({resource:new a({"service.name":o,"service.version":y.SDK_VERSION}),traceExporter:new u({url:r,headers:{"x-api-key":e.apiKey}})}),E.start(),S=m.getTracer("mcp-logger",y.SDK_VERSION),I=!0,e.debug&&console.error("[MCP Logger] Telemetry initialized successfully");const n=async()=>{e.debug&&console.error("[MCP Logger] Shutting down telemetry..."),await l()};return process.once("SIGTERM",n),process.once("SIGINT",n),S}function r(){return S}function o(){return I}function n(e,r,o){M={command:e,args:r,env:o}}function t(){return M}function i(e){N=e}function c(){return N||"unknown"}async function l(){if(E)try{await E.shutdown(),E=null,S=null,I=!1,M=null,N=null}catch(e){console.error("[MCP Logger] Error shutting down telemetry:",e)}}import{NodeSDK as s}from"@opentelemetry/sdk-node";import{OTLPTraceExporter as u}from"@opentelemetry/exporter-trace-otlp-http";import{Resource as a}from"@opentelemetry/resources";import{trace as m}from"@opentelemetry/api";import{readFileSync as g}from"fs";import{fileURLToPath as p}from"url";import{dirname as f,join as d}from"path";const y={ENDPOINT:"https://aware.mcypher.com/v1/traces",SDK_VERSION:function(){try{const e=p(import.meta.url),r=f(e),o=d(r,"..","..","package.json");return JSON.parse(g(o,"utf-8")).version||"1.0.0"}catch(e){return console.error("[MCP Logger] Failed to read package version:",e),"1.0.0"}}(),SERVICE_NAME_PREFIX:"mcp-server"};let E=null,S=null,I=!1,M=null,N=null;export{t as getCLIServerInfo,c as getMCPServerVersion,r as getTracer,e as initializeTelemetry,o as isInitializedTelemetry,n as setCLIServerInfo,i as setMCPServerVersion,l as shutdownTelemetry};
|
package/dist/core/types.d.ts
CHANGED
|
@@ -97,11 +97,13 @@ interface MCPSpanData {
|
|
|
97
97
|
'mcp.events'?: string;
|
|
98
98
|
'mcp.events.count'?: number;
|
|
99
99
|
'mcp.cli.server'?: string;
|
|
100
|
+
'mcp.server.version'?: string;
|
|
100
101
|
'mcp.error'?: boolean;
|
|
101
102
|
'mcp.error.code'?: number;
|
|
102
103
|
'mcp.error.message'?: string;
|
|
103
104
|
'mcp.session.id'?: string;
|
|
104
105
|
'mcp.conversation.id'?: string;
|
|
106
|
+
'mcp.trace.id'?: string;
|
|
105
107
|
'mcp.user.id'?: string;
|
|
106
108
|
'mcp.client.name'?: string;
|
|
107
109
|
'mcp.client.version'?: string;
|
package/dist/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
function e(){return
|
|
1
|
+
function e(){return S}function r(){return q}function t(){return N||"unknown"}async function s(){if(I)try{await I.shutdown(),I=null,S=null,w=!1,q=null,N=null}catch(e){console.error("[MCP Logger] Error shutting down telemetry:",e)}}function o(e,r=1e4){try{const t=JSON.stringify(e);return t.length>r?t.slice(0,r)+"... (truncated)":t}catch(e){return null}}function n(e,r){return e.startsWith("resources/")?{type:e.split("/")[1],uri:r?.uri||r?.path||r?.resource}:e.startsWith("prompts/")?{type:"prompt",uri:r?.name||r?.promptId}:"tools/call"===e?{type:"tool",uri:r?.name}:r?.resourceType&&r?.resourceUri?{type:r.resourceType,uri:r.resourceUri}:{type:void 0,uri:void 0}}function i(e,r,t,s){const o=function(e){if(e){const r=e["user-agent"]||e["User-Agent"];if(r){const e=r.match(/^([^\/]+)\/([^\s]+)/);if(e)return{name:e[1],version:e[2]}}}return{name:void 0,version:void 0}}(s),i=function(e){if(!M.has(e)){const r=y();M.set(e,r)}return M.get(e)}(`${o.name||"unknown"}-${o.version||"0"}`),c=function(e,r){const t=`${e}-${r}`;return O.has(t)||O.set(t,"conv-"+ ++R),O.get(t)}(i,e),a=function(e,r){return e?.userId||e?.user_id?e.userId||e.user_id:r?r["x-user-id"]||r["X-User-Id"]:void 0}(r,s),m=function(e){if(e?.permission||e?.permissionLevel)return e.permission||e.permissionLevel}(r),u=n(e,r);u.uri&&function(e){const r=(L.get(e)||0)+1;L.set(e,r)}(u.uri);const p=function(e,r){return void 0!==e?.cost?e.cost:void 0!==r?.cost?r.cost:void 0}(r,t),l={};return i&&(l.sessionId=i),c&&(l.conversationId=c),a&&(l.userId=a),o.name&&(l.clientName=o.name),o.version&&(l.clientVersion=o.version),m&&(l.permissionLevel=m),void 0!==p&&(l.cost=p),l}function c(s){const c=e();if(!c)return void console.error("[MCP Logger] Tracer not initialized, cannot create span");const a="mcp."+s.method;c.startActiveSpan(a,e=>{try{const c={"mcp.source":s.source,"mcp.transport":s.transport,"mcp.request.id":s.request.id+"","mcp.request.method":s.method,"mcp.request.timestamp":s.request.timestamp,"mcp.request.params":o(s.request.params)||"{}","mcp.request.params.size":JSON.stringify(s.request.params||{}).length,"mcp.response.id":s.request.id+"","mcp.response.timestamp":s.response.timestamp,"mcp.duration_ms":s.duration};if("tools/call"===s.method&&s.request.params){const e=s.request.params.name,r=s.request.params.arguments;if(e&&(c["mcp.tool.name"]=e),r){const e=o(r);e&&(c["mcp.tool.arguments"]=e,c["mcp.tool.arguments.size"]=JSON.stringify(r).length)}}if(void 0!==s.response.result){const e=o(s.response.result);e&&(c["mcp.response.result"]=e,c["mcp.response.result.size"]=JSON.stringify(s.response.result).length)}if(s.request.headers){const e=o(s.request.headers);e&&(c["mcp.headers"]=e,c["mcp.headers.size"]=JSON.stringify(s.request.headers).length)}if("cli"===s.source){const e=r();e&&(c["mcp.cli.server"]=JSON.stringify({command:e.command,args:e.args,env:e.env}));const s=t();c["mcp.server.version"]=s}const a=s.contextMetadata||i(s.method,s.request.params,s.response.result,s.request.headers);a.sessionId&&(c["mcp.session.id"]=a.sessionId),a.conversationId&&(c["mcp.conversation.id"]=a.conversationId),a.sessionId&&a.conversationId&&(c["mcp.trace.id"]=`${a.sessionId}:${a.conversationId}`),a.userId&&(c["mcp.user.id"]=a.userId),a.clientName&&(c["mcp.client.name"]=a.clientName),a.clientVersion&&(c["mcp.client.version"]=a.clientVersion),a.permissionLevel&&(c["mcp.permission.level"]=a.permissionLevel),void 0!==a.cost&&(c["mcp.cost"]=a.cost);const u=function(e,r){const t=n(e,r);if(!t.uri)return{};const s=L.get(t.uri)||0;return{resourceType:t.type,resourceUri:t.uri,resourceAccessCount:s}}(s.method,s.request.params);if(u.resourceType&&(c["mcp.resource.type"]=u.resourceType),u.resourceUri&&(c["mcp.resource.uri"]=u.resourceUri),u.resourceAccessCount&&(c["mcp.resource.access_count"]=u.resourceAccessCount),s.customEvents&&s.customEvents.length>0&&(c["mcp.events"]=JSON.stringify(s.customEvents),c["mcp.events.count"]=s.customEvents.length,s.customEvents.forEach(r=>{e.addEvent("custom."+(r.level||"info"),{message:r.message,metadata:JSON.stringify(r.metadata||{}),timestamp:r.timestamp||Date.now()})})),s.response.error){let r;c["mcp.error"]=!0,r=s.response.error instanceof Error?s.response.error.message:"string"==typeof s.response.error?s.response.error:o(s.response.error)||"Unknown error",c["mcp.error.message"]=r,s.response.error instanceof Error&&e.recordException(s.response.error),e.setStatus({code:m.ERROR,message:r})}else e.setStatus({code:m.OK});!function(e,r){for(const[t,s]of Object.entries(r))null!=s&&e.setAttribute(t,s)}(e,c)}catch(r){console.error("[MCP Logger] Error creating paired span:",r),e.setStatus({code:m.ERROR,message:r+""})}finally{e.end()}})}import{trace as a,SpanStatusCode as m,context as u}from"@opentelemetry/api";import{NodeSDK as p}from"@opentelemetry/sdk-node";import{OTLPTraceExporter as l}from"@opentelemetry/exporter-trace-otlp-http";import{Resource as d}from"@opentelemetry/resources";import{readFileSync as g}from"fs";import{fileURLToPath as v}from"url";import{dirname as f,join as h}from"path";import{ulid as y}from"ulid";const E={ENDPOINT:"https://aware.mcypher.com/v1/traces",SDK_VERSION:function(){try{const e=v(import.meta.url),r=f(e),t=h(r,"..","..","package.json");return JSON.parse(g(t,"utf-8")).version||"1.0.0"}catch(e){return console.error("[MCP Logger] Failed to read package version:",e),"1.0.0"}}(),SERVICE_NAME_PREFIX:"mcp-server"};let I=null,S=null,w=!1,q=null,N=null;const M=new Map,O=new Map;let R=0;const L=new Map,C=Symbol("mcp-logger.customEvents"),b=Object.assign(function(e,r){if(!r.apiKey)throw Error("[mcp-logger] apiKey is required");if(!e)throw Error("[mcp-logger] server instance is required");!function(e){if(w)return e.debug&&console.error("[MCP Logger] Telemetry already initialized, returning existing tracer"),S;const r=e.endpoint||E.ENDPOINT,t=e.serviceName||`${E.SERVICE_NAME_PREFIX}-${Math.random().toString(36).slice(2,8)}`;e.debug&&(console.error("[MCP Logger] Initializing telemetry..."),console.error("[MCP Logger] Endpoint: "+r),console.error("[MCP Logger] Service: "+t)),I=new p({resource:new d({"service.name":t,"service.version":E.SDK_VERSION}),traceExporter:new l({url:r,headers:{"x-api-key":e.apiKey}})}),I.start(),S=a.getTracer("mcp-logger",E.SDK_VERSION),w=!0,e.debug&&console.error("[MCP Logger] Telemetry initialized successfully");const o=async()=>{e.debug&&console.error("[MCP Logger] Shutting down telemetry..."),await s()};process.once("SIGTERM",o),process.once("SIGINT",o)}(r),function(e,r){const t=e.setRequestHandler.bind(e);e.setRequestHandler=function(e,s){const o=e.shape?.method,n=o?._def?.value||"unknown";return r.debug&&console.log("[mcp-logger] Instrumenting handler: "+n),t(e,async(e,t)=>{const o=Date.now(),a=`${n}-${o}-${Math.random().toString(36).slice(2,8)}`,m=[],p=u.active().setValue(C,m);try{const l=await u.with(p,async()=>await s(e,t)),d=Date.now(),g=i(n,e.params,l,void 0);return c({method:n,source:"sdk",transport:"stdio",request:{id:a,timestamp:o,params:e.params},response:{timestamp:d,result:l},duration:d-o,customEvents:m.length>0?m:void 0,contextMetadata:g}),r.debug&&console.log(`[mcp-logger] Request completed (${d-o}ms):`,{method:n,customEvents:m.length}),l}catch(t){const s=Date.now(),u=i(n,e.params,void 0,void 0);throw c({method:n,source:"sdk",transport:"stdio",request:{id:a,timestamp:o,params:e.params},response:{timestamp:s,error:t},duration:s-o,customEvents:m.length>0?m:void 0,contextMetadata:u}),r.debug&&console.error("[mcp-logger] Request failed:",t),t}})},r.debug&&console.log("[mcp-logger] Server instrumentation complete")}(e,r),r.debug&&console.log("[mcp-logger] β Initialization complete")},{addLog(e){const r=u.active().getValue(C);if(!r)return void console.warn("[mcp-logger] addLog called outside of handler context");const t={level:e.level||"info",message:e.message,metadata:e.metadata,timestamp:e.timestamp||Date.now()};r.push(t);const s=a.getSpan(u.active());s&&s.addEvent("custom."+t.level,{message:t.message,metadata:JSON.stringify(t.metadata||{}),timestamp:t.timestamp})},async shutdown(){await s()}});export{b as trace};
|
package/dist/sdk/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
function e(){return
|
|
1
|
+
function e(){return S}function r(){return q}function t(){return N||"unknown"}async function s(){if(I)try{await I.shutdown(),I=null,S=null,w=!1,q=null,N=null}catch(e){console.error("[MCP Logger] Error shutting down telemetry:",e)}}function o(e,r=1e4){try{const t=JSON.stringify(e);return t.length>r?t.slice(0,r)+"... (truncated)":t}catch(e){return null}}function n(e,r){return e.startsWith("resources/")?{type:e.split("/")[1],uri:r?.uri||r?.path||r?.resource}:e.startsWith("prompts/")?{type:"prompt",uri:r?.name||r?.promptId}:"tools/call"===e?{type:"tool",uri:r?.name}:r?.resourceType&&r?.resourceUri?{type:r.resourceType,uri:r.resourceUri}:{type:void 0,uri:void 0}}function i(e,r,t,s){const o=function(e){if(e){const r=e["user-agent"]||e["User-Agent"];if(r){const e=r.match(/^([^\/]+)\/([^\s]+)/);if(e)return{name:e[1],version:e[2]}}}return{name:void 0,version:void 0}}(s),i=function(e){if(!M.has(e)){const r=y();M.set(e,r)}return M.get(e)}(`${o.name||"unknown"}-${o.version||"0"}`),c=function(e,r){const t=`${e}-${r}`;return O.has(t)||O.set(t,"conv-"+ ++R),O.get(t)}(i,e),a=function(e,r){return e?.userId||e?.user_id?e.userId||e.user_id:r?r["x-user-id"]||r["X-User-Id"]:void 0}(r,s),m=function(e){if(e?.permission||e?.permissionLevel)return e.permission||e.permissionLevel}(r),u=n(e,r);u.uri&&function(e){const r=(L.get(e)||0)+1;L.set(e,r)}(u.uri);const p=function(e,r){return void 0!==e?.cost?e.cost:void 0!==r?.cost?r.cost:void 0}(r,t),l={};return i&&(l.sessionId=i),c&&(l.conversationId=c),a&&(l.userId=a),o.name&&(l.clientName=o.name),o.version&&(l.clientVersion=o.version),m&&(l.permissionLevel=m),void 0!==p&&(l.cost=p),l}function c(s){const c=e();if(!c)return void console.error("[MCP Logger] Tracer not initialized, cannot create span");const a="mcp."+s.method;c.startActiveSpan(a,e=>{try{const c={"mcp.source":s.source,"mcp.transport":s.transport,"mcp.request.id":s.request.id+"","mcp.request.method":s.method,"mcp.request.timestamp":s.request.timestamp,"mcp.request.params":o(s.request.params)||"{}","mcp.request.params.size":JSON.stringify(s.request.params||{}).length,"mcp.response.id":s.request.id+"","mcp.response.timestamp":s.response.timestamp,"mcp.duration_ms":s.duration};if("tools/call"===s.method&&s.request.params){const e=s.request.params.name,r=s.request.params.arguments;if(e&&(c["mcp.tool.name"]=e),r){const e=o(r);e&&(c["mcp.tool.arguments"]=e,c["mcp.tool.arguments.size"]=JSON.stringify(r).length)}}if(void 0!==s.response.result){const e=o(s.response.result);e&&(c["mcp.response.result"]=e,c["mcp.response.result.size"]=JSON.stringify(s.response.result).length)}if(s.request.headers){const e=o(s.request.headers);e&&(c["mcp.headers"]=e,c["mcp.headers.size"]=JSON.stringify(s.request.headers).length)}if("cli"===s.source){const e=r();e&&(c["mcp.cli.server"]=JSON.stringify({command:e.command,args:e.args,env:e.env}));const s=t();c["mcp.server.version"]=s}const a=s.contextMetadata||i(s.method,s.request.params,s.response.result,s.request.headers);a.sessionId&&(c["mcp.session.id"]=a.sessionId),a.conversationId&&(c["mcp.conversation.id"]=a.conversationId),a.sessionId&&a.conversationId&&(c["mcp.trace.id"]=`${a.sessionId}:${a.conversationId}`),a.userId&&(c["mcp.user.id"]=a.userId),a.clientName&&(c["mcp.client.name"]=a.clientName),a.clientVersion&&(c["mcp.client.version"]=a.clientVersion),a.permissionLevel&&(c["mcp.permission.level"]=a.permissionLevel),void 0!==a.cost&&(c["mcp.cost"]=a.cost);const u=function(e,r){const t=n(e,r);if(!t.uri)return{};const s=L.get(t.uri)||0;return{resourceType:t.type,resourceUri:t.uri,resourceAccessCount:s}}(s.method,s.request.params);if(u.resourceType&&(c["mcp.resource.type"]=u.resourceType),u.resourceUri&&(c["mcp.resource.uri"]=u.resourceUri),u.resourceAccessCount&&(c["mcp.resource.access_count"]=u.resourceAccessCount),s.customEvents&&s.customEvents.length>0&&(c["mcp.events"]=JSON.stringify(s.customEvents),c["mcp.events.count"]=s.customEvents.length,s.customEvents.forEach(r=>{e.addEvent("custom."+(r.level||"info"),{message:r.message,metadata:JSON.stringify(r.metadata||{}),timestamp:r.timestamp||Date.now()})})),s.response.error){let r;c["mcp.error"]=!0,r=s.response.error instanceof Error?s.response.error.message:"string"==typeof s.response.error?s.response.error:o(s.response.error)||"Unknown error",c["mcp.error.message"]=r,s.response.error instanceof Error&&e.recordException(s.response.error),e.setStatus({code:m.ERROR,message:r})}else e.setStatus({code:m.OK});!function(e,r){for(const[t,s]of Object.entries(r))null!=s&&e.setAttribute(t,s)}(e,c)}catch(r){console.error("[MCP Logger] Error creating paired span:",r),e.setStatus({code:m.ERROR,message:r+""})}finally{e.end()}})}import{trace as a,SpanStatusCode as m,context as u}from"@opentelemetry/api";import{NodeSDK as p}from"@opentelemetry/sdk-node";import{OTLPTraceExporter as l}from"@opentelemetry/exporter-trace-otlp-http";import{Resource as d}from"@opentelemetry/resources";import{readFileSync as g}from"fs";import{fileURLToPath as v}from"url";import{dirname as f,join as h}from"path";import{ulid as y}from"ulid";const E={ENDPOINT:"https://aware.mcypher.com/v1/traces",SDK_VERSION:function(){try{const e=v(import.meta.url),r=f(e),t=h(r,"..","..","package.json");return JSON.parse(g(t,"utf-8")).version||"1.0.0"}catch(e){return console.error("[MCP Logger] Failed to read package version:",e),"1.0.0"}}(),SERVICE_NAME_PREFIX:"mcp-server"};let I=null,S=null,w=!1,q=null,N=null;const M=new Map,O=new Map;let R=0;const L=new Map,C=Symbol("mcp-logger.customEvents"),b=Object.assign(function(e,r){if(!r.apiKey)throw Error("[mcp-logger] apiKey is required");if(!e)throw Error("[mcp-logger] server instance is required");!function(e){if(w)return e.debug&&console.error("[MCP Logger] Telemetry already initialized, returning existing tracer"),S;const r=e.endpoint||E.ENDPOINT,t=e.serviceName||`${E.SERVICE_NAME_PREFIX}-${Math.random().toString(36).slice(2,8)}`;e.debug&&(console.error("[MCP Logger] Initializing telemetry..."),console.error("[MCP Logger] Endpoint: "+r),console.error("[MCP Logger] Service: "+t)),I=new p({resource:new d({"service.name":t,"service.version":E.SDK_VERSION}),traceExporter:new l({url:r,headers:{"x-api-key":e.apiKey}})}),I.start(),S=a.getTracer("mcp-logger",E.SDK_VERSION),w=!0,e.debug&&console.error("[MCP Logger] Telemetry initialized successfully");const o=async()=>{e.debug&&console.error("[MCP Logger] Shutting down telemetry..."),await s()};process.once("SIGTERM",o),process.once("SIGINT",o)}(r),function(e,r){const t=e.setRequestHandler.bind(e);e.setRequestHandler=function(e,s){const o=e.shape?.method,n=o?._def?.value||"unknown";return r.debug&&console.log("[mcp-logger] Instrumenting handler: "+n),t(e,async(e,t)=>{const o=Date.now(),a=`${n}-${o}-${Math.random().toString(36).slice(2,8)}`,m=[],p=u.active().setValue(C,m);try{const l=await u.with(p,async()=>await s(e,t)),d=Date.now(),g=i(n,e.params,l,void 0);return c({method:n,source:"sdk",transport:"stdio",request:{id:a,timestamp:o,params:e.params},response:{timestamp:d,result:l},duration:d-o,customEvents:m.length>0?m:void 0,contextMetadata:g}),r.debug&&console.log(`[mcp-logger] Request completed (${d-o}ms):`,{method:n,customEvents:m.length}),l}catch(t){const s=Date.now(),u=i(n,e.params,void 0,void 0);throw c({method:n,source:"sdk",transport:"stdio",request:{id:a,timestamp:o,params:e.params},response:{timestamp:s,error:t},duration:s-o,customEvents:m.length>0?m:void 0,contextMetadata:u}),r.debug&&console.error("[mcp-logger] Request failed:",t),t}})},r.debug&&console.log("[mcp-logger] Server instrumentation complete")}(e,r),r.debug&&console.log("[mcp-logger] β Initialization complete")},{addLog(e){const r=u.active().getValue(C);if(!r)return void console.warn("[mcp-logger] addLog called outside of handler context");const t={level:e.level||"info",message:e.message,metadata:e.metadata,timestamp:e.timestamp||Date.now()};r.push(t);const s=a.getSpan(u.active());s&&s.addEvent("custom."+t.level,{message:t.message,metadata:JSON.stringify(t.metadata||{}),timestamp:t.timestamp})},async shutdown(){await s()}});export{b as trace};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
function e(e,t,o,r){const n=(
|
|
1
|
+
function e(e,t,o,r){const n=function(e){if(!p.has(e)){const t=a();p.set(e,t)}return p.get(e)}("unknown-0"),s=function(e,t){const o=`${e}-${t}`;return m.has(o)||m.set(o,"conv-"+ ++l),m.get(o)}(n,e),i=function(e){if(e?.userId||e?.user_id)return e.userId||e.user_id}(t),c=function(e){if(e?.permission||e?.permissionLevel)return e.permission||e.permissionLevel}(t),u=function(e,t){return e.startsWith("resources/")?{type:e.split("/")[1],uri:t?.uri||t?.path||t?.resource}:e.startsWith("prompts/")?{type:"prompt",uri:t?.name||t?.promptId}:"tools/call"===e?{type:"tool",uri:t?.name}:t?.resourceType&&t?.resourceUri?{type:t.resourceType,uri:t.resourceUri}:{type:void 0,uri:void 0}}(e,t);u.uri&&function(e){const t=(d.get(e)||0)+1;d.set(e,t)}(u.uri);const g=function(e,t){return void 0!==e?.cost?e.cost:void 0!==t?.cost?t.cost:void 0}(t,o),f={};return n&&(f.sessionId=n),s&&(f.conversationId=s),i&&(f.userId=i),c&&(f.permissionLevel=c),void 0!==g&&(f.cost=g),f}function t(e){console.error("[MCP Logger] Tracer not initialized, cannot create span")}function o(o,r){const s=o.setRequestHandler.bind(o);o.setRequestHandler=function(o,i){const c=o.shape?.method,u=c?._def?.value||"unknown";return r.debug&&console.log("[mcp-logger] Instrumenting handler: "+u),s(o,async(o,s)=>{const c=Date.now(),a=(Math.random().toString(36).slice(2,8),[]),p=n.active().setValue(g,a);try{const m=await n.with(p,async()=>await i(o,s)),l=Date.now();return e(u,o.params,m),t(o.params),r.debug&&console.log(`[mcp-logger] Request completed (${l-c}ms):`,{method:u,customEvents:a.length}),m}catch(n){throw e(u,o.params,void 0),t(o.params),r.debug&&console.error("[mcp-logger] Request failed:",n),n}})},r.debug&&console.log("[mcp-logger] Server instrumentation complete")}function r(){return n.active().getValue(g)}import{context as n}from"@opentelemetry/api";import"@opentelemetry/sdk-node";import"@opentelemetry/exporter-trace-otlp-http";import"@opentelemetry/resources";import{readFileSync as s}from"fs";import{fileURLToPath as i}from"url";import{dirname as c,join as u}from"path";import{ulid as a}from"ulid";!function(){try{const e=i(import.meta.url),t=c(e),o=u(t,"..","..","package.json");return JSON.parse(s(o,"utf-8")).version||"1.0.0"}catch(e){return console.error("[MCP Logger] Failed to read package version:",e),"1.0.0"}}();const p=new Map,m=new Map;let l=0;const d=new Map,g=Symbol("mcp-logger.customEvents");export{r as getCustomEventsFromContext,o as instrumentMCPServer};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@awarecorp/mcp-logger",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.5",
|
|
4
4
|
"description": "Unified MCP observability solution - SDK for code integration and CLI for zero-config wrapping",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -29,10 +29,10 @@
|
|
|
29
29
|
"version:minor": "npm version minor",
|
|
30
30
|
"version:major": "npm version major",
|
|
31
31
|
"version:dev": "npm version prerelease --preid=dev",
|
|
32
|
-
"version:stable": "node -e \"const pkg=require('./package.json'); pkg.version=pkg.version.replace(/-dev\\.\\d+$/,''); require('fs').writeFileSync('package.json',JSON.stringify(pkg,null,2)+'\\n')
|
|
33
|
-
"version:next-dev:patch": "node -e \"const pkg=require('./package.json');
|
|
34
|
-
"version:next-dev:minor": "node -e \"const pkg=require('./package.json');
|
|
35
|
-
"version:next-dev:major": "node -e \"const pkg=require('./package.json');
|
|
32
|
+
"version:stable": "npm version patch --no-git-tag-version && node -e \"const pkg=require('./package.json'); pkg.version=pkg.version.replace(/-dev\\.\\d+$/,''); require('fs').writeFileSync('package.json',JSON.stringify(pkg,null,2)+'\\n')\"",
|
|
33
|
+
"version:next-dev:patch": "node -e \"const pkg=require('./package.json'); const match=pkg.version.match(/^(\\\\d+)\\\\.(\\\\d+)\\\\.(\\\\d+)/); const newVer=match[1]+'.'+match[2]+'.'+(parseInt(match[3])+1)+'-dev.0'; pkg.version=newVer; require('fs').writeFileSync('package.json',JSON.stringify(pkg,null,2)+'\\\\n'); console.log('Version updated to',newVer)\"",
|
|
34
|
+
"version:next-dev:minor": "node -e \"const pkg=require('./package.json'); const match=pkg.version.match(/^(\\\\d+)\\\\.(\\\\d+)\\\\.(\\\\d+)/); const newVer=match[1]+'.'+(parseInt(match[2])+1)+'.0-dev.0'; pkg.version=newVer; require('fs').writeFileSync('package.json',JSON.stringify(pkg,null,2)+'\\\\n'); console.log('Version updated to',newVer)\"",
|
|
35
|
+
"version:next-dev:major": "node -e \"const pkg=require('./package.json'); const match=pkg.version.match(/^(\\\\d+)\\\\.(\\\\d+)\\\\.(\\\\d+)/); const newVer=(parseInt(match[1])+1)+'.0.0-dev.0'; pkg.version=newVer; require('fs').writeFileSync('package.json',JSON.stringify(pkg,null,2)+'\\\\n'); console.log('Version updated to',newVer)\""
|
|
36
36
|
},
|
|
37
37
|
"keywords": [
|
|
38
38
|
"mcp",
|
|
@@ -69,7 +69,8 @@
|
|
|
69
69
|
"@opentelemetry/resources": "^1.25.0",
|
|
70
70
|
"@opentelemetry/sdk-node": "^0.52.0",
|
|
71
71
|
"@opentelemetry/semantic-conventions": "^1.25.0",
|
|
72
|
-
"commander": "^11.1.0"
|
|
72
|
+
"commander": "^11.1.0",
|
|
73
|
+
"ulid": "^3.0.1"
|
|
73
74
|
},
|
|
74
75
|
"devDependencies": {
|
|
75
76
|
"@modelcontextprotocol/sdk": "^0.5.0",
|