@yolo-croket-dev/core 1.9.7-slowquery.0 → 1.9.7-slowquery.1

package/interceptors/logging-service.interceptor.js

@@ -41,6 +41,12 @@ const operators_1 = require("rxjs/operators");
 const dd_trace_1 = __importDefault(require("dd-trace"));
 const { SERVER_NAME } = process.env;
 const msaLogger = new msa_logger_1.default(msa_logger_1.ServerTypeEnum.SERVICE);
+// interface IContent {
+//   pattern: string;
+//   data: IRequest;
+//   /** 무슨 아이디인지 모르겠음 */
+//   id: string;
+// }
 const MAX_CUT_LENGTH = 500;
 dd_trace_1.default.init();
 let LoggingServiceInterceptor = class LoggingServiceInterceptor {
@@ -77,35 +83,45 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
     intercept(context, next) {
         const now = Date.now();
         const args = context.getArgs();
-        const rmqContext = context.switchToRpc().getContext();
-        const data = context.switchToRpc().getData();
+        const rpcContext = context.switchToRpc();
+        const rmqContext = rpcContext.getContext();
+        const data = rpcContext.getData();
         const metadata = args[1];
-        const contextType = args[5];
-        const isGrpc = contextType === 'rpc';
+        const isGrpc = rpcContext.contextType === 'rpc';
         let param;
         let pastFrom;
         let pastFroms;
+        let originalMessage;
+        let pattern; /** @xxx: Grpc: path , Mq: 메시지 패턴명 */
+        let payload;
         if (isGrpc) {
             param = metadata.get('param') || { param: { from: '-', froms: '-' } };
             pastFrom = metadata.get('pastFrom') || '-';
             pastFroms = metadata.get('pastFroms') || [pastFrom];
+            originalMessage = args[0];
+            let gRPCArg = args[3];
+            pattern = gRPCArg.path;
+            payload = data;
         }
         else {
             param = data.param;
             pastFrom = param.from ? JSON.parse(JSON.stringify(param.from)) : '-';
             pastFroms = param.froms ? JSON.parse(JSON.stringify(param.froms)) : [pastFrom];
+            originalMessage = rmqContext.getMessage();
+            pattern = originalMessage.messagePattern;
+            // const originalcontent = originalMessage.content;
+            // const content = JSON.parse(originalcontent.toString()) as IContent;
+            payload = context.switchToHttp().getRequest().data;
         }
         // const pastFrom = data.param.from ? JSON.parse(JSON.stringify(data.param.from)) : '-';
         // const pastFroms = data.param.froms ? JSON.parse(JSON.stringify(data.param.froms)) : [pastFrom];
-        const originalMessage = rmqContext.getMessage();
-        const ctx = context.switchToHttp();
-        const request = ctx.getRequest();
-        const pastParam = JSON.parse(JSON.stringify(request.param));
-        const originalcontent = originalMessage.content;
-        const content = JSON.parse(originalcontent.toString());
-        const traceId = content.data.param ? content.data.param.traceId : '-';
+        // const originalMessage = rmqContext.getMessage();
+        // const ctx = context.switchToHttp();
+        // const request = ctx.getRequest() as IRequest;
+        const pastParam = JSON.parse(JSON.stringify(param));
+        const traceId = param ? param.traceId : '-';
         /** from 변경 */
-        const tmpFrom = `${SERVER_NAME}: ${content.pattern}`;
+        const tmpFrom = `${SERVER_NAME}: ${pattern}`;
         const tmpFroms = JSON.parse(JSON.stringify(pastFroms));
         tmpFroms.push(tmpFrom);
         if (isGrpc) {
@@ -119,8 +135,8 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
         msaLogger.printInputInterceptorService({
             traceId,
             messageBrokerInfo: {
-                messagePatten: content.pattern,
-                payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
+                messagePatten: pattern,
+                payload: JSON.stringify(this.keyCutter(JSON.stringify(payload))),
             },
             paramInfo: pastParam,
             traceInfo: {
@@ -132,11 +148,11 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
         const currentSpan = dd_trace_1.default.scope().active();
         let loggingSpan = null;
         if (currentSpan) {
-            loggingSpan = dd_trace_1.default.startSpan(`logging-service-interceptor-${content.pattern}`, { childOf: currentSpan.context() });
+            loggingSpan = dd_trace_1.default.startSpan(`logging-service-interceptor-${pattern}`, { childOf: currentSpan.context() });
         }
         if (loggingSpan) {
             loggingSpan.setTag('traceId', traceId);
-            loggingSpan.setTag('messagePattern', content.pattern);
+            loggingSpan.setTag('messagePattern', pattern);
         }
         return next.handle()
             .pipe((0, operators_1.tap)(() => {
@@ -148,8 +164,8 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                     ms: elapsed,
                 },
                 messageBrokerInfo: {
-                    messagePatten: content.pattern,
-                    payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
+                    messagePatten: pattern,
+                    payload: JSON.stringify(this.keyCutter(JSON.stringify(payload))),
                 },
                 traceInfo: {
                     from: pastFrom,
@@ -178,8 +194,8 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                     errOption: error.errOption,
                 },
                 messageBrokerInfo: {
-                    messagePatten: content.pattern,
-                    payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
+                    messagePatten: pattern,
+                    payload: JSON.stringify(this.keyCutter(JSON.stringify(payload))),
                 },
                 traceInfo: {
                     from: pastFrom,
@@ -194,8 +210,8 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                     ms: elapsed,
                 },
                 messageBrokerInfo: {
-                    messagePatten: content.pattern,
-                    payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
+                    messagePatten: pattern,
+                    payload: JSON.stringify(this.keyCutter(JSON.stringify(payload))),
                 },
                 traceInfo: {
                     from: pastFrom,

package/package.json

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