account-lookup-service 15.6.0-iso.11 → 15.6.0-iso.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "account-lookup-service",
   "description": "Account Lookup Service is used to validate Party and Participant lookups.",
-  "version": "15.6.0-iso.11",
+  "version": "15.6.0-iso.13",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [
@@ -93,14 +93,14 @@
     "@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.1.0",
+    "@mojaloop/central-services-metrics": "12.2.1",
     "@mojaloop/central-services-shared": "18.11.2",
     "@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.5.1",
+    "@mojaloop/sdk-standard-components": "19.5.2",
     "@now-ims/hapi-now-auth": "2.1.0",
     "ajv": "8.17.1",
     "ajv-keywords": "5.1.0",

package/src/handlers/monitoring/index.js

@@ -18,7 +18,7 @@
 const Hapi = require('@hapi/hapi')
 const Metrics = require('@mojaloop/central-services-metrics')
 const { plugin: HealthPlugin } = require('./plugins/health')
-const { plugin: MetricsPlugin } = require('./plugins/metrics')
+const MetricsPlugin = require('@mojaloop/central-services-metrics').plugin
 const { logger } = require('../../lib')
 
 let server

package/src/plugins.js

@@ -38,7 +38,7 @@ const {
 } = require('@mojaloop/central-services-shared').Util.Hapi
 
 const Config = require('./lib/config')
-const MetricsPlugin = require('./metrics/plugin')
+const MetricsPlugin = require('@mojaloop/central-services-metrics').plugin
 const RequestLogger = require('./lib/requestLogger')
 
 const registerPlugins = async (server, openAPIBackend) => {

package/test/unit/api/health.test.js

@@ -38,6 +38,7 @@ const Sinon = require('sinon')
 const MigrationLockModel = require('../../../src/models/misc/migrationLock')
 const Logger = require('@mojaloop/central-services-logger')
 const Config = require('../../../src/lib/config')
+const Metrics = require('@mojaloop/central-services-metrics')
 
 Logger.isDebugEnabled = jest.fn(() => true)
 Logger.isErrorEnabled = jest.fn(() => true)
@@ -51,6 +52,7 @@ describe('/health', () => {
     sandbox = Sinon.createSandbox()
     sandbox.stub(Db, 'connect').returns(Promise.resolve({}))
     Config.API_PORT = await getPort()
+    Metrics.getDefaultRegister().clear()
     server = await initServer(Config)
   })
 
@@ -117,6 +119,7 @@ describe('/health', () => {
     Config.proxyMap = { proxied: 'proxy' }
     let serverWithProxy
     try {
+      Metrics.getDefaultRegister().clear()
       serverWithProxy = await initServer(Config)
       sandbox.stub(MigrationLockModel, 'getIsMigrationLocked').resolves(false)
       const mock = await Helper.generateMockRequest('/health', 'get')

package/src/handlers/monitoring/plugins/metrics.js

@@ -1,48 +0,0 @@
-/*****
- LICENSE
-
- Copyright © 2020 Mojaloop Foundation
-
- The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0
- (the "License") and you may not use these files except in compliance with the [License](http://www.apache.org/licenses/LICENSE-2.0).
-
- You may obtain a copy of the License at [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
-
- Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- either express or implied. See the License for the specific language governing permissions and limitations under the [License](http://www.apache.org/licenses/LICENSE-2.0).
-
- * Infitx
- - Steven Oderayi <steven.oderayi@infitx.com>
---------------
-******/
-
-'use strict'
-
-const HTTPENUM = require('@mojaloop/central-services-shared').Enum.Http
-const Metrics = require('@mojaloop/central-services-metrics')
-
-const handler = {
-  get: async (_request, reply) => {
-    return reply.response(await Metrics.getMetricsForPrometheus()).code(HTTPENUM.ReturnCodes.OK.CODE)
-  }
-}
-
-const routes = [
-  {
-    method: 'GET',
-    path: '/metrics',
-    handler: handler.get
-  }
-]
-
-const plugin = {
-  name: 'Metrics',
-  register (server) {
-    server.route(routes)
-  }
-}
-
-module.exports = {
-  plugin,
-  handler
-}

package/src/metrics/handler.js

@@ -1,33 +0,0 @@
-/*****
- License
- --------------
- Copyright © 2017 Bill & Melinda Gates Foundation
- The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
- Contributors
- --------------
- This is the official list of the Mojaloop project contributors for this file.
- Names of the original copyright holders (individuals or organizations)
- should be listed with a '*' in the first column. People who have
- contributed from an organization can be listed under the organization
- that actually holds the copyright for their contributions (see the
- Gates Foundation organization for an example). Those individuals should have
- their names indented and be marked with a '-'. Email address can be added
- optionally within square brackets <email>.
- * Gates Foundation
- - Name Surname <name.surname@gatesfoundation.com>
-
- - Pedro Barreto <pedrob@crosslaketech.com>
- - Rajiv Mothilal <rajivmothilal@gmail.com>
- - Shashikant Hirugade <shashikant.hirugade@modusbox.com>
---------------
- ******/
-
-'use strict'
-
-const Metrics = require('@mojaloop/central-services-metrics')
-
-exports.metrics = async function (request, h) {
-  return h.response(await Metrics.getMetricsForPrometheus()).code(200)
-}

package/src/metrics/plugin.js

@@ -1,52 +0,0 @@
-/*****
- License
- --------------
- Copyright © 2017 Bill & Melinda Gates Foundation
- The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
- Contributors
- --------------
- This is the official list of the Mojaloop project contributors for this file.
- Names of the original copyright holders (individuals or organizations)
- should be listed with a '*' in the first column. People who have
- contributed from an organization can be listed under the organization
- that actually holds the copyright for their contributions (see the
- Gates Foundation organization for an example). Those individuals should have
- their names indented and be marked with a '-'. Email address can be added
- optionally within square brackets <email>.
-
- * Gates Foundation
- - Name Surname <name.surname@gatesfoundation.com>
-
- * Lazola Lucas <lazola.lucas@modusbox.com>
- * Rajiv Mothilal <rajiv.mothilal@modusbox.com>
- * Miguel de Barros <miguel.debarros@modusbox.com>
- * Shashikant Hirugade <shashikant.hirugade@modusbox.com>
-
- --------------
-
- ******/
-'use strict'
-
-/**
- * @module src/metrics/plugin
- */
-
-/**
- * @function Register Handler Routes HAPI
- *
- * @async
- * @description Registers registers plugins on HAPI server. This retrieves all routes to be exposed from the routes.js file
- * @returns {Promise} - Returns a promise: resolve if successful, or rejection if failed
- */
-
-exports.plugin = {
-  name: 'handler metrics routes',
-  register: function (server) {
-    server.route(require('./routes'))
-  }
-}

package/src/metrics/routes.js

@@ -1,43 +0,0 @@
-/*****
- License
- --------------
- Copyright © 2017 Bill & Melinda Gates Foundation
- The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
- Contributors
- --------------
- This is the official list of the Mojaloop project contributors for this file.
- Names of the original copyright holders (individuals or organizations)
- should be listed with a '*' in the first column. People who have
- contributed from an organization can be listed under the organization
- that actually holds the copyright for their contributions (see the
- Gates Foundation organization for an example). Those individuals should have
- their names indented and be marked with a '-'. Email address can be added
- optionally within square brackets <email>.
- * Gates Foundation
- - Name Surname <name.surname@gatesfoundation.com>
-
- - Pedro Barreto <pedrob@crosslaketech.com>
- - Rajiv Mothilal <rajivmothilal@gmail.com>
- - Shashikant Hirugade <shashikant.hirugade@modusbox.com>
---------------
- ******/
-
-'use strict'
-
-const Handler = require('./handler')
-const tags = ['api', 'metrics']
-
-module.exports = [
-  {
-    method: 'GET',
-    path: '/metrics',
-    handler: Handler.metrics,
-    config: {
-      tags,
-      description: 'Prometheus metrics endpoint',
-      id: 'metrics'
-    }
-  }
-]