@lark-apaas/observable 1.0.3-alpha.2 → 1.0.3-alpha.3

package/dist/index.d.cts

@@ -30,7 +30,10 @@ declare class AppOTelSDK {
     /**
      * [Log API] 自动关联 TraceContext
      */
-    log(level: string, message: string, extra?: Record<string, unknown>, parentSpan?: Span): void;
+    log(level: string, message: string, extra?: Record<string, unknown>, spanAttr?: {
+        traceId: string;
+        spanId: string;
+    }): void;
     /**
    * 启动 Span 的工厂函数
    * @param {string} name - Span 名称

package/dist/index.d.ts

@@ -30,7 +30,10 @@ declare class AppOTelSDK {
     /**
      * [Log API] 自动关联 TraceContext
      */
-    log(level: string, message: string, extra?: Record<string, unknown>, parentSpan?: Span): void;
+    log(level: string, message: string, extra?: Record<string, unknown>, spanAttr?: {
+        traceId: string;
+        spanId: string;
+    }): void;
     /**
    * 启动 Span 的工厂函数
    * @param {string} name - Span 名称

package/dist/index.js

@@ -2,7 +2,7 @@ import { NodeSDK } from '@opentelemetry/sdk-node';
 import { BatchLogRecordProcessor } from '@opentelemetry/sdk-logs';
 import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-node';
 import { detectResources } from '@opentelemetry/resources';
-import { SpanKind, trace, INVALID_SPAN_CONTEXT, propagation, context, SpanStatusCode } from '@opentelemetry/api';
+import { SpanKind, trace, INVALID_SPAN_CONTEXT, propagation, context, SpanStatusCode, TraceFlags } from '@opentelemetry/api';
 import { logs, SeverityNumber } from '@opentelemetry/api-logs';
 import { ExportResultCode } from '@opentelemetry/core';
 import { randomBytes } from 'crypto';
@@ -9104,7 +9104,7 @@ var AppOTelSDK = class _AppOTelSDK {
   /**
   * [Log API] 自动关联 TraceContext
   */
-  log(level, message, extra = {}, parentSpan) {
+  log(level, message, extra = {}, spanAttr) {
     try {
       const logger = logs.getLogger("app-logger");
       const severityNumber = mapSeverity(level);
@@ -9115,9 +9115,14 @@ var AppOTelSDK = class _AppOTelSDK {
       };
       let logContext = context.active();
       try {
-        if (parentSpan) {
-          const spanInstance = parentSpan;
-          logContext = trace.setSpan(context.active(), spanInstance);
+        if (spanAttr) {
+          const spanContext = {
+            ...spanAttr,
+            // 通常设为 SAMPLED (1)，表示这是一个被采样的链路，否则日志可能会被后端丢弃
+            traceFlags: TraceFlags.SAMPLED,
+            isRemote: false
+          };
+          logContext = trace.setSpan(context.active(), trace.wrapSpanContext(spanContext));
         }
       } catch {
         logContext = context.active();