From 2fb7aa6751140b4d7070bff4d18901ae10061e04 Mon Sep 17 00:00:00 2001 From: xg353y Date: Wed, 16 Jan 2019 15:42:30 +0100 Subject: [PATCH 1/1] Clear MDC variables Clear the MDC variables at the beginning and the end of the API calls. Issue-ID: CLAMP-271 Change-Id: I32504b00c812a4441ba1e4548bb7f42cf2894993 Signed-off-by: xg353y --- .../java/org/onap/clamp/clds/service/CldsHealthcheckService.java | 5 +++++ src/main/java/org/onap/clamp/clds/util/LoggingUtils.java | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/org/onap/clamp/clds/service/CldsHealthcheckService.java b/src/main/java/org/onap/clamp/clds/service/CldsHealthcheckService.java index a017d54b..c25e6e7a 100644 --- a/src/main/java/org/onap/clamp/clds/service/CldsHealthcheckService.java +++ b/src/main/java/org/onap/clamp/clds/service/CldsHealthcheckService.java @@ -29,6 +29,8 @@ import java.util.Date; import org.onap.clamp.clds.dao.CldsDao; import org.onap.clamp.clds.model.CldsHealthCheck; import org.onap.clamp.clds.util.LoggingUtils; +import org.onap.clamp.clds.util.ONAPLogConstants; +import org.slf4j.event.Level; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -54,6 +56,7 @@ public class CldsHealthcheckService { public ResponseEntity gethealthcheck() { CldsHealthCheck cldsHealthCheck = new CldsHealthCheck(); Date startTime = new Date(); + LoggingUtils util = new LoggingUtils(logger); LoggingUtils.setRequestContext("CldsService: GET healthcheck", "Clamp-Health-Check"); LoggingUtils.setTimeContext(startTime, new Date()); boolean healthcheckFailed = false; @@ -74,8 +77,10 @@ public class CldsHealthcheckService { // audit log LoggingUtils.setTimeContext(startTime, new Date()); if(healthcheckFailed) { + util.exiting(HttpStatus.INTERNAL_SERVER_ERROR.toString(), "Healthcheck failed", Level.INFO, ONAPLogConstants.ResponseStatus.ERROR); return new ResponseEntity<>(cldsHealthCheck, HttpStatus.INTERNAL_SERVER_ERROR); } else { + util.exiting("200", "Healthcheck failed", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED); return new ResponseEntity<>(cldsHealthCheck, HttpStatus.OK); } } diff --git a/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java b/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java index 759edb1d..300d6066 100644 --- a/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java +++ b/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java @@ -176,6 +176,7 @@ public class LoggingUtils { * @return this. */ public void entering(HttpServletRequest request, String serviceName) { + MDC.clear(); checkNotNull(request); // Extract MDC values from standard HTTP headers. final String requestID = defaultToUUID(request.getHeader(ONAPLogConstants.Headers.REQUEST_ID)); @@ -205,6 +206,8 @@ public class LoggingUtils { if (serviceName == null || serviceName.equalsIgnoreCase(EMPTY_MESSAGE)) { MDC.put(ONAPLogConstants.MDCs.SERVICE_NAME, request.getRequestURI()); + } else { + MDC.put(ONAPLogConstants.MDCs.SERVICE_NAME, serviceName); } this.mLogger.info(ONAPLogConstants.Markers.ENTRY); -- 2.16.6