CIRCSTORE-573 Remove PII from logs (#568)

Author: OleksandrVidinieiev

src/main/java/org/folio/rest/impl/AnonymizeStorageLoansAPI.java

@@ -54,7 +54,7 @@ public void postAnonymizeStorageLoans(AnonymizeStorageLoansRequest request,
     List<String> invalidIds = loanIdsMap.get(false);
 
     if (CollectionUtils.isNotEmpty(invalidIds)) {
-      log.warn("Invalid loan UUIDs provided: ", invalidIds);
+      log.warn("Invalid loan UUIDs provided: {}", invalidIds);
       addToNotAnonimizedLoans(response, "invalidLoanIds", invalidIds);
     }
 
@@ -66,15 +66,14 @@ public void postAnonymizeStorageLoans(AnonymizeStorageLoansRequest request,
       return;
     }
 
-    log.info("Anonymizing loans: ", validIds);
+    log.info("Anonymizing loans: {}", validIds.size());
 
     final String tenantId = TenantTool.tenantId(okapiHeaders);
     final PostgresClient postgresClient = PgUtil.postgresClient(vertxContext,
       okapiHeaders);
 
     final String combinedAnonymizationSql = createAnonymizationSQL(validIds,
       tenantId);
-    log.info(String.format("Anonymization SQL: %s", combinedAnonymizationSql));
 
     executeSql(postgresClient, combinedAnonymizationSql).map(
       updateResult -> PostAnonymizeStorageLoansResponse.respond200WithApplicationJson(

src/main/java/org/folio/rest/impl/RequestsBatchAPI.java

@@ -10,13 +10,14 @@
 import java.util.Map;
 
 import javax.ws.rs.core.Response;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.folio.rest.annotations.Validate;
 import org.folio.rest.jaxrs.model.RequestsBatch;
 import org.folio.rest.jaxrs.resource.RequestStorageBatch;
 import org.folio.rest.tools.utils.MetadataUtil;
 import org.folio.service.request.RequestBatchResourceService;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Context;
@@ -40,7 +41,7 @@ public void postRequestStorageBatchRequests(
       return;
     }
 
-    log.info("postRequestStorageBatchRequests:: requests: {}", entity.getRequests());
+    log.info("postRequestStorageBatchRequests:: requests count: {}", entity.getRequests().size());
     new RequestBatchResourceService(context, okapiHeaders)
       .executeRequestBatchUpdate(entity.getRequests(), updateResult -> {
         // Successfully updated

src/main/java/org/folio/service/event/DomainEventPublisher.java

@@ -1,7 +1,6 @@
 package org.folio.service.event;
 
 import static org.apache.logging.log4j.LogManager.getLogger;
-import static org.folio.service.event.EntityChangedEventPublisherFactory.requestEventPublisher;
 
 import java.util.Map;
 
@@ -11,7 +10,6 @@
 import org.folio.kafka.SimpleKafkaProducerManager;
 import org.folio.kafka.services.KafkaEnvironmentProperties;
 import org.folio.kafka.services.KafkaProducerRecordBuilder;
-import org.folio.rest.jaxrs.model.Request;
 import org.folio.rest.tools.utils.TenantTool;
 
 import io.vertx.core.Context;
@@ -49,26 +47,21 @@ public Future<Void> publish(K key, DomainEvent<T> event, Map<String, String> oka
         .topic(kafkaTopic)
         .propagateOkapiHeaders(okapiHeaders)
         .build();
-    log.info("publish:: kafkaRecord = [{}]", producerRecord);
-
     KafkaProducer<K, String> producer = null;
     try {
       producer = getOrCreateProducer();
       log.info("publish:: Producer created, sending the record...");
 
       producer.send(producerRecord)
-        .onSuccess(r -> log.info("publish:: Succeeded sending domain event with key [{}], " +
-          "kafka record [{}]", key, producerRecord))
+        .onSuccess(r -> log.info("publish:: Succeeded sending domain event with key [{}]", key))
         .onFailure(cause -> {
-          log.error("publish:: Unable to send domain event with key [{}], kafka record [{}]",
-            key, producerRecord, cause);
+          log.error("publish:: Unable to send domain event with key [{}]", key, cause);
           failureHandler.handle(cause, producerRecord);
         })
         .eventually(producer::flush)
         .eventually(producer::close);
     } catch (Exception e) {
-      log.error("publish:: Failed to initiate send for domain event with key [{}], kafka record [{}]",
-        key, producerRecord, e);
+      log.error("publish:: Failed to initiate send for domain event with key [{}]", key, e);
       if (producer != null) {
         log.info("publish:: Producer is not null, trying to close. Event key: {}.", key);
         producer.close();

src/main/java/org/folio/service/loan/LoanService.java

@@ -13,7 +13,6 @@
 import static org.folio.support.ModuleConstants.MODULE_NAME;
 import static org.folio.support.ModuleConstants.OPEN_LOAN_STATUS;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Map;
@@ -52,6 +51,8 @@
 import org.folio.support.VertxContextRunner;
 import org.joda.time.DateTime;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Context;
 import io.vertx.core.Future;
@@ -91,7 +92,7 @@ public Future<Response> findById(String loanId) {
   }
 
   public Future<Response> create(Loan loan) {
-    log.info("create:: Creating loan: userId: {}, itemId: {}", loan.getUserId(), loan.getItemId());
+    log.info("create:: Creating loan: itemId: {}", loan.getItemId());
     if (loan.getStatus() == null) {
       loan.setStatus(new Status().withName(OPEN_LOAN_STATUS));
     }
@@ -155,7 +156,7 @@ public Future<Response> createOrUpdate(String loanId, Loan loan) {
     return helper.upsertAndPublishEvents(loanId, loan)
         .map(checkForMultipleOpenLoanError(loan))
         .otherwise(err -> {
-          log.error("Failed to store loan: id = {}, loan = [{}]", loanId, helper.jsonStringOrEmpty(loan), err);
+          log.error("Failed to store loan: id = {}", loanId, err);
 
           return ResponseUtil.internalErrorResponse(err);
         });
@@ -246,8 +247,6 @@ public Future<Response> anonymizeByUserId(String userId) {
 
       final String combinedAnonymizationSql = createAnonymizationSQL(userId, tenantId(okapiHeaders));
 
-      log.info(String.format("Anonymization SQL: %s", combinedAnonymizationSql));
-
       postgresClient.execute(combinedAnonymizationSql, ResultHandlerFactory.when(
           s -> promise.complete(LoanStorage.PostLoanStorageLoansAnonymizeByUserIdResponse.respond204()),
           serverErrorResponder::withError));

src/main/java/org/folio/service/request/RequestService.java

@@ -123,8 +123,7 @@ private Future<Response> upsertRequest(String requestId, Request request) {
     return helper.upsertAndPublishEvents(requestId, request)
       .map(checkForSamePositionInQueueError(request))
       .otherwise(err -> {
-        log.error("upsertRequest:: failed to store request: id = {}, request = [{}]",
-          requestId, helper.jsonStringOrEmpty(request), err);
+        log.error("upsertRequest:: failed to store request: id = {}", requestId, err);
 
         return ResponseUtil.internalErrorResponse(err);
       });