feat(csi-927): switched to use loggingPlugin (#511)

feat(csi-927): switched to use loginPlugin

audit-ci.jsonc

@@ -28,6 +28,7 @@
     "GHSA-rm97-x556-q36h", // https://github.com/advisories/GHSA-rm97-x556-q36h
     "GHSA-rv95-896h-c2vc", // https://github.com/advisories/GHSA-rv95-896h-c2vc
     "GHSA-952p-6rrq-rcjv", // https://github.com/advisories/GHSA-952p-6rrq-rcjv
-    "GHSA-3xgq-45jj-v275" // https://github.com/advisories/GHSA-3xgq-45jj-v275
+    "GHSA-3xgq-45jj-v275", // https://github.com/advisories/GHSA-3xgq-45jj-v275
+    "GHSA-rhx6-c78j-4q9w" // https://github.com/advisories/GHSA-rhx6-c78j-4q9w
   ]
 }

package.json

@@ -93,20 +93,20 @@
     "@mojaloop/central-services-error-handling": "13.0.2",
     "@mojaloop/central-services-health": "15.0.0",
     "@mojaloop/central-services-logger": "11.5.1",
-    "@mojaloop/central-services-metrics": "12.4.0",
-    "@mojaloop/central-services-shared": "18.12.1",
+    "@mojaloop/central-services-metrics": "12.4.1",
+    "@mojaloop/central-services-shared": "18.13.0",
     "@mojaloop/central-services-stream": "11.3.1",
     "@mojaloop/database-lib": "11.0.6",
     "@mojaloop/event-sdk": "14.1.1",
     "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.0",
     "@mojaloop/ml-schema-transformer-lib": "2.4.1",
-    "@mojaloop/sdk-standard-components": "19.6.1",
+    "@mojaloop/sdk-standard-components": "19.6.2",
     "@now-ims/hapi-now-auth": "2.1.0",
     "ajv": "8.17.1",
     "ajv-keywords": "5.1.0",
     "blipp": "4.0.2",
     "commander": "12.1.0",
-    "cron": "3.2.1",
+    "cron": "3.3.0",
     "fast-safe-stringify": "^2.1.1",
     "hapi-auth-bearer-token": "8.0.0",
     "joi": "17.13.3",

src/lib/index.js

@@ -1,11 +1,10 @@
-const { loggerFactory, asyncStorage } = require('@mojaloop/central-services-logger/src/contextLogger')
+const { loggerFactory } = require('@mojaloop/central-services-logger/src/contextLogger')
 const { TransformFacades } = require('@mojaloop/ml-schema-transformer-lib')
 
 const logger = loggerFactory('ALS') // global logger without context
 
 module.exports = {
   logger,
   loggerFactory,
-  asyncStorage,
   TransformFacades
 }

src/plugins.js

@@ -24,22 +24,22 @@
  ******/
 'use strict'
 
-const { randomUUID } = require('node:crypto')
 const Inert = require('@hapi/inert')
 const Vision = require('@hapi/vision')
 const Blipp = require('blipp')
 const ErrorHandling = require('@mojaloop/central-services-error-handling')
+const MetricsPlugin = require('@mojaloop/central-services-metrics').plugin
 const {
   APIDocumentation,
   FSPIOPHeaderValidation,
   HapiEventPlugin,
   HapiRawPayload,
-  OpenapiBackendValidator
+  OpenapiBackendValidator,
+  loggingPlugin
 } = require('@mojaloop/central-services-shared').Util.Hapi
 
+const { logger } = require('./lib')
 const Config = require('./lib/config')
-const MetricsPlugin = require('@mojaloop/central-services-metrics').plugin
-const RequestLogger = require('./lib/requestLogger')
 
 const registerPlugins = async (server, openAPIBackend) => {
   await server.register(OpenapiBackendValidator)
@@ -139,23 +139,10 @@ const registerPlugins = async (server, openAPIBackend) => {
     await server.register([Blipp])
   }
 
-  await server.ext([
-    {
-      type: 'onRequest',
-      method: (request, h) => {
-        request.headers.traceid = request.headers.traceid || randomUUID()
-        RequestLogger.logRequest(request)
-        return h.continue
-      }
-    },
-    {
-      type: 'onPreResponse',
-      method: (request, h) => {
-        RequestLogger.logResponse(request)
-        return h.continue
-      }
-    }
-  ])
+  await server.register({
+    plugin: loggingPlugin,
+    options: { log: logger }
+  })
 }
 
 module.exports = {

test/unit/api/participants/{Type}/{ID}.test.js

@@ -40,7 +40,6 @@ const Db = require('../../../../../src/lib/db')
 const oracleEndpointCached = require('../../../../../src/models/oracle/oracleEndpointCached')
 const participant = require('../../../../../src/models/participantEndpoint/facade')
 const participants = require('../../../../../src/domain/participants')
-const requestLogger = require('../../../../../src/lib/requestLogger')
 const Helper = require('../../../../util/helper')
 const initServer = require('../../../../../src/server').initializeApi
 const Config = require('../../../../../src/lib/config')
@@ -55,8 +54,6 @@ describe('/participants/{Type}/{ID}', () => {
   beforeAll(async () => {
     sandbox = Sinon.createSandbox()
     sandbox.stub(Db, 'connect').returns(Promise.resolve({}))
-    sandbox.stub(requestLogger, 'logRequest').returns({})
-    sandbox.stub(requestLogger, 'logResponse').returns({})
     Config.API_PORT = await getPort()
     server = await initServer(Config)
     sandbox.stub(Logger)

test/unit/api/participants/{Type}/{ID}/{SubId}.test.js

@@ -35,7 +35,6 @@ const Db = require('../../../../../../src/lib/db')
 const oracleEndpointCached = require('../../../../../../src/models/oracle/oracleEndpointCached')
 const participant = require('../../../../../../src/models/participantEndpoint/facade')
 const participants = require('../../../../../../src/domain/participants')
-const requestLogger = require('../../../../../../src/lib/requestLogger')
 const Helper = require('../../../../../util/helper')
 const initServer = require('../../../../../../src/server').initializeApi
 const Logger = require('@mojaloop/central-services-logger')
@@ -51,8 +50,6 @@ describe('/participants/{Type}/{ID}/{SubId}', () => {
   beforeAll(async () => {
     sandbox = Sinon.createSandbox()
     sandbox.stub(Db, 'connect').returns(Promise.resolve({}))
-    sandbox.stub(requestLogger, 'logRequest').returns({})
-    sandbox.stub(requestLogger, 'logResponse').returns({})
     Config.API_PORT = await getPort()
     server = await initServer(Config)
   })