@mojaloop/sdk-scheme-adapter 24.2.1-snapshot.0 → 24.3.0-snapshot.1

package/modules/api-svc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-api-svc",
-  "version": "21.0.0-snapshot.27",
+  "version": "21.0.0-snapshot.29",
   "description": "An adapter for connecting to Mojaloop API enabled switches.",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -73,7 +73,7 @@
     "@mojaloop/logging-bc-client-lib": "0.5.8",
     "@mojaloop/ml-schema-transformer-lib": "2.5.6",
     "@mojaloop/sdk-scheme-adapter-private-shared-lib": "workspace:^",
-    "@mojaloop/sdk-standard-components": "19.10.0-snapshot.1",
+    "@mojaloop/sdk-standard-components": "19.10.0-snapshot.2",
     "ajv": "8.17.1",
     "axios": "1.8.2",
     "body-parser": "1.20.3",

package/modules/api-svc/src/BackendEventHandler/index.js

@@ -50,7 +50,7 @@ class BackendEventHandler {
     constructor({ config, logger }) {
         this._conf = config;
 
-        this._logger = logger;
+        this._logger = logger.push({ component: this.constructor.name });
         this._loggerFromLoggingBC = new DefaultLogger(BC_CONFIG.bcName, 'backend-event-handler', '0.0.1', config.logLevel);
 
         this._backendRequests = new BackendRequests({

package/modules/api-svc/src/ControlAgent/index.js

@@ -143,7 +143,7 @@ class Client extends ws {
      */
     constructor({ address = 'localhost', port, logger, appConfig }) {
         super(`ws://${address}:${port}`);
-        this._logger = logger;
+        this._logger = logger.push({ component: 'ControlClient' });
         this._appConfig = appConfig;
     }
 

package/modules/api-svc/src/FSPIOPEventHandler/index.js

@@ -46,7 +46,7 @@ const {
 class FSPIOPEventHandler {
     constructor({ config, logger, cache, wso2 }) {
         this._conf = config;
-        this._logger = logger;
+        this._logger = logger.push({ component: this.constructor.name });
         this._cache = cache;
         this._wso2 = wso2;
 

package/modules/api-svc/src/InboundServer/index.js

@@ -62,7 +62,7 @@ class InboundApi extends EventEmitter {
         }
         this._api = InboundApi._SetupApi({
             conf,
-            logger,
+            logger: logger.push({ component: this.constructor.name }),
             validator,
             cache,
             jwsVerificationKeys: this._jwsVerificationKeys,
@@ -159,10 +159,10 @@ class InboundServer extends EventEmitter {
     constructor(conf, logger, cache, wso2) {
         super({ captureExceptions: true });
         this._conf = conf;
-        this._logger = logger;
+        this._logger = logger.push({ app: this.constructor.name });
         this._api = new InboundApi(
             conf,
-            this._logger.push({ component: 'api' }),
+            this._logger,
             cache,
             _validator,
             wso2,

package/modules/api-svc/src/OAuthTestServer/index.js

@@ -47,7 +47,7 @@ class OAuthTestServer {
      */
     constructor({ port, clientKey, clientSecret, logger }) {
         this._port = port;
-        this._logger = logger;
+        this._logger = logger.push({ component: this.constructor.name });
         this._clientKey = clientKey;
         this._clientSecret = clientSecret;
     }

package/modules/api-svc/src/OutboundServer/index.js

@@ -53,7 +53,7 @@ let _initialize;
 class OutboundApi extends EventEmitter {
     constructor(conf, logger, cache, validator, metricsClient, wso2, eventProducer, eventLogger) {
         super({ captureExceptions: true });
-        this._logger = logger;
+        this._logger = logger.push({ component: this.constructor.name });
         this._api = new Koa();
         this._conf = conf;
         this._cache = cache;
@@ -109,7 +109,7 @@ class OutboundServer extends EventEmitter {
     constructor(conf, logger, cache, metricsClient, wso2) {
         super({ captureExceptions: true });
         this._conf = conf;
-        this._logger = logger;
+        this._logger = logger.push({ app: this.constructor.name });
         this._server = null;
         if (conf.backendEventHandler.enabled) {
             this._eventLogger = new DefaultLogger(BC_CONFIG.bcName, 'backend-api-handler', '0.0.1', conf.logLevel);
@@ -118,7 +118,7 @@ class OutboundServer extends EventEmitter {
         }
         this._api = new OutboundApi(
             conf,
-            this._logger.push({ component: 'api' }),
+            this._logger,
             cache,
             _validator,
             metricsClient,

package/modules/api-svc/src/TestServer/index.js

@@ -194,12 +194,12 @@ class TestServer {
     constructor({ port, logger, cache, config }) {
         _initialize ||= _validator.initialise(yaml.load(require('fs').readFileSync(path.join(__dirname, 'api.yaml'))), config);
         this._port = port;
-        this._logger = logger;
-        this._api = new TestApi(this._logger.push({ component: 'api' }), _validator, cache, config);
+        this._logger = logger.push({ app: this.constructor.name });
+        this._api = new TestApi(this._logger.push({ component: 'TestApi' }), _validator, cache, config);
         this._server = http.createServer(this._api.callback());
         // TODO: why does this appear to need to be called after creating this._server (try reorder
         // it then run the tests)
-        this._wsapi = new WsServer(this._logger.push({ component: 'websocket-server' }), cache);
+        this._wsapi = new WsServer(this._logger.push({ component: 'WsServer' }), cache);
     }
 
     async start() {

package/modules/api-svc/src/index.js

@@ -49,25 +49,13 @@ const Validate = require('./lib/validate');
 const Cache = require('./lib/cache');
 const { SDKStateEnum } = require('./lib/model/common');
 const { createAuthClient } = require('./lib/utils');
-const { createLogger } = require('./lib/logger');
-
-const LOG_ID = {
-    INBOUND:   { app: 'mojaloop-connector-inbound-api' },
-    OUTBOUND:  { app: 'mojaloop-connector-outbound-api' },
-    BACKEND_EVENT_HANDLER:  { app: 'backend-event-handler' },
-    FSPIOP_EVENT_HANDLER:  { app: 'fspiop-event-handler' },
-    TEST:      { app: 'mojaloop-connector-test-api' },
-    OAUTHTEST: { app: 'mojaloop-connector-oauth-test-server' },
-    CONTROL:   { app: 'mojaloop-connector-control-client' },
-    METRICS:   { app: 'mojaloop-connector-metrics' },
-    CACHE:     { component: 'cache' },
-};
+const { logger } = require('./lib/logger');
 
 const PING_INTERVAL_MS = 30000;
 
-const createCache = (config, logger) => new Cache({
+const createCache = (config) => new Cache({
+    logger,
     cacheUrl: config.cacheUrl,
-    logger: logger.push(LOG_ID.CACHE),
     enableTestFeatures: config.enableTestFeatures,
     subscribeTimeoutSeconds:  config.requestProcessingTimeoutSeconds,
 });
@@ -80,14 +68,14 @@ class Server extends EventEmitter {
         super({ captureExceptions: true });
         this.conf = conf;
         this.logger = logger;
-        this.cache = createCache(conf, logger);
+        this.cache = createCache(conf);
         this.pingTimeout;
 
         this.metricsClient = new MetricsClient();
 
         this.metricsServer = new MetricsServer({
             port: this.conf.metrics.port,
-            logger: this.logger.push(LOG_ID.METRICS)
+            logger: this.logger
         });
 
         this.wso2 = createAuthClient(conf, logger);
@@ -97,7 +85,7 @@ class Server extends EventEmitter {
 
         this.inboundServer = new InboundServer(
             this.conf,
-            this.logger.push(LOG_ID.INBOUND),
+            this.logger,
             this.cache,
             this.wso2,
         );
@@ -108,7 +96,7 @@ class Server extends EventEmitter {
 
         this.outboundServer = new OutboundServer(
             this.conf,
-            this.logger.push(LOG_ID.OUTBOUND),
+            this.logger,
             this.cache,
             this.metricsClient,
             this.wso2,
@@ -123,7 +111,7 @@ class Server extends EventEmitter {
                 clientKey: this.conf.oauthTestServer.clientKey,
                 clientSecret: this.conf.oauthTestServer.clientSecret,
                 port: this.conf.oauthTestServer.listenPort,
-                logger: this.logger.push(LOG_ID.OAUTHTEST),
+                logger: this.logger,
             });
         }
 
@@ -131,7 +119,7 @@ class Server extends EventEmitter {
             this.testServer = new TestServer({
                 config: this.conf,
                 port: this.conf.test.port,
-                logger: this.logger.push(LOG_ID.TEST),
+                logger: this.logger,
                 cache: this.cache,
             });
         }
@@ -139,14 +127,14 @@ class Server extends EventEmitter {
         if (this.conf.backendEventHandler.enabled) {
             this.backendEventHandler = new BackendEventHandler({
                 config: this.conf,
-                logger: this.logger.push(LOG_ID.BACKEND_EVENT_HANDLER),
+                logger: this.logger,
             });
         }
 
         if (this.conf.fspiopEventHandler.enabled) {
             this.fspiopEventHandler = new FSPIOPEventHandler({
                 config: this.conf,
-                logger: this.logger.push(LOG_ID.FSPIOP_EVENT_HANDLER),
+                logger: this.logger,
                 cache: this.cache,
                 wso2: this.wso2,
             });
@@ -166,7 +154,7 @@ class Server extends EventEmitter {
             this.controlClient = await ControlAgent.Client.Create({
                 address: this.conf.control.mgmtAPIWsUrl,
                 port: this.conf.control.mgmtAPIWsPort,
-                logger: this.logger.push(LOG_ID.CONTROL),
+                logger: this.logger,
                 appConfig: this.conf,
             });
             this.controlClient.on(ControlAgent.EVENT.RECONFIGURE, this.restart.bind(this));
@@ -212,13 +200,7 @@ class Server extends EventEmitter {
 
     async restart(newConf) {
         const restartActionsTaken = {};
-
         this.logger.isDebugEnabled && this.logger.debug('Server is restarting...');
-        const updateLogger = !_.isEqual(newConf.isJsonOutput, this.conf.isJsonOutput);
-        if (updateLogger) {
-            this.logger = createLogger(newConf);
-            restartActionsTaken.updateLogger = true;
-        }
 
         let oldCache;
         const updateCache = !_.isEqual(this.conf.cacheUrl, newConf.cacheUrl)
@@ -226,7 +208,7 @@ class Server extends EventEmitter {
         if (updateCache) {
             oldCache = this.cache;
             await this.cache.disconnect();
-            this.cache = createCache(newConf, this.logger);
+            this.cache = createCache(newConf);
             await this.cache.connect();
             restartActionsTaken.updateCache = true;
         }
@@ -250,7 +232,7 @@ class Server extends EventEmitter {
             await this.inboundServer.stop();
             this.inboundServer = new InboundServer(
                 newConf,
-                this.logger.push(LOG_ID.INBOUND),
+                this.logger,
                 this.cache,
                 this.wso2,
             );
@@ -269,7 +251,7 @@ class Server extends EventEmitter {
             await this.outboundServer.stop();
             this.outboundServer = new OutboundServer(
                 newConf,
-                this.logger.push(LOG_ID.OUTBOUND),
+                this.logger,
                 this.cache,
                 this.metricsClient,
                 this.wso2,
@@ -289,7 +271,7 @@ class Server extends EventEmitter {
             await this.fspiopEventHandler.stop();
             this.fspiopEventHandler = new FSPIOPEventHandler({
                 config: newConf,
-                logger: this.logger.push(LOG_ID.FSPIOP_EVENT_HANDLER),
+                logger: this.logger,
                 cache: this.cache,
                 wso2: this.wso2,
             });
@@ -305,7 +287,7 @@ class Server extends EventEmitter {
                 this.controlClient = await ControlAgent.Client.Create({
                     address: newConf.control.mgmtAPIWsUrl,
                     port: newConf.control.mgmtAPIWsPort,
-                    logger: this.logger.push(LOG_ID.CONTROL),
+                    logger: this.logger,
                     appConfig: newConf,
                 });
                 this.controlClient.on(ControlAgent.EVENT.RECONFIGURE, this.restart.bind(this));
@@ -348,7 +330,7 @@ class Server extends EventEmitter {
                     clientKey: newConf.oauthTestServer.clientKey,
                     clientSecret: newConf.oauthTestServer.clientSecret,
                     port: newConf.oauthTestServer.listenPort,
-                    logger: this.logger.push(LOG_ID.OAUTHTEST),
+                    logger: this.logger,
                 });
                 await this.oauthTestServer.start();
                 restartActionsTaken.updateOAuthTestServer = true;
@@ -361,7 +343,7 @@ class Server extends EventEmitter {
             if (this.conf.enableTestFeatures) {
                 this.testServer = new TestServer({
                     port: newConf.test.port,
-                    logger: this.logger.push(LOG_ID.TEST),
+                    logger: this.logger,
                     cache: this.cache,
                 });
                 await this.testServer.start();
@@ -371,14 +353,12 @@ class Server extends EventEmitter {
 
         this.conf = newConf;
 
-        await Promise.all([
-            oldCache?.disconnect(),
-        ]);
+        await oldCache?.disconnect();
 
         if (Object.keys(restartActionsTaken).length > 0) {
-            this.logger.isDebugEnabled && this.logger.debug('Server is restarted', { restartActionsTaken });
+            this.logger.info('Server is restarted', { restartActionsTaken });
         } else {
-            this.logger.isDebugEnabled && this.logger.debug('Server not restarted, no config changes detected');
+            this.logger.verbose('Server not restarted, no config changes detected');
         }
     }
 
@@ -414,8 +394,6 @@ async function _GetUpdatedConfigFromMgmtAPI(conf, logger, client) {
 }
 
 async function start(config) {
-    const logger = createLogger(config);
-
     if (config.pm4mlEnabled) {
         const controlClient = await ControlAgent.Client.Create({
             appConfig: config,
@@ -447,7 +425,7 @@ async function start(config) {
         process.exit(1);
     });
 
-    logger.push({ name, version }).info('SDK server is started!');
+    logger.info('SDK server is started!', { name, version });
 }
 
 if (require.main === module) {

package/modules/api-svc/src/lib/cache.js

@@ -46,7 +46,7 @@ class Cache {
             throw new Error('Cache config requires cacheUrl and logger properties');
         }
 
-        this._logger = config.logger;
+        this._logger = config.logger.push({ component: this.constructor.name });
         this._url = config.cacheUrl;
 
         // a redis connection to handle get, set and publish operations

package/modules/api-svc/src/lib/logger.js

@@ -41,7 +41,9 @@ const createLogger = (conf = {}) => {
     return loggerFactory({ context, isJsonOutput });
 };
 
+const logger = createLogger(); // global logger
+
 module.exports = {
-    createLogger,
+    logger,
     LOG_LEVELS,
 };

package/modules/api-svc/src/lib/metrics.js

@@ -113,12 +113,12 @@ class MetricsClient {
 class MetricsServer {
     /**
       * @param {number} port metrics server listen port
-      * @param {Logger} logger Logger
+      * @param {Logger} logger SdkLogger
       * @param {Object} prometheusClient Prometheus client instance
       */
     constructor({ port, logger }) {
         this._port = port;
-        this._logger = logger;
+        this._logger = logger.push({ component: this.constructor.name });
         this._prometheusClient = PrometheusClient;
         this._prometheusRegister = PrometheusClient.register;
         this._api = this.setupApi();

package/modules/api-svc/src/lib/model/InboundTransfersModel.js

@@ -44,7 +44,7 @@ const TRACESTATE_KEY_CALLBACK_START_TS = 'tx_callback_start_ts';
 class InboundTransfersModel {
     constructor(config) {
         this._cache = config.cache;
-        this._logger = config.logger;
+        this._logger = config.logger.push({ component: this.constructor.name });
         this._dfspId = config.dfspId;
         this._expirySeconds = config.expirySeconds;
         this._rejectTransfersOnExpiredQuotes = config.rejectTransfersOnExpiredQuotes;

package/modules/api-svc/src/lib/model/OutboundTransfersModel.js

@@ -59,7 +59,7 @@ class OutboundTransfersModel {
     constructor(config) {
         this._idGenerator = idGenerator(config.idGenerator);
         this._cache = config.cache;
-        this._logger = config.logger.push({ component: OutboundTransfersModel.name });
+        this._logger = config.logger.push({ component: this.constructor.name });
         this._requestProcessingTimeoutSeconds = config.requestProcessingTimeoutSeconds;
         this._dfspId = config.dfspId;
         this._expirySeconds = config.expirySeconds;

package/modules/api-svc/src/lib/model/lib/requests/backendRequests.js

@@ -37,7 +37,7 @@ const { buildUrl, HTTPResponseError } = require('./common');
 class BackendRequests {
     constructor(config) {
         this.config = config;
-        this.logger = config.logger.push({ component: BackendRequests.name });
+        this.logger = config.logger.push({ component: this.constructor.name });
         this.requester = createHttpRequester({ logger: this.logger });
 
         // FSPID of THIS DFSP

package/modules/api-svc/test/integration/lib/cache.test.js

@@ -31,7 +31,7 @@
 jest.dontMock('redis');
 
 const Cache = require('~/lib/cache');
-const { createLogger } = require('~/lib/logger');
+const { logger } = require('~/lib/logger');
 const env = require('../testEnv');
 
 const defaultCacheConfig = {
@@ -40,7 +40,7 @@ const defaultCacheConfig = {
 };
 
 const createCache = async (config) => {
-    config.logger = createLogger({ context: { app: 'mojaloop-sdk-inboundCache' } });
+    config.logger = logger.push({ context: { app: 'mojaloop-sdk-inboundCache' } });
     const cache = new Cache(config);
     await cache.connect();
 

package/modules/api-svc/test/integration-pm4ml/mockServers/managementService/index.js

@@ -1,17 +1,10 @@
 const express = require('express');
-const { createLogger } = require('../../../../src/lib/logger');
+const { logger } = require('../../../../src/lib/logger');
 const Config = require('./config');
 const ManagementService = require('./server');
 
 const app = express();
 
-const logger = createLogger({
-    context: {
-        simulator: 'test',
-        hostname: 'test',
-    }
-});
-
 const managementServer = new ManagementService.Server({
     port: Config.server.port,
     logger,

package/modules/api-svc/test/unit/BackendEventHandler.test.js

@@ -28,7 +28,7 @@
 const { BackendEventHandler } = require('../../src/BackendEventHandler');
 const { BackendRequests } = require('../../src/lib/model/lib/requests');
 const { SDKStateEnum } = require('../../src/lib/model/common');
-const { createLogger } = require('../../src/lib/logger');
+const { logger } = require('../../src/lib/logger');
 const config = require('./data/defaultConfig.json');
 const bulkTransactionResponse = require('./lib/model/data/bulkTransactionResponse.json');
 const {
@@ -42,8 +42,6 @@ const {
     KafkaDomainEventProducer,
 } = require('@mojaloop/sdk-scheme-adapter-private-shared-lib');
 
-const logger = createLogger({ context: { app: 'BackendEventHandler' }, stringify: () => '' });
-
 describe('BackendEventHandler', () => {
     const putBulkTransactions = jest.spyOn(BackendRequests.prototype, 'putBulkTransactions').mockImplementation(async () => ({}));
 

package/modules/api-svc/test/unit/ControlClient.test.js

@@ -28,7 +28,7 @@
 jest.mock('~/lib/cache');
 
 const ControlAgent = require('~/ControlAgent');
-const { createLogger } = require('~/lib/logger');
+const { logger } = require('~/lib/logger');
 const TestControlServer = require('./ControlServer');
 
 // TODO:
@@ -55,12 +55,11 @@ describe('ControlAgent', () => {
     });
 
     describe('API', () => {
-        let server, logger, client;
+        let server, client;
         const appConfig = { control: { port: 4005 }, what: 'ever' };
         const changedConfig = { ...appConfig, some: 'thing' };
 
         beforeAll(async () => {
-            logger = createLogger({ stringify: () => '' });
             server = new TestControlServer.Server({ logger, appConfig });
             client = await ControlAgent.Client.Create({
                 address: 'localhost',

package/modules/api-svc/test/unit/FSPIOPEventHandler.test.js

@@ -42,7 +42,7 @@ const {
 } = require('@mojaloop/sdk-scheme-adapter-private-shared-lib');
 
 const { FSPIOPEventHandler } = require('../../src/FSPIOPEventHandler');
-const { createLogger } = require('../../src/lib/logger');
+const { logger } = require('../../src/lib/logger');
 const {
     OutboundBulkQuotesModel,
     PartiesModel,
@@ -53,8 +53,6 @@ const {
 const bulkQuoteRequest = require('../unit/lib/model/data/bulkQuoteRequest.json');
 const config = require('./data/defaultConfig.json');
 
-const logger = createLogger({ context: { app: 'FSPIOPEventHandler' }, stringify: () => '' });
-
 describe('FSPIOPEventHandler', () => {
     let fspiopEventHandler;
 

package/modules/api-svc/test/unit/InboundServer-iso20022.test.js

@@ -41,14 +41,12 @@ const InboundServer = require('../../src/InboundServer');
 const Cache = require('../../src/lib/cache');
 const config = require('../../src/config');
 const helpers = require('../helpers');
-const { createLogger } = require('../../src/lib/logger');
+const { logger } = require('../../src/lib/logger');
 
 const isoBodies = require('./inboundApi/data/isoBodies');
 const commonHttpHeaders = require('./data/commonHttpHeaders');
 const transactionRequestResponse = require('./lib/model/data/transactionRequestResponse');
 
-const logger = createLogger();
-
 const createIsoHeaders = resource => ({
     ...commonHttpHeaders,
     'content-type': helpers.createIsoHeader(resource)

package/modules/api-svc/test/unit/InboundServer.test.js

@@ -48,7 +48,7 @@ jest.mock('~/lib/cache');
 jest.mock('~/lib/model/lib/requests', () => require('./lib/model/mockedLibRequests'));
 
 const { Jws } = require('@mojaloop/sdk-standard-components');
-const { createLogger } = require('~/lib/logger');
+const { logger } = require('~/lib/logger');
 const InboundServer = require('~/InboundServer');
 const Cache = require('~/lib/cache');
 const path = require('path');
@@ -57,8 +57,6 @@ const os = require('os');
 const http = require('http');
 const https = require('https');
 
-const logger = createLogger();
-
 describe('Inbound Server', () => {
     describe('PUT /parties', () => {
         let serverConfig;

package/modules/api-svc/test/unit/TestServer.test.js

@@ -42,7 +42,7 @@ const WebSocket = require('ws');
 const TestServer = require('~/TestServer');
 const Cache = require('~/lib/cache');
 const InboundServer = require('~/InboundServer');
-const { createLogger } = require('~/lib/logger');
+const { logger } = require('~/lib/logger');
 
 const defaultConfig = require('./data/defaultConfig');
 const putPartiesBody = require('./data/putPartiesBody');
@@ -60,14 +60,11 @@ const createWsClient = async (port, path) => {
 };
 
 describe('Test Server', () => {
-    let testServer, inboundServer, inboundReq, testReq, serverConfig, wsClients, testServerPort,
-        logger, cache;
+    let testServer, inboundServer, inboundReq, testReq, serverConfig, wsClients, testServerPort, cache;
 
     beforeEach(async () => {
         Cache.mockClear();
 
-        logger = createLogger({ stringify: () => '' });
-
         serverConfig = {
             ...JSON.parse(JSON.stringify(defaultConfig)),
             enableTestFeatures: true,

package/modules/api-svc/test/unit/api/transfers/utils.js

@@ -2,7 +2,7 @@ const { mockAxios, jsonContentTypeHeader} = require('../../../helpers');
 
 const OpenAPIResponseValidator = require('openapi-response-validator').default;
 
-const { createLogger } = require('../../../../src/lib/logger');
+const { logger } = require('../../../../src/lib/logger');
 const postTransfersSimpleBody = require('./data/postTransfersSimpleBody');
 
 /**
@@ -112,7 +112,6 @@ function createGetTransfersTester({ reqInbound, reqOutbound, apiSpecsOutbound })
 function createPostTransfersTester({
     requestValidatorInbound, reqInbound, reqOutbound, apiSpecsOutbound
 }) {
-    const logger =createLogger({ context: { app: 'outbound-model-unit-tests' } });
 
     /**
      *

package/modules/api-svc/test/unit/api/utils.js

@@ -4,7 +4,7 @@ const yaml = require('js-yaml');
 const supertest = require('supertest');
 const { WSO2Auth } = require('@mojaloop/sdk-standard-components');
 
-const { createLogger } = require('~/lib/logger');
+const { logger } = require('~/lib/logger');
 const { MetricsClient } = require('~/lib/metrics');
 const Validate = require('~/lib/validate');
 const InboundServer = require('~/InboundServer');
@@ -51,7 +51,6 @@ const createValidators = async () => {
 };
 
 const createTestServers = async (config) => {
-    const logger = createLogger({ stringify: () => '' });
     const defConfig = structuredClone(config);
     const cache = new Cache({
         cacheUrl: defConfig.cacheUrl,

package/modules/api-svc/test/unit/ilp.test.js

@@ -26,7 +26,7 @@
  ******/
 
 const { Ilp } = jest.requireActual('@mojaloop/sdk-standard-components');
-const { createLogger } = require('../../src/lib/logger');
+const { logger } = require('../../src/lib/logger');
 const mocks = require('./lib/model/data/mocks');
 
 describe('ILP Tests -->', () => {
@@ -37,7 +37,7 @@ describe('ILP Tests -->', () => {
     beforeEach(() => {
         ilp = Ilp.ilpFactory(Ilp.ILP_VERSIONS.v4, {
             secret: 'test',
-            logger: createLogger(),
+            logger,
         });
         fxQuotesPayload = mocks.mockFxQuotesPayload();
         fxpBeResponse = mocks.mockFxQuotesInternalResponse();

package/modules/api-svc/test/unit/inboundApi/handlers-iso20022.test.js

@@ -26,13 +26,11 @@ const Model = require('../../../src/lib/model').InboundTransfersModel;
 const QuotesModel = require('../../../src/lib/model').QuotesModel;
 const PartiesModel = require('../../../src/lib/model').PartiesModel;
 const TransfersModel = require('../../../src/lib/model').TransfersModel;
-const { createLogger } = require('../../../src/lib/logger');
+const { logger } = require('../../../src/lib/logger');
 
 const { createIsoHeader } = require('../../helpers');
 const isoBodies = require('./data/isoBodies.json');
 
-const logger = createLogger({ context: { app: 'inbound-handlers-unit-test' } });
-
 describe('Inbound API handlers transforming incoming ISO20022 message bodies', () => {
     describe('POST /quotes', () => {
         let mockContext;

package/modules/api-svc/test/unit/inboundApi/handlers.test.js

@@ -24,13 +24,11 @@ const Model = require('~/lib/model').InboundTransfersModel;
 const QuotesModel = require('~/lib/model').QuotesModel;
 const PartiesModel = require('~/lib/model').PartiesModel;
 const TransfersModel = require('~/lib/model').TransfersModel;
-const { createLogger } = require('~/lib/logger');
+const { logger } = require('~/lib/logger');
 
 const mockArguments = require('./data/mockArguments');
 const mockTransactionRequestData = require('./data/mockTransactionRequest');
 
-const logger = createLogger({ context: { app: 'inbound-handlers-unit-test' }, stringify: () => '' });
-
 describe('Inbound API handlers:', () => {
     let mockArgs;
     let mockTransactionRequest;

package/modules/api-svc/test/unit/index.test.js

@@ -37,7 +37,7 @@ jest.mock('dotenv', () => ({
 
 const promClient = require('prom-client');
 const index = require('~/index');
-const { createLogger } = require('~/lib/logger');
+const { logger } = require('~/lib/logger');
 
 const defaultConfig = require('./data/defaultConfig.json');
 const TestControlServer = require('./ControlServer');
@@ -58,11 +58,10 @@ describe('index.js', () => {
 });
 
 describe('Server', () => {
-    let server, controlServer, conf, logger;
+    let server, controlServer, conf;
 
     beforeEach(async () => {
         promClient.register.clear();
-        logger = createLogger({ stringify: () => '' });
         conf = JSON.parse(JSON.stringify(defaultConfig));
         conf.enableTestFeatures = true;
         conf.pm4mlEnabled = true;

package/modules/api-svc/test/unit/lib/cache.test.js

@@ -31,10 +31,9 @@ jest.mock('redis');
 
 const randomUUID = require('@mojaloop/central-services-shared').Util.id({ type: 'ulid' });
 const Cache = require('~/lib/cache');
-const { createLogger } = require('~/lib/logger');
+const { logger } = require('~/lib/logger');
 
 const createCache = async () => {
-    const logger = createLogger({ context: { app: 'model-unit-tests-cache' } });
     const cache = new Cache({
         cacheUrl: 'redis://dummy:1234',
         logger,

package/modules/api-svc/test/unit/lib/model/AccountsModel.test.js

@@ -44,7 +44,7 @@ const { AccountsModel } = require('~/lib/model');
 
 const StateMachine = require('javascript-state-machine');
 const { MojaloopRequests } = require('@mojaloop/sdk-standard-components');
-const { createLogger } = require('~/lib/logger');
+const { logger } = require('~/lib/logger');
 const { SDKStateEnum } = require('../../../../src/lib/model/common');
 
 const defaultConfig = require('./data/defaultConfig');
@@ -67,7 +67,6 @@ function generateAccounts(count, currencies) {
 
 
 describe('AccountsModel', () => {
-    let logger;
     let cache;
 
     async function testCreateAccount(count, currencies) {
@@ -114,10 +113,6 @@ describe('AccountsModel', () => {
         expect(StateMachine.__instance.state).toBe('succeeded');
     }
 
-    beforeAll(() => {
-        logger = createLogger({ context: { app: 'outbound-model-unit-tests-cache' }, stringify: () => '' });
-    });
-
     beforeEach(async () => {
         cache = new Cache({
             cacheUrl: 'redis://dummy:1234',

package/modules/api-svc/test/unit/lib/model/InboundTransfersModel.test.js

@@ -41,7 +41,7 @@ jest.mock('~/lib/model/lib/requests',() => require('./mockedLibRequests'));
 
 const randomUUID = require('@mojaloop/central-services-shared').Util.id({type: 'ulid'});
 const { MojaloopRequests, Ilp } = require('@mojaloop/sdk-standard-components');
-const { createLogger } = require('~/lib/logger');
+const { logger } = require('~/lib/logger');
 const { BackendRequests, HTTPResponseError } = require('~/lib/model/lib/requests');
 const Cache = require('~/lib/cache');
 const shared = require('~/lib/model/lib/shared');
@@ -72,11 +72,6 @@ describe('inboundModel', () => {
     let config;
     let mockArgs;
     let mockTxnReqArgs;
-    let logger;
-
-    beforeAll(async () => {
-        logger = createLogger({ context: { app: 'inbound-model-unit-tests' }, stringify: () => '' });
-    });
 
     beforeEach(async () => {
         config = JSON.parse(JSON.stringify(defaultConfig));

package/modules/api-svc/test/unit/lib/model/OutboundBulkQuotesModel.test.js

@@ -42,7 +42,7 @@ jest.mock('redis');
 
 const StateMachine = require('javascript-state-machine');
 const { MojaloopRequests } = require('@mojaloop/sdk-standard-components');
-const { createLogger } = require('~/lib/logger');
+const { logger } = require('~/lib/logger');
 const Cache = require('~/lib/cache');
 const Model = require('~/lib/model').OutboundBulkQuotesModel;
 
@@ -60,7 +60,6 @@ const emitBulkQuoteResponseCacheMessage = (cache, bulkQuoteId, bulkQuoteResponse
 describe('OutboundBulkQuotesModel', () => {
     let bulkQuoteResponse;
     let config;
-    let logger;
     let cache;
 
     /**
@@ -107,7 +106,6 @@ describe('OutboundBulkQuotesModel', () => {
     }
 
     beforeAll(async () => {
-        logger = createLogger({ context: { app: 'outbound-model-unit-tests-cache' }, stringify: () => '' });
         bulkQuoteResponse = JSON.parse(JSON.stringify(bulkQuoteResponseTemplate));
     });
 

package/modules/api-svc/test/unit/lib/model/OutboundBulkTransfersModel.test.js

@@ -45,7 +45,7 @@ const Model = require('~/lib/model').OutboundBulkTransfersModel;
 
 const StateMachine = require('javascript-state-machine');
 const { MojaloopRequests } = require('@mojaloop/sdk-standard-components');
-const { createLogger } = require('~/lib/logger');
+const { logger } = require('~/lib/logger');
 const { SDKStateEnum } = require('../../../../src/lib/model/common');
 
 const defaultConfig = require('./data/defaultConfig');
@@ -57,7 +57,6 @@ const emitBulkTransferFulfilCacheMessage = (cache, bulkTransferId, fulfils) => c
 
 describe('outboundBulkTransferModel', () => {
     let config;
-    let logger;
     let cache;
 
     /**
@@ -102,10 +101,6 @@ describe('outboundBulkTransferModel', () => {
         }
     }
 
-    beforeAll(async () => {
-        logger = createLogger({ context: { app: 'outbound-model-unit-tests-cache' }, stringify: () => '' });
-    });
-
     beforeEach(async () => {
         config = JSON.parse(JSON.stringify(defaultConfig));
         MojaloopRequests.__postBulkTransfers = jest.fn(() => Promise.resolve());

package/modules/api-svc/test/unit/lib/model/OutboundRequestToPayModel.test.js

@@ -40,7 +40,7 @@ jest.mock('redis');
 
 const StateMachine = require('javascript-state-machine');
 const { MojaloopRequests } = require('@mojaloop/sdk-standard-components');
-const { createLogger } = require('~/lib/logger');
+const { logger } = require('~/lib/logger');
 const Cache = require('~/lib/cache');
 const Model = require('~/lib/model').OutboundRequestToPayModel;
 const PartiesModel = require('~/lib/model').PartiesModel;
@@ -70,7 +70,6 @@ const emitTransactionRequestResponseCacheMessage = (cache, transactionRequestId,
 describe('outboundModel', () => {
     let transactionRequestResponse;
     let config;
-    let logger;
     let cache;
 
     /**
@@ -86,7 +85,6 @@ describe('outboundModel', () => {
      */
 
     beforeAll(async () => {
-        logger = createLogger({ context: { app: 'outbound-model-unit-tests-cache' }, stringify: () => '' });
         transactionRequestResponse = JSON.parse(JSON.stringify(transactionRequestResponseTemplate));
     });
 

package/modules/api-svc/test/unit/lib/model/OutboundRequestToPayTransferModel.test.js

@@ -40,7 +40,7 @@ jest.mock('redis');
 
 const StateMachine = require('javascript-state-machine');
 const { MojaloopRequests } = require('@mojaloop/sdk-standard-components');
-const { createLogger } = require('~/lib/logger');
+const { logger } = require('~/lib/logger');
 const Cache = require('~/lib/cache');
 const Model = require('~/lib/model').OutboundRequestToPayTransferModel;
 
@@ -64,7 +64,6 @@ const emitTransferFulfilCacheMessage = (cache, transferId, fulfil) => cache.publ
 describe('outboundRequestToPayTransferModel', () => {
     let quoteResponse;
     let config;
-    let logger;
     let cache;
 
     /**
@@ -81,7 +80,6 @@ describe('outboundRequestToPayTransferModel', () => {
 
 
     beforeAll(async () => {
-        logger = createLogger({ context: { app: 'outbound-model-unit-tests-cache' }, stringify: () => '' });
         quoteResponse = JSON.parse(JSON.stringify(quoteResponseTemplate));
     });
 

package/modules/api-svc/test/unit/lib/model/OutboundTransfersISO20022.test.js

@@ -41,7 +41,7 @@ const { MojaloopRequests } = jest.requireActual('@mojaloop/sdk-standard-componen
 const Cache = require('~/lib/cache');
 const Model = require('~/lib/model').OutboundTransfersModel;
 const PartiesModel = require('~/lib/model').PartiesModel;
-const { createLogger } = require('~/lib/logger');
+const { logger } = require('~/lib/logger');
 const { MetricsClient } = require('~/lib/metrics');
 
 const defaultConfig = require('./data/defaultConfig');
@@ -154,12 +154,10 @@ const emitTransferFulfilCacheMessage = (cache, transferId, fulfil) => cache.publ
 describe('API_TYPE="iso20022"', () => {
     let config;
     let cache;
-    let logger;
     let metricsClient;
 
     beforeEach(async () => {
         config = JSON.parse(JSON.stringify(defaultConfig));
-        logger = createLogger({ context: { app: 'outbound-model-unit-tests-cache' }, stringify: () => '' });
         cache = new Cache({
             cacheUrl: 'redis://dummy:1234',
             logger,

package/modules/api-svc/test/unit/lib/model/OutboundTransfersModel.test.js

@@ -45,7 +45,7 @@ const Model = require('~/lib/model').OutboundTransfersModel;
 const PartiesModel = require('~/lib/model').PartiesModel;
 const Cache = require('~/lib/cache');
 const { MetricsClient } = require('~/lib/metrics');
-const { createLogger } = require('~/lib/logger');
+const { logger } = require('~/lib/logger');
 
 const mocks = require('./data/mocks');
 const defaultConfig = require('./data/defaultConfig');
@@ -82,7 +82,6 @@ const dummyRequestsModuleResponse = {
 describe('OutboundTransfersModel Tests', () => {
     let quoteResponse;
     let config;
-    let logger;
     let cache;
     let metricsClient;
 
@@ -179,7 +178,6 @@ describe('OutboundTransfersModel Tests', () => {
     }
 
     beforeAll(async () => {
-        logger = createLogger({ context: { app: 'outbound-model-unit-tests-cache' }, stringify: () => '' });
         quoteResponse = JSON.parse(JSON.stringify(quoteResponseTemplate));
         metricsClient = new MetricsClient();
     });
@@ -1660,7 +1658,7 @@ describe('OutboundTransfersModel Tests', () => {
         beforeEach(() => {
             model = new Model({
                 cache,
-                logger: createLogger({ context: { app: 'outbound-model-fx-flow-unit-tests' } }),
+                logger,
                 metricsClient,
                 ...config,
             });

package/modules/api-svc/test/unit/lib/model/lib/requests/backendRequests.test.js

@@ -29,14 +29,14 @@
 jest.unmock('@mojaloop/sdk-standard-components');
 
 const { mockAxios } = require('../../../../../helpers');
-const { createLogger } = require('~/lib/logger');
+const { logger } = require('~/lib/logger');
 
 const { BackendRequests, HTTPResponseError } = require('../../../../../../src/lib/model/lib/requests');
 const defaultConfig = require('../../data/defaultConfig');
 
 const config = {
     ...defaultConfig,
-    logger: createLogger(),
+    logger,
 };
 
 describe('backendRequests Tests -->', () => {

package/modules/api-svc/test/unit/mockLogger.js

@@ -27,7 +27,7 @@
  --------------
  ******/
 
-const { createLogger } = require('../../src/lib/logger');
+const { logger } = require('../../src/lib/logger');
 
 function mockLogger(context, keepQuiet) {
     // if keepQuite is undefined then be quiet
@@ -64,7 +64,7 @@ function mockLogger(context, keepQuiet) {
 
         return mockLogger;
     }
-    return createLogger();
+    return logger.push({ component: 'mockLogger' });
 }
 
 module.exports = mockLogger;

package/modules/outbound-command-event-handler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-outbound-command-event-handler",
-  "version": "0.3.0-snapshot.25",
+  "version": "0.3.0-snapshot.27",
   "description": "Mojaloop sdk scheme adapter command event handler",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter/",

package/modules/outbound-domain-event-handler/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mojaloop/sdk-scheme-adapter-outbound-domain-event-handler",
-    "version": "0.3.0-snapshot.25",
+    "version": "0.3.0-snapshot.27",
     "description": "mojaloop sdk scheme adapter outbound domain event handler",
     "license": "Apache-2.0",
     "homepage": "https://github.com/mojaloop/sdk-scheme-adapter/",

package/modules/private-shared-lib/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-  "version": "0.4.0-snapshot.24",
+  "version": "0.4.0-snapshot.26",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-      "version": "0.4.0-snapshot.24",
+      "version": "0.4.0-snapshot.26",
       "license": "Apache-2.0",
       "dependencies": {
         "@mojaloop/api-snippets": "17.7.9",

package/modules/private-shared-lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-  "version": "0.4.0-snapshot.25",
+  "version": "0.4.0-snapshot.27",
   "description": "SDK Scheme Adapter private shared library.",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/accounts-and-balances-bc/tree/main/modules/private-types",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter",
-  "version": "24.2.1-snapshot.0",
+  "version": "24.3.0-snapshot.1",
   "description": "mojaloop sdk-scheme-adapter",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter",