@contrail/telemetry 1.1.0-alpha-refactor-telemetry-3 → 2.0.0-dev-telemetry-own-otel-2

package/lib/logger/index.d.ts

@@ -2,8 +2,9 @@ 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_PAYLOAD } from './semantic-conventions';
+export { loggerStorage, withLogContext } from './log-context';
 export declare const baseLogger: pino.Logger<never, boolean>;
-export declare const logger: pino.Logger<never, boolean>;
+export declare const logger: pino.Logger;
 /**
  * Add a stream destination to the logger's multistream.
  * Use this to wire additional log sinks (e.g. InMemoryLogStream in app-framework).

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.ATTR_LOG_PAYLOAD = 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.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"));
@@ -16,7 +16,7 @@ const resources_1 = require("@opentelemetry/resources");
 const api_1 = require("@opentelemetry/api");
 const stream_1 = require("stream");
 const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
-const flatten_object_1 = require("./flatten-object");
+const util_1 = require("@contrail/util");
 const logger_config_1 = require("./logger-config");
 const parse_otel_resource_attributes_1 = require("./parse-otel-resource-attributes");
 const semantic_conventions_2 = require("./semantic-conventions");
@@ -29,6 +29,9 @@ Object.defineProperty(exports, "PINO_LEVEL_TO_NAME", { enumerable: true, get: fu
 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_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; } });
+Object.defineProperty(exports, "withLogContext", { enumerable: true, get: function () { return log_context_1.withLogContext; } });
 // --- Environment & Resource Setup ---
 const semantic_conventions_4 = require("../semantic-conventions");
 const LAMBDA_ENV_OTEL_ATTRIBUTES = getLambdaEnvAttributes();
@@ -115,7 +118,7 @@ function createOtelStream() {
                 const lambdaEnvAttributes = LAMBDA_ENV_OTEL_ATTRIBUTES;
                 let safeAttributes;
                 try {
-                    safeAttributes = (0, flatten_object_1.flattenObject)(attributes);
+                    safeAttributes = util_1.ObjectUtil.flattenObject(attributes);
                 }
                 catch {
                     // Fallback in case flattening fails somehow. This is not expected.
@@ -230,7 +233,8 @@ exports.baseLogger = (0, pino_1.default)({
         [semantic_conventions_1.ATTR_SERVICE_VERSION]: serviceVersion,
     },
 }, pino_1.default.multistream(buildPinoStreams()));
-exports.logger = exports.baseLogger;
+const log_context_2 = require("./log-context");
+exports.logger = (0, log_context_2.createContextAwareLogger)(exports.baseLogger);
 // --- Public API ---
 /**
  * Add a stream destination to the logger's multistream.

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

@@ -0,0 +1,5 @@
+import { AsyncLocalStorage } from 'async_hooks';
+import type { Logger } from 'pino';
+export declare const loggerStorage: AsyncLocalStorage<Logger>;
+export declare function createContextAwareLogger(baseLogger: Logger): Logger;
+export declare function withLogContext<T>(fields: Record<string, unknown>, fn: () => T): T;

package/lib/logger/log-context.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loggerStorage = void 0;
+exports.createContextAwareLogger = createContextAwareLogger;
+exports.withLogContext = withLogContext;
+const async_hooks_1 = require("async_hooks");
+exports.loggerStorage = new async_hooks_1.AsyncLocalStorage();
+let _baseLogger;
+function createContextAwareLogger(baseLogger) {
+    _baseLogger = baseLogger;
+    return new Proxy(baseLogger, {
+        get(target, prop, receiver) {
+            var _a;
+            const currentLogger = (_a = exports.loggerStorage.getStore()) !== null && _a !== void 0 ? _a : target;
+            return Reflect.get(currentLogger, prop, receiver);
+        },
+    });
+}
+function withLogContext(fields, fn) {
+    var _a;
+    const parent = (_a = exports.loggerStorage.getStore()) !== null && _a !== void 0 ? _a : _baseLogger;
+    const child = parent.child(fields);
+    return exports.loggerStorage.run(child, fn);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/telemetry",
-  "version": "1.1.0-alpha-refactor-telemetry-3",
+  "version": "2.0.0-dev-telemetry-own-otel-2",
   "description": "Telemetry and monitoring utilities for contrail services",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -15,6 +15,7 @@
   "license": "ISC",
   "dependencies": {
     "@codegenie/serverless-express": "^4.16.0",
+    "@contrail/util": "^1.2.1",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/api-logs": "^0.211.0",
     "@opentelemetry/core": "^2.5.0",
@@ -34,7 +35,7 @@
     }
   },
   "devDependencies": {
-    "@types/aws-lambda": "^8.10.161",
+    "@types/aws-lambda": "^8.10.145",
     "@types/jest": "^29.5.2",
     "@types/node": "^20.0.0",
     "jest": "^29.5.0",

package/lib/logger/flatten-object.d.ts

@@ -1,4 +0,0 @@
-type PrimitiveValue = string | number | boolean;
-type FlattenedObject = Record<string, PrimitiveValue>;
-export declare function flattenObject(obj: Record<string, unknown>): FlattenedObject;
-export {};

package/lib/logger/flatten-object.js

@@ -1,60 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.flattenObject = flattenObject;
-const MAX_DEPTH = 10;
-function flattenObject(obj) {
-    const seen = new WeakSet();
-    return flattenRecursive(obj, '', seen, 0);
-}
-function flattenRecursive(obj, prefix, ancestors, depth) {
-    const result = {};
-    if (depth > MAX_DEPTH) {
-        result[prefix || 'value'] = '[max depth exceeded]';
-        return result;
-    }
-    ancestors.add(obj);
-    for (const [key, value] of Object.entries(obj)) {
-        const fullKey = prefix ? `${prefix}.${key}` : key;
-        if (value === null || value === undefined) {
-            continue;
-        }
-        if (typeof value === 'object') {
-            if (ancestors.has(value)) {
-                result[fullKey] = '[circular reference]';
-                continue;
-            }
-            if (Array.isArray(value)) {
-                result[fullKey] = JSON.stringify(value);
-            }
-            else if (value instanceof Date) {
-                result[fullKey] = value.toISOString();
-            }
-            else if (value instanceof Error) {
-                result[fullKey] = value.message;
-                if (value.stack) {
-                    result[`${fullKey}.stack`] = value.stack;
-                }
-            }
-            else {
-                Object.assign(result, flattenRecursive(value, fullKey, ancestors, depth + 1));
-            }
-        }
-        else if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
-            result[fullKey] = value;
-        }
-        else if (typeof value === 'bigint') {
-            result[fullKey] = value.toString();
-        }
-        else if (typeof value === 'symbol') {
-            result[fullKey] = value.toString();
-        }
-        else if (typeof value === 'function') {
-            result[fullKey] = '[function]';
-        }
-        else {
-            result[fullKey] = String(value);
-        }
-    }
-    ancestors.delete(obj);
-    return result;
-}