@contrail/telemetry 2.0.4 → 2.0.5

package/lib/logger/index.js

@@ -82,6 +82,7 @@ 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');
@@ -117,14 +118,14 @@ function createStdoutStream() {
                     const requestId = (_d = getLambdaRequestId()) !== null && _d !== void 0 ? _d : '-';
                     const payload = logRecord[semantic_conventions_2.ATTR_LOG_PAYLOAD];
                     const payloadLine = payload && typeof payload === 'object' && Object.keys(payload).length > 0
-                        ? `${JSON.stringify(payload, null, 2)}\n`
+                        ? `\n${JSON.stringify(payload, null, 2)}`
                         : '';
-                    line = `${time}\t${requestId}\t${level}\t${message}\n${payloadLine}`;
+                    line = `${time}\t${requestId}\t${level}\t${message}${payloadLine}`;
                 }
                 catch {
-                    line = chunk.toString();
+                    line = chunk.toString().replace(/\n$/, '');
                 }
-                process.stdout.write(line);
+                stdout_writer_1.stdoutWriter.log(line);
                 callback();
             },
         }),

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

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

package/lib/logger/stdout-writer.js

@@ -0,0 +1,20 @@
+"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'),
+};

package/package.json

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