@contrail/telemetry 2.0.8 → 2.0.9-alpha-formatting.1

package/lib/logger/index.d.ts

@@ -2,7 +2,7 @@ import pino from 'pino';
 export { parseOtelResourceAttributes } from './parse-otel-resource-attributes';
 export { PINO_LEVEL_TO_OTEL_SEVERITY, PINO_LEVEL_TO_NAME } from './logger-config';
 export { ATTR_LOG_MESSAGE, ATTR_LOG_BODY, ATTR_LOG_PAYLOAD } from './semantic-conventions';
-export { loggerStorage, withLogAttributes } from './log-context';
+export { loggerStorage, withLogAttributes, withLogContext } from './log-context';
 export declare const baseLogger: pino.Logger<never, boolean>;
 export declare const logger: pino.Logger;
 /**

package/lib/logger/index.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a, _b, _c, _d, _e, _f, _g;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logger = exports.baseLogger = exports.withLogAttributes = exports.loggerStorage = exports.ATTR_LOG_PAYLOAD = exports.ATTR_LOG_BODY = exports.ATTR_LOG_MESSAGE = exports.PINO_LEVEL_TO_NAME = exports.PINO_LEVEL_TO_OTEL_SEVERITY = exports.parseOtelResourceAttributes = void 0;
+exports.logger = exports.baseLogger = exports.withLogContext = exports.withLogAttributes = exports.loggerStorage = exports.ATTR_LOG_PAYLOAD = exports.ATTR_LOG_BODY = exports.ATTR_LOG_MESSAGE = exports.PINO_LEVEL_TO_NAME = exports.PINO_LEVEL_TO_OTEL_SEVERITY = exports.parseOtelResourceAttributes = void 0;
 exports.addStream = addStream;
 exports.flushLogs = flushLogs;
 const pino_1 = __importDefault(require("pino"));
@@ -33,6 +33,7 @@ Object.defineProperty(exports, "ATTR_LOG_PAYLOAD", { enumerable: true, get: func
 var log_context_1 = require("./log-context");
 Object.defineProperty(exports, "loggerStorage", { enumerable: true, get: function () { return log_context_1.loggerStorage; } });
 Object.defineProperty(exports, "withLogAttributes", { enumerable: true, get: function () { return log_context_1.withLogAttributes; } });
+Object.defineProperty(exports, "withLogContext", { enumerable: true, get: function () { return log_context_1.withLogContext; } });
 // --- Singleton Guard ---
 // The logger uses AsyncLocalStorage for request context propagation. If two copies
 // of this module are loaded (e.g. due to a version mismatch causing npm to install
@@ -58,6 +59,11 @@ if (globalRecord[TELEMETRY_SINGLETON_KEY]) {
 else {
     globalRecord[TELEMETRY_SINGLETON_KEY] = true;
 }
+// Capture the real console.log before app-framework's hijackConsole() replaces it.
+// This module loads first (as a dependency), so this is always the original.
+// Using it in the stdout stream avoids the infinite loop (hijacked console → pino → console → …)
+// while preserving single-event CloudWatch output (process.stdout.write splits on newlines).
+const originalConsoleLog = console.log;
 // --- Environment & Resource Setup ---
 const semantic_conventions_4 = require("../semantic-conventions");
 const LAMBDA_ENV_OTEL_ATTRIBUTES = getLambdaEnvAttributes();
@@ -83,7 +89,6 @@ const otelLoggerProvider = new sdk_logs_1.LoggerProvider({
 });
 const otelLogger = otelLoggerProvider.getLogger(serviceName);
 // --- Pino Stream Destinations ---
-const stdout_writer_1 = require("./stdout-writer");
 function isPinoPrettyInstalled() {
     try {
         require.resolve('pino-pretty');
@@ -109,24 +114,21 @@ function createStdoutStream() {
         level: 'trace',
         stream: new stream_1.Writable({
             write(chunk, _encoding, callback) {
-                var _a, _b, _c, _d;
+                var _a;
                 let line;
                 try {
                     const logRecord = JSON.parse(chunk.toString());
-                    const time = (_a = logRecord.time) !== null && _a !== void 0 ? _a : new Date().toISOString();
-                    const level = (_b = logger_config_1.PINO_LEVEL_TO_NAME[logRecord.level]) !== null && _b !== void 0 ? _b : 'INFO';
-                    const message = (_c = logRecord[semantic_conventions_2.ATTR_LOG_MESSAGE]) !== null && _c !== void 0 ? _c : '';
-                    const requestId = (_d = getLambdaRequestId()) !== null && _d !== void 0 ? _d : '-';
+                    const message = (_a = logRecord[semantic_conventions_2.ATTR_LOG_MESSAGE]) !== null && _a !== void 0 ? _a : '';
                     const payload = logRecord[semantic_conventions_2.ATTR_LOG_PAYLOAD];
                     const payloadLine = payload && typeof payload === 'object' && Object.keys(payload).length > 0
                         ? `\n${JSON.stringify(payload, null, 2)}`
                         : '';
-                    line = `${time}\t${requestId}\t${level}\t${message}${payloadLine}`;
+                    line = `${message}${payloadLine}`;
                 }
                 catch {
                     line = chunk.toString().replace(/\n$/, '');
                 }
-                stdout_writer_1.stdoutWriter.log(line);
+                originalConsoleLog(line);
                 callback();
             },
         }),

package/lib/logger/log-context.d.ts

@@ -59,3 +59,5 @@ export declare function createContextAwareLogger(baseLogger: Logger): Logger;
  * });
  */
 export declare function withLogAttributes<T>(fields: Record<string, unknown>, fn: () => T): T;
+/** @deprecated Use `withLogAttributes` instead. */
+export declare const withLogContext: typeof withLogAttributes;

package/lib/logger/log-context.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loggerStorage = void 0;
+exports.withLogContext = exports.loggerStorage = void 0;
 exports.createContextAwareLogger = createContextAwareLogger;
 exports.withLogAttributes = withLogAttributes;
 const async_hooks_1 = require("async_hooks");
@@ -78,3 +78,5 @@ function withLogAttributes(fields, fn) {
     const child = parent.child(fields);
     return exports.loggerStorage.run(child, fn);
 }
+/** @deprecated Use `withLogAttributes` instead. */
+exports.withLogContext = withLogAttributes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/telemetry",
-  "version": "2.0.8",
+  "version": "2.0.9-alpha-formatting.1",
   "description": "Telemetry and monitoring utilities for contrail services",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/lib/logger/stdout-writer.d.ts

@@ -1,6 +0,0 @@
-export declare const stdoutWriter: {
-    log: {
-        (...data: any[]): void;
-        (message?: any, ...optionalParams: any[]): void;
-    };
-};

package/lib/logger/stdout-writer.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.stdoutWriter = void 0;
-// Capture the original console.log before app-framework's hijackConsole() replaces it.
-// Lambda treats each console.log() call as a single CloudWatch log event (even with
-// embedded newlines), unlike process.stdout.write() which splits on \n. Using the
-// original lets us pretty-print objects without them scattering across log events.
-//
-// Guard: if telemetry is imported after hijackConsole(), the captured function would be
-// the hijacked one, creating an infinite loop. Detect by checking for [native code] —
-// falls back to process.stdout.write if console.log has been replaced by anything.
-const _capturedConsoleLog = console.log;
-const isNative = Function.prototype.toString.call(_capturedConsoleLog).includes('[native code]');
-// Wrapped in an object so tests can jest.spyOn(stdoutWriter, 'log') regardless
-// of Jest's console patching strategy (BufferedConsole vs CustomConsole).
-exports.stdoutWriter = {
-    log: isNative ? _capturedConsoleLog : (...args) => process.stdout.write(args.map(String).join(' ') + '\n'),
-};