X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Futils%2Ftransactionid%2FTransactionIdFilter.java;h=3451b85be5ce4bb8d87ea4aff14faeb03cbd6229;hb=167b3d6d3f85e8d0ff3680a7d85ca1c9cf99b2b1;hp=725084ac07ff31ab436ceecd0b63928d200d7842;hpb=f40805fd803fe7e6aa8f7bb4c5d41cf85d163738;p=holmes%2Fcommon.git diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java index 725084a..3451b85 100644 --- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java +++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java @@ -1,5 +1,5 @@ /** - * Copyright 2018-2021 ZTE Corporation. + * Copyright 2018-2022 ZTE Corporation. *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,9 +36,6 @@ import java.util.UUID; public class TransactionIdFilter implements Filter { public static final Marker INVOKE_SYNCHRONOUS; - public static final Marker ENTRY = MarkerFactory.getMarker("ENTRY"); - public static final Marker EXIT = MarkerFactory.getMarker("EXIT"); - private static final String DEFAULT_REQUEST_ID = UUID.randomUUID().toString(); static { @@ -57,7 +54,6 @@ public class TransactionIdFilter implements Filter { HttpServletRequest httpServletRequest = (HttpServletRequest) servletRequest; AddHeadersHttpServletRequestWrapper requestWithTransactionId = new AddHeadersHttpServletRequestWrapper( httpServletRequest); - log.warn(ENTRY, "Entering."); String requestID = ensureTransactionIdIsPresent(requestWithTransactionId); HttpServletResponse httpServletResponse = (HttpServletResponse) servletResponse; @@ -76,11 +72,9 @@ public class TransactionIdFilter implements Filter { MDC.put("RequestID", requestID); MDC.put("InvocationID", invocationID); - log.warn(INVOKE_SYNCHRONOUS, "Invoking synchronously ... "); try { filterChain.doFilter(requestWithTransactionId, httpServletResponse); } finally { - log.debug(EXIT, "Exiting."); MDC.remove("RequestID"); MDC.remove("InvocationID"); } @@ -97,7 +91,6 @@ public class TransactionIdFilter implements Filter { if (StringUtils.isBlank(requestId)) { requestId = TransactionIdUtils.getUUID(); - log.info(INVOKE_SYNCHRONOUS, "This warning has a 'MY_MARKER' annotation."); log.info("Request ID ({} header) not exist. It was generated: {}", TransactionIdUtils.REQUEST_ID_HEADER, requestId); request.addHeader(TransactionIdUtils.REQUEST_ID_HEADER, requestId);