@icd-iot-aicf/nestjs-logger 0.0.1 → 0.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/common/helper/tools.d.ts +5 -0
- package/dist/common/helper/tools.js +73 -0
- package/dist/common/helper/tools.js.map +1 -0
- package/dist/logger/cloudron/dtos/logger.cauldron.dto.d.ts +1 -1
- package/dist/logger/cloudron/dtos/logger.cauldron.dto.js +23 -6
- package/dist/logger/cloudron/dtos/logger.cauldron.dto.js.map +1 -1
- package/dist/logger/cloudron/global/cloudron.global.d.ts +0 -0
- package/dist/logger/cloudron/global/cloudron.global.js +1 -0
- package/dist/logger/cloudron/global/cloudron.global.js.map +1 -0
- package/dist/logger/cloudron/middleware/cloudron.middleware.js +1 -1
- package/dist/logger/cloudron/middleware/cloudron.middleware.js.map +1 -1
- package/dist/logger/logger.service.js +3 -1
- package/dist/logger/logger.service.js.map +1 -1
- package/dist/metrics/metrics.middleware.js +17 -1
- package/dist/metrics/metrics.middleware.js.map +1 -1
- package/dist/metrics/metrics.service.d.ts +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.mapResultCode = mapResultCode;
|
|
4
|
+
exports.mapStatusCodeMetric = mapStatusCodeMetric;
|
|
5
|
+
const response_1 = require("./response");
|
|
6
|
+
function mapResultCode(res, statusCode) {
|
|
7
|
+
const mapDataResponse = typeof res == 'string' ? JSON.parse(res) : res;
|
|
8
|
+
const respData = { resultCode: response_1.RESULTS.SUCCESS.resultCode, resultDesc: response_1.RESULTS.SUCCESS.resultDescription };
|
|
9
|
+
if (mapDataResponse.OperationStatus?.Code) {
|
|
10
|
+
respData.resultCode = mapDataResponse.OperationStatus?.Code;
|
|
11
|
+
}
|
|
12
|
+
else {
|
|
13
|
+
respData.resultCode = `${statusCode}00`;
|
|
14
|
+
}
|
|
15
|
+
if (mapDataResponse.OperationStatus?.DeveloperMessage) {
|
|
16
|
+
respData.resultDesc = String(mapDataResponse.OperationStatus?.DeveloperMessage);
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
switch (statusCode) {
|
|
20
|
+
case 200:
|
|
21
|
+
respData.resultDesc = response_1.RESULTS.SUCCESS.resultDescription;
|
|
22
|
+
break;
|
|
23
|
+
case 201:
|
|
24
|
+
respData.resultDesc = response_1.RESULTS.CREATED.resultDescription;
|
|
25
|
+
break;
|
|
26
|
+
case 202:
|
|
27
|
+
respData.resultDesc = response_1.RESULTS.ACCEPTED.resultDescription;
|
|
28
|
+
break;
|
|
29
|
+
case 400:
|
|
30
|
+
respData.resultDesc = response_1.RESULTS.DATA_INVALID.resultDescription;
|
|
31
|
+
break;
|
|
32
|
+
case 401:
|
|
33
|
+
respData.resultDesc = response_1.RESULTS.UNAUTHORIZED.resultDescription;
|
|
34
|
+
break;
|
|
35
|
+
case 403:
|
|
36
|
+
respData.resultDesc = response_1.RESULTS.REQUIRE.resultDescription;
|
|
37
|
+
break;
|
|
38
|
+
case 404:
|
|
39
|
+
respData.resultDesc = response_1.RESULTS.DATA_NOT_FOUND.resultDescription;
|
|
40
|
+
break;
|
|
41
|
+
case 404:
|
|
42
|
+
respData.resultDesc = response_1.RESULTS.NOT_ALLOWED.resultDescription;
|
|
43
|
+
break;
|
|
44
|
+
case 409:
|
|
45
|
+
respData.resultDesc = response_1.RESULTS.CONFLICT.resultDescription;
|
|
46
|
+
break;
|
|
47
|
+
case 413:
|
|
48
|
+
respData.resultDesc = response_1.RESULTS.PAYLOAD_TOO_LARGE.resultDescription;
|
|
49
|
+
break;
|
|
50
|
+
case 500:
|
|
51
|
+
respData.resultDesc = response_1.RESULTS.INTERNAL_SERVER_ERROR.resultDescription;
|
|
52
|
+
break;
|
|
53
|
+
case 501:
|
|
54
|
+
respData.resultDesc = response_1.RESULTS.UNSUPPORTED.resultDescription;
|
|
55
|
+
break;
|
|
56
|
+
default:
|
|
57
|
+
respData.resultDesc = response_1.RESULTS.SUCCESS.resultDescription;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
return respData;
|
|
61
|
+
}
|
|
62
|
+
function mapStatusCodeMetric(statusCode, responseBody) {
|
|
63
|
+
const mapDataResponse = typeof responseBody == 'string' ? JSON.parse(responseBody) : responseBody;
|
|
64
|
+
let respData = response_1.RESULTS.SUCCESS.resultCode;
|
|
65
|
+
if (mapDataResponse.OperationStatus?.Code) {
|
|
66
|
+
respData = mapDataResponse.OperationStatus?.Code;
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
respData = `${statusCode}00`;
|
|
70
|
+
}
|
|
71
|
+
return respData;
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=tools.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../src/common/helper/tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ export declare class CSummaryLog implements ISummaryLog {
|
|
|
15
15
|
resTimestamp: string;
|
|
16
16
|
usageTime: number;
|
|
17
17
|
custom: any;
|
|
18
|
-
constructor(req: Request, res: any, activityData: ActivityData);
|
|
18
|
+
constructor(req: Request, res: any, activityData: ActivityData, statusCode: number);
|
|
19
19
|
}
|
|
20
20
|
export declare class CDetailLog implements IDetailLog {
|
|
21
21
|
systemTimestamp: any;
|
|
@@ -5,24 +5,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.CDetailManaulLog = exports.LogLevel = exports.LogType = exports.CActivityLogNews = exports.CDetailEndpointLog = exports.CDetailLog = exports.CSummaryLog = void 0;
|
|
7
7
|
const main_1 = require("../../../main");
|
|
8
|
+
const microtime_1 = __importDefault(require("microtime"));
|
|
8
9
|
const os_1 = __importDefault(require("os"));
|
|
9
10
|
const tools_1 = require("../../../utils/tools");
|
|
10
11
|
const app_log_config_service_1 = require("../../../config/app-log-config.service");
|
|
11
12
|
const tracnsaction_info_1 = require("../../../common/async-storage/tracnsaction-info");
|
|
12
13
|
const global_function_1 = require("../../core/functions/global-function");
|
|
14
|
+
const external_transaction_info_1 = require("../../../common/async-storage/external-transaction-info");
|
|
15
|
+
const tools_2 = require("../../../common/helper/tools");
|
|
13
16
|
class CSummaryLog {
|
|
14
|
-
constructor(req, res, activityData) {
|
|
17
|
+
constructor(req, res, activityData, statusCode) {
|
|
18
|
+
const { resultCode, resultDesc } = (0, tools_2.mapResultCode)(res, statusCode);
|
|
15
19
|
const appConfig = app_log_config_service_1.AppLogConfigService.getConfig();
|
|
20
|
+
const transactionInfo = (0, global_function_1.GetTransactionReference)();
|
|
16
21
|
this.systemTimestamp = `${(0, main_1.dayJs)().format('DD/MM/YYYY HH:mm:ss.SSS')}`;
|
|
17
22
|
this.logType = LogType.SUMMARY;
|
|
18
23
|
this.namespace = appConfig.appName || null;
|
|
19
24
|
this.applicationName = appConfig.componentName || null;
|
|
20
25
|
this.containerId = os_1.default.hostname();
|
|
21
|
-
this.sessionId =
|
|
26
|
+
this.sessionId = transactionInfo.sessionId || null;
|
|
22
27
|
this.tid = req.headers['x-ais-orderref'] || null;
|
|
23
|
-
this.cmdName =
|
|
24
|
-
this.resultCode =
|
|
25
|
-
this.resultDesc =
|
|
28
|
+
this.cmdName = transactionInfo.recordName || req.url;
|
|
29
|
+
this.resultCode = resultCode;
|
|
30
|
+
this.resultDesc = resultDesc;
|
|
26
31
|
this.reqTimestamp = `${(0, main_1.dayJs)((0, tools_1.changeMicroToMilli)(activityData.startTime)).format('DD/MM/YYYY HH:mm:ss.SSS')}`;
|
|
27
32
|
this.resTimestamp = `${(0, main_1.dayJs)((0, tools_1.changeMicroToMilli)(activityData.endTime)).format('DD/MM/YYYY HH:mm:ss.SSS')}`;
|
|
28
33
|
this.usageTime = (0, tools_1.calculateDifferentTimeMicroToMilli)(activityData.startTime, activityData.endTime);
|
|
@@ -109,6 +114,8 @@ class CDetailManaulLog {
|
|
|
109
114
|
constructor(data) {
|
|
110
115
|
const appConfig = app_log_config_service_1.AppLogConfigService.getConfig();
|
|
111
116
|
const transactionRefInfo = tracnsaction_info_1.transactionInfoLocalStorage.getStore();
|
|
117
|
+
const startTime = data.startTime || microtime_1.default.now();
|
|
118
|
+
const endTime = data.endTime || microtime_1.default.now();
|
|
112
119
|
this.systemTimestamp = `${(0, main_1.dayJs)().format('DD/MM/YYYY HH:mm:ss.SSS')}`;
|
|
113
120
|
this.logType = LogType.DETAIL;
|
|
114
121
|
this.namespace = appConfig.appName || null;
|
|
@@ -116,8 +123,18 @@ class CDetailManaulLog {
|
|
|
116
123
|
this.containerId = os_1.default.hostname();
|
|
117
124
|
this.sessionId = transactionRefInfo.get('sessionId');
|
|
118
125
|
this.tid = transactionRefInfo.get('transactionId');
|
|
119
|
-
this.custom1 = data.message;
|
|
126
|
+
this.custom1 = new CCustomX(JSON.parse(data.message), { startTime, endTime });
|
|
120
127
|
}
|
|
121
128
|
}
|
|
122
129
|
exports.CDetailManaulLog = CDetailManaulLog;
|
|
130
|
+
class CCustomX {
|
|
131
|
+
constructor(message, activityData) {
|
|
132
|
+
const externalInfoStore = external_transaction_info_1.externalTransactionInfoLocal.getStore();
|
|
133
|
+
this.requestObject = JSON.stringify(message.requestObject);
|
|
134
|
+
this.responseObject = JSON.stringify(message.responseObject);
|
|
135
|
+
this.activityLog = new CActivityLog(activityData);
|
|
136
|
+
this.endPointName = externalInfoStore.get('dependency');
|
|
137
|
+
this.subSessionId = externalInfoStore.get('subSessionId');
|
|
138
|
+
}
|
|
139
|
+
}
|
|
123
140
|
//# sourceMappingURL=logger.cauldron.dto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.cauldron.dto.js","sourceRoot":"","sources":["../../../../src/logger/cloudron/dtos/logger.cauldron.dto.ts"],"names":[],"mappings":";;;;;;AAAA,wCAAsC;
|
|
1
|
+
{"version":3,"file":"logger.cauldron.dto.js","sourceRoot":"","sources":["../../../../src/logger/cloudron/dtos/logger.cauldron.dto.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
//# sourceMappingURL=cloudron.global.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cloudron.global.js","sourceRoot":"","sources":["../../../../src/logger/cloudron/global/cloudron.global.ts"],"names":[],"mappings":""}
|
|
@@ -49,7 +49,7 @@ let CloudronMiddleware = class CloudronMiddleware {
|
|
|
49
49
|
startTime,
|
|
50
50
|
endTime,
|
|
51
51
|
};
|
|
52
|
-
const summary = new logger_cauldron_dto_1.CSummaryLog(req, buffer, activityData);
|
|
52
|
+
const summary = new logger_cauldron_dto_1.CSummaryLog(req, buffer, activityData, res.statusCode);
|
|
53
53
|
summary.custom =
|
|
54
54
|
this.externalSummaryService.getCustomSummaryCloudron(sessionId);
|
|
55
55
|
this.logger.log(summary);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudron.middleware.js","sourceRoot":"","sources":["../../../../src/logger/cloudron/middleware/cloudron.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4D;AAC5D,yDAA2D;AAC3D,6FAAuF;AAEvF,gDAAmD;AACnD,qEAIqC;AACrC,0DAAkC;AAClC,0EAA+E;AAC/E,uDAAuD;AAGhD,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YACmB,MAA2B,EACpC,sBAAkD;QADzC,WAAM,GAAN,MAAM,CAAqB;QACpC,2BAAsB,GAAtB,sBAAsB,CAA4B;IACzD,CAAC;IAEJ,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QACjD,MAAM,SAAS,GAAG,mBAAS,CAAC,GAAG,EAAE,CAAC;QAClC,MAAM,SAAS,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC;QACvC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,IAAA,mBAAW,GAAE,CAAC;QAChD,IAAI,CAAC,sBAAsB,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;QAC1D,MAAM,MAAM,GAAU,EAAE,CAAC;QACzB,MAAM,aAAa,GAAG,GAAG,CAAC,KAAK,CAAC;QAChC,MAAM,WAAW,GAAG,GAAG,CAAC,GAAG,CAAC;QAE5B,GAAG,CAAC,KAAK,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;YAC7B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAClC,OAAO,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACxC,CAAC,CAAC;QACF,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;YAC3B,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;gBACZ,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACpC,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACtD,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACpB,MAAM,OAAO,GAAG,mBAAS,CAAC,GAAG,EAAE,CAAC;gBAChC,MAAM,YAAY,GAAiB;oBACjC,SAAS;oBACT,OAAO;iBACR,CAAC;gBACF,MAAM,OAAO,GAAG,IAAI,iCAAW,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cloudron.middleware.js","sourceRoot":"","sources":["../../../../src/logger/cloudron/middleware/cloudron.middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,7 +76,9 @@ let CustomLoggerService = class CustomLoggerService {
|
|
|
76
76
|
case configurations_1.FORMAT_TYPE.CLOUDRON:
|
|
77
77
|
this.autoSetLevel = (data, level) => {
|
|
78
78
|
try {
|
|
79
|
-
data.
|
|
79
|
+
if (data.logType !== 'Summary') {
|
|
80
|
+
data.logLevel = level.toUpperCase();
|
|
81
|
+
}
|
|
80
82
|
return data;
|
|
81
83
|
}
|
|
82
84
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.service.js","sourceRoot":"","sources":["../../src/logger/logger.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA2D;AAC3D,iDAAmC;AACnC,qCAAiC;AACjC,6EAAuE;AACvE,6DAAuD;AAGhD,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAM9B;QAJU,iBAAY,GAAiC,CAAC,IAAI,EAAE,EAAE;YAC9D,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAGA,MAAM,MAAM,GAAG,4CAAmB,CAAC,SAAS,EAAE,CAAC;QAE/C,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;YACjC,KAAK,EAAE,MAAM,CAAC,QAAQ;YACtB,MAAM,EAAE,gBAAM,CAAC,OAAO,CACpB,gBAAM,CAAC,MAAM,EAAE,EACf,gBAAM,CAAC,QAAQ,EAAE,EACjB,gBAAM,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC,EACvD,gBAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,CAC3C;YACD,UAAU,EAAE;gBACV,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE;aAGjC;SACF,CAAC,CAAC;QAEH,QAAQ,MAAM,CAAC,MAAM,EAAE,CAAC;YACtB,KAAK,4BAAW,CAAC,IAAI,IAAI,4BAAW,CAAC,GAAG;gBACtC,IAAI,CAAC,YAAY,GAAG,CAAC,IAAI,EAAE,KAAa,EAAE,EAAE;oBAC1C,IAAI,CAAC;wBACH,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;wBACnB,OAAO,IAAI,CAAC;oBACd,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,OAAO,IAAI,CAAC;oBACd,CAAC;gBACH,CAAC,CAAC;gBACF,MAAM;YACR,KAAK,4BAAW,CAAC,QAAQ;gBACvB,IAAI,CAAC,YAAY,GAAG,CAAC,IAAI,EAAE,KAAa,EAAE,EAAE;oBAC1C,IAAI,CAAC;wBACH,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.service.js","sourceRoot":"","sources":["../../src/logger/logger.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ exports.AMQPMetricsMiddleware = exports.HTTPMetricsMiddleware = void 0;
|
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const metrics_service_1 = require("./metrics.service");
|
|
15
15
|
const tracnsaction_info_1 = require("../common/async-storage/tracnsaction-info");
|
|
16
|
+
const tools_1 = require("../common/helper/tools");
|
|
16
17
|
let HTTPMetricsMiddleware = class HTTPMetricsMiddleware {
|
|
17
18
|
constructor(metricsService) {
|
|
18
19
|
this.metricsService = metricsService;
|
|
@@ -24,6 +25,21 @@ let HTTPMetricsMiddleware = class HTTPMetricsMiddleware {
|
|
|
24
25
|
}
|
|
25
26
|
use(req, res, next) {
|
|
26
27
|
const startTime = new Date().getTime();
|
|
28
|
+
const chunks = [];
|
|
29
|
+
let responseBody;
|
|
30
|
+
const originalWrite = res.write;
|
|
31
|
+
const originalEnd = res.end;
|
|
32
|
+
res.write = (...args) => {
|
|
33
|
+
chunks.push(Buffer.from(args[0]));
|
|
34
|
+
return originalWrite.apply(res, args);
|
|
35
|
+
};
|
|
36
|
+
res.end = (...args) => {
|
|
37
|
+
if (args[0]) {
|
|
38
|
+
chunks.push(Buffer.from(args[0]));
|
|
39
|
+
}
|
|
40
|
+
responseBody = Buffer.concat(chunks).toString();
|
|
41
|
+
return originalEnd.apply(res, args);
|
|
42
|
+
};
|
|
27
43
|
this.activeRequests++;
|
|
28
44
|
if (this.activeRequests > this.maxConcurrentRequests) {
|
|
29
45
|
this.maxConcurrentRequests = this.activeRequests;
|
|
@@ -31,7 +47,7 @@ let HTTPMetricsMiddleware = class HTTPMetricsMiddleware {
|
|
|
31
47
|
res.on('finish', () => {
|
|
32
48
|
this.activeRequests--;
|
|
33
49
|
const elapsedTimeSec = (new Date().getTime() - startTime) / 1000;
|
|
34
|
-
this.metricsService.incrementMetricsRequest(tracnsaction_info_1.transactionInfoLocalStorage.getStore().get('recordName'), req.method, res.statusCode, elapsedTimeSec, this.maxConcurrentRequests, this.activeRequests);
|
|
50
|
+
this.metricsService.incrementMetricsRequest(tracnsaction_info_1.transactionInfoLocalStorage.getStore().get('recordName'), req.method, (0, tools_1.mapStatusCodeMetric)(res.statusCode, responseBody), elapsedTimeSec, this.maxConcurrentRequests, this.activeRequests);
|
|
35
51
|
});
|
|
36
52
|
next();
|
|
37
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.middleware.js","sourceRoot":"","sources":["../../src/metrics/metrics.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4D;AAE5D,uDAAmD;AACnD,iFAAwF;
|
|
1
|
+
{"version":3,"file":"metrics.middleware.js","sourceRoot":"","sources":["../../src/metrics/metrics.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4D;AAE5D,uDAAmD;AACnD,iFAAwF;AACxF,kDAA6D;AAGtD,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,YAA6B,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QACnD,mBAAc,GAAG,CAAC,CAAC;QACnB,0BAAqB,GAAG,CAAC,CAAC;IAF4B,CAAC;IAI/D,wBAAwB;QACtB,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACpC,CAAC;IAED,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QACjD,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QACvC,MAAM,MAAM,GAAU,EAAE,CAAC;QACzB,IAAI,YAAY,CAAA;QAChB,MAAM,aAAa,GAAG,GAAG,CAAC,KAAK,CAAC;QAChC,MAAM,WAAW,GAAG,GAAG,CAAC,GAAG,CAAC;QAE5B,GAAG,CAAC,KAAK,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;YAC7B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAClC,OAAO,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACxC,CAAC,CAAC;QAGD,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;YAC5B,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;gBACZ,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACpC,CAAC;YACD,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;YAChD,OAAO,WAAW,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACtC,CAAC,CAAC;QAGF,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACrD,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,cAAc,CAAC;QACnD,CAAC;QAED,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACpB,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,MAAM,cAAc,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC;YACjE,IAAI,CAAC,cAAc,CAAC,uBAAuB,CACzC,+CAA2B,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,EACxD,GAAG,CAAC,MAAM,EACV,IAAA,2BAAmB,EAAC,GAAG,CAAC,UAAU,EAAE,YAAY,CAAC,EACjD,cAAc,EACd,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,cAAc,CACpB,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,IAAI,EAAE,CAAC;IACT,CAAC;CACF,CAAA;AAlDY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAEkC,gCAAc;GADhD,qBAAqB,CAkDjC;AAGM,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,YAA6B,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;IAAG,CAAC;IAE/D,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QACjD,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QAMtB,CAAC,CAAC,CAAC;QACH,IAAI,EAAE,CAAC;IACT,CAAC;CACF,CAAA;AAbY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAEkC,gCAAc;GADhD,qBAAqB,CAajC"}
|
|
@@ -5,7 +5,7 @@ export declare class MetricsService {
|
|
|
5
5
|
private maxConcurrent;
|
|
6
6
|
private sumConcurrent;
|
|
7
7
|
constructor();
|
|
8
|
-
incrementMetricsRequest(path: string, method: string, status:
|
|
8
|
+
incrementMetricsRequest(path: string, method: string, status: string, elapsedTimeMs: number, maxConcurrentRequests: number, activeRequests: number): void;
|
|
9
9
|
calculatorTime: (transactionTimeTaked: any) => string;
|
|
10
10
|
getMetrics(): Promise<string>;
|
|
11
11
|
}
|