@edirect/trace 1.0.20 → 9.0.1

package/dist/constants/headers.d.ts

@@ -1,4 +1,4 @@
-declare const _default: {
-    X_CORRELATION_ID: string;
-};
-export default _default;
+declare const _default: {
+    X_CORRELATION_ID: string;
+};
+export default _default;

package/dist/constants/headers.js

@@ -1,6 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    X_CORRELATION_ID: 'x-correlation-id',
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    X_CORRELATION_ID: 'x-correlation-id',
+};
 //# sourceMappingURL=headers.js.map

package/dist/constants/index.d.ts

@@ -1,2 +1 @@
-export { default as HEADERS } from './headers';
-export { default as TRACE_SERVER } from './servers';
+export { default as HEADERS } from './headers';

package/dist/constants/index.js

@@ -1,11 +1,9 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TRACE_SERVER = exports.HEADERS = void 0;
-var headers_1 = require("./headers");
-Object.defineProperty(exports, "HEADERS", { enumerable: true, get: function () { return __importDefault(headers_1).default; } });
-var servers_1 = require("./servers");
-Object.defineProperty(exports, "TRACE_SERVER", { enumerable: true, get: function () { return __importDefault(servers_1).default; } });
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HEADERS = void 0;
+var headers_1 = require("./headers");
+Object.defineProperty(exports, "HEADERS", { enumerable: true, get: function () { return __importDefault(headers_1).default; } });
 //# sourceMappingURL=index.js.map

package/dist/constants/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/constants/index.ts"],"names":[],"mappings":";;;;;;AAAA,qCAA+C;AAAtC,mHAAA,OAAO,OAAW;AAC3B,qCAAmD;AAA1C,wHAAA,OAAO,OAAgB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/constants/index.ts"],"names":[],"mappings":";;;;;;AAAA,qCAA+C;AAAtC,mHAAA,OAAO,OAAW"}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export * as middlewares from './middlewares';
-export * as utils from './utils';
-export * as constants from './constants';
-export * as services from './services';
+export * as middlewares from './middlewares';
+export * as utils from './utils';
+export * as constants from './constants';
+export * as services from './services';

package/dist/index.js

@@ -1,27 +1,31 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.services = exports.constants = exports.utils = exports.middlewares = void 0;
-exports.middlewares = __importStar(require("./middlewares"));
-exports.utils = __importStar(require("./utils"));
-exports.constants = __importStar(require("./constants"));
-exports.services = __importStar(require("./services"));
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.services = exports.constants = exports.utils = exports.middlewares = void 0;
+exports.middlewares = __importStar(require("./middlewares"));
+exports.utils = __importStar(require("./utils"));
+exports.constants = __importStar(require("./constants"));
+exports.services = __importStar(require("./services"));
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA6C;AAC7C,iDAAiC;AACjC,yDAAyC;AACzC,uDAAuC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA6C;AAC7C,iDAAiC;AACjC,yDAAyC;AACzC,uDAAuC"}

package/dist/middlewares/CLS.d.ts

@@ -1,5 +1,5 @@
-import { Request, Response, NextFunction } from 'express';
-declare class CLS {
-    static middleware(req: Request, res: Response, next: NextFunction): void;
-}
-export default CLS;
+import { Request, Response, NextFunction } from 'express';
+declare class CLS {
+    static middleware(req: Request, res: Response, next: NextFunction): void;
+}
+export default CLS;

package/dist/middlewares/CLS.js

@@ -1,30 +1,34 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const cls = __importStar(require("cls-hooked"));
-class CLS {
-    static middleware(req, res, next) {
-        const nameSpace = cls.createNamespace('trace');
-        nameSpace.run(() => next());
-    }
-}
-exports.default = CLS;
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const cls = __importStar(require("cls-hooked"));
+class CLS {
+    static middleware(req, res, next) {
+        const nameSpace = cls.createNamespace('trace');
+        nameSpace.run(() => next());
+    }
+}
+exports.default = CLS;
 //# sourceMappingURL=CLS.js.map

package/dist/middlewares/CLS.js.map

@@ -1 +1 @@
-{"version":3,"file":"CLS.js","sourceRoot":"","sources":["../../src/middlewares/CLS.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAGlC,MAAM,GAAG;IAOP,MAAM,CAAC,UAAU,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QAC/D,MAAM,SAAS,GAAG,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAC/C,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9B,CAAC;CACF;AAED,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"CLS.js","sourceRoot":"","sources":["../../src/middlewares/CLS.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAGlC,MAAM,GAAG;IAOP,MAAM,CAAC,UAAU,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QAC/D,MAAM,SAAS,GAAG,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAC/C,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9B,CAAC;CACF;AAED,kBAAe,GAAG,CAAC"}

package/dist/middlewares/body.d.ts

@@ -1,5 +1,7 @@
-import { NextFunction, Request, Response } from 'express';
-declare class Body {
-    body: (req: Request, _: Response, next: NextFunction) => void;
-}
-export default Body;
+import { NextFunction, Request, Response } from 'express';
+declare class Body {
+    private propertiesToArray;
+    private getValue;
+    body: (req: Request, _: Response, next: NextFunction) => void;
+}
+export default Body;

package/dist/middlewares/body.js

@@ -1,28 +1,38 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const api_1 = __importDefault(require("@opentelemetry/api"));
-class Body {
-    constructor() {
-        this.body = (req, _, next) => {
-            let span = api_1.default.trace.getSpan(api_1.default.context.active());
-            if (!span)
-                span = api_1.default.trace.getTracer("edirect/trace", "1").startSpan(req.originalUrl.split('?').shift());
-            const bodyString = JSON.stringify(req.body);
-            const charsLength = bodyString.length;
-            const chunks = [];
-            for (let i = 0; i < charsLength; i += 1000) {
-                chunks.push(bodyString.substring(i, i + 1000));
-            }
-            span.setAttribute('http_request_body', chunks);
-            if (req.query)
-                span.setAttribute('http_request_url_query', new URLSearchParams(req.query).toString());
-            span.setAttribute('http_request_url_full', req.originalUrl);
-            next();
-        };
-    }
-}
-exports.default = Body;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const api_1 = __importDefault(require("@opentelemetry/api"));
+class Body {
+    constructor() {
+        this.propertiesToArray = (obj) => {
+            const isObject = (val) => val && typeof val === "object" && !Array.isArray(val);
+            const addDelimiter = (a, b) => (a ? `${a}.${b}` : b);
+            const paths = (obj, head = "") => {
+                return Object.entries(obj).reduce((product, [key, value]) => {
+                    const fullPath = addDelimiter(head, key);
+                    return isObject(value)
+                        ? product.concat(paths(value, fullPath))
+                        : product.concat(fullPath);
+                }, []);
+            };
+            return paths(obj);
+        };
+        this.getValue = (path, obj) => path.split(".").reduce((acc, c) => acc && acc[c], obj);
+        this.body = (req, _, next) => {
+            var _a, _b;
+            let span = api_1.default.trace.getSpan(api_1.default.context.active());
+            const url = ((_b = (_a = req === null || req === void 0 ? void 0 : req.originalUrl) === null || _a === void 0 ? void 0 : _a.split("?")) === null || _b === void 0 ? void 0 : _b.shift()) || "";
+            if (!span)
+                span = api_1.default.trace.getTracer("edirect/trace", "1").startSpan(url);
+            const attrs = this.propertiesToArray(req.body);
+            for (let x = 0; x < attrs.length; x++) {
+                span.setAttribute(`http@body.${attrs[x]}`, this.getValue(attrs[x], req.body));
+            }
+            next();
+        };
+    }
+}
+exports.default = Body;
 //# sourceMappingURL=body.js.map

package/dist/middlewares/body.js.map

@@ -1 +1 @@
-{"version":3,"file":"body.js","sourceRoot":"","sources":["../../src/middlewares/body.ts"],"names":[],"mappings":";;;;;AACA,6DAA+C;AAE/C,MAAM,IAAI;IAAV;QAOS,SAAI,GAAG,CAAC,GAAY,EAAE,CAAW,EAAE,IAAkB,EAAQ,EAAE;YACpE,IAAI,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;YACvE,IAAI,CAAC,IAAI;gBACP,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;YAE3G,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC5C,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC;YAEtC,MAAM,MAAM,GAAG,EAAE,CAAC;YAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,IAAI,IAAI,EAAE;gBAC1C,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;aAChD;YAED,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;YAC/C,IAAI,GAAG,CAAC,KAAK;gBACX,IAAI,CAAC,YAAY,CACf,wBAAwB,EACxB,IAAI,eAAe,CAAC,GAAG,CAAC,KAA+B,CAAC,CAAC,QAAQ,EAAE,CACpE,CAAC;YAEJ,IAAI,CAAC,YAAY,CAAC,uBAAuB,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;YAE5D,IAAI,EAAE,CAAC;QACT,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,kBAAe,IAAI,CAAC"}
+{"version":3,"file":"body.js","sourceRoot":"","sources":["../../src/middlewares/body.ts"],"names":[],"mappings":";;;;;AACA,6DAA+C;AAE/C,MAAM,IAAI;IAAV;QAEU,sBAAiB,GAAG,CAAC,GAAY,EAAY,EAAE;YACrD,MAAM,QAAQ,GAAG,CAAC,GAAY,EAAQ,EAAE,CACtC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAExD,MAAM,YAAY,GAAG,CAAC,CAAS,EAAE,CAAS,EAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAE9E,MAAM,KAAK,GAAG,CAAC,GAAQ,EAAE,IAAI,GAAG,EAAE,EAAY,EAAE;gBAC9C,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAC/B,CAAC,OAAiB,EAAE,CAAC,GAAG,EAAE,KAAK,CAAmB,EAAE,EAAE;oBACpD,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;oBACzC,OAAO,QAAQ,CAAC,KAAK,CAAC;wBACpB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;wBACxC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC/B,CAAC,EACD,EAAE,CACH,CAAC;YACJ,CAAC,CAAC;YAEF,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;QACpB,CAAC,CAAC;QAEM,aAAQ,GAAG,CAAC,IAAY,EAAE,GAAY,EAAQ,EAAE,CACtD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAQlD,SAAI,GAAG,CAAC,GAAY,EAAE,CAAW,EAAE,IAAkB,EAAQ,EAAE;;YACpE,IAAI,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;YACvE,MAAM,GAAG,GAAG,CAAA,MAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,0CAAE,KAAK,CAAC,GAAG,CAAC,0CAAE,KAAK,EAAE,KAAI,EAAE,CAAC;YACxD,IAAI,CAAC,IAAI;gBACP,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAE5E,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACrC,IAAI,CAAC,YAAY,CAAC,aAAa,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;aAC/E;YAED,IAAI,EAAE,CAAC;QACT,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,kBAAe,IAAI,CAAC"}

package/dist/middlewares/index.d.ts

@@ -1,3 +1,3 @@
-export { default as Trace } from './trace';
-export { default as CLS } from './CLS';
-export { default as Body } from './body';
+export { default as Trace } from './trace';
+export { default as CLS } from './CLS';
+export { default as Body } from './body';

package/dist/middlewares/index.js

@@ -1,13 +1,13 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Body = exports.CLS = exports.Trace = void 0;
-var trace_1 = require("./trace");
-Object.defineProperty(exports, "Trace", { enumerable: true, get: function () { return __importDefault(trace_1).default; } });
-var CLS_1 = require("./CLS");
-Object.defineProperty(exports, "CLS", { enumerable: true, get: function () { return __importDefault(CLS_1).default; } });
-var body_1 = require("./body");
-Object.defineProperty(exports, "Body", { enumerable: true, get: function () { return __importDefault(body_1).default; } });
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Body = exports.CLS = exports.Trace = void 0;
+var trace_1 = require("./trace");
+Object.defineProperty(exports, "Trace", { enumerable: true, get: function () { return __importDefault(trace_1).default; } });
+var CLS_1 = require("./CLS");
+Object.defineProperty(exports, "CLS", { enumerable: true, get: function () { return __importDefault(CLS_1).default; } });
+var body_1 = require("./body");
+Object.defineProperty(exports, "Body", { enumerable: true, get: function () { return __importDefault(body_1).default; } });
 //# sourceMappingURL=index.js.map

package/dist/middlewares/trace.d.ts

@@ -1,5 +1,5 @@
-import { Request, Response, NextFunction } from 'express';
-declare class Trace {
-    static trace(req: Request, res: Response, next: NextFunction): void;
-}
-export default Trace;
+import { Request, Response, NextFunction } from 'express';
+declare class Trace {
+    static trace(req: Request, res: Response, next: NextFunction): void;
+}
+export default Trace;

package/dist/middlewares/trace.js

@@ -1,27 +1,27 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const constants_1 = require("../constants");
-const uuid_1 = require("uuid");
-const utils_1 = require("../utils");
-class Trace {
-    static trace(req, res, next) {
-        let cid = (0, uuid_1.v4)();
-        try {
-            if (req.headers[constants_1.HEADERS.X_CORRELATION_ID]) {
-                cid = req.headers[constants_1.HEADERS.X_CORRELATION_ID];
-            }
-            else {
-                req.headers[constants_1.HEADERS.X_CORRELATION_ID] = cid;
-            }
-        }
-        catch (error) {
-            console.log(error);
-        }
-        finally {
-            utils_1.Trace.setCID(cid);
-            return next();
-        }
-    }
-}
-exports.default = Trace;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const constants_1 = require("../constants");
+const uuid_1 = require("uuid");
+const utils_1 = require("../utils");
+class Trace {
+    static trace(req, res, next) {
+        let cid = (0, uuid_1.v4)();
+        try {
+            if (req.headers[constants_1.HEADERS.X_CORRELATION_ID]) {
+                cid = req.headers[constants_1.HEADERS.X_CORRELATION_ID];
+            }
+            else {
+                req.headers[constants_1.HEADERS.X_CORRELATION_ID] = cid;
+            }
+        }
+        catch (error) {
+            console.log(error);
+        }
+        finally {
+            utils_1.Trace.setCID(cid);
+            return next();
+        }
+    }
+}
+exports.default = Trace;
 //# sourceMappingURL=trace.js.map

package/dist/services/APM.d.ts

@@ -1,10 +1,13 @@
-declare class APM {
-    serviceName: string;
-    serverUrl: string;
-    traceServer: string;
-    constructor(serviceName?: string, serverUrl?: string, traceServer?: string);
-    private startElastic;
-    private startOtlp;
-    startTrace(): void;
-}
-export default APM;
+declare class APM {
+    private serverUrl;
+    private scope;
+    private environment;
+    private cluster;
+    private tenant;
+    private service;
+    private version;
+    private owner;
+    constructor(serverUrl: string, scope: string, environment: string, cluster: string, tenant: string, service: string, version: string, owner: string);
+    startTrace(): void;
+}
+export default APM;

package/dist/services/APM.js

@@ -1,79 +1,73 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const elastic_apm_node_1 = __importDefault(require("elastic-apm-node"));
-const config_1 = require("@edirect/config");
-const constants_1 = require("../constants");
-const exporter_jaeger_1 = require("@opentelemetry/exporter-jaeger");
-const exporter_otlp_http_1 = require("@opentelemetry/exporter-otlp-http");
-const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
-const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
-const resources_1 = require("@opentelemetry/resources");
-const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
-const instrumentation_1 = require("@opentelemetry/instrumentation");
-const instrumentation_http_1 = require("@opentelemetry/instrumentation-http");
-const instrumentation_express_1 = require("@opentelemetry/instrumentation-express");
-const config = new config_1.ConfigService(`.${process.env.NODE_ENV || 'development'}.env`);
-const env = config.getConfig();
-class APM {
-    constructor(serviceName, serverUrl, traceServer) {
-        this.serviceName = serviceName || env.APM_SERVICE_NAME || 'service-test';
-        this.serverUrl = serverUrl || env.APM_SERVER_URL || 'localhost';
-        this.traceServer = traceServer || env.TRACE_SERVER || '';
-    }
-    startElastic() {
-        elastic_apm_node_1.default.start({
-            serviceName: this.serviceName,
-            serverUrl: this.serverUrl,
-            logUncaughtExceptions: true,
-            useElasticTraceparentHeader: true,
-            usePathAsTransactionName: true,
-            captureBody: 'all',
-            captureExceptions: true,
-            sanitizeFieldNames: [],
-        });
-        return;
-    }
-    startOtlp() {
-        let exporter;
-        switch (this.traceServer) {
-            case constants_1.TRACE_SERVER.JAEGER:
-                exporter = new exporter_jaeger_1.JaegerExporter({ host: this.serverUrl });
-                break;
-            case constants_1.TRACE_SERVER.OTLP:
-                exporter = new exporter_otlp_http_1.OTLPTraceExporter({ url: this.serverUrl });
-                break;
-            default:
-                return;
-        }
-        const provider = new sdk_trace_node_1.NodeTracerProvider({
-            resource: new resources_1.Resource({
-                [semantic_conventions_1.SemanticResourceAttributes.SERVICE_NAME]: this.serviceName,
-            }),
-        });
-        provider.addSpanProcessor(new sdk_trace_base_1.SimpleSpanProcessor(exporter));
-        provider.register();
-        (0, instrumentation_1.registerInstrumentations)({
-            instrumentations: [
-                new instrumentation_http_1.HttpInstrumentation({ ignoreIncomingPaths: ['/healthcheck', 'healthcheck'] }),
-                new instrumentation_express_1.ExpressInstrumentation({ ignoreLayers: ['/healthcheck', 'healthcheck'] }),
-            ],
-        });
-        return;
-    }
-    startTrace() {
-        switch (this.traceServer) {
-            case constants_1.TRACE_SERVER.ELASTIC_APM:
-                this.startElastic();
-                break;
-            default:
-                this.startOtlp();
-                break;
-        }
-        return;
-    }
-}
-exports.default = APM;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const config_1 = require("@edirect/config");
+const exporter_trace_otlp_http_1 = require("@opentelemetry/exporter-trace-otlp-http");
+const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
+const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
+const resources_1 = require("@opentelemetry/resources");
+const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
+const instrumentation_1 = require("@opentelemetry/instrumentation");
+const instrumentation_http_1 = require("@opentelemetry/instrumentation-http");
+const instrumentation_express_1 = require("@opentelemetry/instrumentation-express");
+const config = new config_1.ConfigService(`.${process.env.NODE_ENV || 'development'}.env`);
+const env = config.getConfig();
+class APM {
+    constructor(serverUrl, scope, environment, cluster, tenant, service, version, owner) {
+        this.serverUrl = serverUrl;
+        this.scope = scope;
+        this.environment = environment;
+        this.cluster = cluster;
+        this.tenant = tenant;
+        this.service = service;
+        this.version = version;
+        this.owner = owner;
+        const TRACE_SERVER_URL = env['TRACE_SERVER_URL'];
+        const TRACE_TAG_SCOPE = env['TRACE_TAG_SCOPE'] || '';
+        const TRACE_TAG_ENV = env['TRACE_TAG_ENV'] || '';
+        const TRACE_TAG_CLUSTER = env['TRACE_TAG_CLUSTER'] || '';
+        const TRACE_TAG_TENANT = env['TRACE_TAG_TENANT'] || '';
+        const TRACE_TAG_SERVICE = env['TRACE_TAG_SERVICE'] || '';
+        const TRACE_TAG_VERSION = env['TRACE_TAG_VERSION'] || '';
+        const TRACE_TAG_OWNER = env['TRACE_TAG_OWNER'] || '';
+        this.serverUrl = this.serverUrl || TRACE_SERVER_URL;
+        this.scope = this.scope || TRACE_TAG_SCOPE;
+        this.environment = this.environment || TRACE_TAG_ENV;
+        this.cluster = this.cluster || TRACE_TAG_CLUSTER;
+        this.tenant = this.tenant || TRACE_TAG_TENANT;
+        this.service = this.service || TRACE_TAG_SERVICE;
+        this.version = this.version || TRACE_TAG_VERSION;
+        this.owner = this.owner || TRACE_TAG_OWNER;
+    }
+    startTrace() {
+        if (!this.serverUrl)
+            return;
+        const exporter = new exporter_trace_otlp_http_1.OTLPTraceExporter({ url: `https://${this.serverUrl}/v1/traces` });
+        const provider = new sdk_trace_node_1.NodeTracerProvider({
+            resource: new resources_1.Resource({
+                [semantic_conventions_1.SemanticResourceAttributes.SERVICE_NAME]: this.service,
+                ['TRACE_TAG_SCOPE']: this.scope,
+                ['TRACE_TAG_ENV']: this.environment,
+                ['TRACE_TAG_CLUSTER']: this.cluster,
+                ['TRACE_TAG_TENANT']: this.tenant,
+                ['TRACE_TAG_SERVICE']: this.service,
+                ['TRACE_TAG_VERSION']: this.version,
+                ['TRACE_TAG_OWNER']: this.owner,
+            }),
+        });
+        provider.addSpanProcessor(new sdk_trace_base_1.BatchSpanProcessor(exporter));
+        provider.register();
+        (0, instrumentation_1.registerInstrumentations)({
+            instrumentations: [
+                new instrumentation_http_1.HttpInstrumentation({
+                    ignoreIncomingPaths: ['/healthcheck', 'healthcheck'],
+                }),
+                new instrumentation_express_1.ExpressInstrumentation({
+                    ignoreLayers: ['/healthcheck', 'healthcheck'],
+                }),
+            ],
+        });
+        return;
+    }
+}
+exports.default = APM;
 //# sourceMappingURL=APM.js.map

package/dist/services/APM.js.map

@@ -1 +1 @@
-{"version":3,"file":"APM.js","sourceRoot":"","sources":["../../src/services/APM.ts"],"names":[],"mappings":";;;;;AAAA,wEAAmC;AACnC,4CAAgD;AAChD,4CAA4C;AAC5C,oEAAgE;AAChE,0EAAsE;AACtE,kEAAoE;AACpE,kEAAmE;AACnE,wDAAoD;AACpD,8EAAiF;AACjF,oEAA0E;AAC1E,8EAA0E;AAC1E,oFAAgF;AAEhF,MAAM,MAAM,GAAG,IAAI,sBAAa,CAC9B,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa,MAAM,CAChD,CAAC;AACF,MAAM,GAAG,GAA2B,MAAM,CAAC,SAAS,EAAE,CAAC;AAEvD,MAAM,GAAG;IAKP,YAAY,WAAoB,EAAE,SAAkB,EAAE,WAAoB;QACxE,IAAI,CAAC,WAAW,GAAG,WAAW,IAAI,GAAG,CAAC,gBAAgB,IAAI,cAAc,CAAC;QACzE,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,GAAG,CAAC,cAAc,IAAI,WAAW,CAAC;QAChE,IAAI,CAAC,WAAW,GAAG,WAAW,IAAI,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC;IAC3D,CAAC;IAEO,YAAY;QAClB,0BAAG,CAAC,KAAK,CAAC;YACR,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,qBAAqB,EAAE,IAAI;YAC3B,2BAA2B,EAAE,IAAI;YACjC,wBAAwB,EAAE,IAAI;YAC9B,WAAW,EAAE,KAAK;YAClB,iBAAiB,EAAE,IAAI;YACvB,kBAAkB,EAAE,EAAE;SACvB,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAEO,SAAS;QACf,IAAI,QAAQ,CAAC;QACb,QAAQ,IAAI,CAAC,WAAW,EAAE;YACxB,KAAK,wBAAY,CAAC,MAAM;gBACtB,QAAQ,GAAG,IAAI,gCAAc,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;gBACxD,MAAM;YACR,KAAK,wBAAY,CAAC,IAAI;gBACpB,QAAQ,GAAG,IAAI,sCAAiB,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;gBAC1D,MAAM;YACR;gBACE,OAAO;SACV;QAED,MAAM,QAAQ,GAAG,IAAI,mCAAkB,CAAC;YACtC,QAAQ,EAAE,IAAI,oBAAQ,CAAC;gBACrB,CAAC,iDAA0B,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,WAAW;aAC5D,CAAC;SACH,CAAC,CAAC;QACH,QAAQ,CAAC,gBAAgB,CAAC,IAAI,oCAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC7D,QAAQ,CAAC,QAAQ,EAAE,CAAC;QAEpB,IAAA,0CAAwB,EAAC;YACvB,gBAAgB,EAAE;gBAChB,IAAI,0CAAmB,CAAC,EAAC,mBAAmB,EAAE,CAAC,cAAc,EAAE,aAAa,CAAC,EAAC,CAAC;gBAC/E,IAAI,gDAAsB,CAAC,EAAC,YAAY,EAAE,CAAC,cAAc,EAAE,aAAa,CAAC,EAAC,CAAC;aAC5E;SACF,CAAC,CAAA;QAEF,OAAO;IACT,CAAC;IAEM,UAAU;QACf,QAAQ,IAAI,CAAC,WAAW,EAAE;YACxB,KAAK,wBAAY,CAAC,WAAW;gBAC3B,IAAI,CAAC,YAAY,EAAE,CAAC;gBACpB,MAAM;YACR;gBACE,IAAI,CAAC,SAAS,EAAE,CAAC;gBACjB,MAAM;SACT;QACD,OAAO;IACT,CAAC;CACF;AAED,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"APM.js","sourceRoot":"","sources":["../../src/services/APM.ts"],"names":[],"mappings":"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"}

package/dist/services/index.d.ts

@@ -1 +1 @@
-export { default as APM } from './APM';
+export { default as APM } from './APM';