From 7868ed0487009cc7285a35d1bcd76f7cba6b9bdd Mon Sep 17 00:00:00 2001 From: anupmarathe Date: Wed, 30 Aug 2017 15:07:37 +0530 Subject: Fix to get calling application identifier As per EELF logging guidelines, component can put a calling application identifier or user name in MDC against key PartnerName. SO is setting user name against key PartnerName in LogFilter. By having an identity of calling application can assist in debugging. To achieve this SO will check request header key X-FromAppId and set its value against MDC - FromAppId. Change-Id: Ib67c5e76fdf5567282200e17210ddb49cf9a57fb Issue-ID: SO-99 Signed-off-by: anupmarathe --- common/src/main/java/org/openecomp/mso/logger/LogFilter.java | 5 +++++ common/src/main/java/org/openecomp/mso/logger/MsoLogger.java | 3 +++ 2 files changed, 8 insertions(+) (limited to 'common/src/main/java') diff --git a/common/src/main/java/org/openecomp/mso/logger/LogFilter.java b/common/src/main/java/org/openecomp/mso/logger/LogFilter.java index ca25ad2e22..6eaf356c0e 100644 --- a/common/src/main/java/org/openecomp/mso/logger/LogFilter.java +++ b/common/src/main/java/org/openecomp/mso/logger/LogFilter.java @@ -53,6 +53,11 @@ public class LogFilter implements Filter { if (null != userPrincipal) { MDC.put (MsoLogger.PARTNERNAME, userPrincipal.getName ()); } + //Set identity of calling application / component + String fromAppId = httpRequest.getHeader(MsoLogger.HEADER_FROM_APP_ID); + if(fromAppId != null && !fromAppId.isEmpty()) { + MDC.put (MsoLogger.FROM_APP_ID, fromAppId); + } chain.doFilter(httpRequest, httpResponse); } diff --git a/common/src/main/java/org/openecomp/mso/logger/MsoLogger.java b/common/src/main/java/org/openecomp/mso/logger/MsoLogger.java index 4c39815bd0..e9b6fb1225 100644 --- a/common/src/main/java/org/openecomp/mso/logger/MsoLogger.java +++ b/common/src/main/java/org/openecomp/mso/logger/MsoLogger.java @@ -71,6 +71,9 @@ public class MsoLogger { private static final String USER = "User"; private static final String DUMMY_VALUE = "trace-#"; public static final String UNKNOWN = "UNKNOWN"; + //For getting an identity of calling application + public static final String HEADER_FROM_APP_ID = "X-FromAppId"; + public static final String FROM_APP_ID = "FromAppId"; // Audit/Metric log specific private static final String BEGINTIME = "BeginTimestamp"; private static final String ENDTIME = "EndTimestamp"; -- cgit 1.2.3-korg