vcluster-yaml-mcp-server 1.0.11 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vcluster-yaml-mcp-server",
-  "version": "1.0.11",
+  "version": "1.1.0",
   "description": "MCP server for querying vcluster YAML configurations using jq",
   "main": "src/index.js",
   "type": "module",

package/src/http-server.js

@@ -7,10 +7,14 @@ import rateLimit from 'express-rate-limit';
 import { requireApiKey } from './middleware/auth.js';
 import promClient from 'prom-client';
 import { getHealthInfo, getServerInfo } from './server-info.js';
+import { trace, SpanStatusCode } from '@opentelemetry/api';
 
 const PORT = process.env.PORT || 3000;
 const REQUIRE_AUTH = process.env.REQUIRE_AUTH === 'true';
 
+// OpenTelemetry tracer
+const tracer = trace.getTracer('vcluster-yaml-mcp-server');
+
 // Prometheus metrics setup
 const register = new promClient.Registry();
 promClient.collectDefaultMetrics({ register });
@@ -96,29 +100,47 @@ const mcpHandler = async (req, res) => {
   const clientIp = req.ip || req.headers['x-forwarded-for'] || req.socket.remoteAddress;
   console.log(`MCP ${req.method} request from ${clientIp}`);
 
-  try {
-    // Create new transport per request to prevent ID collisions
-    const transport = new StreamableHTTPServerTransport({
-      sessionIdGenerator: undefined,
-      enableJsonResponse: true
-    });
-
-    // Cleanup on connection close
-    res.on('close', () => {
-      transport.close();
-    });
-
-    const server = createServer();
-    await server.connect(transport);
-    await transport.handleRequest(req, res, req.body);
-
-    mcpRequestCounter.inc({ method: req.method, status: 'success' });
-  } catch (error) {
-    mcpRequestCounter.inc({ method: req.method, status: 'error' });
-    throw error;
-  } finally {
-    mcpRequestDuration.observe({ method: req.method }, (Date.now() - start) / 1000);
-  }
+  // Extract JSONRPC request details for tracing
+  const jsonrpcRequest = req.body;
+  const mcpMethod = jsonrpcRequest?.method || 'unknown';
+  const mcpId = jsonrpcRequest?.id;
+
+  return tracer.startActiveSpan('mcp.request', async (span) => {
+    try {
+      // Add MCP-specific span attributes
+      span.setAttribute('mcp.method', mcpMethod);
+      if (mcpId !== undefined) {
+        span.setAttribute('mcp.id', mcpId);
+      }
+      span.setAttribute('http.client_ip', clientIp);
+
+      // Create new transport per request to prevent ID collisions
+      const transport = new StreamableHTTPServerTransport({
+        sessionIdGenerator: undefined,
+        enableJsonResponse: true
+      });
+
+      // Cleanup on connection close
+      res.on('close', () => {
+        transport.close();
+      });
+
+      const server = createServer();
+      await server.connect(transport);
+      await transport.handleRequest(req, res, req.body);
+
+      mcpRequestCounter.inc({ method: req.method, status: 'success' });
+      span.setStatus({ code: SpanStatusCode.OK });
+    } catch (error) {
+      mcpRequestCounter.inc({ method: req.method, status: 'error' });
+      span.setStatus({ code: SpanStatusCode.ERROR, message: error.message });
+      span.recordException(error);
+      throw error;
+    } finally {
+      mcpRequestDuration.observe({ method: req.method }, (Date.now() - start) / 1000);
+      span.end();
+    }
+  });
 };
 
 // Support both GET and POST for MCP endpoint

package/src/instrumentation.js

@@ -4,52 +4,22 @@
 import { NodeSDK } from '@opentelemetry/sdk-node';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
 import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node';
-import { Resource } from '@opentelemetry/resources';
-import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
-import { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api';
-
-// Enable diagnostic logging (set to DiagLogLevel.DEBUG for troubleshooting)
-const logLevel = process.env.OTEL_LOG_LEVEL === 'debug' ? DiagLogLevel.DEBUG : DiagLogLevel.INFO;
-diag.setLogger(new DiagConsoleLogger(), logLevel);
 
 // Configure OTLP exporter
 const traceExporter = new OTLPTraceExporter({
-  // OTel Collector endpoint (can be overridden via env var)
   url: process.env.OTEL_EXPORTER_OTLP_ENDPOINT || 'http://opentelemetry-collector.tempo.svc.cluster.local:4317',
-  // Use gRPC protocol
-  // No TLS needed for in-cluster communication
 });
 
-// Configure service resource
-const resource = Resource.default().merge(
-  new Resource({
-    [ATTR_SERVICE_NAME]: process.env.OTEL_SERVICE_NAME || 'vcluster-yaml-mcp-server',
-    [ATTR_SERVICE_VERSION]: process.env.npm_package_version || '1.0.0',
-    // Add custom attributes
-    'deployment.environment': process.env.NODE_ENV || 'production',
-    'service.namespace': 'default',
-  })
-);
-
-// Initialize OpenTelemetry SDK
+// Initialize OpenTelemetry SDK with minimal config
+// The SDK will automatically detect and set up resource attributes
 const sdk = new NodeSDK({
-  resource,
+  serviceName: process.env.OTEL_SERVICE_NAME || 'vcluster-yaml-mcp-server',
   traceExporter,
   instrumentations: [
     getNodeAutoInstrumentations({
-      // Auto-instrument Express, HTTP, and other common libraries
+      // Disable file system instrumentation (too noisy)
       '@opentelemetry/instrumentation-fs': {
-        enabled: false, // Disable file system instrumentation (too noisy)
-      },
-      '@opentelemetry/instrumentation-express': {
-        enabled: true,
-      },
-      '@opentelemetry/instrumentation-http': {
-        enabled: true,
-        // Add request/response headers to spans
-        requestHook: (span, request) => {
-          span.setAttribute('http.client_ip', request.headers['x-forwarded-for'] || request.connection.remoteAddress);
-        },
+        enabled: false,
       },
     }),
   ],
@@ -59,8 +29,7 @@ const sdk = new NodeSDK({
 sdk.start();
 
 console.log('OpenTelemetry tracing initialized');
-console.log(`  Service: ${resource.attributes[ATTR_SERVICE_NAME]}`);
-console.log(`  Version: ${resource.attributes[ATTR_SERVICE_VERSION]}`);
+console.log(`  Service: ${process.env.OTEL_SERVICE_NAME || 'vcluster-yaml-mcp-server'}`);
 console.log(`  Exporter: ${process.env.OTEL_EXPORTER_OTLP_ENDPOINT || 'http://opentelemetry-collector.tempo.svc.cluster.local:4317'}`);
 
 // Graceful shutdown