diff --git a/docker/gateway/package.json b/docker/gateway/package.json index 0c5460f7..52064e2c 100644 --- a/docker/gateway/package.json +++ b/docker/gateway/package.json @@ -27,7 +27,6 @@ "dependencies": { "cors": "^2.8.5", "express": "^4.19.2", - "express-pino-logger": "^7.0.0", "fetch-intercept": "^2.4.0", "helmet": "^6.0.0", "http-proxy-middleware": "^3.0.0", @@ -36,6 +35,7 @@ "jwt-decode": "^4.0.0", "method-override": "^3.0.0", "pino": "^8.6.1", + "pino-http": "^10.1.0", "pino-pretty": "^11.2.1", "ts-node": "^10.9.2", "yaml": "^2.4.3" @@ -43,7 +43,6 @@ "devDependencies": { "@types/cors": "^2.8.17", "@types/express": "^4.17.21", - "@types/express-pino-logger": "^4.0.5", "@types/jest": "^29.5.12", "@types/jquery": "^3.5.29", "@types/js-yaml": "^4.0.9", @@ -51,7 +50,6 @@ "@types/node": "^18.19.31", "@types/pino-multi-stream": "^5.1.6", "@types/supertest": "^6.0.2", - "@types/yaml": "^1.9.7", "babel-jest": "^29.6.1", "compression-webpack-plugin": "^11.1.0", "copy-webpack-plugin": "^12.0.2", diff --git a/docker/gateway/src/logger.ts b/docker/gateway/src/logger.ts index 49626e84..6dd9c178 100644 --- a/docker/gateway/src/logger.ts +++ b/docker/gateway/src/logger.ts @@ -1,5 +1,7 @@ import pino from 'pino' -import expressPinoLogger from 'express-pino-logger' +import pinoHttpLogger from 'pino-http' -export const logger = pino({ level: process.env.LOG_LEVEL || 'info' }) -export const expressLogger = expressPinoLogger(logger) +const level = process.env.LOG_LEVEL || 'info' + +export const logger = pino({ level: level}) +export const expressLogger = pinoHttpLogger({ logger: logger }) diff --git a/yarn.lock b/yarn.lock index 5931a624..acb27b7b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2110,7 +2110,6 @@ __metadata: dependencies: "@types/cors": "npm:^2.8.17" "@types/express": "npm:^4.17.21" - "@types/express-pino-logger": "npm:^4.0.5" "@types/jest": "npm:^29.5.12" "@types/jquery": "npm:^3.5.29" "@types/js-yaml": "npm:^4.0.9" @@ -2118,13 +2117,11 @@ __metadata: "@types/node": "npm:^18.19.31" "@types/pino-multi-stream": "npm:^5.1.6" "@types/supertest": "npm:^6.0.2" - "@types/yaml": "npm:^1.9.7" babel-jest: "npm:^29.6.1" compression-webpack-plugin: "npm:^11.1.0" copy-webpack-plugin: "npm:^12.0.2" cors: "npm:^2.8.5" express: "npm:^4.19.2" - express-pino-logger: "npm:^7.0.0" fetch-intercept: "npm:^2.4.0" helmet: "npm:^6.0.0" http-proxy-middleware: "npm:^3.0.0" @@ -2137,6 +2134,7 @@ __metadata: jwt-decode: "npm:^4.0.0" method-override: "npm:^3.0.0" pino: "npm:^8.6.1" + pino-http: "npm:^10.1.0" pino-pretty: "npm:^11.2.1" source-map-loader: "npm:^5.0.0" supertest: "npm:^7.0.0" @@ -3865,16 +3863,6 @@ __metadata: languageName: node linkType: hard -"@types/express-pino-logger@npm:^4.0.5": - version: 4.0.5 - resolution: "@types/express-pino-logger@npm:4.0.5" - dependencies: - "@types/pino": "npm:6.3" - "@types/pino-http": "npm:*" - checksum: 10/2c14592e25b2a168cd0f333743c4def061e7c3a3c57b6dcb730e5a9ad717f7c5fb21f5893a2c3b6f06e4205132765f3c2e056d124c19e8c28bb99b7e29fcfd7a - languageName: node - linkType: hard - "@types/express-serve-static-core@npm:*, @types/express-serve-static-core@npm:^4.17.33": version: 4.17.38 resolution: "@types/express-serve-static-core@npm:4.17.38" @@ -4145,15 +4133,6 @@ __metadata: languageName: node linkType: hard -"@types/pino-http@npm:*": - version: 5.8.4 - resolution: "@types/pino-http@npm:5.8.4" - dependencies: - "@types/pino": "npm:6.3" - checksum: 10/9520c7ea5e2f4b6950d0635d26d3e37f70ef8199c3f6815e9f8dca887a9e967f81b4f1228b91d63b9506f4e9f3cac921170fd84b07ba62fbbe675b4d2579951a - languageName: node - linkType: hard - "@types/pino-multi-stream@npm:^5.1.6": version: 5.1.6 resolution: "@types/pino-multi-stream@npm:5.1.6" @@ -4414,15 +4393,6 @@ __metadata: languageName: node linkType: hard -"@types/yaml@npm:^1.9.7": - version: 1.9.7 - resolution: "@types/yaml@npm:1.9.7" - dependencies: - yaml: "npm:*" - checksum: 10/0cdbf1857d89ade9b7d00aa09f2e0a2a56b707870b1dc1387f5be5398cd60c3f92bb32a543471147d2eaf38919f921391e0ade34fc9e1e022c7d67fb1a0da73c - languageName: node - linkType: hard - "@types/yargs-parser@npm:*": version: 21.0.1 resolution: "@types/yargs-parser@npm:21.0.1" @@ -7175,18 +7145,6 @@ __metadata: languageName: node linkType: hard -"duplexify@npm:^4.1.2": - version: 4.1.3 - resolution: "duplexify@npm:4.1.3" - dependencies: - end-of-stream: "npm:^1.4.1" - inherits: "npm:^2.0.3" - readable-stream: "npm:^3.1.1" - stream-shift: "npm:^1.0.2" - checksum: 10/b44b98ba0ffac3a658b4b1bf877219e996db288c5ae6f3dc55ca9b2cbef7df60c10eabfdd947f3d73a623eb9975a74a66d6d61e6f26bff90155315adb362aa77 - languageName: node - linkType: hard - "eastasianwidth@npm:^0.2.0": version: 0.2.0 resolution: "eastasianwidth@npm:0.2.0" @@ -7259,7 +7217,7 @@ __metadata: languageName: node linkType: hard -"end-of-stream@npm:^1.1.0, end-of-stream@npm:^1.4.1": +"end-of-stream@npm:^1.1.0": version: 1.4.4 resolution: "end-of-stream@npm:1.4.4" dependencies: @@ -8124,15 +8082,6 @@ __metadata: languageName: node linkType: hard -"express-pino-logger@npm:^7.0.0": - version: 7.0.0 - resolution: "express-pino-logger@npm:7.0.0" - dependencies: - pino-http: "npm:^6.0.0" - checksum: 10/b213ace84818ef81a38b10576e59fadbfe6aeb11da19c1d2ebd180040a7dfb3474a318979695d65ed43e6fa9c4415f42bf1cfcca9cea99c976f3c8f2c15b89db - languageName: node - linkType: hard - "express@npm:^4.17.3, express@npm:^4.19.2": version: 4.19.2 resolution: "express@npm:4.19.2" @@ -8244,7 +8193,7 @@ __metadata: languageName: node linkType: hard -"fast-redact@npm:^3.0.0, fast-redact@npm:^3.1.1": +"fast-redact@npm:^3.1.1": version: 3.5.0 resolution: "fast-redact@npm:3.5.0" checksum: 10/24b27e2023bd5a62f908d97a753b1adb8d89206b260f97727728e00b693197dea2fc2aa3711147a385d0ec6e713569fd533df37a4ef947e08cb65af3019c7ad5 @@ -8258,15 +8207,6 @@ __metadata: languageName: node linkType: hard -"fast-url-parser@npm:^1.1.3": - version: 1.1.3 - resolution: "fast-url-parser@npm:1.1.3" - dependencies: - punycode: "npm:^1.3.2" - checksum: 10/6d33f46ce9776f7f3017576926207a950ca39bc5eb78fc794404f2288fe494720f9a119084b75569bd9eb09d2b46678bfaf39c191fb2c808ef3c833dc8982752 - languageName: node - linkType: hard - "fastest-levenshtein@npm:^1.0.12": version: 1.0.16 resolution: "fastest-levenshtein@npm:1.0.16" @@ -12005,13 +11945,6 @@ __metadata: languageName: node linkType: hard -"on-exit-leak-free@npm:^0.2.0": - version: 0.2.0 - resolution: "on-exit-leak-free@npm:0.2.0" - checksum: 10/36a3a1baea964dc01088884e9d87824cc1a3304ae702e7c688bdb5deec61fbb79325977dd6cba5988f60ad40fedc6ef31ec705adf65b4b042bc0d2686186c0dd - languageName: node - linkType: hard - "on-exit-leak-free@npm:^2.1.0": version: 2.1.2 resolution: "on-exit-leak-free@npm:2.1.2" @@ -12382,25 +12315,15 @@ __metadata: languageName: node linkType: hard -"pino-abstract-transport@npm:v0.5.0": - version: 0.5.0 - resolution: "pino-abstract-transport@npm:0.5.0" - dependencies: - duplexify: "npm:^4.1.2" - split2: "npm:^4.0.0" - checksum: 10/d304a104e5cb0c3fef62ea544a4a39bf2472a602cdd7ddb136b0671b9c324ad93fa7888825c4cf33e624802436e897081ba92440f40518b9f2dbdbc0c889e409 - languageName: node - linkType: hard - -"pino-http@npm:^6.0.0": - version: 6.6.0 - resolution: "pino-http@npm:6.6.0" +"pino-http@npm:^10.1.0": + version: 10.1.0 + resolution: "pino-http@npm:10.1.0" dependencies: - fast-url-parser: "npm:^1.1.3" get-caller-file: "npm:^2.0.5" - pino: "npm:^7.5.0" - pino-std-serializers: "npm:^5.0.0" - checksum: 10/bcdb7bd996fa3e70b77ad77b7753693056778814351b2bd1bd3cf57fa91b0752fa5af4ff2d793ff6266b913d7e122a32e3163e5254f7380308ff1acee2feb626 + pino: "npm:^9.0.0" + pino-std-serializers: "npm:^7.0.0" + process-warning: "npm:^3.0.0" + checksum: 10/419a89113b98df1b80fc140326ff3afc93cd4b46b11af0f79f7b2c2185e365d0092beda86f5a2f62d51d07227f5835803c0e999cffba6b536b3a3495bd081c18 languageName: node linkType: hard @@ -12428,20 +12351,6 @@ __metadata: languageName: node linkType: hard -"pino-std-serializers@npm:^4.0.0": - version: 4.0.0 - resolution: "pino-std-serializers@npm:4.0.0" - checksum: 10/cec586f9634ef0e6582f62bc8fc5ca5b6e5e11ab88fe3950c66fb0fd5d6690f66bc39cd3f27216b925d2963ad5c3bba415718819ac20ebe0390c7d056cbfea1b - languageName: node - linkType: hard - -"pino-std-serializers@npm:^5.0.0": - version: 5.6.0 - resolution: "pino-std-serializers@npm:5.6.0" - checksum: 10/706d3bd66cf31cc2abd959b810f3dedc4f3642a50f90171df79c5c739f724a8806892221f2f23114b0d27205a1e273cd889d91e49ed41e856299eed7d5ed7909 - languageName: node - linkType: hard - "pino-std-serializers@npm:^6.0.0": version: 6.2.2 resolution: "pino-std-serializers@npm:6.2.2" @@ -12449,24 +12358,10 @@ __metadata: languageName: node linkType: hard -"pino@npm:^7.5.0": - version: 7.11.0 - resolution: "pino@npm:7.11.0" - dependencies: - atomic-sleep: "npm:^1.0.0" - fast-redact: "npm:^3.0.0" - on-exit-leak-free: "npm:^0.2.0" - pino-abstract-transport: "npm:v0.5.0" - pino-std-serializers: "npm:^4.0.0" - process-warning: "npm:^1.0.0" - quick-format-unescaped: "npm:^4.0.3" - real-require: "npm:^0.1.0" - safe-stable-stringify: "npm:^2.1.0" - sonic-boom: "npm:^2.2.1" - thread-stream: "npm:^0.15.1" - bin: - pino: bin.js - checksum: 10/1c7b4b52fea76e0bc5d8b1190a0fee24279cb16d76fdb5833b32b64256fd8a94d641574b850faba5be72514f04045206b6d902a9a3f5ceae2a4296687088e073 +"pino-std-serializers@npm:^7.0.0": + version: 7.0.0 + resolution: "pino-std-serializers@npm:7.0.0" + checksum: 10/884e08f65aa5463d820521ead3779d4472c78fc434d8582afb66f9dcb8d8c7119c69524b68106cb8caf92c0487be7794cf50e5b9c0383ae65b24bf2a03480951 languageName: node linkType: hard @@ -12491,6 +12386,27 @@ __metadata: languageName: node linkType: hard +"pino@npm:^9.0.0": + version: 9.2.0 + resolution: "pino@npm:9.2.0" + dependencies: + atomic-sleep: "npm:^1.0.0" + fast-redact: "npm:^3.1.1" + on-exit-leak-free: "npm:^2.1.0" + pino-abstract-transport: "npm:^1.2.0" + pino-std-serializers: "npm:^7.0.0" + process-warning: "npm:^3.0.0" + quick-format-unescaped: "npm:^4.0.3" + real-require: "npm:^0.2.0" + safe-stable-stringify: "npm:^2.3.1" + sonic-boom: "npm:^4.0.1" + thread-stream: "npm:^3.0.0" + bin: + pino: bin.js + checksum: 10/7d8db2228a468d0f54839719d8bee12c6e16529a98df7477e0ec530359c596bf26b291dc1dbf92ede633a487df4a29b871e795f777ce091a9576409d1bd87137 + languageName: node + linkType: hard + "pirates@npm:^4.0.1, pirates@npm:^4.0.4": version: 4.0.6 resolution: "pirates@npm:4.0.6" @@ -12675,13 +12591,6 @@ __metadata: languageName: node linkType: hard -"process-warning@npm:^1.0.0": - version: 1.0.0 - resolution: "process-warning@npm:1.0.0" - checksum: 10/8736d11d8d71c349d176e210305e84d74b13af06efb3c779377b056bfd608257d1e4e32b8fbbf90637c900f0313e40f7c9f583140884f667a21fc10a869b840c - languageName: node - linkType: hard - "process-warning@npm:^3.0.0": version: 3.0.0 resolution: "process-warning@npm:3.0.0" @@ -12780,7 +12689,7 @@ __metadata: languageName: node linkType: hard -"punycode@npm:^1.3.2, punycode@npm:^1.4.1": +"punycode@npm:^1.4.1": version: 1.4.1 resolution: "punycode@npm:1.4.1" checksum: 10/af2700dde1a116791ff8301348ff344c47d6c224e875057237d1b5112035655fb07a6175cfdb8bf0e3a8cdfd2dc82b3a622e0aefd605566c0e949a6d0d1256a4 @@ -13083,7 +12992,7 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:^3.0.6, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0": +"readable-stream@npm:^3.0.6, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0": version: 3.6.2 resolution: "readable-stream@npm:3.6.2" dependencies: @@ -13116,13 +13025,6 @@ __metadata: languageName: node linkType: hard -"real-require@npm:^0.1.0": - version: 0.1.0 - resolution: "real-require@npm:0.1.0" - checksum: 10/0ba1c440dc9b7777d35a97f755312bf236be0847249f76cc9789c5c08d141f5d80b8564888e6a94ed0253fabf597b6892f8502c4e5658fb98f88642633a39723 - languageName: node - linkType: hard - "real-require@npm:^0.2.0": version: 0.2.0 resolution: "real-require@npm:0.2.0" @@ -13598,7 +13500,7 @@ __metadata: languageName: node linkType: hard -"safe-stable-stringify@npm:^2.1.0, safe-stable-stringify@npm:^2.3.1": +"safe-stable-stringify@npm:^2.3.1": version: 2.4.3 resolution: "safe-stable-stringify@npm:2.4.3" checksum: 10/a6c192bbefe47770a11072b51b500ed29be7b1c15095371c1ee1dc13e45ce48ee3c80330214c56764d006c485b88bd0b24940d868948170dddc16eed312582d8 @@ -13958,7 +13860,7 @@ __metadata: languageName: node linkType: hard -"sonic-boom@npm:^2.1.0, sonic-boom@npm:^2.2.1": +"sonic-boom@npm:^2.1.0": version: 2.8.0 resolution: "sonic-boom@npm:2.8.0" dependencies: @@ -14150,13 +14052,6 @@ __metadata: languageName: node linkType: hard -"stream-shift@npm:^1.0.2": - version: 1.0.3 - resolution: "stream-shift@npm:1.0.3" - checksum: 10/a24c0a3f66a8f9024bd1d579a533a53be283b4475d4e6b4b3211b964031447bdf6532dd1f3c2b0ad66752554391b7c62bd7ca4559193381f766534e723d50242 - languageName: node - linkType: hard - "string-length@npm:^4.0.1": version: 4.0.2 resolution: "string-length@npm:4.0.2" @@ -14554,15 +14449,6 @@ __metadata: languageName: node linkType: hard -"thread-stream@npm:^0.15.1": - version: 0.15.2 - resolution: "thread-stream@npm:0.15.2" - dependencies: - real-require: "npm:^0.1.0" - checksum: 10/ca0a4f5bf45db88b48b41af0299455eaa8f01dd3ef8279e7ba6909c295b3ab79ddf576b595cbbceb4dbdf4012b17c6449805092926163fcbf30ac1604cb595b1 - languageName: node - linkType: hard - "thread-stream@npm:^2.6.0": version: 2.7.0 resolution: "thread-stream@npm:2.7.0" @@ -14572,6 +14458,15 @@ __metadata: languageName: node linkType: hard +"thread-stream@npm:^3.0.0": + version: 3.1.0 + resolution: "thread-stream@npm:3.1.0" + dependencies: + real-require: "npm:^0.2.0" + checksum: 10/ea2d816c4f6077a7062fac5414a88e82977f807c82ee330938fb9691fe11883bb03f078551c0518bb649c239e47ba113d44014fcbb5db42c5abd5996f35e4213 + languageName: node + linkType: hard + "through@npm:^2.3.6": version: 2.3.8 resolution: "through@npm:2.3.8" @@ -16366,15 +16261,6 @@ __metadata: languageName: node linkType: hard -"yaml@npm:*, yaml@npm:^2.4.3": - version: 2.4.3 - resolution: "yaml@npm:2.4.3" - bin: - yaml: bin.mjs - checksum: 10/a618d3b968e3fb601cf7266db6e250e5cdd3b81853039a59108145202d5055b47c2d23a8e1ab661f8ba3ba095dcf6b4bb55cea2c14b97a418e5b059d27f8814e - languageName: node - linkType: hard - "yaml@npm:^1.10.0": version: 1.10.2 resolution: "yaml@npm:1.10.2" @@ -16389,6 +16275,15 @@ __metadata: languageName: node linkType: hard +"yaml@npm:^2.4.3": + version: 2.4.3 + resolution: "yaml@npm:2.4.3" + bin: + yaml: bin.mjs + checksum: 10/a618d3b968e3fb601cf7266db6e250e5cdd3b81853039a59108145202d5055b47c2d23a8e1ab661f8ba3ba095dcf6b4bb55cea2c14b97a418e5b059d27f8814e + languageName: node + linkType: hard + "yargs-parser@npm:^18.1.2": version: 18.1.3 resolution: "yargs-parser@npm:18.1.3"