From e0b5d32cd0e987d6e2f0443b7050587bc4d7896d Mon Sep 17 00:00:00 2001 From: gulnaz Date: Thu, 5 Jun 2025 16:24:27 +0300 Subject: [PATCH] SUPPORT-9182: small fix in logs --- .../ervu/audit/service/impl/BaseAuditService.java | 14 ++------------ .../service/impl/BaseReplyingKafkaService.java | 8 ++++---- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/backend/src/main/java/ru/micord/ervu/audit/service/impl/BaseAuditService.java b/backend/src/main/java/ru/micord/ervu/audit/service/impl/BaseAuditService.java index 2cbcc0c..090c7a6 100644 --- a/backend/src/main/java/ru/micord/ervu/audit/service/impl/BaseAuditService.java +++ b/backend/src/main/java/ru/micord/ervu/audit/service/impl/BaseAuditService.java @@ -33,7 +33,7 @@ import ru.micord.ervu.util.NetworkUtils; public class BaseAuditService implements AuditService { private static final Logger LOGGER = LoggerFactory.getLogger(BaseAuditService.class); private static final List IP_HEADERS = - Arrays.asList("X-Forwarded-For", "Proxy-Client-IP", "WL-Proxy-Client-IP", "HTTP_CLIENT_IP", "HTTP_X_FORWARDED_FOR", "X-CLIENT-IP"); + Arrays.asList("X-Forwarded-For", "WL-Proxy-Client-IP", "HTTP_CLIENT_IP", "HTTP_X_FORWARDED_FOR"); private final AuditKafkaPublisher auditPublisher; @@ -114,7 +114,7 @@ public class BaseAuditService implements AuditService { LOGGER.info("Thread {} - event published in {} ms", Thread.currentThread().getId(), System.currentTimeMillis() - startTime); - LOGGER.info("client ip from header: {}", getClientIp(request)); + IP_HEADERS.forEach(header -> LOGGER.info("Data from header: {} - {}", header, request.getHeader(header))); } @Override @@ -144,14 +144,4 @@ public class BaseAuditService implements AuditService { throw new RuntimeException(e); } } - - public String getClientIp(HttpServletRequest request) { - IP_HEADERS.forEach(header -> LOGGER.info("Data from header: {} - {}", header, request.getHeader(header))); - return IP_HEADERS.stream() - .map(request::getHeader) - .filter(Objects::nonNull) - .filter(ip -> !ip.isEmpty() && !ip.equalsIgnoreCase("unknown")) - .findFirst() - .orElseGet(request::getRemoteAddr); - } } diff --git a/backend/src/main/java/ru/micord/ervu/kafka/service/impl/BaseReplyingKafkaService.java b/backend/src/main/java/ru/micord/ervu/kafka/service/impl/BaseReplyingKafkaService.java index 96aacea..190ded5 100644 --- a/backend/src/main/java/ru/micord/ervu/kafka/service/impl/BaseReplyingKafkaService.java +++ b/backend/src/main/java/ru/micord/ervu/kafka/service/impl/BaseReplyingKafkaService.java @@ -29,13 +29,13 @@ public abstract class BaseReplyingKafkaService implements ReplyingKafkaSer try { ConsumerRecord result = Optional.ofNullable(replyFuture.get()) .orElseThrow(() -> new KafkaMessageException("Kafka return result is null")); - LOGGER.info("Thread {} - KafkaSendMessageAndGetReply: {} ms", - Thread.currentThread().getId(), System.currentTimeMillis() - startTime); + LOGGER.info("Thread {} - KafkaSendMessageAndGetReply: {} ms, replyTopic: {}", + Thread.currentThread().getId(), System.currentTimeMillis() - startTime, replyTopic); return result; } catch (InterruptedException | ExecutionException e) { - LOGGER.error("Thread {} - KafkaSendMessageAndGetReply: {} ms", - Thread.currentThread().getId(), System.currentTimeMillis() - startTime); + LOGGER.error("Thread {} - KafkaSendMessageAndGetReply: {} ms, replyTopic: {}", + Thread.currentThread().getId(), System.currentTimeMillis() - startTime, replyTopic); throw new KafkaMessageReplyTimeoutException(e); } }