@blaxel/telemetry 0.2.0-dev5 → 0.2.0-dev7

package/dist/index.js

@@ -7,9 +7,9 @@ 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_LOGGER === "legacy") {
+if (core_1.settings.loggerType === "http") {
     (0, legacy_logger_1.setLegacyLogger)();
 }
-else if (core_1.env.BL_LOGGER === "json") {
+else if (core_1.settings.loggerType === "json") {
     (0, json_logger_1.setJsonLogger)();
 }

package/dist/json_logger.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.originalLogger = void 0;
 exports.setJsonLogger = setJsonLogger;
 exports.stringify = stringify;
-const core_1 = require("@blaxel/core");
+const api_1 = require("@opentelemetry/api");
 function setJsonLogger() {
     console.debug = (message, ...args) => {
         const msg = formatLogMessage("DEBUG", message, args);
@@ -72,9 +72,12 @@ function formatLogMessage(severity, message, args) {
     });
 }
 function getLabels() {
-    return {
-        "blaxel-workspace": core_1.settings.workspace,
-        "blaxel-name": core_1.settings.name,
-        "blaxel-type": core_1.settings.type,
-    };
+    const currentSpan = api_1.trace.getActiveSpan();
+    if (currentSpan) {
+        const { traceId, spanId } = currentSpan.spanContext();
+        return {
+            "trace-id": traceId,
+            "span-id": spanId
+        };
+    }
 }

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) {
@@ -181,6 +182,7 @@ class TelemetryManager {
         });
     }
     instrumentApp() {
+        core_1.telemetryRegistry.registerProvider(new telemetry_provider_1.OtelTelemetryProvider());
         const httpInstrumentation = new instrumentation_http_1.HttpInstrumentation({
             requireParentforOutgoingSpans: true,
         });

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-dev5",
+  "version": "0.2.0-dev7",
   "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-dev5"
+    "@blaxel/core": "0.2.0-dev7"
   },
   "devDependencies": {
     "@eslint/js": "^9.26.0",