@foam-ai/node-cliengo 0.1.0-alpha.3 → 0.1.0-alpha.6

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

@@ -103,9 +103,9 @@ function createInertInstance(serviceName) {
         createPinoDestination: () => new node_stream_1.Writable({
             write: (_c, _e, cb) => cb(),
         }),
-        buildTraceparent: () => undefined,
-        injectSnsAttributes: (attrs) => attrs,
-        injectJobData: (data) => data,
+        buildTraceparent: trace_bridge_1.buildTraceparent,
+        injectSnsAttributes: sns_1.injectSnsAttributes,
+        injectJobData: job_1.injectJobData,
         wrapSqsConsumer: async (_t, _s, _m, fn) => fn(),
         wrapJobConsumer: async (_t, _s, _j, fn) => fn(),
         extractParentContext: () => {

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

@@ -26,6 +26,6 @@
 import { type Tracer } from '@opentelemetry/api';
 import type { FoamMetrics } from './types';
 export declare function injectJobData<T extends Record<string, unknown>>(data: T): T & {
-    traceparent?: string;
+    traceparent: string;
 };
 export declare function wrapJobConsumer(tracer: Tracer, spanName: string, jobData: Record<string, unknown>, fn: () => Promise<void>, metrics?: FoamMetrics): Promise<void>;

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

@@ -31,11 +31,7 @@ const api_1 = require("@opentelemetry/api");
 const nr_1 = require("./nr");
 const trace_bridge_1 = require("./trace-bridge");
 function injectJobData(data) {
-    const tp = (0, trace_bridge_1.buildTraceparent)();
-    if (!tp) {
-        return data;
-    }
-    return { ...data, traceparent: tp };
+    return { ...data, traceparent: (0, trace_bridge_1.buildTraceparent)() };
 }
 async function wrapJobConsumer(tracer, spanName, jobData, fn, metrics) {
     const nr = (0, nr_1.getNr)();

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,8 +22,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).
@@ -32,7 +37,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPinoDestination = createPinoDestination;
 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 +70,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);
                         }

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

@@ -8,10 +8,7 @@
  *   alongside the existing ones. This function spread-merges it in.
  *
  * Edge cases covered:
- *   - No active NR transaction (buildTraceparent returns undefined): the
- *     original attributes are returned unchanged — no traceparent key added.
- *   - Empty attrs {}: returns just { traceparent: ... } if NR is active,
- *     or {} if not. Never crashes.
+ *   - Empty attrs {}: returns { traceparent: ... }. Never crashes.
  *   - Existing traceparent in attrs: overwritten with the current value
  *     (spread puts our key last).
  */

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

@@ -9,10 +9,7 @@
  *   alongside the existing ones. This function spread-merges it in.
  *
  * Edge cases covered:
- *   - No active NR transaction (buildTraceparent returns undefined): the
- *     original attributes are returned unchanged — no traceparent key added.
- *   - Empty attrs {}: returns just { traceparent: ... } if NR is active,
- *     or {} if not. Never crashes.
+ *   - Empty attrs {}: returns { traceparent: ... }. Never crashes.
  *   - Existing traceparent in attrs: overwritten with the current value
  *     (spread puts our key last).
  */
@@ -20,12 +17,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.injectSnsAttributes = injectSnsAttributes;
 const trace_bridge_1 = require("./trace-bridge");
 function injectSnsAttributes(attrs) {
-    const tp = (0, trace_bridge_1.buildTraceparent)();
-    if (!tp) {
-        return attrs;
-    }
     return {
         ...attrs,
-        traceparent: { DataType: 'String', StringValue: tp },
+        traceparent: { DataType: 'String', StringValue: (0, trace_bridge_1.buildTraceparent)() },
     };
 }

package/dist/node-cliengo/src/trace-bridge.d.ts

@@ -2,16 +2,20 @@
  * W3C trace context utilities for New Relic and OpenTelemetry interop.
  *
  * Why this file exists:
- *   NR owns the active trace (it creates transactions via http monkey-patching),
- *   but our OTel spans need to share the same traceId so Foam and NR traces
- *   correlate. This module reads NR's trace metadata and converts it to/from
- *   W3C traceparent format (`00-{traceId}-{spanId}-{flags}`).
+ *   Reads trace context from two sources (NR first, then OTel's own active
+ *   span) and converts it to/from W3C traceparent format. This means trace
+ *   propagation works whether NR is installed, partially loaded, or completely
+ *   removed.
+ *
+ * Resolution order (buildTraceparent / getTraceContext):
+ *   1. NR's getTraceMetadata() — if NR is loaded and has an active transaction
+ *   2. OTel's active span context — if our own tracer has an active span
+ *   3. Generate fresh traceId (16 bytes) + spanId (8 bytes) — always has context
  *
  * Functions:
- *   - buildTraceparent(): reads NR's active traceId/spanId, returns a W3C
- *     traceparent string. Used by producers to inject into SNS attributes or
- *     BullMQ/Bull job data. Returns undefined when NR is not loaded or no
- *     active transaction exists.
+ *   - buildTraceparent(): always returns a W3C traceparent string — from NR,
+ *     OTel, or freshly generated. Used by producers to inject into SNS
+ *     attributes or BullMQ/Bull job data.
  *   - extractParentContext(): parses a traceparent string into an OTel Context
  *     with a remote SpanContext. Used by consumers to link their OTel spans
  *     back to the producer's trace. Returns ROOT_CONTEXT on malformed input.
@@ -20,11 +24,9 @@
  *     so the trace context is always current.
  *
  * Edge cases covered:
- *   - NR not loaded: getTraceMetadata() returns undefined — we default to
- *     empty strings, buildTraceparent returns undefined, getTraceContext
- *     returns empty strings. No crash.
- *   - NR loaded but no active transaction: traceId/spanId are empty strings.
- *     buildTraceparent returns undefined. Consumers create a fresh trace.
+ *   - NR not loaded: falls back to OTel active span, then to generated IDs.
+ *   - NR loaded but no active transaction: same fallback chain.
+ *   - NR removed entirely: OTel active span or generated IDs. Always works.
  *   - Malformed traceparent (wrong number of parts, wrong hex lengths):
  *     extractParentContext returns ROOT_CONTEXT — consumer creates a fresh
  *     trace instead of crashing.
@@ -33,7 +35,7 @@
  */
 import { type Context } from '@opentelemetry/api';
 import type { TraceContext } from './types';
-export declare function buildTraceparent(): string | undefined;
+export declare function buildTraceparent(): string;
 export declare function extractParentContext(traceparent: string): Context;
 export declare function getTraceContext(): TraceContext;
 export declare function getActiveContext(): Context;

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

@@ -3,16 +3,20 @@
  * W3C trace context utilities for New Relic and OpenTelemetry interop.
  *
  * Why this file exists:
- *   NR owns the active trace (it creates transactions via http monkey-patching),
- *   but our OTel spans need to share the same traceId so Foam and NR traces
- *   correlate. This module reads NR's trace metadata and converts it to/from
- *   W3C traceparent format (`00-{traceId}-{spanId}-{flags}`).
+ *   Reads trace context from two sources (NR first, then OTel's own active
+ *   span) and converts it to/from W3C traceparent format. This means trace
+ *   propagation works whether NR is installed, partially loaded, or completely
+ *   removed.
+ *
+ * Resolution order (buildTraceparent / getTraceContext):
+ *   1. NR's getTraceMetadata() — if NR is loaded and has an active transaction
+ *   2. OTel's active span context — if our own tracer has an active span
+ *   3. Generate fresh traceId (16 bytes) + spanId (8 bytes) — always has context
  *
  * Functions:
- *   - buildTraceparent(): reads NR's active traceId/spanId, returns a W3C
- *     traceparent string. Used by producers to inject into SNS attributes or
- *     BullMQ/Bull job data. Returns undefined when NR is not loaded or no
- *     active transaction exists.
+ *   - buildTraceparent(): always returns a W3C traceparent string — from NR,
+ *     OTel, or freshly generated. Used by producers to inject into SNS
+ *     attributes or BullMQ/Bull job data.
  *   - extractParentContext(): parses a traceparent string into an OTel Context
  *     with a remote SpanContext. Used by consumers to link their OTel spans
  *     back to the producer's trace. Returns ROOT_CONTEXT on malformed input.
@@ -21,11 +25,9 @@
  *     so the trace context is always current.
  *
  * Edge cases covered:
- *   - NR not loaded: getTraceMetadata() returns undefined — we default to
- *     empty strings, buildTraceparent returns undefined, getTraceContext
- *     returns empty strings. No crash.
- *   - NR loaded but no active transaction: traceId/spanId are empty strings.
- *     buildTraceparent returns undefined. Consumers create a fresh trace.
+ *   - NR not loaded: falls back to OTel active span, then to generated IDs.
+ *   - NR loaded but no active transaction: same fallback chain.
+ *   - NR removed entirely: OTel active span or generated IDs. Always works.
  *   - Malformed traceparent (wrong number of parts, wrong hex lengths):
  *     extractParentContext returns ROOT_CONTEXT — consumer creates a fresh
  *     trace instead of crashing.
@@ -37,15 +39,35 @@ exports.buildTraceparent = buildTraceparent;
 exports.extractParentContext = extractParentContext;
 exports.getTraceContext = getTraceContext;
 exports.getActiveContext = getActiveContext;
+const node_crypto_1 = require("node:crypto");
 const api_1 = require("@opentelemetry/api");
 const nr_1 = require("./nr");
-function buildTraceparent() {
+function generateTraceId() {
+    return (0, node_crypto_1.randomBytes)(16).toString('hex');
+}
+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: '' };
-    const { traceId, spanId } = meta;
-    if (!traceId || !spanId) {
-        return undefined;
+    if (meta.traceId && meta.spanId) {
+        return { traceId: meta.traceId, spanId: meta.spanId };
+    }
+    // 2. Fall back to OTel's own active span
+    const activeSpan = api_1.trace.getActiveSpan();
+    if (activeSpan) {
+        const sc = activeSpan.spanContext();
+        if (sc.traceId && sc.spanId) {
+            return { traceId: sc.traceId, spanId: sc.spanId };
+        }
     }
+    // 3. Generate our own — ensures trace context is always available
+    return { traceId: generateTraceId(), spanId: generateSpanId() };
+}
+function buildTraceparent() {
+    const { traceId, spanId } = resolveTraceIds();
     return `00-${traceId}-${spanId}-01`;
 }
 function extractParentContext(traceparent) {
@@ -67,10 +89,7 @@ function extractParentContext(traceparent) {
     return api_1.trace.setSpanContext(api_1.ROOT_CONTEXT, spanContext);
 }
 function getTraceContext() {
-    const nr = (0, nr_1.getNr)();
-    const meta = nr.getTraceMetadata?.() ?? { traceId: '', spanId: '' };
-    const traceId = meta.traceId ?? '';
-    const spanId = meta.spanId ?? '';
+    const { traceId, spanId } = resolveTraceIds();
     const traceparent = traceId && spanId ? `00-${traceId}-${spanId}-01` : '';
     return { traceId, spanId, traceparent };
 }

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

@@ -62,10 +62,10 @@ export interface FoamInstance {
     createWinstonTransport(): WinstonTransport;
     createPinoMixin(): () => Record<string, string>;
     createPinoDestination(): NodeJS.WritableStream;
-    buildTraceparent(): string | undefined;
+    buildTraceparent(): string;
     injectSnsAttributes(attrs: Record<string, SnsMessageAttributeValue>): Record<string, SnsMessageAttributeValue>;
     injectJobData<T extends Record<string, unknown>>(data: T): T & {
-        traceparent?: string;
+        traceparent: string;
     };
     wrapSqsConsumer(tracer: Tracer, spanName: string, msg: SqsMessage, fn: () => Promise<void>): Promise<void>;
     wrapJobConsumer(tracer: Tracer, spanName: string, jobData: Record<string, unknown>, fn: () => Promise<void>): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foam-ai/node-cliengo",
-  "version": "0.1.0-alpha.3",
+  "version": "0.1.0-alpha.6",
   "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",