Fix/traceparent headers (#77)

* reverted traceparent headers to undefined * added common request function to clean empty headers and have same style logging
mojaloop · Sep 26, 2019 · f33d623 · f33d623
1 parent 5e8d7f3
commit f33d623
Show file tree

Hide file tree

Showing 18 changed files with 119 additions and 100 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sims",
-  "version": "8.1.0",
+  "version": "8.1.1",
   "description": "A super-simple fsp simulator",
   "main": "src/index.js",
   "author": "ModusBox",
@@ -33,7 +33,9 @@
     "@hapi/inert": "5.2.1",
     "@hapi/joi": "15.1.1",
     "@hapi/joi-date": "1.3.0",
+    "@hapi/vision": "5.5.3",
     "@mojaloop/central-services-error-handling": "7.4.3",
+    "@mojaloop/central-services-logger": "8.1.1",
     "@mojaloop/central-services-metrics": "5.2.0",
     "@mojaloop/central-services-shared": "7.4.8",
     "axios": "0.19.0",
@@ -47,8 +49,7 @@
     "ilp-packet": "3.0.9",
     "joi-currency-code": "2.0.2",
     "node-cache": "4.2.1",
-    "prom-client": "11.5.3",
-    "@hapi/vision": "5.5.3"
+    "prom-client": "11.5.3"
   },
   "devDependencies": {
     "pre-commit": "1.2.2",

diff --git a/src/acceptheaderpayee/handler.js b/src/acceptheaderpayee/handler.js
@@ -25,9 +25,9 @@ const NodeCache = require('node-cache')
 const myCache = new NodeCache()
 const requests = new NodeCache()
 const callbacks = new NodeCache()
-const request = require('axios')
+const request = require('../lib/sendRequest')
 const https = require('https')
-const Logger = require('@mojaloop/central-services-shared').Logger
+const Logger = require('@mojaloop/central-services-logger')
 const Enums = require('@mojaloop/central-services-shared').Enum
 const Metrics = require('../lib/metrics')
 const base64url = require('base64url')
@@ -137,18 +137,18 @@ exports.getPartiesByTypeAndId = function (req, h) {
           'FSPIOP-Signature': JSON.stringify(fspiopSignature),
           'FSPIOP-HTTP-Method': 'PUT',
           'FSPIOP-URI': `/parties/${req.params.type}/${req.params.id}`,
-          traceparent: req.headers.traceparent || '',
-          tracestate: req.headers.tracestate || ''
+          traceparent: req.headers.traceparent ? req.headers.traceparent : undefined,
+          tracestate: req.headers.tracestate ? req.headers.tracestate : undefined
         },
         httpsAgent: new https.Agent({
           rejectUnauthorized: false
         }),
         data: JSON.stringify(myCache.get(req.params.id))
       }
 
-      Logger.info((new Date().toISOString()), 'Executing PUT', url)
+      // Logger.info((new Date().toISOString()), 'Executing PUT', url)
       const res = await request(url, opts)
-      Logger.info((new Date().toISOString()), 'response: ', res.status)
+      // Logger.info((new Date().toISOString()), 'response: ', res.status)
       if (res.status !== Enums.Http.ReturnCodes.ACCEPTED.CODE) {
         // TODO: how does one identify the failed response?
         throw new Error(`Failed to send. Result: ${res}`)
@@ -226,17 +226,17 @@ exports.postQuotes = function (req, h) {
           'FSPIOP-Signature': `${JSON.stringify(fspiopSignature)}`,
           'FSPIOP-HTTP-Method': 'PUT',
           'FSPIOP-URI': `/quotes/${quotesRequest.quoteId}`,
-          traceparent: req.headers.traceparent || '',
-          tracestate: req.headers.tracestate || ''
+          traceparent: req.headers.traceparent ? req.headers.traceparent : undefined,
+          tracestate: req.headers.tracestate ? req.headers.tracestate : undefined
         },
         httpsAgent: new https.Agent({
           rejectUnauthorized: false
         }),
         data: JSON.stringify(quotesResponse)
       }
-      Logger.info((new Date().toISOString()), 'Executing PUT', url)
+      // Logger.info((new Date().toISOString()), 'Executing PUT', url)
       const res = await request(url, opts)
-      Logger.info((new Date().toISOString()), 'response: ', res.status)
+      // Logger.info((new Date().toISOString()), 'response: ', res.status)
       if (res.status !== Enums.Http.ReturnCodes.ACCEPTED.CODE) {
         // TODO: how does one identify the failed response?
         throw new Error(`Failed to send. Result: ${res}`)
@@ -308,18 +308,18 @@ exports.postTransfers = async function (req, h) {
           'FSPIOP-Signature': JSON.stringify(fspiopSignature),
           'FSPIOP-HTTP-Method': 'PUT',
           'FSPIOP-URI': fspiopUriHeader,
-          traceparent: req.headers.traceparent || '',
-          tracestate: req.headers.tracestate || ''
+          traceparent: req.headers.traceparent ? req.headers.traceparent : undefined,
+          tracestate: req.headers.tracestate ? req.headers.tracestate : undefined
         },
         httpsAgent: new https.Agent({
           rejectUnauthorized: false
         }),
         data: JSON.stringify(transfersResponse)
       }
 
-      Logger.info(`Executing PUT: [${url}], HEADERS: [${JSON.stringify(opts.headers)}], BODY: [${JSON.stringify(transfersResponse)}]`)
+      // Logger.info(`Executing PUT: [${url}], HEADERS: [${JSON.stringify(opts.headers)}], BODY: [${JSON.stringify(transfersResponse)}]`)
       const res = await request(url, opts)
-      Logger.info(`response: ${res.status}`)
+      // Logger.info(`response: ${res.status}`)
       if (res.status !== Enums.Http.ReturnCodes.ACCEPTED.CODE) {
         // TODO: how does one identify the failed response?
         throw new Error(`Failed to send. Result: ${JSON.stringify(res)}`)

diff --git a/src/bulkTransfers/handler.js b/src/bulkTransfers/handler.js
@@ -26,9 +26,9 @@ const NodeCache = require('node-cache')
 const myCache = new NodeCache()
 const requests = new NodeCache()
 const callbacks = new NodeCache()
-const request = require('axios')
+const request = require('../lib/sendRequest')
 const https = require('https')
-const Logger = require('@mojaloop/central-services-shared').Logger
+const Logger = require('@mojaloop/central-services-logger')
 const Enums = require('@mojaloop/central-services-shared').Enum
 const Metrics = require('../lib/metrics')
 const base64url = require('base64url')
@@ -97,8 +97,8 @@ exports.postBulkTransfers = async function (req, h) {
           'FSPIOP-Signature': JSON.stringify(fspiopSignature),
           'FSPIOP-HTTP-Method': 'PUT',
           'FSPIOP-URI': fspiopUriHeader,
-          traceparent: req.headers.traceparent || '',
-          tracestate: req.headers.tracestate || ''
+          traceparent: req.headers.traceparent ? req.headers.traceparent : undefined,
+          tracestate: req.headers.tracestate ? req.headers.tracestate : undefined
         },
         transformRequest: [(data, headers) => {
           delete headers.common.Accept
@@ -109,9 +109,9 @@ exports.postBulkTransfers = async function (req, h) {
         }),
         data: JSON.stringify(bulkTransferResponse)
       }
-      Logger.info(`Executing PUT: [${url}], HEADERS: [${JSON.stringify(opts.headers)}], BODY: [${JSON.stringify(bulkTransferResponse)}]`)
+      // Logger.info(`Executing PUT: [${url}], HEADERS: [${JSON.stringify(opts.headers)}], BODY: [${JSON.stringify(bulkTransferResponse)}]`)
       const res = await request(url, opts)
-      Logger.info(`response: ${res.status}`)
+      // Logger.info(`response: ${res.status}`)
       if (res.status !== Enums.Http.ReturnCodes.ACCEPTED.CODE) {
         // TODO: how does one identify the failed response?
         throw new Error(`Failed to send. Result: ${JSON.stringify(res)}`)

diff --git a/src/lib/metrics.js b/src/lib/metrics.js
@@ -30,7 +30,7 @@
 // const client = require('prom-client')
 const Metrics = require('@mojaloop/central-services-metrics')
 // const Logger = require('./logger')
-const Logger = require('@mojaloop/central-services-shared').Logger
+const Logger = require('@mojaloop/central-services-logger')
 
 let alreadySetup = false
 const prefix = process.env.METRICS_PREFIX || 'moja_'

diff --git a/src/lib/requestLogger.js b/src/lib/requestLogger.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Logger = require('@mojaloop/central-services-shared').Logger
+const Logger = require('@mojaloop/central-services-logger')
 const Util = require('util')
 
 const logRequest = function (request) {

diff --git a/src/lib/sendRequest.js b/src/lib/sendRequest.js
@@ -0,0 +1,10 @@
+const Logger = require('@mojaloop/central-services-logger')
+const request = require('axios')
+const { pickBy, identity } = require('lodash')
+
+module.exports = async (url, opts) => {
+  Logger.info(`Executing PUT: [${url}], HEADERS: [${JSON.stringify(opts.headers)}], BODY: [${JSON.stringify(opts.body)}]`)
+  const optionsWithCleanHeaders = Object.assign({}, opts, { headers: pickBy(opts.headers, identity) })
+  const res = await request(url, optionsWithCleanHeaders)
+  Logger.info((new Date().toISOString()), 'response: ', res.status)
+}
diff --git a/src/noresponsepayeefsp/handler.js b/src/noresponsepayeefsp/handler.js
@@ -26,7 +26,7 @@ const NodeCache = require('node-cache')
 const myCache = new NodeCache()
 const requests = new NodeCache()
 const callbacks = new NodeCache()
-const Logger = require('@mojaloop/central-services-shared').Logger
+const Logger = require('@mojaloop/central-services-logger')
 const Enums = require('@mojaloop/central-services-shared').Enum
 const Metrics = require('../lib/metrics')
 

diff --git a/src/oracle/handler.js b/src/oracle/handler.js
@@ -27,7 +27,7 @@ const NodeCache = require('node-cache')
 const participantsCache = new NodeCache()
 const requestsCache = new NodeCache()
 const batchRequestCache = new NodeCache()
-const Logger = require('@mojaloop/central-services-shared').Logger
+const Logger = require('@mojaloop/central-services-logger')
 const Enums = require('@mojaloop/central-services-shared').Enum
 const Metrics = require('../lib/metrics')
 

diff --git a/src/payee/handler.js b/src/payee/handler.js
@@ -26,9 +26,9 @@ const NodeCache = require('node-cache')
 const myCache = new NodeCache()
 const requests = new NodeCache()
 const callbacks = new NodeCache()
-const request = require('axios')
+const request = require('../lib/sendRequest')
 const https = require('https')
-const Logger = require('@mojaloop/central-services-shared').Logger
+const Logger = require('@mojaloop/central-services-logger')
 const Enums = require('@mojaloop/central-services-shared').Enum
 const Metrics = require('../lib/metrics')
 const base64url = require('base64url')
@@ -146,8 +146,8 @@ exports.getPartiesByTypeAndId = function (req, h) {
           'FSPIOP-Signature': JSON.stringify(fspiopSignature),
           'FSPIOP-HTTP-Method': 'PUT',
           'FSPIOP-URI': `/parties/${req.params.type}/${req.params.id}`,
-          traceparent: req.headers.traceparent || '',
-          tracestate: req.headers.tracestate || ''
+          traceparent: req.headers.traceparent ? req.headers.traceparent : undefined,
+          tracestate: req.headers.tracestate ? req.headers.tracestate : undefined
         },
         transformRequest: [(data, headers) => {
           delete headers.common.Accept
@@ -159,9 +159,9 @@ exports.getPartiesByTypeAndId = function (req, h) {
         data: JSON.stringify(myCache.get(req.params.id))
       }
 
-      Logger.info((new Date().toISOString()), 'Executing PUT', url)
+      // Logger.info((new Date().toISOString()), 'Executing PUT', url)
       const res = await request(url, opts)
-      Logger.info((new Date().toISOString()), 'response: ', res.status)
+      // Logger.info((new Date().toISOString()), 'response: ', res.status)
       if (res.status !== Enums.Http.ReturnCodes.ACCEPTED.CODE) {
         // TODO: how does one identify the failed response?
         throw new Error(`Failed to send. Result: ${res}`)
@@ -260,8 +260,8 @@ exports.postQuotes = function (req, h) {
           'FSPIOP-Signature': `${JSON.stringify(fspiopSignature)}`,
           'FSPIOP-HTTP-Method': 'PUT',
           'FSPIOP-URI': `/quotes/${quotesRequest.quoteId}`,
-          traceparent: req.headers.traceparent || '',
-          tracestate: req.headers.tracestate || ''
+          traceparent: req.headers.traceparent ? req.headers.traceparent : undefined,
+          tracestate: req.headers.tracestate ? req.headers.tracestate : undefined
         },
         transformRequest: [(data, headers) => {
           delete headers.common.Accept
@@ -272,9 +272,9 @@ exports.postQuotes = function (req, h) {
         }),
         data: JSON.stringify(quotesResponse)
       }
-      Logger.info((new Date().toISOString()), 'Executing PUT', url)
+      // Logger.info((new Date().toISOString()), 'Executing PUT', url)
       const res = await request(url, opts)
-      Logger.info((new Date().toISOString()), 'response: ', res.status)
+      // Logger.info((new Date().toISOString()), 'response: ', res.status)
       if (res.status !== Enums.Http.ReturnCodes.ACCEPTED.CODE) {
         // TODO: how does one identify the failed response?
         throw new Error(`Failed to send. Result: ${res}`)
@@ -349,8 +349,8 @@ exports.postTransfers = async function (req, h) {
           'FSPIOP-Signature': JSON.stringify(fspiopSignature),
           'FSPIOP-HTTP-Method': 'PUT',
           'FSPIOP-URI': fspiopUriHeader,
-          traceparent: req.headers.traceparent || '',
-          tracestate: req.headers.tracestate || ''
+          traceparent: req.headers.traceparent ? req.headers.traceparent : undefined,
+          tracestate: req.headers.tracestate ? req.headers.tracestate : undefined
         },
         transformRequest: [(data, headers) => {
           delete headers.common.Accept
@@ -362,9 +362,9 @@ exports.postTransfers = async function (req, h) {
         data: JSON.stringify(transfersResponse)
       }
 
-      Logger.info(`Executing PUT: [${url}], HEADERS: [${JSON.stringify(opts.headers)}], BODY: [${JSON.stringify(transfersResponse)}]`)
+      // Logger.info(`Executing PUT: [${url}], HEADERS: [${JSON.stringify(opts.headers)}], BODY: [${JSON.stringify(transfersResponse)}]`)
       const res = await request(url, opts)
-      Logger.info(`response: ${res.status}`)
+      // Logger.info(`response: ${res.status}`)
       if (res.status !== Enums.Http.ReturnCodes.ACCEPTED.CODE) {
         // TODO: how does one identify the failed response?
         throw new Error(`Failed to send. Result: ${JSON.stringify(res)}`)

diff --git a/src/payer/handler.js b/src/payer/handler.js
@@ -28,7 +28,7 @@ const myCache = new NodeCache()
 const requests = new NodeCache()
 const callbacks = new NodeCache()
 const Metrics = require('../lib/metrics')
-const Logger = require('@mojaloop/central-services-shared').Logger
+const Logger = require('@mojaloop/central-services-logger')
 const Enums = require('@mojaloop/central-services-shared').Enum
 
 const extractUrls = (request) => {

diff --git a/src/routes.js b/src/routes.js
@@ -23,7 +23,7 @@
 'use strict'
 
 const Glob = require('glob')
-const Logger = require('@mojaloop/central-services-shared').Logger
+const Logger = require('@mojaloop/central-services-logger')
 
 exports.plugin = {
   name: 'api routes',

diff --git a/src/shared/setup.js b/src/shared/setup.js
@@ -24,7 +24,7 @@
 
 const Hapi = require('@hapi/hapi')
 const Boom = require('@hapi/boom')
-const Logger = require('@mojaloop/central-services-shared').Logger
+const Logger = require('@mojaloop/central-services-logger')
 const Metrics = require('../lib/metrics')
 const RequestLogger = require('../lib/requestLogger')
 

diff --git a/src/testfsp1/handler.js b/src/testfsp1/handler.js
@@ -27,9 +27,9 @@ const NodeCache = require('node-cache')
 const myCache = new NodeCache()
 const requests = new NodeCache()
 const callbacks = new NodeCache()
-const request = require('axios')
+const request = require('../lib/sendRequest')
 const https = require('https')
-const Logger = require('@mojaloop/central-services-shared').Logger
+const Logger = require('@mojaloop/central-services-logger')
 const Enums = require('@mojaloop/central-services-shared').Enum
 const Metrics = require('../lib/metrics')
 const base64url = require('base64url')
@@ -119,8 +119,8 @@ exports.getPartiesByTypeAndId = function (req, h) {
           'FSPIOP-Source': 'testfsp1',
           'FSPIOP-Destination': req.headers['fspiop-source'],
           Date: req.headers.date,
-          traceparent: req.headers.traceparent || '',
-          tracestate: req.headers.tracestate || ''
+          traceparent: req.headers.traceparent ? req.headers.traceparent : undefined,
+          tracestate: req.headers.tracestate ? req.headers.tracestate : undefined
         },
         transformRequest: [(data, headers) => {
           delete headers.common.Accept
@@ -266,8 +266,8 @@ exports.postQuotes = function (req, h) {
           'FSPIOP-Signature': `${JSON.stringify(fspiopSignature)}`,
           'FSPIOP-HTTP-Method': 'PUT',
           'FSPIOP-URI': `/quotes/${quotesRequest.quoteId}`,
-          traceparent: req.headers.traceparent || '',
-          tracestate: req.headers.tracestate || ''
+          traceparent: req.headers.traceparent ? req.headers.traceparent : undefined,
+          tracestate: req.headers.tracestate ? req.headers.tracestate : undefined
         },
         transformRequest: [(data, headers) => {
           delete headers.common.Accept
@@ -278,9 +278,9 @@ exports.postQuotes = function (req, h) {
         }),
         data: JSON.stringify(quotesResponse)
       }
-      Logger.info(`Executing PUT: [${url}], HEADERS: [${JSON.stringify(opts.headers)}], BODY: [${JSON.stringify(quotesResponse)}]`)
+      // Logger.info(`Executing PUT: [${url}], HEADERS: [${JSON.stringify(opts.headers)}], BODY: [${JSON.stringify(quotesResponse)}]`)
       const res = await request(url, opts)
-      Logger.info((new Date().toISOString()), 'response: ', res.status)
+      // Logger.info((new Date().toISOString()), 'response: ', res.status)
       if (res.status !== Enums.Http.ReturnCodes.ACCEPTED.CODE) {
         // TODO: how does one identify the failed response?
         throw new Error(`Failed to send. Result: ${res}`)
@@ -395,14 +395,14 @@ exports.postTransfers = async function (req, h) {
           'FSPIOP-Signature': JSON.stringify(fspiopSignature),
           'FSPIOP-HTTP-Method': 'PUT',
           'FSPIOP-URI': fspiopUriHeader,
-          traceparent: req.headers.traceparent || '',
-          tracestate: req.headers.tracestate || ''
+          traceparent: req.headers.traceparent ? req.headers.traceparent : undefined,
+          tracestate: req.headers.tracestate ? req.headers.tracestate : undefined
         },
         data: JSON.stringify(transfersResponse)
       }
-      Logger.info(`Executing PUT: [${url}], HEADERS: [${JSON.stringify(opts.headers)}], BODY: [${JSON.stringify(transfersResponse)}]`)
+      // Logger.info(`Executing PUT: [${url}], HEADERS: [${JSON.stringify(opts.headers)}], BODY: [${JSON.stringify(transfersResponse)}]`)
       const res = await request(url, opts)
-      Logger.info(`response: ${res.status}`)
+      // Logger.info(`response: ${res.status}`)
       if (res.status !== Enums.Http.ReturnCodes.ACCEPTED.CODE) {
         // TODO: how does one identify the failed response?
         throw new Error(`Failed to send. Result: ${JSON.stringify(res)}`)