From: pranavdi <Pranav.Dixit@amdocs.com>
Date: Mon, 18 Sep 2017 05:26:10 +0000 (+0530)
Subject: Add RequestId and PartnerName in log
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e053ec4b6e7b4f214087d7d6d107055103cbc442;p=aai%2Faai-service.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: I3c19a1f84958e1c847dd0925740e896feb51d023
Issue-Id: AAI-274
Signed-off-by: pranavdi <Pranav.Dixit@amdocs.com>
---

diff --git a/ajsc-aai/src/main/java/org/openecomp/aai/interceptors/AAILogJAXRSInInterceptor.java b/ajsc-aai/src/main/java/org/openecomp/aai/interceptors/AAILogJAXRSInInterceptor.java
index b0e1742..448f8b9 100644
--- a/ajsc-aai/src/main/java/org/openecomp/aai/interceptors/AAILogJAXRSInInterceptor.java
+++ b/ajsc-aai/src/main/java/org/openecomp/aai/interceptors/AAILogJAXRSInInterceptor.java
@@ -48,6 +48,7 @@ import org.openecomp.aai.rest.util.EchoResponse;
 import org.openecomp.aai.util.AAIConfig;
 import org.openecomp.aai.util.AAIConstants;
 import org.openecomp.aai.util.HbaseSaltPrefixer;
+import org.slf4j.MDC;
 
 public class AAILogJAXRSInInterceptor extends JAXRSInInterceptor {
 
@@ -221,14 +222,19 @@ 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> fa = headersList.get("X-FromAppId");
-			if (fa != null) {
-				for (String fromAppIdValue : fa) {
+			List<String> fromAppIdList = headersList.get("X-FromAppId");
+			if (fromAppIdList != null) {
+				for (String fromAppIdValue : fromAppIdList) {
 					fromAppId = fromAppIdValue;
 				}
+				MDC.put("PartnerName",fromAppId);
 			}
 			
 			List<String> contentType = headersList.get("Content-Type");