@contrail/telemetry 2.0.5-alpha-log-body.0 → 2.0.6-alpha.0

package/CHANGELOG.md

@@ -7,12 +7,6 @@ Versioning follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
-## [2.0.5] - 2026-04-17
-
-### Added
-
-- **`contrail.log.body` attribute** — Every OTel log record now carries a `contrail.log.body` custom attribute that duplicates the log body. This enables grouping and filtering by log message in observability UIs (e.g. Dash0) that only expose custom attributes, not the standard `body` field.
-
 ## [2.0.4] - 2026-04-16
 
 ### Added

package/lib/logger/index.d.ts

@@ -1,7 +1,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 { ATTR_LOG_MESSAGE, ATTR_LOG_PAYLOAD } from './semantic-conventions';
 export { loggerStorage, withLogAttributes } 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.withLogAttributes = exports.loggerStorage = exports.ATTR_LOG_PAYLOAD = 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"));
@@ -28,7 +28,6 @@ Object.defineProperty(exports, "PINO_LEVEL_TO_OTEL_SEVERITY", { enumerable: true
 Object.defineProperty(exports, "PINO_LEVEL_TO_NAME", { enumerable: true, get: function () { return logger_config_2.PINO_LEVEL_TO_NAME; } });
 var semantic_conventions_3 = require("./semantic-conventions");
 Object.defineProperty(exports, "ATTR_LOG_MESSAGE", { enumerable: true, get: function () { return semantic_conventions_3.ATTR_LOG_MESSAGE; } });
-Object.defineProperty(exports, "ATTR_LOG_BODY", { enumerable: true, get: function () { return semantic_conventions_3.ATTR_LOG_BODY; } });
 Object.defineProperty(exports, "ATTR_LOG_PAYLOAD", { enumerable: true, get: function () { return semantic_conventions_3.ATTR_LOG_PAYLOAD; } });
 var log_context_1 = require("./log-context");
 Object.defineProperty(exports, "loggerStorage", { enumerable: true, get: function () { return log_context_1.loggerStorage; } });
@@ -83,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');
@@ -118,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();
             },
         }),
@@ -164,7 +164,6 @@ function createOtelStream() {
                     // environment, even if user code accidentally sets a conflicting key.
                     attributes: {
                         ...safeAttributes,
-                        [semantic_conventions_2.ATTR_LOG_BODY]: message,
                         ...lambdaEnvAttributes,
                         ...spanAttributes,
                     },

package/lib/logger/semantic-conventions.d.ts

@@ -5,11 +5,6 @@
  * Attribute key for the log message body.
  */
 export declare const ATTR_LOG_MESSAGE: "contrail.message";
-/**
- * Custom attribute that duplicates the log body so it is available for
- * grouping / filtering in observability UIs that only expose custom attributes.
- */
-export declare const ATTR_LOG_BODY: "contrail.log.body";
 /**
  * Attribute key for user-provided log payload objects.
  */

package/lib/logger/semantic-conventions.js

@@ -3,16 +3,11 @@
  * Log-specific semantic conventions.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ATTR_LOG_PAYLOAD = exports.ATTR_LOG_BODY = exports.ATTR_LOG_MESSAGE = void 0;
+exports.ATTR_LOG_PAYLOAD = exports.ATTR_LOG_MESSAGE = void 0;
 /**
  * Attribute key for the log message body.
  */
 exports.ATTR_LOG_MESSAGE = 'contrail.message';
-/**
- * Custom attribute that duplicates the log body so it is available for
- * grouping / filtering in observability UIs that only expose custom attributes.
- */
-exports.ATTR_LOG_BODY = 'contrail.log.body';
 /**
  * Attribute key for user-provided log payload objects.
  */

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 console.log so we can use it from the pino stdout stream.
+// Lambda treats each console.log() call as a single CloudWatch log event (even with
+// embedded newlines), unlike process.stdout.write() which splits on \n.
+//
+// Guard: app-framework's hijackConsole() replaces console.log with overridenLog,
+// which routes back into pino — using it here would create an infinite loop.
+// We detect that specific replacement by name. Any other replacement (e.g. the
+// OTel Lambda layer's console patch) is safe to use.
+const _capturedConsoleLog = console.log;
+const isAppFrameworkHijack = _capturedConsoleLog.name === 'overridenLog';
+// Wrapped in an object so tests can jest.spyOn(stdoutWriter, 'log') regardless
+// of Jest's console patching strategy (BufferedConsole vs CustomConsole).
+exports.stdoutWriter = {
+    log: isAppFrameworkHijack
+        ? (...args) => process.stdout.write(args.map(String).join(' ') + '\n')
+        : _capturedConsoleLog,
+};

package/package.json

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