@lark-apaas/observable-web 1.0.1-alpha.4 → 1.0.1-alpha.6

package/dist/index.d.ts

@@ -12,6 +12,7 @@ interface WebSdkConfig {
         log: string;
         metric: string;
         trace: string;
+        time?: string;
     };
     headers?: Record<string, string>;
 }
@@ -27,6 +28,7 @@ declare class WebObservableSdk {
     private config;
     private isStarted;
     static EmptySpan: Span;
+    static timeOffset: number;
     constructor();
     static get instance(): WebObservableSdk;
     start(config: WebSdkConfig): void;
@@ -34,12 +36,15 @@ declare class WebObservableSdk {
     private initMetrics;
     private initTraces;
     private initAutoPv;
+    static adjustHrTime(hrTime: [number, number]): [number, number];
+    private initTimeOffset;
     private flushData;
     private registerLifecycleListeners;
+    static getCalibratedDate(): Date;
     log(level: 'INFO' | 'ERROR' | 'WARN', message: string, attributes?: Record<string, any>, span?: Span): void;
     addCount(name: string, value?: number, attributes?: Record<string, any>): void;
     startSpan(name: string, options?: SpanOptions, spanContext?: Context): Span | undefined;
-    trace<T>(name: string, fn: (span: Span) => Promise<T>, options?: SpanOptions, spanContext?: Context): Promise<T>;
+    trace<T>(name: string, fn: (span: Span) => Promise<T>, options?: SpanOptions, span?: Span): Promise<T>;
     shutdown(): Promise<void>;
 }
 declare const observable: WebObservableSdk;

package/dist/index.js

@@ -1,5 +1,7 @@
 'use strict';
 
+require('zone.js');
+var contextZone = require('@opentelemetry/context-zone');
 var resources = require('@opentelemetry/resources');
 var sdkLogs = require('@opentelemetry/sdk-logs');
 var sdkMetrics = require('@opentelemetry/sdk-metrics');
@@ -766,10 +768,10 @@ var TraceAPI = (
       }
       return this._instance;
     };
-    TraceAPI2.prototype.setGlobalTracerProvider = function(provider) {
+    TraceAPI2.prototype.setGlobalTracerProvider = function(provider2) {
       var success = registerGlobal(API_NAME3, this._proxyTracerProvider, DiagAPI.instance());
       if (success) {
-        this._proxyTracerProvider.setDelegate(provider);
+        this._proxyTracerProvider.setDelegate(provider2);
       }
       return success;
     };
@@ -792,7 +794,7 @@ var trace = TraceAPI.getInstance();
 
 // package.json
 var package_default = {
-  version: "1.0.1-alpha.3"};
+  version: "1.0.1-alpha.6"};
 
 // src/const.ts
 var defaultResourceAttr = {
@@ -971,8 +973,8 @@ var CustomWebMetricExporter = class {
   transformNumberDataPoints(dataPoints) {
     return dataPoints.map((dp) => ({
       attributes: __spreadValues(__spreadValues({}, convertAttributesToString(dp.attributes)), getDefaultAttr()),
-      startTimeUnixNano: hrTimeToNanosNumber(dp.startTime),
-      timeUnixNano: hrTimeToNanosNumber(dp.endTime),
+      startTimeUnixNano: hrTimeToNanosNumber(WebObservableSdk.adjustHrTime(dp.startTime)),
+      timeUnixNano: hrTimeToNanosNumber(WebObservableSdk.adjustHrTime(dp.endTime)),
       // JS 中所有数字都是双精度浮点数，默认映射到 asDouble
       // 如果需要 asInt，需要自行判断 Number.isInteger(dp.value)
       asDouble: dp.value
@@ -1111,8 +1113,8 @@ var CustomWebLogExporter = class {
       logRecords: logs.map((log) => {
         var _a, _b, _c;
         return {
-          timeUnixNano: hrTimeToNanosNumber(log.hrTime),
-          observedTimeUnixNano: hrTimeToNanosNumber(log.hrTimeObserved),
+          timeUnixNano: hrTimeToNanosNumber(WebObservableSdk.adjustHrTime(log.hrTime)),
+          observedTimeUnixNano: hrTimeToNanosNumber(WebObservableSdk.adjustHrTime(log.hrTimeObserved)),
           severityNumber: log.severityNumber,
           severityText: log.severityText,
           body: log.body,
@@ -1198,8 +1200,8 @@ var CustomWebTraceExporter = class {
         parentSpanID: (_a = span.parentSpanContext) == null ? void 0 : _a.spanId,
         name: span.name,
         kind: span.kind,
-        startTimeUnixNano: hrTimeToNanosNumber(span.startTime),
-        endTimeUnixNano: hrTimeToNanosNumber(span.endTime),
+        startTimeUnixNano: hrTimeToNanosNumber(WebObservableSdk.adjustHrTime(span.startTime)),
+        endTimeUnixNano: hrTimeToNanosNumber(WebObservableSdk.adjustHrTime(span.endTime)),
         attributes: __spreadValues(__spreadValues({}, convertAttributesToString(span.attributes)), getDefaultAttr()),
         status: {
           code: span.status.code,
@@ -1210,7 +1212,7 @@ var CustomWebTraceExporter = class {
         events: span.events.map((event) => {
           var _a2;
           return {
-            timeUnixNano: hrTimeToNanosNumber(event.time),
+            timeUnixNano: hrTimeToNanosNumber(WebObservableSdk.adjustHrTime(event.time)),
             name: event.name,
             attributes: convertAttributesToString((_a2 = event.attributes) != null ? _a2 : {}),
             droppedAttributesCount: event.droppedAttributesCount
@@ -1272,6 +1274,10 @@ var CustomWebTraceExporter = class {
 };
 
 // src/core/sdk.ts
+var provider = new sdkTraceWeb.WebTracerProvider();
+provider.register({
+  contextManager: new contextZone.ZoneContextManager()
+});
 var _WebObservableSdk = class _WebObservableSdk {
   constructor() {
     this.isStarted = false;
@@ -1285,6 +1291,7 @@ var _WebObservableSdk = class _WebObservableSdk {
   start(config) {
     if (this.isStarted || config.env === "preview" /* Dev */) return;
     this.config = config;
+    this.initTimeOffset();
     try {
       this.resource = resources.detectResources({
         detectors: [new CustomWebDetector()]
@@ -1308,6 +1315,13 @@ var _WebObservableSdk = class _WebObservableSdk {
       url: this.config.collectorUrl.log,
       headers: ((_b = this.config) == null ? void 0 : _b.headers) || {}
     });
+    const originalExport = exporter.export.bind(exporter);
+    exporter.export = (logs, resultCallback) => {
+      for (const log of logs) {
+        log.hrTime = _WebObservableSdk._adjustHrTime(log.hrTime);
+      }
+      return originalExport(logs, resultCallback);
+    };
     this.loggerProvider = new sdkLogs.LoggerProvider({
       resource: this.resource,
       processors: [
@@ -1327,6 +1341,17 @@ var _WebObservableSdk = class _WebObservableSdk {
       url: (_b = this.config) == null ? void 0 : _b.collectorUrl.metric,
       headers: ((_c = this.config) == null ? void 0 : _c.headers) || {}
     });
+    const originalExport = exporter.export.bind(exporter);
+    exporter.export = (metrics, resultCallback) => {
+      for (const record of metrics.scopeMetrics) {
+        for (const metric of record.metrics) {
+          for (const dataPoint of metric.dataPoints) {
+            dataPoint.hrTime = _WebObservableSdk._adjustHrTime(dataPoint.hrTime);
+          }
+        }
+      }
+      return originalExport(metrics, resultCallback);
+    };
     this.meterProvider = new sdkMetrics.MeterProvider({
       resource: this.resource,
       readers: [
@@ -1348,6 +1373,14 @@ var _WebObservableSdk = class _WebObservableSdk {
       url: (_b = this.config) == null ? void 0 : _b.collectorUrl.trace,
       headers: ((_c = this.config) == null ? void 0 : _c.headers) || {}
     });
+    const originalExport = exporter.export.bind(exporter);
+    exporter.export = (spans, resultCallback) => {
+      for (const span of spans) {
+        span.startTime = _WebObservableSdk._adjustHrTime(span.startTime);
+        span.endTime = _WebObservableSdk._adjustHrTime(span.endTime);
+      }
+      return originalExport(spans, resultCallback);
+    };
     this.tracerProvider = new sdkTraceWeb.WebTracerProvider({
       resource: this.resource,
       spanProcessors: [
@@ -1367,6 +1400,43 @@ var _WebObservableSdk = class _WebObservableSdk {
     const pvTracker = new PvInstrumentation(meter);
     pvTracker.enable();
   }
+  static adjustHrTime(hrTime) {
+    if (_WebObservableSdk.timeOffset === 0) {
+      return hrTime;
+    }
+    try {
+      const offsetNs = BigInt(_WebObservableSdk.timeOffset);
+      const originalTimeNs = BigInt(hrTime[0]) * BigInt(1e9) + BigInt(hrTime[1]);
+      const calibratedTimeNs = originalTimeNs + offsetNs;
+      const calibratedSec = calibratedTimeNs / BigInt(1e9);
+      const calibratedNs = calibratedTimeNs % BigInt(1e9);
+      return [Number(calibratedSec), Number(calibratedNs)];
+    } catch (e) {
+      console.error("Failed to adjust HrTime", e);
+      return hrTime;
+    }
+  }
+  initTimeOffset() {
+    return __async(this, null, function* () {
+      var _a;
+      try {
+        if (!((_a = this.config) == null ? void 0 : _a.collectorUrl.time)) return;
+        const start = Date.now();
+        const response = yield fetch(this.config.collectorUrl.time);
+        const end = Date.now();
+        const rtt = end - start;
+        const serverTimeStr = yield response.json();
+        const serverTimeNs = BigInt(serverTimeStr.timestampNsStr);
+        if (serverTimeNs) {
+          const clientTimeMs = start + rtt / 2;
+          const clientTimeNs = BigInt(Math.round(clientTimeMs)) * BigInt(1e6);
+          _WebObservableSdk.timeOffset = Number(serverTimeNs - clientTimeNs);
+        }
+      } catch (error) {
+        console.error("Failed to init time offset:", error);
+      }
+    });
+  }
   flushData() {
     try {
       const promises = [];
@@ -1411,6 +1481,10 @@ var _WebObservableSdk = class _WebObservableSdk {
       this.flushData();
     });
   }
+  static getCalibratedDate() {
+    const offsetInMs = _WebObservableSdk.timeOffset / 1e6;
+    return new Date(Date.now() + offsetInMs);
+  }
   // --- 公开 API: 日志（Log） ---
   log(level, message, attributes = {}, span) {
     try {
@@ -1419,7 +1493,7 @@ var _WebObservableSdk = class _WebObservableSdk {
         severityText: level,
         body: message,
         attributes,
-        timestamp: /* @__PURE__ */ new Date(),
+        timestamp: _WebObservableSdk.getCalibratedDate(),
         context: ctx
       });
     } catch (error) {
@@ -1444,17 +1518,17 @@ var _WebObservableSdk = class _WebObservableSdk {
     }
   }
   // --- 公开 API: 链路追踪 (Trace) ---
-  trace(name, fn, options, spanContext) {
+  trace(name, fn, options, span) {
     return __async(this, null, function* () {
       if (!this.tracer) {
         return fn(_WebObservableSdk.EmptySpan);
       }
-      const ctx = spanContext || context.active();
-      return this.tracer.startActiveSpan(name, options || {}, ctx, (span) => __async(this, null, function* () {
+      const ctx = span ? trace.setSpan(context.active(), span) : context.active();
+      return this.tracer.startActiveSpan(name, options || {}, ctx, (span2) => __async(this, null, function* () {
         try {
-          return yield fn(span);
+          return yield fn(span2);
         } finally {
-          span.end();
+          span2.end();
         }
       }));
     });
@@ -1473,6 +1547,7 @@ var _WebObservableSdk = class _WebObservableSdk {
   }
 };
 _WebObservableSdk.EmptySpan = trace.wrapSpanContext(INVALID_SPAN_CONTEXT);
+_WebObservableSdk.timeOffset = 0;
 var WebObservableSdk = _WebObservableSdk;
 var observable = WebObservableSdk.instance;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/observable-web",
-  "version": "1.0.1-alpha.4",
+  "version": "1.0.1-alpha.6",
   "description": "Observable SDK For Web",
   "main": "./dist/index.js",
   "files": [
@@ -18,12 +18,14 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@opentelemetry/context-zone": "^2.4.0",
     "@opentelemetry/core": "^2.2.0",
     "@opentelemetry/resources": "^2.2.0",
     "@opentelemetry/sdk-logs": "^0.208.0",
     "@opentelemetry/sdk-metrics": "^2.2.0",
     "@opentelemetry/sdk-trace-base": "^2.2.0",
-    "@opentelemetry/sdk-trace-web": "^2.2.0"
+    "@opentelemetry/sdk-trace-web": "^2.2.0",
+    "zone.js": "^0.16.0"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.9.0",