vona-core 5.1.32 → 5.1.34

package/dist/index.js

@@ -1564,19 +1564,19 @@ class BeanContainer {
         fn = function ([receiver, _], next) {
           const beanInstance = self.app.bean._getBean(aopMethod.beanFullName);
           if (!beanInstance.get) throw new Error(`get property accessor not exists: ${aopMethod.onionName}`);
-          return beanInstance.get(aopMethod.options, _patchAopNext([receiver, _], next), receiver, prop);
+          return beanInstance.get(aopMethod.options, _patchAopMethodNext([receiver, _], next), receiver, prop);
         };
       } else if (methodType === 'set') {
         fn = function ([receiver, value], next) {
           const beanInstance = self.app.bean._getBean(aopMethod.beanFullName);
           if (!beanInstance.set) throw new Error(`set property accessor not exists: ${aopMethod.onionName}`);
-          return beanInstance.set(aopMethod.options, value, _patchAopNext([receiver, value], next), receiver, prop);
+          return beanInstance.set(aopMethod.options, value, _patchAopMethodNext([receiver, value], next), receiver, prop);
         };
       } else if (methodType === 'method') {
         fn = function ([receiver, args], next) {
           const beanInstance = self.app.bean._getBean(aopMethod.beanFullName);
           if (!beanInstance.execute) throw new Error(`execute method not exists: ${aopMethod.onionName}`);
-          return beanInstance.execute(aopMethod.options, args, _patchAopNext([receiver, args], next), receiver, prop);
+          return beanInstance.execute(aopMethod.options, args, _patchAopMethodNext([receiver, args], next), receiver, prop);
         };
       }
       chains.push([aopKey, fn]);
@@ -1602,6 +1602,17 @@ function _patchAopNext([receiver, context], next) {
     return next([receiver, context]);
   };
 }
+function _patchAopMethodNext([receiver, context], next) {
+  const nextPatched = (...args) => {
+    context = args.length === 0 ? context : args[0];
+    return next([receiver, context]);
+  };
+  nextPatched.replay = (...args) => {
+    const nextContext = args.length === 0 ? context : args[0];
+    return next.replay([receiver, nextContext]);
+  };
+  return nextPatched;
+}
 function __checkAopOfDescriptorInfo(descriptorInfo) {
   if (!descriptorInfo) return true;
   return !descriptorInfo.dynamic && !descriptorInfo.ofBeanBase;
@@ -2789,9 +2800,18 @@ const formatLoggerErrors = opts => {
 };
 const formatLoggerCtx = Winston.format((info, _opts) => {
   const app = useApp();
-  if (!app.ctx || !app.ctx.method || !app.ctx.path) return info;
-  info.method = app.ctx.method;
-  info.path = app.ctx.path;
+  if (!app.ctx) return info;
+  if (app.ctx.method) info.method = app.ctx.method;
+  if (app.ctx.path) info.path = app.ctx.path;
+  const telemetry = app.ctx.state.telemetry;
+  if (telemetry?.requestId) info.request_id = telemetry.requestId;
+  const span = telemetry?.span ?? telemetry?.serverSpan;
+  const spanContext = span?.spanContext();
+  if (spanContext?.traceId && spanContext?.spanId) {
+    info.trace_id = spanContext.traceId;
+    info.span_id = spanContext.spanId;
+    info.trace_flags = spanContext.traceFlags;
+  }
   return info;
 });
 const formatLoggerDummy = Winston.format(info => {