@diia-inhouse/diia-logger 3.19.13 → 3.20.0
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/index.js +9 -4
- package/dist/index.js.map +1 -1
- package/package.json +3 -2
- package/src/index.ts +10 -4
package/dist/index.js
CHANGED
|
@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.createTrimmer = exports.defaultOptions = exports.DiiaLogger = void 0;
|
|
37
|
+
const api_1 = require("@opentelemetry/api");
|
|
37
38
|
const lodash_1 = require("lodash");
|
|
38
39
|
const pino_1 = __importStar(require("pino"));
|
|
39
40
|
const types_1 = require("@diia-inhouse/types");
|
|
@@ -58,10 +59,14 @@ class DiiaLogger {
|
|
|
58
59
|
formatters: {
|
|
59
60
|
level: (l) => ({ level: l.toUpperCase() }),
|
|
60
61
|
},
|
|
61
|
-
mixin: () =>
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
62
|
+
mixin: () => {
|
|
63
|
+
const logData = this.asyncLocalStorage?.getStore()?.logData;
|
|
64
|
+
const spanId = api_1.trace.getSpan(api_1.context.active())?.spanContext().spanId;
|
|
65
|
+
return {
|
|
66
|
+
headers: spanId ? { ...logData, spanId } : logData,
|
|
67
|
+
serviceVersion: this.getServiceVersion(),
|
|
68
|
+
};
|
|
69
|
+
},
|
|
65
70
|
serializers: {
|
|
66
71
|
err: (value) => {
|
|
67
72
|
const res = pino_1.stdSerializers.err(value);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,mCAAiC;AACjC,6CAAoF;AAEpF,+CAAuF;AAGvF,qCAAkD;AAClD,uCAAmC;AAEnC,MAAqB,UAAU;IAMN;IACA;IANb,MAAM,CAAkB;IAExB,IAAI,CAA4B;IAExC,YACqB,UAAyB,EAAE,EAC3B,iBAA8C,EAC/D,oBAA8C,IAAI,EAClD,gBAAyC,IAAI;QAH5B,YAAO,GAAP,OAAO,CAAoB;QAC3B,sBAAiB,GAAjB,iBAAiB,CAA6B;QAI/D,MAAM,eAAe,GAAG,IAAA,gCAAuB,EAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC7D,MAAM,EACF,MAAM,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,GACjC,GAAG,eAAe,CAAA;QAEnB,IAAI,CAAC,MAAM;YACP,aAAa;gBACb,IAAA,cAAI,EACA;oBACI,SAAS,EAAE,GAAG,EAAE,CAAC,iBAAiB,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW,EAAE,GAAG;oBACvE,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,gBAAQ,CAAC,IAAI;oBAC7C,IAAI,EAAE,SAAS;oBACf,UAAU,EAAE;wBACR,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;qBAC7C;oBACD,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@diia-inhouse/diia-logger",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.20.0",
|
|
4
4
|
"description": "Logger package",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/types/index.d.ts",
|
|
@@ -27,6 +27,7 @@
|
|
|
27
27
|
"find-circulars": "madge --circular --extensions ts ./"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
+
"@opentelemetry/api": "1.9.1",
|
|
30
31
|
"lodash": "4.18.1",
|
|
31
32
|
"pino": "10.3.1",
|
|
32
33
|
"pino-pretty": "13.1.3"
|
|
@@ -36,7 +37,7 @@
|
|
|
36
37
|
"@diia-inhouse/eslint-config": "8.8.0",
|
|
37
38
|
"@diia-inhouse/eslint-plugin": "1.9.5",
|
|
38
39
|
"@diia-inhouse/types": "12.0.1",
|
|
39
|
-
"@diia-inhouse/utils": "5.3.
|
|
40
|
+
"@diia-inhouse/utils": "5.3.17",
|
|
40
41
|
"@types/lodash": "4.17.24",
|
|
41
42
|
"@vitest/coverage-v8": "4.0.18",
|
|
42
43
|
"@vitest/ui": "4.0.18",
|
package/src/index.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
2
|
import { AsyncLocalStorage } from 'node:async_hooks'
|
|
3
3
|
|
|
4
|
+
import { context, trace } from '@opentelemetry/api'
|
|
4
5
|
import { isObject } from 'lodash'
|
|
5
6
|
import pino, { DestinationStream, Logger as PinoLogger, stdSerializers } from 'pino'
|
|
6
7
|
|
|
@@ -36,10 +37,15 @@ export default class DiiaLogger implements Logger {
|
|
|
36
37
|
formatters: {
|
|
37
38
|
level: (l) => ({ level: l.toUpperCase() }),
|
|
38
39
|
},
|
|
39
|
-
mixin: () =>
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
40
|
+
mixin: () => {
|
|
41
|
+
const logData = this.asyncLocalStorage?.getStore()?.logData
|
|
42
|
+
const spanId = trace.getSpan(context.active())?.spanContext().spanId
|
|
43
|
+
|
|
44
|
+
return {
|
|
45
|
+
headers: spanId ? { ...logData, spanId } : logData,
|
|
46
|
+
serviceVersion: this.getServiceVersion(),
|
|
47
|
+
}
|
|
48
|
+
},
|
|
43
49
|
serializers: {
|
|
44
50
|
err: (value) => {
|
|
45
51
|
const res = stdSerializers.err(value)
|