log request_id if header is set by heroku

salesforce · Aug 5, 2017 · f2c3cca · f2c3cca
1 parent e1fa2b8
commit f2c3cca
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/jobQueue/jobWrapper.js b/jobQueue/jobWrapper.js
@@ -29,6 +29,7 @@ const TIME_TO_LIVE =
 
 /**
  * Set log object params from job results.
+ *
  * @param  {Object} jobResultObj - Job result object
  * @param  {Object} logObject - Log object
  */
@@ -117,9 +118,13 @@ function logJobOnComplete(req, job) {
 
     /*
      * If req object is defined; extract the user name, token and ipaddress and
-     * update the log object
+     * update the log object. Add "request_id" if header is set by heroku.
      */
     if (req) {
+      if (req.headers && req.headers['x-request-id']) {
+        logObject.request_id = req.headers['x-request-id'];
+      }
+
       logObject.ipAddress = activityLogUtil.getIPAddrFromReq(req);
       jwtUtil.getTokenDetailsFromRequest(req)
       .then((resObj) => {

diff --git a/utils/apiLog.js b/utils/apiLog.js
@@ -104,8 +104,12 @@ function logAPI(req, resultObj, retval, recordCountOverride) {
       method: req.method,
     };
 
-    // if API token enabled,
-    // extract user, token to update log object
+    // Add "request_id" if header is set by heroku.
+    if (req.headers && req.headers['x-request-id']) {
+      logObject.request_id = req.headers['x-request-id'];
+    }
+
+    // If API token enabled, extract user, token to update log object
     jwtUtil.getTokenDetailsFromRequest(req)
     .then((resObj) => {
       logObject.user = resObj.username;