@datalayer/core 1.0.15 → 1.0.16

package/lib/otel/auth.d.ts

@@ -0,0 +1,11 @@
+export interface ResolvedOtelAuth {
+    token: string;
+    userUid: string;
+}
+export declare function resolveOtelUserUid(token?: string, userUid?: string): string | null;
+export declare function resolveOtelAuth(token?: string, userUid?: string): ResolvedOtelAuth;
+export declare function buildOtelWebSocketUrl(options: {
+    baseUrl: string;
+    token: string;
+    userUid?: string;
+}): string;

package/lib/otel/auth.js

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2023-2026 Datalayer, Inc.
+ * Distributed under the terms of the Modified BSD License.
+ */
+import { getDatalayerJwtUser, parseJwtPayload } from '../utils/Jwt.js';
+function normalizeBaseUrl(baseUrl) {
+    const normalized = baseUrl.startsWith('ws://') || baseUrl.startsWith('wss://')
+        ? baseUrl.replace(/^ws/, 'http')
+        : baseUrl;
+    return new URL(normalized);
+}
+export function resolveOtelUserUid(token, userUid) {
+    if (typeof userUid === 'string' && userUid.trim().length > 0) {
+        return userUid.trim();
+    }
+    if (!token) {
+        return null;
+    }
+    const user = getDatalayerJwtUser(token);
+    if (user?.uid) {
+        return user.uid;
+    }
+    const payload = parseJwtPayload(token);
+    const sub = payload?.sub;
+    if (typeof sub === 'string' && sub.trim().length > 0) {
+        return sub.trim();
+    }
+    return null;
+}
+export function resolveOtelAuth(token, userUid) {
+    if (!token || token.trim().length === 0) {
+        throw new Error('OTEL requires an authenticated token.');
+    }
+    const resolvedUserUid = resolveOtelUserUid(token, userUid);
+    if (!resolvedUserUid) {
+        throw new Error('OTEL requires datalayer.user_uid. Provide a JWT with user.uid/sub or pass userUid explicitly.');
+    }
+    return {
+        token,
+        userUid: resolvedUserUid,
+    };
+}
+export function buildOtelWebSocketUrl(options) {
+    const auth = resolveOtelAuth(options.token, options.userUid);
+    const url = normalizeBaseUrl(options.baseUrl);
+    const wsProtocol = url.protocol === 'https:' ? 'wss:' : 'ws:';
+    const pathname = url.pathname.replace(/\/$/, '');
+    const hasApiPrefix = pathname.endsWith('/api/otel/v1') || pathname.includes('/api/otel/v1/');
+    url.protocol = wsProtocol;
+    url.pathname = hasApiPrefix ? `${pathname}/ws` : '/api/otel/v1/ws';
+    url.search = '';
+    url.searchParams.set('token', auth.token);
+    url.searchParams.set('user_uid', auth.userUid);
+    return url.toString();
+}

package/lib/otel/client/OtelClient.d.ts

@@ -9,6 +9,8 @@ export interface OtelClientOptions {
     baseUrl?: string;
     /** JWT bearer token or API key for authentication. */
     token?: string;
+    /** Explicit user UID; optional when token contains user.uid/sub. */
+    userUid?: string;
 }
 export interface FetchTracesOptions {
     serviceName?: string;
@@ -37,7 +39,8 @@ export interface FetchMetricTotalOptions {
  */
 export declare class OtelClient {
     private readonly baseUrl;
-    private readonly token?;
+    private readonly token;
+    private readonly userUid;
     constructor(options?: OtelClientOptions);
     /** List recent spans / traces. */
     fetchTraces(options?: FetchTracesOptions): Promise<{

package/lib/otel/client/OtelClient.js

@@ -17,15 +17,16 @@
  * ```
  */
 import { coreStore } from '../../state/substates/CoreState.js';
+import { resolveOtelAuth } from '../auth.js';
 // ── Fetch helper ────────────────────────────────────────────────────────────
-async function otelFetch(url, token, options) {
+async function otelFetch(url, token, userUid, options) {
+    const auth = resolveOtelAuth(token, userUid);
     const headers = {
         Accept: 'application/json',
         'Cache-Control': 'no-store, no-cache, must-revalidate',
     };
-    if (token) {
-        headers['Authorization'] = `Bearer ${token}`;
-    }
+    headers['Authorization'] = `Bearer ${auth.token}`;
+    headers['X-Datalayer-User-Uid'] = auth.userUid;
     if (options?.body) {
         headers['Content-Type'] = 'application/json';
     }
@@ -76,6 +77,18 @@ function parseMetricTimestamp(raw) {
     return new Date(numeric).toISOString();
 }
 function normalizeMetric(raw) {
+    // Preserve the raw nanosecond timestamp for time-series charts.
+    let timestampUnixNano;
+    const rawNano = raw.timestamp_unix_nano;
+    if (typeof rawNano === 'number' && rawNano > 0) {
+        timestampUnixNano = rawNano;
+    }
+    else if (typeof rawNano === 'string') {
+        const parsed = Number(rawNano);
+        if (Number.isFinite(parsed) && parsed > 0) {
+            timestampUnixNano = parsed;
+        }
+    }
     return {
         metric_name: String(raw.metric_name ?? raw.MetricName ?? raw.name ?? raw.Name ?? ''),
         service_name: String(raw.service_name ?? raw.ServiceName ?? ''),
@@ -90,6 +103,7 @@ function normalizeMetric(raw) {
                         ? String(raw.Unit)
                         : undefined,
         timestamp: parseMetricTimestamp(raw),
+        timestamp_unix_nano: timestampUnixNano,
         metric_type: raw.metric_type != null
             ? String(raw.metric_type)
             : raw.MetricType != null
@@ -109,10 +123,13 @@ function normalizeMetric(raw) {
 export class OtelClient {
     baseUrl;
     token;
+    userUid;
     constructor(options = {}) {
         this.baseUrl =
             options.baseUrl ?? coreStore.getState().configuration.otelRunUrl;
-        this.token = options.token;
+        const auth = resolveOtelAuth(options.token, options.userUid);
+        this.token = auth.token;
+        this.userUid = auth.userUid;
     }
     // ── Traces ────────────────────────────────────────────────────────────────
     /** List recent spans / traces. */
@@ -120,13 +137,13 @@ export class OtelClient {
         const params = new URLSearchParams({ limit: String(options.limit ?? 50) });
         if (options.serviceName)
             params.set('service_name', options.serviceName);
-        const resp = await otelFetch(`${this.baseUrl}/api/otel/v1/traces/?${params}`, this.token);
+        const resp = await otelFetch(`${this.baseUrl}/api/otel/v1/traces/?${params}`, this.token, this.userUid);
         const rows = (Array.isArray(resp) ? resp : resp.data) ?? [];
         return { data: rows, count: rows.length };
     }
     /** Fetch all spans for a single trace by `traceId`. */
     async fetchTrace(traceId) {
-        const resp = await otelFetch(`${this.baseUrl}/api/otel/v1/traces/${traceId}`, this.token);
+        const resp = await otelFetch(`${this.baseUrl}/api/otel/v1/traces/${traceId}`, this.token, this.userUid);
         const rows = (Array.isArray(resp) ? resp : resp.data) ?? [];
         return { data: rows };
     }
@@ -140,7 +157,7 @@ export class OtelClient {
             params.set('severity', options.severity);
         if (options.traceId)
             params.set('trace_id', options.traceId);
-        const resp = await otelFetch(`${this.baseUrl}/api/otel/v1/logs/?${params}`, this.token);
+        const resp = await otelFetch(`${this.baseUrl}/api/otel/v1/logs/?${params}`, this.token, this.userUid);
         const rows = (Array.isArray(resp) ? resp : resp.data) ?? [];
         return { data: rows, count: rows.length };
     }
@@ -152,7 +169,7 @@ export class OtelClient {
             params.set('service_name', options.serviceName);
         if (options.metricName)
             params.set('metric_name', options.metricName);
-        const resp = await otelFetch(`${this.baseUrl}/api/otel/v1/metrics/?${params}`, this.token);
+        const resp = await otelFetch(`${this.baseUrl}/api/otel/v1/metrics/?${params}`, this.token, this.userUid);
         const rows = (Array.isArray(resp) ? resp : resp.data) ?? [];
         const normalized = Array.isArray(rows)
             ? rows.map(row => normalizeMetric(row))
@@ -177,7 +194,7 @@ export class OtelClient {
     // ── Services ──────────────────────────────────────────────────────────────
     /** List known service names observed in traces. */
     async fetchServices() {
-        const resp = await otelFetch(`${this.baseUrl}/api/otel/v1/traces/services/list`, this.token);
+        const resp = await otelFetch(`${this.baseUrl}/api/otel/v1/traces/services/list`, this.token, this.userUid);
         if (Array.isArray(resp))
             return resp;
         const byServices = resp.services;
@@ -192,7 +209,7 @@ export class OtelClient {
     // ── Stats ─────────────────────────────────────────────────────────────────
     /** Fetch storage / ingestion statistics. */
     async fetchStats() {
-        return otelFetch(`${this.baseUrl}/api/otel/v1/stats/`, this.token);
+        return otelFetch(`${this.baseUrl}/api/otel/v1/stats/`, this.token, this.userUid);
     }
     // ── SQL query ─────────────────────────────────────────────────────────────
     /**
@@ -201,7 +218,7 @@ export class OtelClient {
      * Available tables: `spans`, `logs`, `metrics`.
      */
     async executeQuery(sql) {
-        return otelFetch(`${this.baseUrl}/api/otel/v1/query/`, this.token, { method: 'POST', body: { sql } });
+        return otelFetch(`${this.baseUrl}/api/otel/v1/query/`, this.token, this.userUid, { method: 'POST', body: { sql } });
     }
     // ── System ────────────────────────────────────────────────────────────────
     /**
@@ -210,7 +227,7 @@ export class OtelClient {
      * Returns process memory/CPU, disk usage, and per-table row counts.
      */
     async fetchSystem() {
-        const resp = await otelFetch(`${this.baseUrl}/api/otel/v1/system/`, this.token);
+        const resp = await otelFetch(`${this.baseUrl}/api/otel/v1/system/`, this.token, this.userUid);
         return (resp.data ?? resp);
     }
 }

package/lib/otel/hooks/index.d.ts

@@ -173,6 +173,8 @@ export declare function useOtelWebSocket(options: {
     baseUrl?: string;
     /** JWT token or API key for authentication. */
     token?: string;
+    /** Explicit user UID; optional when token contains user.uid/sub. */
+    userUid?: string;
     /** Whether to automatically reconnect on disconnect. Default true. */
     autoReconnect?: boolean;
     /** Reconnect delay in ms. Default 3000. */

package/lib/otel/hooks/index.js

@@ -9,6 +9,7 @@
  */
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { coreStore } from '../../state/substates/CoreState.js';
+import { buildOtelWebSocketUrl, resolveOtelAuth } from '../auth.js';
 // ── Global 401 handler ──────────────────────────────────────────────
 let _onUnauthorized = null;
 /**
@@ -35,14 +36,14 @@ export function setOtelOnUnauthorized(cb) {
  * handler has been registered via {@link setOtelOnUnauthorized}, the
  * handler is called before the error is thrown.
  */
-async function otelFetch(url, token, options) {
+async function otelFetch(url, token, userUid, options) {
+    const auth = resolveOtelAuth(token, userUid);
     const headers = {
         Accept: 'application/json',
         'Cache-Control': 'no-store, no-cache, must-revalidate',
     };
-    if (token) {
-        headers['Authorization'] = `Bearer ${token}`;
-    }
+    headers['Authorization'] = `Bearer ${auth.token}`;
+    headers['X-Datalayer-User-Uid'] = auth.userUid;
     const isPost = options?.method === 'POST';
     if (isPost) {
         headers['Content-Type'] = 'application/json';
@@ -407,7 +408,7 @@ export function useOtelQuery(options) {
         setLoading(true);
         setError(null);
         try {
-            const data = await otelFetch(`${baseUrl}/api/otel/v1/query/`, token, {
+            const data = await otelFetch(`${baseUrl}/api/otel/v1/query/`, token, undefined, {
                 method: 'POST',
                 body: { sql },
             });
@@ -436,7 +437,7 @@ export function useOtelQuery(options) {
  * @returns `{ connected, error, close }` – reactive connection state.
  */
 export function useOtelWebSocket(options) {
-    const { baseUrl = coreStore.getState().configuration.otelRunUrl, token, autoReconnect = true, reconnectDelayMs = 3000, callbacks, } = options;
+    const { baseUrl = coreStore.getState().configuration.otelRunUrl, token, userUid, autoReconnect = true, reconnectDelayMs = 3000, callbacks, } = options;
     const [connected, setConnected] = useState(false);
     const [error, setError] = useState(null);
     const wsRef = useRef(null);
@@ -459,23 +460,19 @@ export function useOtelWebSocket(options) {
             setConnected(false);
             return;
         }
-        // Derive ws(s):// URL from http(s):// baseUrl.
         let wsUrl;
-        if (baseUrl.startsWith('http://')) {
-            wsUrl = `ws://${baseUrl.slice(7)}`;
-        }
-        else if (baseUrl.startsWith('https://')) {
-            wsUrl = `wss://${baseUrl.slice(8)}`;
-        }
-        else if (baseUrl.startsWith('ws://') || baseUrl.startsWith('wss://')) {
-            wsUrl = baseUrl;
+        try {
+            wsUrl = buildOtelWebSocketUrl({
+                baseUrl,
+                token,
+                userUid,
+            });
         }
-        else {
-            // Relative URL – use current page's protocol.
-            const proto = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
-            wsUrl = `${proto}//${window.location.host}${baseUrl}`;
+        catch (err) {
+            setError(err?.message ?? 'WebSocket auth error');
+            setConnected(false);
+            return;
         }
-        wsUrl = `${wsUrl.replace(/\/$/, '')}/api/otel/v1/ws?token=${encodeURIComponent(token)}`;
         function connect() {
             const ws = new WebSocket(wsUrl);
             wsRef.current = ws;
@@ -527,6 +524,6 @@ export function useOtelWebSocket(options) {
                 wsRef.current = null;
             }
         };
-    }, [baseUrl, token, autoReconnect, reconnectDelayMs]);
+    }, [baseUrl, token, userUid, autoReconnect, reconnectDelayMs]);
     return { connected, error, close };
 }

package/lib/otel/index.d.ts

@@ -13,6 +13,8 @@
  */
 export type { OtelSpan, OtelLog, OtelMetric, OtelSpanEvent, OtelSpanLink, SignalType, OtelLiveProps, OtelTracesListProps, OtelSpanDetailProps, OtelTimelineProps, OtelLogsListProps, OtelMetricsListProps, OtelSpanTreeProps, OtelSearchBarProps, OtelTimelineRangeSliderProps, OtelQueryRow, OtelQueryResult, } from './types';
 export { toMs, formatDuration, formatTime, serviceColor, kindColor, severityColor, severityVariant, buildSpanTree, flattenSpanTree, } from './utils';
+export { resolveOtelAuth, resolveOtelUserUid, buildOtelWebSocketUrl, } from './auth';
+export type { ResolvedOtelAuth } from './auth';
 export { useOtelTraces, useOtelTrace, useOtelLogs, useOtelMetrics, useOtelServices, useOtelStats, useOtelQuery, useOtelSystem, useOtelWebSocket, setOtelOnUnauthorized, } from './hooks';
 export type { OtelWsMessage, OtelWsCallbacks, OtelSystemData, OtelSystemProcess, OtelSystemDisk, OtelSystemTable, } from './hooks';
 export { OtelClient, createOtelClient } from './client';

package/lib/otel/index.js

@@ -4,6 +4,8 @@
  */
 // ── Utils ─────────────────────────────────────────────────────────────────────
 export { toMs, formatDuration, formatTime, serviceColor, kindColor, severityColor, severityVariant, buildSpanTree, flattenSpanTree, } from './utils.js';
+// ── Auth helpers ──────────────────────────────────────────────────────────────
+export { resolveOtelAuth, resolveOtelUserUid, buildOtelWebSocketUrl, } from './auth.js';
 // ── Hooks ─────────────────────────────────────────────────────────────────────
 export { useOtelTraces, useOtelTrace, useOtelLogs, useOtelMetrics, useOtelServices, useOtelStats, useOtelQuery, useOtelSystem, useOtelWebSocket, setOtelOnUnauthorized, } from './hooks/index.js';
 // ── Client ────────────────────────────────────────────────────────────────────

package/lib/otel/types.d.ts

@@ -55,6 +55,8 @@ export interface OtelMetric {
     value: number;
     unit?: string;
     timestamp: string;
+    /** Raw nanosecond timestamp preserved from the backend. */
+    timestamp_unix_nano?: number;
     attributes?: Record<string, unknown>;
     metric_type?: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datalayer/core",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "type": "module",
   "workspaces": [
     ".",