From 232d2301cedd44070449d155618274b91bab0275 Mon Sep 17 00:00:00 2001
From: Andrea De Rinaldis <andrea.derinaldis@pagopa.it>
Date: Mon, 16 Sep 2024 13:05:49 +0200
Subject: [PATCH] fix: refactoring on trace writing for log (and cost) tuning

---
 .../wispconverter/exception/AppErrorCodeMessageEnum.java  | 2 +-
 .../wispconverter/service/ECommerceHangTimerService.java  | 8 ++++----
 .../pagopa/wispconverter/service/ReceiptTimerService.java | 4 ++--
 .../gov/pagopa/wispconverter/service/RecoveryService.java | 2 +-
 .../servicebus/ECommerceHangTimeoutConsumer.java          | 2 +-
 .../wispconverter/servicebus/PaymentTimeoutConsumer.java  | 2 +-
 .../gov/pagopa/wispconverter/servicebus/RTConsumer.java   | 6 +++---
 .../java/it/gov/pagopa/wispconverter/util/ReUtil.java     | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/it/gov/pagopa/wispconverter/exception/AppErrorCodeMessageEnum.java b/src/main/java/it/gov/pagopa/wispconverter/exception/AppErrorCodeMessageEnum.java
index e16882bd..cb515889 100644
--- a/src/main/java/it/gov/pagopa/wispconverter/exception/AppErrorCodeMessageEnum.java
+++ b/src/main/java/it/gov/pagopa/wispconverter/exception/AppErrorCodeMessageEnum.java
@@ -50,7 +50,7 @@ public enum AppErrorCodeMessageEnum {
     PERSISTENCE_RPT_NOT_FOUND(2001, "RPT not found", "Error while retrieving RPT. RPT with sessionId [{0}] not found.", HttpStatus.NOT_FOUND, "An error occurred while trying to retrieve the RPT content saved in storage by WISP SOAP Converter. This can be related either with the use of a wrong sessionId or a missed persistence from WISP SOAP Converter, so it is better to analyze the entire flow using Technical Support's APIs. This block totally the conversion of the RPTs in GPD's payment positions, so the whole process is discarded."),
     PERSISTENCE_RT_NOT_FOUND(2002, "RT not found", "Error while retrieving RT. RT with id [{0}] and partition key [{1}] not found.", HttpStatus.NOT_FOUND, "An error occurred while trying to retrieve the RT content saved in storage by WISP Converter. This can be related either with the use of a wrong identifier, a missed persistence or an expired object, so it is better to analyze the entire flow using Technical Support's APIs."),
     PERSISTENCE_REQUESTID_CACHING_ERROR(2003, "RequestID caching error", "Error while reading cached RequestID. No valid value found for key [{0}].", HttpStatus.NOT_FOUND, "An error occurred while trying to retrieve data from internal cache. Specifically, the cached key, defined in format wisp_nav2iuv_<domainId>_<nav> needed for RT generation, was not found. This missing read invalidates the entire process of the RT generation."),
-    PERSISTENCE_SERVICE_BUS_CANCEL_ERROR(2004, "ServiceBus Error", "Error while communicating with Service Bus for cancel scheduled message related to payment token timeout. {0}", HttpStatus.INTERNAL_SERVER_ERROR, "An error occurred while communicating with Service Bus for cancel scheduled message related to payment token"),
+    PERSISTENCE_SERVICE_BUS_CANCEL_ERROR(2004, "ServiceBus Error", "Error while communicating with Service Bus for cancel scheduled message related to timer timeout. {0}", HttpStatus.INTERNAL_SERVER_ERROR, "An error occurred while communicating with Service Bus for cancel scheduled message related to timer timeout"),
     PERSISTENCE_MAPPING_NAV_TO_IUV_ERROR(2005, "Mapping caching error", "Error while reading cached mapping from NAV to IUV. No valid value found for NAV-based key [{0}].", HttpStatus.NOT_FOUND, "An error occurred while trying to retrieve data from internal cache. Specifically, the cached key, defined in format wisp_nav2iuv_<domainId>_<nav> needed for RT generation is corrupted in some way, because it is not possible to extract 'domainId' or 'nav' correctly. This wrong read invalidates the entire process of the RT generation."),
     CONFIGURATION_NOT_FOUND(2006, "Configuration not found", "The configuration for the selected item does not exist", HttpStatus.NOT_FOUND, "An error occured while retrieving the configuration. Check the input string and if the configuration is present or not"),
     // --- Client errors ---
diff --git a/src/main/java/it/gov/pagopa/wispconverter/service/ECommerceHangTimerService.java b/src/main/java/it/gov/pagopa/wispconverter/service/ECommerceHangTimerService.java
index 26b381b6..27ba9c4d 100644
--- a/src/main/java/it/gov/pagopa/wispconverter/service/ECommerceHangTimerService.java
+++ b/src/main/java/it/gov/pagopa/wispconverter/service/ECommerceHangTimerService.java
@@ -92,8 +92,8 @@ public void sendMessage(ECommerceHangTimeoutMessage message) {
         Long sequenceNumber = serviceBusSenderClient.scheduleMessage(serviceBusMessage, scheduledExpirationTime);
 
         // log event
-        log.info("Sent scheduled message_base64 {} to the queue: {}", LogUtils.encodeToBase64(message.toString()), queueName);
-        generateRE(InternalStepStatus.ECOMMERCE_HANG_TIMER_CREATED, "Scheduled ECommerceHangTimerService: [" + message + "]");
+        log.debug("Sent scheduled message_base64 {} to the queue: {}", LogUtils.encodeToBase64(message.toString()), queueName);
+        generateRE(InternalStepStatus.ECOMMERCE_HANG_TIMER_CREATED, "Scheduled eCommerce hang release: [" + message + "]");
 
         // insert in Redis cache sequenceNumber of the message
         cacheRepository.insert(key, sequenceNumber.toString(), expirationTime, ChronoUnit.SECONDS);
@@ -108,7 +108,7 @@ public void sendMessage(ECommerceHangTimeoutMessage message) {
      */
     public void cancelScheduledMessage(String noticeNumber, String fiscalCode) {
 
-        log.debug("Cancel scheduled message for ECommerceHangTimer {} {}", sanitizeInput(noticeNumber), sanitizeInput(fiscalCode));
+        log.debug("Cancel scheduled message for eCommerce hang release {} {}", sanitizeInput(noticeNumber), sanitizeInput(fiscalCode));
         String key = String.format(ECOMMERCE_TIMER_MESSAGE_KEY_FORMAT, noticeNumber, fiscalCode);
 
         // get the sequenceNumber from the Redis cache
@@ -118,7 +118,7 @@ public void cancelScheduledMessage(String noticeNumber, String fiscalCode) {
 
             // cancel scheduled message in the service bus queue
             callCancelScheduledMessage(sequenceNumber);
-            log.info("Canceled scheduled message for ecommerce_hang_timeout_base64 {} {}", LogUtils.encodeToBase64(sanitizeInput(noticeNumber)), LogUtils.encodeToBase64(sanitizeInput(fiscalCode)));
+            log.debug("Canceled scheduled message for ecommerce_hang_timeout_base64 {} {}", LogUtils.encodeToBase64(sanitizeInput(noticeNumber)), LogUtils.encodeToBase64(sanitizeInput(fiscalCode)));
 
             // delete the sequenceNumber from the Redis cache
             cacheRepository.delete(key);
diff --git a/src/main/java/it/gov/pagopa/wispconverter/service/ReceiptTimerService.java b/src/main/java/it/gov/pagopa/wispconverter/service/ReceiptTimerService.java
index d7448d63..34117707 100644
--- a/src/main/java/it/gov/pagopa/wispconverter/service/ReceiptTimerService.java
+++ b/src/main/java/it/gov/pagopa/wispconverter/service/ReceiptTimerService.java
@@ -77,7 +77,7 @@ public void sendMessage(ReceiptTimerRequest message) {
         // compute time and schedule message for consumer trigger
         OffsetDateTime scheduledExpirationTime = OffsetDateTime.now().plus(message.getExpirationTime(), ChronoUnit.MILLIS);
         Long sequenceNumber = serviceBusSenderClient.scheduleMessage(serviceBusMessage, scheduledExpirationTime);
-        log.info("Sent scheduled message_base64 {} to the queue: {}", LogUtils.encodeToBase64(message.toString()), queueName);
+        log.debug("Sent scheduled message_base64 {} to the queue: {}", LogUtils.encodeToBase64(message.toString()), queueName);
         generateRE(InternalStepStatus.RECEIPT_TIMER_GENERATION_CREATED_SCHEDULED_SEND, "Scheduled receipt: [" + message + "]");
 
         // insert {wisp_timer_<paymentToken>, sequenceNumber} for Duplicate Prevention Logic and for call cancelScheduledMessage(sequenceNumber)
@@ -108,7 +108,7 @@ private void cancelScheduledMessage(String paymentToken) {
         // cancel scheduled message
         if (this.callCancelScheduledMessage(sequenceNumberString)) {
 
-            log.info("Canceled scheduled message for payment-token_base64 {}", LogUtils.encodeToBase64(paymentToken));
+            log.debug("Canceled scheduled message for payment-token_base64 {}", LogUtils.encodeToBase64(paymentToken));
             cacheRepository.delete(sequenceNumberKey);
             log.debug("Deleted sequence number {} for payment-token: {} from cache", sequenceNumberString, sequenceNumberKey);
             generateRE(InternalStepStatus.RECEIPT_TIMER_GENERATION_DELETED_SCHEDULED_SEND, "Deleted sequence number: [" + sequenceNumberString + "] for payment token: [" + sequenceNumberKey + "]");
diff --git a/src/main/java/it/gov/pagopa/wispconverter/service/RecoveryService.java b/src/main/java/it/gov/pagopa/wispconverter/service/RecoveryService.java
index dae65d1b..a5327a86 100644
--- a/src/main/java/it/gov/pagopa/wispconverter/service/RecoveryService.java
+++ b/src/main/java/it/gov/pagopa/wispconverter/service/RecoveryService.java
@@ -90,7 +90,7 @@ public RecoveryReceiptResponse recoverReceiptKOForCreditorInstitution(String cre
 
         CompletableFuture<Boolean> executeRecovery = recoverReceiptKOAsync(dateFrom, dateTo, creditorInstitution, paymentsToReconcile);
         executeRecovery
-                .thenAccept(value -> log.info("Reconciliation for creditor institution [{}] in date range [{}-{}] completed!", creditorInstitution, dateFrom, dateTo))
+                .thenAccept(value -> log.debug("Reconciliation for creditor institution [{}] in date range [{}-{}] completed!", creditorInstitution, dateFrom, dateTo))
                 .exceptionally(e -> {
                     log.error("Reconciliation for creditor institution [{}] in date range [{}-{}] ended unsuccessfully!", creditorInstitution, dateFrom, dateTo, e);
                     throw new AppException(e, AppErrorCodeMessageEnum.ERROR, e.getMessage());
diff --git a/src/main/java/it/gov/pagopa/wispconverter/servicebus/ECommerceHangTimeoutConsumer.java b/src/main/java/it/gov/pagopa/wispconverter/servicebus/ECommerceHangTimeoutConsumer.java
index f3a6c12f..6bb31f2a 100644
--- a/src/main/java/it/gov/pagopa/wispconverter/servicebus/ECommerceHangTimeoutConsumer.java
+++ b/src/main/java/it/gov/pagopa/wispconverter/servicebus/ECommerceHangTimeoutConsumer.java
@@ -63,7 +63,7 @@ public void initializeClient() {
     public void processMessage(ServiceBusReceivedMessageContext context) {
         setSessionDataInfoInMDC("ecommerce-hang-timeout-trigger");
         ServiceBusReceivedMessage message = context.getMessage();
-        log.info("Processing message. Session: {}, Sequence #: {}. Contents: {}", message.getMessageId(), message.getSequenceNumber(), message.getBody());
+        log.debug("Processing message. Session: {}, Sequence #: {}. Contents: {}", message.getMessageId(), message.getSequenceNumber(), message.getBody());
         try {
             // read the message
             ECommerceHangTimeoutMessage timeoutMessage = mapper.readValue(message.getBody().toStream(), ECommerceHangTimeoutMessage.class);
diff --git a/src/main/java/it/gov/pagopa/wispconverter/servicebus/PaymentTimeoutConsumer.java b/src/main/java/it/gov/pagopa/wispconverter/servicebus/PaymentTimeoutConsumer.java
index 540613e5..a12315ae 100644
--- a/src/main/java/it/gov/pagopa/wispconverter/servicebus/PaymentTimeoutConsumer.java
+++ b/src/main/java/it/gov/pagopa/wispconverter/servicebus/PaymentTimeoutConsumer.java
@@ -52,7 +52,7 @@ public void post() {
     public void processMessage(ServiceBusReceivedMessageContext context) {
         setSessionDataInfoInMDC("payment-token-timeout-trigger");
         ServiceBusReceivedMessage message = context.getMessage();
-        log.info("Processing message. Session: {}, Sequence #: {}. Contents: {}", message.getMessageId(),
+        log.debug("Processing message. Session: {}, Sequence #: {}. Contents: {}", message.getMessageId(),
                 message.getSequenceNumber(), message.getBody());
         try {
             ReceiptDto receiptDto = mapper.readValue(message.getBody().toStream(), ReceiptDto.class);
diff --git a/src/main/java/it/gov/pagopa/wispconverter/servicebus/RTConsumer.java b/src/main/java/it/gov/pagopa/wispconverter/servicebus/RTConsumer.java
index a07d0599..ef8db0dd 100644
--- a/src/main/java/it/gov/pagopa/wispconverter/servicebus/RTConsumer.java
+++ b/src/main/java/it/gov/pagopa/wispconverter/servicebus/RTConsumer.java
@@ -84,7 +84,7 @@ public void processMessage(ServiceBusReceivedMessageContext context) {
         // retrieving content from context of arrived message
         setSessionDataInfoInMDC("resend-rt");
         ServiceBusReceivedMessage message = context.getMessage();
-        log.info("Processing " + message.getMessageId());
+        log.debug("Processing " + message.getMessageId());
 
         // extracting the values needed for the search of the receipt persisted in storage
         String compositedIdForReceipt = new String(message.getBody().toBytes());
@@ -144,7 +144,7 @@ private void resendRTToCreditorInstitution(String receiptId, RTRequestEntity rec
 
         try {
 
-            log.info("Sending receipt [{}]", receiptId);
+            log.debug("Sending receipt [{}]", receiptId);
 
             // unzip retrieved zipped payload from GZip format
             byte[] unzippedPayload = ZipUtil.unzip(AppBase64Util.base64Decode(receipt.getPayload()));
@@ -158,7 +158,7 @@ private void resendRTToCreditorInstitution(String receiptId, RTRequestEntity rec
             String rawPayload = new String(unzippedPayload);
             paaInviaRTSenderService.sendToCreditorInstitution(receipt.getUrl(), extractHeaders(receipt.getHeaders()), rawPayload);
             rtRetryComosService.deleteRTRequestEntity(receipt);
-            log.info("Sent receipt [{}]", receiptId);
+            log.debug("Sent receipt [{}]", receiptId);
 
             // generate a new event in RE for store the successful re-sending of the receipt
             generateREForSentRT();
diff --git a/src/main/java/it/gov/pagopa/wispconverter/util/ReUtil.java b/src/main/java/it/gov/pagopa/wispconverter/util/ReUtil.java
index fb58166d..225dff5a 100644
--- a/src/main/java/it/gov/pagopa/wispconverter/util/ReUtil.java
+++ b/src/main/java/it/gov/pagopa/wispconverter/util/ReUtil.java
@@ -267,7 +267,7 @@ private static String formatClientHeaders(HttpHeaders headers) {
                 headers.add(s, StringUtils.join(h, ","));
             });
         } catch (UnsupportedOperationException e) {
-            log.trace("Impossible to add formatted header to existing Headers object:", e);
+            log.debug("Impossible to add formatted header to existing Headers object:", e);
         }
 
         return formatHeaders(headers);