@lark-apaas/nestjs-logger 1.0.2-alpha.21 → 1.0.2-alpha.23

package/dist/index.js

@@ -63771,35 +63771,27 @@ var CustomExporter = class {
       uuid: idGenerator.generateTraceId(),
       app_env: isDev ? AppEnv.Dev : AppEnv.Prod
     };
-    const otlpLikeStructures = logs2.map((log) => {
-      const rawAttributes = {
-        ...defaultAttributes,
-        ...log.attributes ?? {}
-      };
-      const attributes = convertAttributesToString(rawAttributes);
-      return {
-        resource: {
-          attributes: {
-            ...defaultResourceAttr
-          }
-        },
-        logRecords: [
-          {
-            timeUnixNano: hrTimeToNanosNumber(log.hrTime),
-            observedTimeUnixNano: hrTimeToNanosNumber(log.hrTimeObserved),
-            severityNumber: log.severityNumber,
-            severityText: log.severityText,
-            body: log.body,
-            attributes,
-            traceId: log.spanContext?.traceId,
-            spanId: log.spanContext?.spanId
-          }
-        ]
-      };
-    });
-    otlpLikeStructures.forEach((structure) => {
-      console.log(this.logPrefix + JSON.stringify(structure) + this.logSuffix);
-    });
+    const otlpLikeStructure = {
+      resource: {
+        attributes: {
+          ...defaultResourceAttr
+        }
+      },
+      logRecords: logs2.map((log) => ({
+        timeUnixNano: hrTimeToNanosNumber(log.hrTime),
+        observedTimeUnixNano: hrTimeToNanosNumber(log.hrTimeObserved),
+        severityNumber: log.severityNumber,
+        severityText: log.severityText,
+        body: log.body,
+        attributes: convertAttributesToString({
+          ...defaultAttributes,
+          ...log.attributes ?? {}
+        }),
+        traceID: log.spanContext?.traceId,
+        spanID: log.spanContext?.spanId
+      }))
+    };
+    console.log(this.logPrefix + JSON.stringify(otlpLikeStructure) + this.logSuffix);
     resultCallback({
       code: ExportResultCode.SUCCESS
     });
@@ -63856,60 +63848,38 @@ var CustomTraceExporter = class {
   }
   tracePrefix = "force-trace-prefix";
   traceSuffix = "force-trace-suffix";
-  requestContextService;
-  constructor(contextProvider) {
-    this.requestContextService = contextProvider;
-  }
   export(spans, resultCallback) {
     const isDev = process.env.NODE_ENV === "development";
     const defaultAttributes = {
       uuid: idGenerator.generateTraceId(),
       app_env: isDev ? AppEnv.Dev : AppEnv.Prod
     };
-    const ctx = this.requestContextService.getContext();
-    const contextAttributes = ctx ? {
-      user_id: ctx.userId,
-      tenant_id: ctx.tenantId,
-      app_id: ctx.appId,
-      method: ctx.method,
-      path: ctx.path
-    } : {
-      user_id: void 0,
-      tenant_id: void 0,
-      app_id: void 0
-    };
-    const otlpLikeStructures = spans.map((span) => {
-      const rawAttributes = {
-        ...defaultAttributes,
-        ...contextAttributes,
-        ...span.attributes ?? {}
-      };
-      const attributes = convertAttributesToString(rawAttributes);
-      return {
-        resource: {
-          // 合并 OTel Resource（此处暂留空，真实场景可由 sdk.resource 提供）
-          attributes: {
-            ...defaultResourceAttr
-          }
-        },
-        spans: [
-          {
-            startTimeUnixNano: hrTimeToNanosNumber(span.startTime),
-            endTimeUnixNano: hrTimeToNanosNumber(span.endTime),
-            name: span.name,
-            attributes,
-            traceId: span.spanContext().traceId,
-            spanId: span.spanContext().spanId,
-            parentSpanID: span.parentSpanContext?.spanId,
-            status: span.status,
-            spanKind: SpanKind.SERVER
-          }
-        ]
-      };
-    });
-    otlpLikeStructures.forEach((structure) => {
-      console.log(this.tracePrefix + JSON.stringify(structure) + this.traceSuffix);
-    });
+    const otlpLikeStructure = {
+      resource: {
+        attributes: {
+          ...defaultResourceAttr
+        }
+      },
+      spans: spans.map((span) => {
+        const rawAttributes = {
+          ...defaultAttributes,
+          ...span.attributes ?? {}
+        };
+        const attributes = convertAttributesToString(rawAttributes);
+        return {
+          startTimeUnixNano: hrTimeToNanosNumber(span.startTime),
+          endTimeUnixNano: hrTimeToNanosNumber(span.endTime),
+          name: span.name,
+          attributes,
+          traceID: span.spanContext().traceId,
+          spanID: span.spanContext().spanId,
+          parentSpanID: span.parentSpanContext?.spanId,
+          status: span.status,
+          kind: SpanKind.SERVER
+        };
+      })
+    };
+    console.log(this.tracePrefix + JSON.stringify(otlpLikeStructure) + this.traceSuffix);
     resultCallback({
       code: ExportResultCode.SUCCESS
     });
@@ -63928,9 +63898,6 @@ var AppOTelSDK = class _AppOTelSDK {
   logProcessor = null;
   spanProcessor = null;
   static CUSTOM_FORMAT_REGEX = /^[0-9a-fA-F]{32}-[0-9a-fA-F]{16}$/;
-  contextProvider = {
-    getContext: /* @__PURE__ */ __name2(() => ({}), "getContext")
-  };
   start() {
     const resource = detectResources({
       detectors: [
@@ -63940,12 +63907,12 @@ var AppOTelSDK = class _AppOTelSDK {
     const logExporter = new CustomExporter();
     this.logProcessor = new BatchLogRecordProcessor(logExporter, {
       scheduledDelayMillis: 2e3,
-      maxExportBatchSize: 10
+      maxExportBatchSize: 2
     });
-    const traceExporter = new CustomTraceExporter(this.contextProvider);
+    const traceExporter = new CustomTraceExporter();
     this.spanProcessor = new import_sdk_trace_node.BatchSpanProcessor(traceExporter, {
-      scheduledDelayMillis: 1e3,
-      maxExportBatchSize: 1
+      scheduledDelayMillis: 2e3,
+      maxExportBatchSize: 2
     });
     this.sdk = new import_sdk_node.NodeSDK({
       resource,
@@ -63961,17 +63928,12 @@ var AppOTelSDK = class _AppOTelSDK {
   startContext(headers, name, fn) {
     const carrier = {};
     const customTraceId = headers["rpc-persist-apaas-observability-trace"];
-    const upperClass = headers["Rpc-Persist-Apaas-Observability-Trace"];
     if (customTraceId && _AppOTelSDK.CUSTOM_FORMAT_REGEX.test(customTraceId)) {
       carrier["traceparent"] = `00-${customTraceId}-01`;
-    } else {
-      carrier["traceparent"] = `00-${idGenerator.generateTraceId()}-${idGenerator.generateSpanId()}-01`;
     }
     const activeContext = propagation.extract(context.active(), carrier);
     const tracer = trace.getTracer("app-core");
     tracer.startActiveSpan(name, {}, activeContext, (span) => {
-      span.setAttribute("upperClass", upperClass);
-      span.setAttribute("lowerClass", customTraceId);
       fn(span);
     });
   }
@@ -64031,24 +63993,6 @@ var AppOTelSDK = class _AppOTelSDK {
   }
 };
 var appSdk = new AppOTelSDK();
-function Trace(name) {
-  return function(target, propertyKey, descriptor) {
-    const originalMethod = descriptor.value;
-    if (!originalMethod) {
-      return descriptor;
-    }
-    descriptor.value = async function(...args) {
-      const spanName = name || `${target?.constructor?.name}.${String(propertyKey)}`;
-      return await appSdk.trace(spanName, async (_) => {
-        const result = await originalMethod.apply(this, args);
-        return result;
-      });
-    };
-    return descriptor;
-  };
-}
-__name(Trace, "Trace");
-__name2(Trace, "Trace");
 
 // ../nestjs-observable/dist/index.js
 import { CommonModule } from "@lark-apaas/nestjs-common";
@@ -64073,28 +64017,49 @@ function _ts_metadata(k, v) {
 }
 __name(_ts_metadata, "_ts_metadata");
 __name3(_ts_metadata, "_ts_metadata");
-var ObservableService = class {
+var ObservableService = class _ObservableService {
   static {
-    __name(this, "ObservableService");
+    __name(this, "_ObservableService");
   }
   static {
     __name3(this, "ObservableService");
   }
   reqCtx;
+  static _instance = null;
   constructor(reqCtx) {
     this.reqCtx = reqCtx;
+    if (!_ObservableService._instance) {
+      _ObservableService._instance = this;
+    }
+  }
+  /** 获取全局单例（需确保模块已初始化） */
+  static getInstance() {
+    if (!_ObservableService._instance) {
+      throw new Error("[nestjs-observable] ObservableService \u5C1A\u672A\u521D\u59CB\u5316\uFF0C\u8BF7\u786E\u4FDD\u5728\u6839\u6A21\u5757\u5F15\u5165 NestjsObservableModule.forRoot()");
+    }
+    return _ObservableService._instance;
   }
   /** 记录日志（自动合并上下文） */
   log(level, message, attributes = {}) {
     const contextAttributes = this.reqCtx.getContext() || {};
     appSdk.log(level, message, {
+      module: "app_server",
+      source_type: "user",
       ...contextAttributes,
       ...attributes
     });
   }
-  /** 记录链路 */
+  /** 记录链路 for user，供用户调用 */
   trace(name, fn) {
-    return appSdk.trace(name, fn);
+    const contextAttributes = this.reqCtx.getContext() || {};
+    return appSdk.trace(name, (span) => {
+      span.setAttributes({
+        module: "app_server",
+        source_type: "user",
+        ...contextAttributes
+      });
+      return fn(span);
+    });
   }
   /** 手动刷新（FaaS/请求结束时可调用） */
   async flush() {
@@ -64121,6 +64086,15 @@ function _ts_metadata2(k, v) {
 }
 __name(_ts_metadata2, "_ts_metadata2");
 __name3(_ts_metadata2, "_ts_metadata");
+var OBSERVABLE_SINGLETON = null;
+function getObservableService() {
+  if (!OBSERVABLE_SINGLETON) {
+    throw new Error("[nestjs-observable] ObservableService \u5C1A\u672A\u521D\u59CB\u5316\uFF0C\u8BF7\u786E\u4FDD\u5728\u6839\u6A21\u5757\u5F15\u5165 NestjsObservableModule.forRoot()");
+  }
+  return OBSERVABLE_SINGLETON;
+}
+__name(getObservableService, "getObservableService");
+__name3(getObservableService, "getObservableService");
 var NestjsObservableModule = class _NestjsObservableModule {
   static {
     __name(this, "_NestjsObservableModule");
@@ -64128,7 +64102,9 @@ var NestjsObservableModule = class _NestjsObservableModule {
   static {
     __name3(this, "NestjsObservableModule");
   }
-  constructor() {
+  observableService;
+  constructor(observableService) {
+    this.observableService = observableService;
   }
   static forRoot() {
     return {
@@ -64138,6 +64114,7 @@ var NestjsObservableModule = class _NestjsObservableModule {
   }
   onModuleInit() {
     appSdk.start();
+    OBSERVABLE_SINGLETON = this.observableService;
   }
 };
 NestjsObservableModule = _ts_decorate2([
@@ -64154,7 +64131,9 @@ NestjsObservableModule = _ts_decorate2([
     ]
   }),
   _ts_metadata2("design:type", Function),
-  _ts_metadata2("design:paramtypes", [])
+  _ts_metadata2("design:paramtypes", [
+    typeof ObservableService === "undefined" ? Object : ObservableService
+  ])
 ], NestjsObservableModule);
 var SpanStatusCode2;
 (function(SpanStatusCode22) {
@@ -64209,6 +64188,37 @@ var ObservableTraceMiddleware = class {
 ObservableTraceMiddleware = _ts_decorate3([
   Injectable2()
 ], ObservableTraceMiddleware);
+function Trace(name) {
+  return function(target, propertyKey, descriptor) {
+    const originalMethod = descriptor.value;
+    if (!originalMethod) {
+      return descriptor;
+    }
+    descriptor.value = async function(...args) {
+      const spanName = name || `${target?.constructor?.name}.${String(propertyKey)}`;
+      const context2 = this.reqCtx?.getContext?.() || {};
+      const contextAttributes = {
+        user_id: context2.userId || "",
+        app_id: context2.appId || "",
+        tenant_id: context2.tenantId || ""
+      };
+      return await appSdk.trace(spanName, async (span) => {
+        if (contextAttributes && typeof contextAttributes === "object") {
+          span.setAttributes({
+            module: "app_server",
+            source_type: "user",
+            ...contextAttributes
+          });
+        }
+        const result = await originalMethod.apply(this, args);
+        return result;
+      });
+    };
+    return descriptor;
+  };
+}
+__name(Trace, "Trace");
+__name3(Trace, "Trace");
 
 // src/service/app-logger.service.ts
 function _ts_decorate4(decorators, target, key, desc) {