@foam-ai/node-cliengo 0.1.0-alpha.5 → 0.1.0-alpha.7

package/dist/node-cliengo/src/http/express.d.ts

@@ -36,6 +36,18 @@
 import { type Tracer } from '@opentelemetry/api';
 import type { ExpressErrorHandler, ExpressRequestHandler } from '../types';
 export declare function createExpressMiddleware(tracer: Tracer): ExpressRequestHandler;
+/**
+ * Reads the trace context that was captured on the request at middleware time.
+ * Use this in pino-http's `customProps` to get trace IDs even after NR's
+ * transaction has ended:
+ *
+ *   pinoHttp({ customProps: (req) => getRequestTraceContext(req) })
+ */
+export declare function getRequestTraceContext(req: any): {
+    traceId: string;
+    spanId: string;
+    traceparent: string;
+};
 export declare function createExpressErrorHandler(middlewareRef?: ExpressRequestHandler & {
     _markErrorHandler?: () => void;
 }): ExpressErrorHandler;

package/dist/node-cliengo/src/http/express.js

@@ -36,11 +36,13 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createExpressMiddleware = createExpressMiddleware;
+exports.getRequestTraceContext = getRequestTraceContext;
 exports.createExpressErrorHandler = createExpressErrorHandler;
 const api_1 = require("@opentelemetry/api");
 const trace_bridge_1 = require("../trace-bridge");
 const request_context_1 = require("./request-context");
 const SPAN_KEY = Symbol.for('foam.shadow.span');
+const TRACE_CTX_KEY = Symbol.for('foam.trace.context');
 /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment */
 function createExpressMiddleware(tracer) {
     let errorHandlerRegistered = false;
@@ -61,6 +63,7 @@ function createExpressMiddleware(tracer) {
             },
         });
         req[SPAN_KEY] = span;
+        req[TRACE_CTX_KEY] = { traceId, spanId };
         const startTime = Date.now();
         const onFinish = () => {
             try {
@@ -99,6 +102,25 @@ function createExpressMiddleware(tracer) {
     middleware._markErrorHandler = markErrorHandlerRegistered;
     return middleware;
 }
+/**
+ * Reads the trace context that was captured on the request at middleware time.
+ * Use this in pino-http's `customProps` to get trace IDs even after NR's
+ * transaction has ended:
+ *
+ *   pinoHttp({ customProps: (req) => getRequestTraceContext(req) })
+ */
+function getRequestTraceContext(req) {
+    try {
+        const ctx = req[TRACE_CTX_KEY];
+        const traceId = ctx?.traceId ?? '';
+        const spanId = ctx?.spanId ?? '';
+        const traceparent = traceId && spanId ? `00-${traceId}-${spanId}-01` : '';
+        return { traceId, spanId, traceparent };
+    }
+    catch {
+        return { traceId: '', spanId: '', traceparent: '' };
+    }
+}
 function createExpressErrorHandler(middlewareRef) {
     middlewareRef?._markErrorHandler?.();
     return (err, req, _res, next) => {

package/dist/node-cliengo/src/http/fastify.d.ts

@@ -25,4 +25,14 @@
  */
 import { type Tracer } from '@opentelemetry/api';
 import type { FastifyPluginAsync } from '../types';
+/**
+ * Reads the trace context that was captured on the request at hook time.
+ * Use this in Fastify's logger mixin or serializers to get trace IDs even
+ * after NR's transaction has ended.
+ */
+export declare function getRequestTraceContext(request: any): {
+    traceId: string;
+    spanId: string;
+    traceparent: string;
+};
 export declare function createFastifyPlugin(tracer: Tracer): FastifyPluginAsync;

package/dist/node-cliengo/src/http/fastify.js

@@ -25,12 +25,31 @@
  *   - done() always called even if our code throws — Fastify hook contract.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRequestTraceContext = getRequestTraceContext;
 exports.createFastifyPlugin = createFastifyPlugin;
 const api_1 = require("@opentelemetry/api");
 const trace_bridge_1 = require("../trace-bridge");
 const request_context_1 = require("./request-context");
 const SPAN_KEY = Symbol.for('foam.shadow.span');
 const START_KEY = Symbol.for('foam.shadow.start');
+const TRACE_CTX_KEY = Symbol.for('foam.trace.context');
+/**
+ * Reads the trace context that was captured on the request at hook time.
+ * Use this in Fastify's logger mixin or serializers to get trace IDs even
+ * after NR's transaction has ended.
+ */
+function getRequestTraceContext(request) {
+    try {
+        const ctx = request[TRACE_CTX_KEY];
+        const traceId = ctx?.traceId ?? '';
+        const spanId = ctx?.spanId ?? '';
+        const traceparent = traceId && spanId ? `00-${traceId}-${spanId}-01` : '';
+        return { traceId, spanId, traceparent };
+    }
+    catch {
+        return { traceId: '', spanId: '', traceparent: '' };
+    }
+}
 /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment */
 function createFastifyPlugin(tracer) {
     return async (fastify) => {
@@ -49,6 +68,7 @@ function createFastifyPlugin(tracer) {
                 });
                 request[SPAN_KEY] = span;
                 request[START_KEY] = Date.now();
+                request[TRACE_CTX_KEY] = { traceId, spanId };
             }
             catch {
                 /* never crash */

package/dist/node-cliengo/src/index.d.ts

@@ -18,8 +18,8 @@ export { buildTraceparent, extractParentContext, getTraceContext } from './trace
 export { injectSnsAttributes } from './sns';
 export { injectJobData, wrapJobConsumer } from './job';
 export { wrapSqsConsumer } from './sqs';
-export { createExpressMiddleware, createExpressErrorHandler } from './http/express';
-export { createFastifyPlugin } from './http/fastify';
+export { createExpressMiddleware, createExpressErrorHandler, getRequestTraceContext } from './http/express';
+export { createFastifyPlugin, getRequestTraceContext as getFastifyRequestTraceContext } from './http/fastify';
 export { createWinstonFormat } from './logs/winston-format';
 export { createPinoMixin } from './logs/pino-mixin';
 export { FOAM_OTEL_ENDPOINT } from './constants';

package/dist/node-cliengo/src/index.js

@@ -15,7 +15,7 @@
  *   access to the foam instance.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FOAM_OTEL_ENDPOINT = exports.createPinoMixin = exports.createWinstonFormat = exports.createFastifyPlugin = exports.createExpressErrorHandler = exports.createExpressMiddleware = exports.wrapSqsConsumer = exports.wrapJobConsumer = exports.injectJobData = exports.injectSnsAttributes = exports.getTraceContext = exports.extractParentContext = exports.buildTraceparent = exports.init = void 0;
+exports.FOAM_OTEL_ENDPOINT = exports.createPinoMixin = exports.createWinstonFormat = exports.getFastifyRequestTraceContext = exports.createFastifyPlugin = exports.getRequestTraceContext = exports.createExpressErrorHandler = exports.createExpressMiddleware = exports.wrapSqsConsumer = exports.wrapJobConsumer = exports.injectJobData = exports.injectSnsAttributes = exports.getTraceContext = exports.extractParentContext = exports.buildTraceparent = exports.init = void 0;
 var init_1 = require("./init");
 Object.defineProperty(exports, "init", { enumerable: true, get: function () { return init_1.init; } });
 var trace_bridge_1 = require("./trace-bridge");
@@ -32,8 +32,10 @@ Object.defineProperty(exports, "wrapSqsConsumer", { enumerable: true, get: funct
 var express_1 = require("./http/express");
 Object.defineProperty(exports, "createExpressMiddleware", { enumerable: true, get: function () { return express_1.createExpressMiddleware; } });
 Object.defineProperty(exports, "createExpressErrorHandler", { enumerable: true, get: function () { return express_1.createExpressErrorHandler; } });
+Object.defineProperty(exports, "getRequestTraceContext", { enumerable: true, get: function () { return express_1.getRequestTraceContext; } });
 var fastify_1 = require("./http/fastify");
 Object.defineProperty(exports, "createFastifyPlugin", { enumerable: true, get: function () { return fastify_1.createFastifyPlugin; } });
+Object.defineProperty(exports, "getFastifyRequestTraceContext", { enumerable: true, get: function () { return fastify_1.getRequestTraceContext; } });
 var winston_format_1 = require("./logs/winston-format");
 Object.defineProperty(exports, "createWinstonFormat", { enumerable: true, get: function () { return winston_format_1.createWinstonFormat; } });
 var pino_mixin_1 = require("./logs/pino-mixin");

package/dist/node-cliengo/src/logs/pino-destination.d.ts

@@ -21,8 +21,13 @@
  *     60→FATAL. Unknown numeric levels default to INFO.
  *   - Pino uses `msg` for the message field (not `message` like Winston). We
  *     check both for compatibility with custom Pino configs.
- *   - Internal Pino fields (pid, hostname, time) are excluded from attributes
- *     to avoid noise. All other fields are forwarded.
+ *   - Trace context (traceId, spanId, traceparent) is read from the parsed
+ *     JSON line, NOT from getTraceContext(). The pino mixin injects these at
+ *     log-write time (when NR's transaction is still active). The stream write
+ *     happens asynchronously — by then NR's transaction has ended, so calling
+ *     getTraceContext() here would return empty strings.
+ *   - Internal Pino fields (pid, hostname, time) and trace fields (traceId,
+ *     spanId, traceparent) are excluded from forwarded attributes.
  *   - Callback always called — never blocks the Pino stream pipeline.
  *   - Buffer chunks: converted to string before parsing (handles both Buffer
  *     and string inputs from Node streams).

package/dist/node-cliengo/src/logs/pino-destination.js

@@ -22,17 +22,22 @@
  *     60→FATAL. Unknown numeric levels default to INFO.
  *   - Pino uses `msg` for the message field (not `message` like Winston). We
  *     check both for compatibility with custom Pino configs.
- *   - Internal Pino fields (pid, hostname, time) are excluded from attributes
- *     to avoid noise. All other fields are forwarded.
+ *   - Trace context (traceId, spanId, traceparent) is read from the parsed
+ *     JSON line, NOT from getTraceContext(). The pino mixin injects these at
+ *     log-write time (when NR's transaction is still active). The stream write
+ *     happens asynchronously — by then NR's transaction has ended, so calling
+ *     getTraceContext() here would return empty strings.
+ *   - Internal Pino fields (pid, hostname, time) and trace fields (traceId,
+ *     spanId, traceparent) are excluded from forwarded attributes.
  *   - Callback always called — never blocks the Pino stream pipeline.
  *   - Buffer chunks: converted to string before parsing (handles both Buffer
  *     and string inputs from Node streams).
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPinoDestination = createPinoDestination;
+const api_1 = require("@opentelemetry/api");
 const api_logs_1 = require("@opentelemetry/api-logs");
 const node_stream_1 = require("node:stream");
-const trace_bridge_1 = require("../trace-bridge");
 const PINO_LEVEL_MAP = {
     10: api_logs_1.SeverityNumber.TRACE,
     20: api_logs_1.SeverityNumber.DEBUG,
@@ -66,16 +71,23 @@ function createPinoDestination(loggerProvider, serviceName) {
                 const msg = parsed.msg ?? parsed.message ?? '';
                 const severity = PINO_LEVEL_MAP[level] ?? api_logs_1.SeverityNumber.INFO;
                 const severityText = PINO_LEVEL_TEXT[level] ?? 'INFO';
-                const ctx = (0, trace_bridge_1.getTraceContext)();
+                // Read trace context from the parsed JSON line — the pino mixin already
+                // injected traceId/spanId/traceparent at log-write time (when the NR
+                // transaction was still active). Calling getTraceContext() here would be
+                // too late — the stream write happens asynchronously after NR's
+                // transaction has ended.
+                const traceId = parsed.traceId ?? '';
+                const spanId = parsed.spanId ?? '';
                 const attributes = {};
-                if (ctx.traceId) {
-                    attributes['trace.id'] = ctx.traceId;
+                if (traceId) {
+                    attributes['trace.id'] = traceId;
                 }
-                if (ctx.spanId) {
-                    attributes['span.id'] = ctx.spanId;
+                if (spanId) {
+                    attributes['span.id'] = spanId;
                 }
+                const SKIP_KEYS = new Set(['level', 'msg', 'message', 'time', 'pid', 'hostname', 'traceId', 'spanId', 'traceparent']);
                 for (const [key, val] of Object.entries(parsed)) {
-                    if (key !== 'level' && key !== 'msg' && key !== 'message' && key !== 'time' && key !== 'pid' && key !== 'hostname') {
+                    if (!SKIP_KEYS.has(key)) {
                         try {
                             attributes[key] = typeof val === 'string' ? val : JSON.stringify(val);
                         }
@@ -84,11 +96,24 @@ function createPinoDestination(loggerProvider, serviceName) {
                         }
                     }
                 }
+                // Build an OTel Context carrying the SpanContext so the SDK stamps the
+                // native traceId/spanId fields on the exported OTLP LogRecord. Without
+                // this, backends can't correlate logs to traces.
+                let logContext;
+                if (traceId && spanId) {
+                    logContext = api_1.trace.setSpanContext(api_1.ROOT_CONTEXT, {
+                        traceId,
+                        spanId,
+                        traceFlags: 1,
+                        isRemote: true,
+                    });
+                }
                 otelLogger.emit({
                     body: msg,
                     severityNumber: severity,
                     severityText,
                     attributes,
+                    ...(logContext && { context: logContext }),
                 });
             }
             catch {

package/dist/node-cliengo/src/trace-bridge.js

@@ -49,11 +49,18 @@ function generateSpanId() {
     return (0, node_crypto_1.randomBytes)(8).toString('hex');
 }
 function resolveTraceIds() {
-    // 1. Try NR
-    const nr = (0, nr_1.getNr)();
-    const meta = nr.getTraceMetadata?.() ?? { traceId: '', spanId: '' };
-    if (meta.traceId && meta.spanId) {
-        return { traceId: meta.traceId, spanId: meta.spanId };
+    // 1. Try NR (guarded — getTraceMetadata() can throw if the underlying
+    //    transaction is null, which happens when pino-http logs fire after
+    //    NR's transaction has ended)
+    try {
+        const nr = (0, nr_1.getNr)();
+        const meta = nr.getTraceMetadata?.() ?? { traceId: '', spanId: '' };
+        if (meta.traceId && meta.spanId) {
+            return { traceId: meta.traceId, spanId: meta.spanId };
+        }
+    }
+    catch {
+        // NR transaction is null or getTraceMetadata threw — fall through
     }
     // 2. Fall back to OTel's own active span
     const activeSpan = api_1.trace.getActiveSpan();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foam-ai/node-cliengo",
-  "version": "0.1.0-alpha.5",
+  "version": "0.1.0-alpha.7",
   "description": "Unified observability (traces, logs, metrics) for Cliengo Node.js services, connecting New Relic APM with Foam's OTel collector.",
   "main": "dist/node-cliengo/src/index.js",
   "types": "dist/node-cliengo/src/index.d.ts",