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

package/lib/logger/index.js

@@ -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");
@@ -115,7 +115,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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/telemetry",
-  "version": "1.1.0-alpha-refactor-telemetry-1",
+  "version": "2.0.0-dev-telemetry-own-otel-1",
   "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;
-}