@yolo-croket-dev/core 1.7.4-datadog.8 → 1.7.4

package/interceptors/logging-service.interceptor.js

@@ -28,6 +28,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoggingServiceInterceptor = void 0;
 /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -35,9 +38,11 @@ exports.LoggingServiceInterceptor = void 0;
 const common_1 = require("@nestjs/common");
 const msa_logger_1 = __importStar(require("@yolo-croket-dev/msa-logger"));
 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);
 const MAX_CUT_LENGTH = 500;
+dd_trace_1.default.init();
 let LoggingServiceInterceptor = class LoggingServiceInterceptor {
     keyCutter(data) {
         try {
@@ -101,6 +106,14 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                 froms: pastFroms,
             },
         });
+        const currentSpan = dd_trace_1.default.scope().active();
+        const loggingSpan = dd_trace_1.default.startSpan(`logging-service-interceptor-${content.pattern}`, {
+            childOf: currentSpan.context(),
+        });
+        if (loggingSpan) {
+            loggingSpan.setTag('traceId', traceId);
+            loggingSpan.setTag('messagePattern', content.pattern);
+        }
         return next.handle()
             .pipe((0, operators_1.tap)(() => {
             const elapsed = Date.now() - now;
@@ -119,7 +132,16 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                     froms: pastFroms,
                 },
             });
+            loggingSpan.finish();
         })).pipe((0, operators_1.catchError)((error) => {
+            if (loggingSpan) {
+                loggingSpan.setTag('error', true);
+                loggingSpan.setTag('error.message', error.message);
+                loggingSpan.setTag('error.status', error.status);
+                loggingSpan.setTag('error.subMessage', error.subMessage);
+                loggingSpan.setTag('error.stack', error.stack);
+                loggingSpan.setTag('error.type', error.constructor.name);
+            }
             msaLogger.printExceptionFliterService({
                 traceId,
                 errInfo: {
@@ -153,6 +175,7 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                     froms: pastFroms,
                 },
             });
+            loggingSpan.finish();
             throw error;
         }));
     }

package/interceptors/rpc.interceptor.js

@@ -31,9 +31,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RPCInterceptor = void 0;
 /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -43,7 +40,6 @@ const core_1 = require("@nestjs/core");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const msa_logger_1 = __importStar(require("@yolo-croket-dev/msa-logger"));
-const dd_trace_1 = __importDefault(require("dd-trace"));
 // import Logger from '@yolo-croket-dev/logger';
 const functions_1 = require("../functions");
 const exceptions_1 = require("../exceptions");
@@ -194,22 +190,6 @@ let RPCInterceptor = class RPCInterceptor {
             const errInfo = err.errInfo;
             const duration = Date.now() - now;
             let isAck = false;
-            if (process.env.DD_AGENT_HOST && process.env.DD_AGENT_HOST.startsWith('datadog-agent-agent')) {
-                const span = dd_trace_1.default.scope().active();
-                if (span) {
-                    msaLogger.debug('Active span found', { traceId: 'ACTIVE_SPAN_FOUND' }, { err: { message: errMsg, stack: err.stack ? err.stack : null }, DD_AGENT_HOST: process.env.DD_AGENT_HOST });
-                    span.setTag('error', {
-                        message: errMsg,
-                        stack: err.stack ? err.stack : null,
-                        type: 'RpcExceptionsHandler',
-                    });
-                    span.finish();
-                    msaLogger.debug('Active span found', { traceId: 'ACTIVE_SPAN_FOUND2' }, { err: { message: errMsg, stack: err.stack ? err.stack : null }, DD_AGENT_HOST: process.env.DD_AGENT_HOST });
-                }
-                else {
-                    msaLogger.error('No active span found', { traceId: 'NO_ACTIVE_SPAN' });
-                }
-            }
             /** 파일 객체 처리 */
             (0, functions_1.reWriteFileValue)(arg === null || arg === void 0 ? void 0 : arg.file);
             const abstractAmqpHandlerData = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yolo-croket-dev/core",
-  "version": "1.7.4-datadog.8",
+  "version": "1.7.4",
   "author": "Yolo Co., Ltd.",
   "description": "Yolo commonization module",
   "main": "index.js",
@@ -21,6 +21,7 @@
     "@yolo-croket-dev/redis": "^1.0.23",
     "@yolo-croket-dev/swagger": "^0.0.7",
     "axios": "^1.1.3",
+    "dd-trace": "^5.25.0",
     "randomstring": "^1.2.2",
     "rxjs": "^7.4.0",
     "uuid": "^8.3.2"
@@ -28,7 +29,6 @@
   "devDependencies": {
     "@types/node": "^16.11.9",
     "@types/randomstring": "^1.1.8",
-    "@types/uuid": "^8.3.4",
-    "dd-trace": "^5.25.0"
+    "@types/uuid": "^8.3.4"
   }
 }