@tigerdata/mcp-boilerplate 0.3.0 → 0.4.1

package/dist/http/mcp.js

@@ -1,9 +1,13 @@
 import { isInitializeRequest } from '@modelcontextprotocol/sdk/types.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
+import { trace, context as otelContext, propagation, SpanKind, SpanStatusCode, } from '@opentelemetry/api';
+import { ATTR_HTTP_RESPONSE_STATUS_CODE } from '@opentelemetry/semantic-conventions';
 import { Router } from 'express';
 import { randomUUID } from 'node:crypto';
 import getRawBody from 'raw-body';
 import { log } from '../logger.js';
+const name = process.env.OTEL_SERVICE_NAME;
+const tracer = trace.getTracer(name ? `${name}.router.mcp` : 'router.mcp');
 export const mcpRouterFactory = (context, createServer, { name, stateful = true, } = {}) => {
     const router = Router();
     const transports = new Map();
@@ -75,24 +79,43 @@ export const mcpRouterFactory = (context, createServer, { name, stateful = true,
         await transport.handleRequest(req, res, body);
     };
     router.post('/', async (req, res) => {
-        try {
-            await (stateful
-                ? handleStatefulRequest(req, res)
-                : handleStatelessRequest(req, res));
+        let traceContext = otelContext.active();
+        if (req.headers.traceparent) {
+            // Some MCP clients (e.g. pydantic) pass the parent trace context
+            traceContext = propagation.extract(traceContext, {
+                traceparent: req.headers.traceparent,
+            });
         }
-        catch (error) {
-            log.error('Error handling MCP request:', error);
-            if (!res.headersSent) {
-                res.status(500).json({
-                    jsonrpc: '2.0',
-                    error: {
-                        code: -32603,
-                        message: 'Internal server error',
-                    },
-                    id: null,
+        await tracer.startActiveSpan('mcp.http.post', { kind: SpanKind.SERVER }, traceContext, async (span) => {
+            try {
+                await (stateful
+                    ? handleStatefulRequest(req, res)
+                    : handleStatelessRequest(req, res));
+                span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, res.statusCode);
+                span.setStatus({ code: SpanStatusCode.OK });
+            }
+            catch (error) {
+                log.error('Error handling MCP request:', error);
+                span.recordException(error);
+                span.setStatus({
+                    code: SpanStatusCode.ERROR,
+                    message: error.message,
                 });
+                if (!res.headersSent) {
+                    res.status(500).json({
+                        jsonrpc: '2.0',
+                        error: {
+                            code: -32603,
+                            message: 'Internal server error',
+                        },
+                        id: null,
+                    });
+                }
             }
-        }
+            finally {
+                span.end();
+            }
+        });
     });
     // Reusable handler for GET and DELETE requests
     const handleSessionRequest = async (req, res) => {

package/dist/tracing.d.ts

@@ -1,4 +1,4 @@
-import type { Span, Tracer } from '@opentelemetry/api';
+import { type Span, type Tracer } from '@opentelemetry/api';
 import type { GenerateTextResult, ModelMessage } from 'ai';
 export declare const withSpan: <T>(tracer: Tracer, name: string, fn: (span: Span) => Promise<T>) => Promise<T>;
 export declare const addAiResultToSpan: (span: Span, aiResult: GenerateTextResult<any, unknown>, inputMessages: ModelMessage[]) => void;

package/dist/tracing.js

@@ -1,3 +1,4 @@
+import { SpanStatusCode } from '@opentelemetry/api';
 import { log } from './logger.js';
 export const withSpan = async (tracer, name, fn) => {
     return tracer.startActiveSpan(name, async (span) => {
@@ -6,6 +7,11 @@ export const withSpan = async (tracer, name, fn) => {
         }
         catch (error) {
             log.error(`Error in span ${name}`, error);
+            span.recordException(error);
+            span.setStatus({
+                code: SpanStatusCode.ERROR,
+                message: error.message,
+            });
             throw error;
         }
         finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tigerdata/mcp-boilerplate",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "MCP boilerplate code for Node.js",
   "license": "Apache-2.0",
   "author": "TigerData",
@@ -41,6 +41,7 @@
     "@opentelemetry/sdk-metrics": "^2.2.0",
     "@opentelemetry/sdk-node": "^0.207.0",
     "@opentelemetry/sdk-trace-node": "^2.2.0",
+    "@opentelemetry/semantic-conventions": "^1.37.0",
     "express": "^5.1.0",
     "raw-body": "^3.0.1",
     "zod": "^3.23.8"