@blaxel/telemetry 0.2.0-dev2 → 0.2.0-dev20

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,8 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.originalLogger = exports.blaxelTelemetry = void 0;
-const logger_1 = require("./logger");
-Object.defineProperty(exports, "originalLogger", { enumerable: true, get: function () { return logger_1.originalLogger; } });
+exports.blaxelTelemetry = void 0;
+const core_1 = require("@blaxel/core");
+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.settings.loggerType === "http") {
+    (0, legacy_logger_1.setLegacyLogger)();
+}
+else if (core_1.settings.loggerType === "json") {
+    (0, json_logger_1.setJsonLogger)();
+}

package/dist/json_logger.d.ts

@@ -0,0 +1,8 @@
+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;
+};

package/dist/json_logger.js

@@ -0,0 +1,57 @@
+"use strict";
+/* eslint-disable no-console */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.originalLogger = void 0;
+exports.setJsonLogger = setJsonLogger;
+const core_1 = require("@blaxel/core");
+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,
+};
+// Format a log message with appropriate color and prefix
+function formatLogMessage(severity, message, args) {
+    const messageStr = typeof message === "string" ? message : (0, core_1.stringify)(message, 2);
+    const argsStr = args.map(arg => typeof arg === "string" ? arg : (0, core_1.stringify)(arg, 2)).join(" ");
+    let msg = `${messageStr}${argsStr ? " " + argsStr : ""}`;
+    const logEntry = {
+        message: msg,
+        severity
+    };
+    const currentSpan = api_1.trace.getActiveSpan();
+    if (currentSpan) {
+        const { traceId, spanId } = currentSpan.spanContext();
+        const traceIdName = core_1.env.BL_LOGGER_TRACE_ID || 'trace_id';
+        const spanIdName = core_1.env.BL_LOGGER_SPAN_ID || 'span_id';
+        const traceIdPrefix = core_1.env.BL_LOGGER_TRACE_ID_PREFIX || '';
+        const spanIdPrefix = core_1.env.BL_LOGGER_SPAN_ID_PREFIX || '';
+        logEntry[traceIdName] = `${traceIdPrefix}${traceId}`;
+        logEntry[spanIdName] = `${spanIdPrefix}${spanId}`;
+    }
+    return JSON.stringify(logEntry);
+}

package/dist/legacy_logger.d.ts

@@ -0,0 +1,8 @@
+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;
+};

package/dist/legacy_logger.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.originalLogger = void 0;
+exports.setLegacyLogger = setLegacyLogger;
+/* eslint-disable no-console */
+const core_1 = require("@blaxel/core");
+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,
+};
+// Format a log message with appropriate color and prefix
+function formatLogMessage(message, args) {
+    const messageStr = typeof message === "string" ? message : (0, core_1.stringify)(message, 2);
+    const argsStr = args.map(arg => typeof arg === "string" ? arg : (0, core_1.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/dist/logger.d.ts

@@ -1,3 +1,4 @@
+export declare function overrideConsole(): void;
 export declare const originalLogger: {
     info: (message?: any, ...optionalParams: any[]) => void;
     error: (message?: any, ...optionalParams: any[]) => void;

package/dist/logger.js

@@ -1,10 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.originalLogger = void 0;
+exports.overrideConsole = overrideConsole;
 exports.stringify = stringify;
 /* eslint-disable no-console */
 const api_logs_1 = require("@opentelemetry/api-logs");
 const telemetry_1 = require("./telemetry");
+function overrideConsole() {
+    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,
@@ -54,28 +82,3 @@ async function emitLog(severityNumber, message) {
 function emitLogSync(severityNumber, message) {
     emitLog(severityNumber, message).catch(() => { });
 }
-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);
-};

package/dist/telemetry.d.ts

@@ -43,7 +43,7 @@ declare class TelemetryManager {
     /**
      * Get resource attributes for OpenTelemetry.
      */
-    getResourceAttributes(): Promise<Record<string, string>>;
+    get resourceAttributes(): Record<string, string>;
     /**
      * Initialize and return the OTLP Metric Exporter.
      */
@@ -57,7 +57,7 @@ declare class TelemetryManager {
      */
     getLogExporter(): OTLPLogExporter;
     instrumentApp(): void;
-    setExporters(): Promise<void>;
+    setExporters(): void;
     shutdownApp(): Promise<void>;
 }
 export declare const blaxelTelemetry: TelemetryManager;

package/dist/telemetry.js

@@ -14,6 +14,7 @@ const resources_1 = require("@opentelemetry/resources");
 const sdk_logs_1 = require("@opentelemetry/sdk-logs");
 const sdk_metrics_1 = require("@opentelemetry/sdk-metrics");
 const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
+const telemetry_provider_1 = require("./telemetry_provider");
 class BlaxelResource {
     attributes;
     constructor(attributes) {
@@ -82,7 +83,7 @@ class TelemetryManager {
         this.setupSignalHandler();
         this.initialized = true;
         this.setConfiguration().catch((error) => {
-            console.error("Error setting configuration:", error);
+            core_1.logger.error("Error setting configuration:", error);
         });
     }
     async setConfiguration() {
@@ -90,9 +91,9 @@ class TelemetryManager {
             return;
         }
         await (0, core_1.authenticate)();
-        await this.setExporters();
+        this.setExporters();
         this.otelLogger = api_logs_1.logs.getLogger("blaxel");
-        console.debug("Telemetry ready");
+        core_1.logger.debug("Telemetry ready");
         this.configured = true;
     }
     get enabled() {
@@ -121,12 +122,9 @@ class TelemetryManager {
     setupSignalHandler() {
         const signals = ["SIGINT", "SIGTERM", "uncaughtException", "exit"];
         for (const signal of signals) {
-            process.on(signal, (error) => {
-                if (signal !== "exit") {
-                    core_1.logger.error(error.stack);
-                }
+            process.on(signal, () => {
                 this.shutdownApp().catch((error) => {
-                    console.debug("Fatal error during shutdown:", error);
+                    core_1.logger.debug("Fatal error during shutdown:", error);
                     process.exit(0);
                 });
             });
@@ -135,8 +133,8 @@ class TelemetryManager {
     /**
      * Get resource attributes for OpenTelemetry.
      */
-    async getResourceAttributes() {
-        const resource = await resources_1.envDetector.detect();
+    get resourceAttributes() {
+        const resource = resources_1.envDetector.detect();
         const attributes = resource.attributes || {};
         if (core_1.settings.name) {
             attributes["service.name"] = core_1.settings.name;
@@ -181,6 +179,7 @@ class TelemetryManager {
         });
     }
     instrumentApp() {
+        core_1.telemetryRegistry.registerProvider(new telemetry_provider_1.OtelTelemetryProvider());
         const httpInstrumentation = new instrumentation_http_1.HttpInstrumentation({
             requireParentforOutgoingSpans: true,
         });
@@ -188,8 +187,8 @@ class TelemetryManager {
             instrumentations: [httpInstrumentation],
         });
     }
-    async setExporters() {
-        const resource = new BlaxelResource(await this.getResourceAttributes());
+    setExporters() {
+        const resource = new BlaxelResource(this.resourceAttributes);
         const logExporter = this.getLogExporter();
         this.loggerProvider = new sdk_logs_1.LoggerProvider({
             resource,
@@ -234,28 +233,28 @@ class TelemetryManager {
             if (this.nodeTracerProvider) {
                 shutdownPromises.push(this.nodeTracerProvider
                     .shutdown()
-                    .catch((error) => console.debug("Error shutting down tracer provider:", error)));
+                    .catch((error) => core_1.logger.debug("Error shutting down tracer provider:", error)));
             }
             if (this.meterProvider) {
                 shutdownPromises.push(this.meterProvider
                     .shutdown()
-                    .catch((error) => console.debug("Error shutting down meter provider:", error)));
+                    .catch((error) => core_1.logger.debug("Error shutting down meter provider:", error)));
             }
             if (this.loggerProvider) {
                 shutdownPromises.push(this.loggerProvider
                     .shutdown()
-                    .catch((error) => console.debug("Error shutting down logger provider:", error)));
+                    .catch((error) => core_1.logger.debug("Error shutting down logger provider:", error)));
             }
             // Wait for all providers to shutdown with a timeout
             await Promise.race([
                 Promise.all(shutdownPromises),
                 new Promise((resolve) => setTimeout(resolve, 5000)), // 5 second timeout
             ]);
-            console.debug("Instrumentation shutdown complete");
+            core_1.logger.debug("Instrumentation shutdown complete");
             process.exit(0);
         }
         catch (error) {
-            console.error("Error during shutdown:", error);
+            core_1.logger.error("Error during shutdown:", error);
             process.exit(1);
         }
     }

package/dist/telemetry_provider.d.ts

@@ -0,0 +1,4 @@
+import { BlaxelSpan, BlaxelSpanOptions, BlaxelTelemetryProvider } from "@blaxel/core";
+export declare class OtelTelemetryProvider implements BlaxelTelemetryProvider {
+    startSpan(name: string, options?: BlaxelSpanOptions): BlaxelSpan;
+}

package/dist/telemetry_provider.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OtelTelemetryProvider = void 0;
+const api_1 = require("@opentelemetry/api");
+class OtelSpan {
+    span;
+    constructor(span) {
+        this.span = span;
+    }
+    setAttribute(key, value) {
+        this.span.setAttribute(key, value);
+    }
+    setAttributes(attributes) {
+        Object.entries(attributes).forEach(([k, v]) => this.span.setAttribute(k, v));
+    }
+    recordException(error) {
+        this.span.recordException(error);
+        this.span.setStatus({ code: api_1.SpanStatusCode.ERROR, message: error.message });
+    }
+    setStatus(status, message) {
+        this.span.setStatus({
+            code: status === 'ok' ? api_1.SpanStatusCode.OK : api_1.SpanStatusCode.ERROR,
+            message,
+        });
+    }
+    end() {
+        this.span.end();
+    }
+    getContext() {
+        return this.span.spanContext();
+    }
+}
+class OtelTelemetryProvider {
+    startSpan(name, options) {
+        // Use the tracer from the registered NodeTracerProvider
+        const tracer = api_1.trace.getTracer("blaxel");
+        // Prepare OpenTelemetry span options
+        const otelOptions = {
+            attributes: options?.attributes,
+            root: options?.isRoot,
+        };
+        // Handle parent context if provided
+        let ctx = api_1.context.active();
+        if (options?.parentContext) {
+            ctx = options.parentContext;
+        }
+        // Start the span
+        const span = tracer.startSpan(name, otelOptions, ctx);
+        return new OtelSpan(span);
+    }
+}
+exports.OtelTelemetryProvider = OtelTelemetryProvider;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaxel/telemetry",
-  "version": "0.2.0-dev2",
+  "version": "0.2.0-dev20",
   "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-dev2"
+    "@blaxel/core": "0.2.0-dev20"
   },
   "devDependencies": {
     "@eslint/js": "^9.26.0",
@@ -81,6 +81,7 @@
   },
   "scripts": {
     "build": "tsc",
+    "dev": "tsc --watch",
     "lint": "eslint src/"
   }
 }