diff options
| -rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/logging/VidLoggerAspect.java | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/logging/VidLoggerAspect.java b/vid-app-common/src/main/java/org/onap/vid/logging/VidLoggerAspect.java index f87297c37..08aaf09ce 100644 --- a/vid-app-common/src/main/java/org/onap/vid/logging/VidLoggerAspect.java +++ b/vid-app-common/src/main/java/org/onap/vid/logging/VidLoggerAspect.java @@ -32,7 +32,6 @@ import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; -import org.onap.logging.ref.slf4j.ONAPLogConstants; import org.onap.portalsdk.core.logging.aspect.EELFLoggerAdvice; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.onap.portalsdk.core.service.AppService; @@ -40,7 +39,6 @@ import org.onap.portalsdk.core.util.SystemProperties; import org.onap.portalsdk.core.web.support.UserUtils; import org.onap.vid.controller.ControllersUtils; import org.onap.vid.utils.SystemPropertiesWrapper; -import org.slf4j.MDC; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -92,7 +90,7 @@ public class VidLoggerAspect { HttpServletRequest httpServletRequest = httpServletRequestOrNull(joinPoint); fixSetRequestBasedDefaultsIntoGlobalLoggingContext(httpServletRequest, joinPoint.getSignature().getDeclaringType().getName()); - addRequestIdToMdcForMetricFilter(httpServletRequest); + fixServerFqdnInMDC(); //Execute the actual method @@ -111,14 +109,6 @@ public class VidLoggerAspect { return result; } - //prepare MDC for org.onap.logging.filter.base.AbstractMetricLogFilter - private void addRequestIdToMdcForMetricFilter(HttpServletRequest httpServletRequest) { - if (httpServletRequest!=null) { - String requestId = UserUtils.getRequestId(httpServletRequest); - MDC.put(ONAPLogConstants.MDCs.REQUEST_ID, requestId); - } - } - // Set the status code into MDC *before* the metrics log is written by advice.after() private void fixStatusCodeInMDC(String restStatus) { EELFLoggerDelegate.mdcPut(SystemProperties.STATUS_CODE, restStatus); @@ -166,7 +156,6 @@ public class VidLoggerAspect { String loginId = controllersUtils.extractUserId(httpServletRequest); logger.setRequestBasedDefaultsIntoGlobalLoggingContext(httpServletRequest, appName, requestId, loginId); - } } |