@lark-apaas/nestjs-logger 1.0.2-alpha.22 → 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
     });
@@ -63879,11 +63871,11 @@ var CustomTraceExporter = class {
           endTimeUnixNano: hrTimeToNanosNumber(span.endTime),
           name: span.name,
           attributes,
-          traceId: span.spanContext().traceId,
-          spanId: span.spanContext().spanId,
+          traceID: span.spanContext().traceId,
+          spanID: span.spanContext().spanId,
           parentSpanID: span.parentSpanContext?.spanId,
           status: span.status,
-          spanKind: SpanKind.SERVER
+          kind: SpanKind.SERVER
         };
       })
     };
@@ -63936,15 +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`;
     }
     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);
     });
   }
@@ -64028,16 +64017,27 @@ 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 = {}) {
@@ -64086,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");
@@ -64093,7 +64102,9 @@ var NestjsObservableModule = class _NestjsObservableModule {
   static {
     __name3(this, "NestjsObservableModule");
   }
-  constructor() {
+  observableService;
+  constructor(observableService) {
+    this.observableService = observableService;
   }
   static forRoot() {
     return {
@@ -64103,6 +64114,7 @@ var NestjsObservableModule = class _NestjsObservableModule {
   }
   onModuleInit() {
     appSdk.start();
+    OBSERVABLE_SINGLETON = this.observableService;
   }
 };
 NestjsObservableModule = _ts_decorate2([
@@ -64119,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) {
@@ -64182,7 +64196,12 @@ function Trace(name) {
     }
     descriptor.value = async function(...args) {
       const spanName = name || `${target?.constructor?.name}.${String(propertyKey)}`;
-      const contextAttributes = this.reqCtx?.getContext?.() || {};
+      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({
@@ -64676,7 +64695,6 @@ var LoggingInterceptor = class {
     }
     this.appLogger.log(`HTTP request started
 url=${req.url}`, "HTTPTraceInterceptor");
-    this.appLogger.log(`header: ${JSON.stringify(req.headers)}`, "HTTPHeaderInfo");
     this.traceLogger.logStructured("verbose", "HTTP request started", requestMeta, "HTTPTraceInterceptor");
     let logged = false;
     res.on("finish", () => {