From: pranavdi <Pranav.Dixit@amdocs.com>
Date: Sun, 17 Sep 2017 06:57:07 +0000 (+0530)
Subject: Add RequestId and PartnerName in log
X-Git-Tag: v1.1.0~16^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=75ea836990332d1d8797e0e2ec10820d628c95b3;p=aai%2Ftraversal.git

Add RequestId and PartnerName in log

The Onap application logging guidelines suggest the logs should have MDCs
for RequestId and PartnerName to create audit trail. Adding the same for
AAI logs

Change-Id: Idfc6c4c0d31eaec90c8c397ee526072a09e1504e
Issue-ID: AAI-274
Signed-off-by: pranavdi <Pranav.Dixit@amdocs.com>
---

diff --git a/aai-traversal/src/main/java/org/openecomp/aai/interceptors/AAILogJAXRSInInterceptor.java b/aai-traversal/src/main/java/org/openecomp/aai/interceptors/AAILogJAXRSInInterceptor.java
index a0ddefff..958639f0 100644
--- a/aai-traversal/src/main/java/org/openecomp/aai/interceptors/AAILogJAXRSInInterceptor.java
+++ b/aai-traversal/src/main/java/org/openecomp/aai/interceptors/AAILogJAXRSInInterceptor.java
@@ -46,6 +46,7 @@ import org.openecomp.aai.util.HbaseSaltPrefixer;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
+import org.slf4j.MDC;
 
 public class AAILogJAXRSInInterceptor extends JAXRSInInterceptor {
 
@@ -216,8 +217,22 @@ public class AAILogJAXRSInInterceptor extends JAXRSInInterceptor {
 				} else if (replacedTransId) { 
 					logMsg = "Replaced invalid requestID of " + transId + " Assigned " + newTransId;
 				}
-			} 
-			
+				MDC.put("RequestId",newTransId);
+			}
+			else {
+				MDC.put("RequestId",transId);
+			}
+
+
+			List<String> fromAppIdList = headersList.get("X-FromAppId");
+			if (fromAppIdList != null) {
+				String fromAppId = null;
+				for (String fromAppIdValue : fromAppIdList) {
+					fromAppId = fromAppIdValue;
+				}
+				MDC.put("PartnerName",fromAppId);
+			}
+
 			List<String> contentType = headersList.get("Content-Type");
 			if (contentType == null) {
 				ct = (String)message.get(Message.CONTENT_TYPE);