@tigerdata/mcp-boilerplate 0.2.0 → 0.3.0

package/dist/cliEntrypoint.js

@@ -17,7 +17,8 @@ export async function cliEntrypoint(stdioEntrypoint, httpEntrypoint, instrumenta
                 let cleanup;
                 if (args.includes('--instrument') ||
                     process.env.INSTRUMENT === 'true') {
-                    ({ cleanup } = await import(instrumentation));
+                    const { instrument } = await import(instrumentation);
+                    ({ cleanup } = instrument());
                 }
                 // Import and run the HTTP server
                 const { registerCleanupFn } = await import(httpEntrypoint);

package/dist/index.d.ts

@@ -5,3 +5,5 @@ export { stdioServerFactory } from './stdio.js';
 export { type ApiFactory } from './types.js';
 export { StatusError } from './StatusError.js';
 export { type AdditionalSetupArgs } from './mcpServer.js';
+export { withSpan, addAiResultToSpan } from './tracing.js';
+export { registerExitHandlers } from './registerExitHandlers.js';

package/dist/index.js

@@ -3,3 +3,5 @@ export { httpServerFactory } from './httpServer.js';
 export { log } from './logger.js';
 export { stdioServerFactory } from './stdio.js';
 export { StatusError } from './StatusError.js';
+export { withSpan, addAiResultToSpan } from './tracing.js';
+export { registerExitHandlers } from './registerExitHandlers.js';

package/dist/instrumentation.d.ts

@@ -1,3 +1,13 @@
 import { NodeSDK } from '@opentelemetry/sdk-node';
-export declare const sdk: NodeSDK;
-export declare const cleanup: () => Promise<void>;
+import { InstrumentationConfigMap } from '@opentelemetry/auto-instrumentations-node';
+import type { Instrumentation } from '@opentelemetry/instrumentation';
+interface Options {
+    environment?: string;
+    instrumentations?: Instrumentation[];
+    nodeAutoInstrumentationsOptions?: InstrumentationConfigMap;
+}
+export declare const instrument: (options?: Options) => {
+    cleanup: () => Promise<void>;
+    sdk: NodeSDK;
+};
+export {};

package/dist/instrumentation.js

@@ -2,57 +2,67 @@ import { NodeSDK } from '@opentelemetry/sdk-node';
 import { resourceFromAttributes } from '@opentelemetry/resources';
 import { OTLPTraceExporter as GrpcTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
 import { OTLPTraceExporter as HttpTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
-import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node';
+import { getNodeAutoInstrumentations, } from '@opentelemetry/auto-instrumentations-node';
 import { BatchSpanProcessor, } from '@opentelemetry/sdk-trace-base';
 import { BatchLogRecordProcessor, } from '@opentelemetry/sdk-logs';
 import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http';
 import { log } from './logger.js';
-const spanProcessors = [];
-const logRecordProcessors = [];
-if (process.env.OTEL_EXPORTER_OTLP_ENDPOINT) {
-    spanProcessors.push(new BatchSpanProcessor(new GrpcTraceExporter()));
-}
-if (process.env.JAEGER_TRACES_ENDPOINT) {
-    spanProcessors.push(new BatchSpanProcessor(new GrpcTraceExporter({
-        url: process.env.JAEGER_TRACES_ENDPOINT,
-    })));
-}
-if (process.env.LOGFIRE_TRACES_ENDPOINT) {
-    spanProcessors.push(new BatchSpanProcessor(new HttpTraceExporter({
-        url: process.env.LOGFIRE_TRACES_ENDPOINT,
-        headers: process.env.LOGFIRE_TOKEN
-            ? { Authorization: `Bearer ${process.env.LOGFIRE_TOKEN}` }
-            : {},
-    })));
-}
-if (process.env.LOGFIRE_LOGS_ENDPOINT) {
-    logRecordProcessors.push(new BatchLogRecordProcessor(new OTLPLogExporter({
-        url: process.env.LOGFIRE_LOGS_ENDPOINT,
-        headers: process.env.LOGFIRE_TOKEN
-            ? { Authorization: `Bearer ${process.env.LOGFIRE_TOKEN}` }
-            : {},
-    })));
-}
-export const sdk = new NodeSDK({
-    instrumentations: [getNodeAutoInstrumentations()],
-    spanProcessors,
-    logRecordProcessors,
-    resource: resourceFromAttributes({
-        'deployment.environment.name': process.env.LOGFIRE_ENVIRONMENT || process.env.NODE_ENV || 'development',
-        'service.instance.id': process.env.HOSTNAME,
-    }),
-});
-// Initialize the SDK and register with the OpenTelemetry API
-sdk.start();
-log.info('OpenTelemetry initialized');
-export const cleanup = async () => {
-    try {
-        await Promise.all(spanProcessors.map((sp) => sp.shutdown()));
-        await Promise.all(logRecordProcessors.map((lp) => lp.shutdown()));
-        await sdk.shutdown();
-        log.info('OpenTelemetry terminated');
+export const instrument = (options = {}) => {
+    const spanProcessors = [];
+    const logRecordProcessors = [];
+    if (process.env.OTEL_EXPORTER_OTLP_ENDPOINT) {
+        spanProcessors.push(new BatchSpanProcessor(new GrpcTraceExporter()));
     }
-    catch (error) {
-        log.error('Error terminating OpenTelemetry', error);
+    if (process.env.JAEGER_TRACES_ENDPOINT) {
+        spanProcessors.push(new BatchSpanProcessor(new GrpcTraceExporter({
+            url: process.env.JAEGER_TRACES_ENDPOINT,
+        })));
     }
+    if (process.env.LOGFIRE_TRACES_ENDPOINT) {
+        spanProcessors.push(new BatchSpanProcessor(new HttpTraceExporter({
+            url: process.env.LOGFIRE_TRACES_ENDPOINT,
+            headers: process.env.LOGFIRE_TOKEN
+                ? { Authorization: `Bearer ${process.env.LOGFIRE_TOKEN}` }
+                : {},
+        })));
+    }
+    if (process.env.LOGFIRE_LOGS_ENDPOINT) {
+        logRecordProcessors.push(new BatchLogRecordProcessor(new OTLPLogExporter({
+            url: process.env.LOGFIRE_LOGS_ENDPOINT,
+            headers: process.env.LOGFIRE_TOKEN
+                ? { Authorization: `Bearer ${process.env.LOGFIRE_TOKEN}` }
+                : {},
+        })));
+    }
+    const sdk = new NodeSDK({
+        instrumentations: options.instrumentations || [
+            getNodeAutoInstrumentations(options.nodeAutoInstrumentationsOptions),
+        ],
+        spanProcessors,
+        logRecordProcessors,
+        resource: resourceFromAttributes({
+            'deployment.environment.name': options.environment ||
+                process.env.LOGFIRE_ENVIRONMENT ||
+                process.env.NODE_ENV ||
+                'development',
+            'service.instance.id': process.env.HOSTNAME,
+        }),
+    });
+    // Initialize the SDK and register with the OpenTelemetry API
+    sdk.start();
+    log.info('OpenTelemetry initialized');
+    return {
+        cleanup: async () => {
+            try {
+                await Promise.all(spanProcessors.map((sp) => sp.shutdown()));
+                await Promise.all(logRecordProcessors.map((lp) => lp.shutdown()));
+                await sdk.shutdown();
+                log.info('OpenTelemetry terminated');
+            }
+            catch (error) {
+                log.error('Error terminating OpenTelemetry', error);
+            }
+        },
+        sdk,
+    };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tigerdata/mcp-boilerplate",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "MCP boilerplate code for Node.js",
   "license": "Apache-2.0",
   "author": "TigerData",
@@ -16,6 +16,10 @@
     ".": {
       "import": "./dist/index.js",
       "types": "./dist/index.d.ts"
+    },
+    "./instrumentation": {
+      "import": "./dist/instrumentation.js",
+      "types": "./dist/instrumentation.d.ts"
     }
   },
   "files": [