@yolo-croket-dev/core 1.10.1 → 1.10.2

package/functions/rmq-diagnostics.function.d.ts

@@ -67,6 +67,18 @@ export declare function registerRmqObservation(owner: object, observer: RmqConne
  * @process 관찰 대상이 아니면 undefined를 반환한다.
  */
 export declare function getRmqDiagnosticSnapshot(owner: object): Snapshot | undefined;
+/**
+ * @author jun
+ * @description 현재 메시지의 핸들러 오류 상세를 LoggingServiceInterceptor가 기록할 수 있음을 표시한다.
+ * @process 메시지 객체만 약하게 참조하여 동시 요청과 재전달 메시지를 구분한다.
+ */
+export declare function markRmqHandlerLogging(message: unknown): void;
+/**
+ * @author jun
+ * @description 현재 메시지에 핸들러 오류 상세 로거가 있는지 확인한다.
+ * @process RPCInterceptor의 중복 상세 기록 여부를 결정한다.
+ */
+export declare function hasRmqHandlerLogging(message: unknown): boolean;
 /**
  * @author jun
  * @description 이미 기록한 오류 상세를 표시한다.

package/functions/rmq-diagnostics.function.js

@@ -26,13 +26,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDiagnosticRmqClient = exports.getRecordedRmqDiagnosticError = exports.recordRmqDiagnosticError = exports.getRmqDiagnosticSnapshot = exports.registerRmqObservation = exports.withRmqConnectionName = exports.createRmqObserver = exports.RmqConnectionObserver = exports.isRmqDiagnosticsEnabled = void 0;
+exports.createDiagnosticRmqClient = exports.getRecordedRmqDiagnosticError = exports.recordRmqDiagnosticError = exports.hasRmqHandlerLogging = exports.markRmqHandlerLogging = exports.getRmqDiagnosticSnapshot = exports.registerRmqObservation = exports.withRmqConnectionName = exports.createRmqObserver = exports.RmqConnectionObserver = exports.isRmqDiagnosticsEnabled = void 0;
 const node_crypto_1 = require("node:crypto");
 const node_os_1 = __importDefault(require("node:os"));
 const microservices_1 = require("@nestjs/microservices");
 const msa_logger_1 = __importStar(require("@yolo-croket-dev/msa-logger"));
 const observations = new WeakMap();
 const recordedErrors = new WeakMap();
+const handlerLoggingMessages = new WeakSet();
 let logger;
 /**
  * @author jun
@@ -245,6 +246,25 @@ function getRmqDiagnosticSnapshot(owner) {
     return (_a = observations.get(owner)) === null || _a === void 0 ? void 0 : _a.snapshot();
 }
 exports.getRmqDiagnosticSnapshot = getRmqDiagnosticSnapshot;
+/**
+ * @author jun
+ * @description 현재 메시지의 핸들러 오류 상세를 LoggingServiceInterceptor가 기록할 수 있음을 표시한다.
+ * @process 메시지 객체만 약하게 참조하여 동시 요청과 재전달 메시지를 구분한다.
+ */
+function markRmqHandlerLogging(message) {
+    if (message !== null && typeof message === 'object')
+        handlerLoggingMessages.add(message);
+}
+exports.markRmqHandlerLogging = markRmqHandlerLogging;
+/**
+ * @author jun
+ * @description 현재 메시지에 핸들러 오류 상세 로거가 있는지 확인한다.
+ * @process RPCInterceptor의 중복 상세 기록 여부를 결정한다.
+ */
+function hasRmqHandlerLogging(message) {
+    return message !== null && typeof message === 'object' && handlerLoggingMessages.has(message);
+}
+exports.hasRmqHandlerLogging = hasRmqHandlerLogging;
 // Contains error metadata only, never per-request context: one RMQ error can reject concurrent calls.
 /**
  * @author jun

package/interceptors/logging-service.interceptor.js

@@ -161,6 +161,8 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
             loggingSpan.setTag('traceId', traceId);
             loggingSpan.setTag('messagePattern', pattern);
         }
+        if (connection)
+            (0, rmq_diagnostics_function_1.markRmqHandlerLogging)(originalMessage);
         return next.handle()
             .pipe((0, operators_1.tap)(() => {
             const elapsed = Date.now() - now;

package/interceptors/rpc.interceptor.js

@@ -207,7 +207,7 @@ let RPCInterceptor = class RPCInterceptor {
             msaLogger.debug('isRedeliveryMessage RETRY_COUNT_ZERO_OR_NO_RETRY true, 재처리하여 전달토록 하기', { traceId: ((_d = content.data.param) === null || _d === void 0 ? void 0 : _d.traceId) || 'RETRY_COUNT_ZERO_OR_NO_RETRY' });
         }
         const noAck = message.fields.routingKey.includes('ASYNC');
-        let localErrorProcessor = async (err) => {
+        let localErrorProcessor = async (err, preHandlerError = false) => {
             var _a, _b;
             const errMsg = err.response ? err.response : err.message;
             const status = err.status ? err.status : 500;
@@ -280,7 +280,8 @@ let RPCInterceptor = class RPCInterceptor {
                 }
             }
             const sendMessage = Buffer.from(JSON.stringify(abstractAmqpHandlerData));
-            const diagnostic = startConnection
+            const delegatedDiagnostic = Boolean(startConnection && !preHandlerError && (0, rmq_diagnostics_function_1.hasRmqHandlerLogging)(message));
+            const diagnostic = startConnection && !delegatedDiagnostic
                 ? (0, msa_logger_1.normalizeDiagnosticError)(err, isTimeoutError ? 'response_timeout' : 'service_error') : undefined;
             const diagnosticInfo = diagnostic ? {
                 ...diagnostic.diagnosticInfo,
@@ -293,26 +294,35 @@ let RPCInterceptor = class RPCInterceptor {
             } : undefined;
             if (!isAck || diagnostic) {
                 const currentContext = functions_1.AbortContext.getCurrentContext();
-                msaLogger.warn(isAck ? 'RPCInterceptor 오류 처리' : '에러 응답 전송 처리', {
-                    traceId: execInterceptor.traceId,
-                    diagnosticInfo,
-                }, diagnostic ? {
-                    error: diagnostic.details,
+                let logDetails = {
                     reDeliveryCount,
                     staticRetryCount,
                     currentContext: (_a = currentContext === null || currentContext === void 0 ? void 0 : currentContext.requestId) !== null && _a !== void 0 ? _a : null,
-                } : {
-                    error: {
-                        message: err.message,
-                        stack: err.stack,
-                        name: err.name,
-                        response: err.response,
-                        reDeliveryCount,
-                        staticRetryCount,
-                    },
-                    messagePattern: method,
-                    currentContext: currentContext && currentContext.requestId ? currentContext.requestId : null,
-                });
+                };
+                if (diagnostic) {
+                    logDetails = {
+                        ...logDetails,
+                        error: diagnostic.details,
+                    };
+                }
+                else if (!delegatedDiagnostic) {
+                    logDetails = {
+                        error: {
+                            message: err.message,
+                            stack: err.stack,
+                            name: err.name,
+                            response: err.response,
+                            reDeliveryCount,
+                            staticRetryCount,
+                        },
+                        messagePattern: method,
+                        currentContext: currentContext && currentContext.requestId ? currentContext.requestId : null,
+                    };
+                }
+                msaLogger.warn(isAck ? 'RPCInterceptor 오류 처리' : '에러 응답 전송 처리', {
+                    traceId: execInterceptor.traceId,
+                    diagnosticInfo,
+                }, logDetails);
             }
             if (!isAck) {
                 channel.sendToQueue(message.properties.replyTo, sendMessage, { correlationId: message.properties.correlationId });
@@ -344,7 +354,7 @@ let RPCInterceptor = class RPCInterceptor {
                 }
             }
             catch (err) {
-                await localErrorProcessor(err);
+                await localErrorProcessor(err, true);
                 return new rxjs_1.Observable();
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yolo-croket-dev/core",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "author": "Yolo Co., Ltd.",
   "description": "Yolo commonization module",
   "main": "index.js",