@blaxel/telemetry 0.2.0-dev4 → 0.2.0-dev6

package/dist/index.d.ts

@@ -1,3 +1,2 @@
-import { originalLogger, overrideConsole } from "./logger";
 import { blaxelTelemetry } from "./telemetry";
-export { blaxelTelemetry, originalLogger, overrideConsole };
+export { blaxelTelemetry };

package/dist/index.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.overrideConsole = exports.originalLogger = exports.blaxelTelemetry = void 0;
+exports.blaxelTelemetry = void 0;
 const core_1 = require("@blaxel/core");
-const logger_1 = require("./logger");
-Object.defineProperty(exports, "originalLogger", { enumerable: true, get: function () { return logger_1.originalLogger; } });
-Object.defineProperty(exports, "overrideConsole", { enumerable: true, get: function () { return logger_1.overrideConsole; } });
+const json_logger_1 = require("./json_logger");
+const legacy_logger_1 = require("./legacy_logger");
 const telemetry_1 = require("./telemetry");
 Object.defineProperty(exports, "blaxelTelemetry", { enumerable: true, get: function () { return telemetry_1.blaxelTelemetry; } });
 telemetry_1.blaxelTelemetry.initialize();
-if (core_1.env.BL_LEGACY_LOGGER === "true") {
-    (0, logger_1.overrideConsole)();
+if (core_1.env.BL_LOGGER === "legacy") {
+    (0, legacy_logger_1.setLegacyLogger)();
+}
+else if (core_1.env.BL_LOGGER === "json") {
+    (0, json_logger_1.setJsonLogger)();
 }

package/dist/json_logger.d.ts

@@ -0,0 +1,15 @@
+export declare function setJsonLogger(): void;
+export declare const originalLogger: {
+    info: (message?: any, ...optionalParams: any[]) => void;
+    error: (message?: any, ...optionalParams: any[]) => void;
+    warn: (message?: any, ...optionalParams: any[]) => void;
+    debug: (message?: any, ...optionalParams: any[]) => void;
+    log: (message?: any, ...optionalParams: any[]) => void;
+};
+/**
+ * Stringify an object with a limited depth
+ * @param obj The object to stringify
+ * @param maxDepth Maximum depth (default: 1)
+ * @param depth Current depth (internal use)
+ */
+export declare function stringify<T>(obj: T, maxDepth?: number, depth?: number): string;

package/dist/json_logger.js

@@ -0,0 +1,83 @@
+"use strict";
+/* eslint-disable no-console */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.originalLogger = void 0;
+exports.setJsonLogger = setJsonLogger;
+exports.stringify = stringify;
+const api_1 = require("@opentelemetry/api");
+function setJsonLogger() {
+    console.debug = (message, ...args) => {
+        const msg = formatLogMessage("DEBUG", message, args);
+        exports.originalLogger.log(msg);
+    };
+    console.log = (message, ...args) => {
+        const msg = formatLogMessage("INFO", message, args);
+        exports.originalLogger.log(msg);
+    };
+    console.info = (message, ...args) => {
+        const msg = formatLogMessage("INFO", message, args);
+        exports.originalLogger.log(msg);
+    };
+    console.warn = (message, ...args) => {
+        const msg = formatLogMessage("WARN", message, args);
+        exports.originalLogger.log(msg);
+    };
+    console.error = (message, ...args) => {
+        const msg = formatLogMessage("ERROR", message, args);
+        exports.originalLogger.log(msg);
+    };
+}
+exports.originalLogger = {
+    info: console.info,
+    error: console.error,
+    warn: console.warn,
+    debug: console.debug,
+    log: console.log,
+};
+/**
+ * Stringify an object with a limited depth
+ * @param obj The object to stringify
+ * @param maxDepth Maximum depth (default: 1)
+ * @param depth Current depth (internal use)
+ */
+function stringify(obj, maxDepth = 1, depth = 0) {
+    if (obj instanceof Error)
+        return obj.stack || obj.message;
+    if (obj === null)
+        return 'null';
+    if (obj === undefined)
+        return 'undefined';
+    // If we've reached max depth or it's not an object
+    if (depth >= maxDepth || typeof obj !== 'object') {
+        return typeof obj === 'object' ? `[${Array.isArray(obj) ? 'Array' : 'object'}]` :
+            typeof obj === 'string' ? `"${obj}"` : String(obj);
+    }
+    // Handle arrays
+    if (Array.isArray(obj)) {
+        return `[${obj.map(item => stringify(item, maxDepth, depth + 1)).join(', ')}]`;
+    }
+    // Handle objects
+    const pairs = Object.entries(obj).map(([key, val]) => `"${key}": ${stringify(val, maxDepth, depth + 1)}`);
+    return `{${pairs.join(', ')}}`;
+}
+// Format a log message with appropriate color and prefix
+function formatLogMessage(severity, message, args) {
+    const messageStr = typeof message === "string" ? message : stringify(message, 2);
+    const argsStr = args.map(arg => typeof arg === "string" ? arg : stringify(arg, 2)).join(" ");
+    let msg = `${messageStr}${argsStr ? " " + argsStr : ""}`;
+    return JSON.stringify({
+        message: msg,
+        severity,
+        labels: getLabels()
+    });
+}
+function getLabels() {
+    const currentSpan = api_1.trace.getActiveSpan();
+    if (currentSpan) {
+        const { traceId, spanId } = currentSpan.spanContext();
+        return {
+            "trace-id": traceId,
+            "span-id": spanId
+        };
+    }
+}

package/dist/legacy_logger.d.ts

@@ -0,0 +1,15 @@
+export declare function setLegacyLogger(): void;
+export declare const originalLogger: {
+    info: (message?: any, ...optionalParams: any[]) => void;
+    error: (message?: any, ...optionalParams: any[]) => void;
+    warn: (message?: any, ...optionalParams: any[]) => void;
+    debug: (message?: any, ...optionalParams: any[]) => void;
+    log: (message?: any, ...optionalParams: any[]) => void;
+};
+/**
+ * Stringify an object with a limited depth
+ * @param obj The object to stringify
+ * @param maxDepth Maximum depth (default: 1)
+ * @param depth Current depth (internal use)
+ */
+export declare function stringify<T>(obj: T, maxDepth?: number, depth?: number): string;

package/dist/legacy_logger.js

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.originalLogger = void 0;
+exports.setLegacyLogger = setLegacyLogger;
+exports.stringify = stringify;
+/* eslint-disable no-console */
+const api_logs_1 = require("@opentelemetry/api-logs");
+const telemetry_1 = require("./telemetry");
+function setLegacyLogger() {
+    console.debug = (message, ...args) => {
+        const msg = formatLogMessage(message, args);
+        exports.originalLogger.log(msg);
+        emitLogSync(api_logs_1.SeverityNumber.DEBUG, msg);
+    };
+    console.log = (message, ...args) => {
+        const msg = formatLogMessage(message, args);
+        exports.originalLogger.log(msg);
+        emitLogSync(api_logs_1.SeverityNumber.INFO, msg);
+    };
+    console.info = (message, ...args) => {
+        const msg = formatLogMessage(message, args);
+        exports.originalLogger.log(msg);
+        emitLogSync(api_logs_1.SeverityNumber.INFO, msg);
+    };
+    console.error = (message, ...args) => {
+        const msg = formatLogMessage(message, args);
+        exports.originalLogger.log(msg);
+        emitLogSync(api_logs_1.SeverityNumber.ERROR, msg);
+    };
+    console.warn = (message, ...args) => {
+        const msg = formatLogMessage(message, args);
+        exports.originalLogger.log(msg);
+        emitLogSync(api_logs_1.SeverityNumber.WARN, msg);
+    };
+}
+exports.originalLogger = {
+    info: console.info,
+    error: console.error,
+    warn: console.warn,
+    debug: console.debug,
+    log: console.log,
+};
+/**
+ * Stringify an object with a limited depth
+ * @param obj The object to stringify
+ * @param maxDepth Maximum depth (default: 1)
+ * @param depth Current depth (internal use)
+ */
+function stringify(obj, maxDepth = 1, depth = 0) {
+    if (obj instanceof Error)
+        return obj.stack || obj.message;
+    if (obj === null)
+        return 'null';
+    if (obj === undefined)
+        return 'undefined';
+    // If we've reached max depth or it's not an object
+    if (depth >= maxDepth || typeof obj !== 'object') {
+        return typeof obj === 'object' ? `[${Array.isArray(obj) ? 'Array' : 'object'}]` :
+            typeof obj === 'string' ? `"${obj}"` : String(obj);
+    }
+    // Handle arrays
+    if (Array.isArray(obj)) {
+        return `[${obj.map(item => stringify(item, maxDepth, depth + 1)).join(', ')}]`;
+    }
+    // Handle objects
+    const pairs = Object.entries(obj).map(([key, val]) => `"${key}": ${stringify(val, maxDepth, depth + 1)}`);
+    return `{${pairs.join(', ')}}`;
+}
+// Format a log message with appropriate color and prefix
+function formatLogMessage(message, args) {
+    const messageStr = typeof message === "string" ? message : stringify(message, 2);
+    const argsStr = args.map(arg => typeof arg === "string" ? arg : stringify(arg, 2)).join(" ");
+    return `${messageStr}${argsStr ? " " + argsStr : ""}`;
+}
+async function emitLog(severityNumber, message) {
+    const loggerInstance = await telemetry_1.blaxelTelemetry.getLogger();
+    loggerInstance.emit({
+        severityNumber: severityNumber,
+        body: message,
+    });
+}
+function emitLogSync(severityNumber, message) {
+    emitLog(severityNumber, message).catch(() => { });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaxel/telemetry",
-  "version": "0.2.0-dev4",
+  "version": "0.2.0-dev6",
   "description": "Blaxel SDK for TypeScript",
   "license": "MIT",
   "author": "Blaxel, INC (https://blaxel.ai)",
@@ -71,7 +71,7 @@
     "@opentelemetry/sdk-trace-base": "^2.0.0",
     "@opentelemetry/sdk-trace-node": "^2.0.0",
     "ai": "^4.3.13",
-    "@blaxel/core": "0.2.0-dev4"
+    "@blaxel/core": "0.2.0-dev6"
   },
   "devDependencies": {
     "@eslint/js": "^9.26.0",