@riocrypto/common-server 1.0.1459 → 1.0.1461

package/build/index.d.ts

@@ -3,6 +3,7 @@ export * from "./middlewares/validate-request";
 export * from "./middlewares/get-order";
 export * from "./middlewares/authorize";
 export * from "./middlewares/not-sandbox";
+export * from "./middlewares/set-trace";
 export * from "./services/apiKey";
 export * from "./services/password";
 export * from "./services/logger";

package/build/index.js

@@ -19,6 +19,7 @@ __exportStar(require("./middlewares/validate-request"), exports);
 __exportStar(require("./middlewares/get-order"), exports);
 __exportStar(require("./middlewares/authorize"), exports);
 __exportStar(require("./middlewares/not-sandbox"), exports);
+__exportStar(require("./middlewares/set-trace"), exports);
 __exportStar(require("./services/apiKey"), exports);
 __exportStar(require("./services/password"), exports);
 __exportStar(require("./services/logger"), exports);

package/build/middlewares/set-trace.d.ts

@@ -0,0 +1,2 @@
+import { NextFunction, Request, Response } from "express";
+export declare const setTrace: (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/build/middlewares/set-trace.js

@@ -0,0 +1,33 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setTrace = void 0;
+const node_opentelemetry_1 = require("@hyperdx/node-opentelemetry");
+const setTrace = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c, _d;
+    if (req.user) {
+        (0, node_opentelemetry_1.setTraceAttributes)({
+            userId: req.user.id,
+            userEmail: req.user.email,
+            authId: (_a = req.auth) === null || _a === void 0 ? void 0 : _a.id,
+            phoneNumber: (_b = req.auth) === null || _b === void 0 ? void 0 : _b.phoneNumber,
+        });
+    }
+    else if (req.admin) {
+        (0, node_opentelemetry_1.setTraceAttributes)({
+            adminId: req.admin.id,
+            adminAuthId: (_c = req.adminAuth) === null || _c === void 0 ? void 0 : _c.id,
+            email: (_d = req.adminAuth) === null || _d === void 0 ? void 0 : _d.email,
+        });
+    }
+    next();
+});
+exports.setTrace = setTrace;

package/build/services/logger.js

@@ -26,7 +26,7 @@ class LoggerService {
             const { getWinsonTransport } = yield require("@hyperdx/node-opentelemetry");
             this.logger = (0, winston_1.createLogger)({
                 level: MAX_LEVEL,
-                format: winston_1.format.json(),
+                format: winston_1.format.combine(winston_1.format.timestamp(), winston_1.format.json(), winston_1.format.metadata(), winston_1.format.prettyPrint()),
                 transports: [
                     new winston_1.transports.Console(),
                     getWinsonTransport(MAX_LEVEL, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.1459",
+  "version": "1.0.1461",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",