From a62082d1d586fc34c73cbe3bbcb9d26b2e81bf10 Mon Sep 17 00:00:00 2001 From: ToineSiebelink Date: Tue, 3 Feb 2026 10:08:41 +0000 Subject: [PATCH] ProvMnS; do not log Policy(denied) Exception - Policy deny-response is like an 'expected exception' - Gergely Molnar asked not to log this. - also changed logging of deny response details to trace level as agreed with Csaba Kocsis Issue-ID: CPS-2826 Change-Id: I73a714fff6ec76fcbf92e23b04335ec4646fa5d3 Signed-off-by: ToineSiebelink --- .../cps/ncmp/impl/data/policyexecutor/PolicyExecutor.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/data/policyexecutor/PolicyExecutor.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/data/policyexecutor/PolicyExecutor.java index c04ae62d6a..3e6cbbd0d0 100644 --- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/data/policyexecutor/PolicyExecutor.java +++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/data/policyexecutor/PolicyExecutor.java @@ -72,6 +72,7 @@ public class PolicyExecutor { private static final String PERMISSION_BASE_PATH = "operation-permission"; private static final String REQUEST_PATH = "permissions"; + private static final String DO_NOT_LOG_POLICY_EXCEPTION = ""; @Qualifier("policyExecutorWebClient") private final WebClient policyExecutorWebClient; @@ -189,14 +190,17 @@ public class PolicyExecutor { if ("allow".equals(permissionResult)) { log.trace("Operation allowed."); } else { - log.warn("Policy Executor permission result: {}", permissionResult); - log.warn("Policy Executor message: {}", details); + log.trace("Policy Executor permission result: {}", permissionResult); + log.trace("Policy Executor message: {}", details); final String message = "Operation not allowed. Decision id " + id + " : " + permissionResult; throw new PolicyExecutorException(message, details, optionalCauseOfError); } } private String createErrorDetailsMessage(final Throwable throwable) { + if (throwable instanceof PolicyExecutorException) { + return DO_NOT_LOG_POLICY_EXCEPTION; + } if (throwable instanceof WebClientResponseException webClientResponseException) { return "Policy Executor returned HTTP Status code " + webClientResponseException.getStatusCode().value() + "."; @@ -216,8 +220,10 @@ public class PolicyExecutor { private void processException(final RuntimeException runtimeException) { final String errorDetailsMessage = createErrorDetailsMessage(runtimeException); - log.warn("Exception during Policy Execution check. Class: {}, Message: {}, Details: {}", + if (!DO_NOT_LOG_POLICY_EXCEPTION.equals(errorDetailsMessage)) { + log.warn("Exception during Policy Execution check. Class: {}, Message: {}, Details: {}", runtimeException.getClass().getSimpleName(), runtimeException.getMessage(), errorDetailsMessage); + } if (runtimeException instanceof WebClientResponseException || runtimeException instanceof WebClientRequestException) { -- 2.16.6