diff --git a/README.md b/README.md index 7eb9a4f585..c5ac2f66b3 100644 --- a/README.md +++ b/README.md @@ -163,8 +163,8 @@ For example, if you want to use an environment variable to set the `name` parame |Name |Description |-----------------------|------------------------------- |`SERVER_SERVLET_CONTEXT_PATH` | URI basePath -|`LOGGING_LEVEL_ROOT` | Setting log level (trace, debug, info, warn, error, fatal, off). Default: debug -|`LOGGING_LEVEL_COM_PROVECTUS` |Setting log level (trace, debug, info, warn, error, fatal, off). Default: debug +|`LOGGING_LEVEL_ROOT` | Setting log level (trace, debug, info, warn, error). Default: info +|`LOGGING_LEVEL_COM_PROVECTUS` |Setting log level (trace, debug, info, warn, error). Default: debug |`SERVER_PORT` |Port for the embedded server. Default: `8080` |`KAFKA_ADMIN-CLIENT-TIMEOUT` | Kafka API timeout in ms. Default: `30000` |`KAFKA_CLUSTERS_0_NAME` | Cluster name diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml index 6723a24cd3..79b119892a 100644 --- a/kafka-ui-api/pom.xml +++ b/kafka-ui-api/pom.xml @@ -26,12 +26,6 @@ org.springframework.boot spring-boot-starter-webflux - - - org.springframework.boot - spring-boot-starter-logging - - org.springframework.boot @@ -64,6 +58,12 @@ org.apache.zookeeper zookeeper ${zookeper.version} + + + org.slf4j + slf4j-log4j12 + + org.projectlombok @@ -110,8 +110,9 @@ org.springframework.boot - spring-boot-starter-log4j2 + spring-boot-starter-logging + io.projectreactor.addons reactor-extra diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KsqlClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KsqlClient.java index bee2f9472e..2e8026648d 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KsqlClient.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KsqlClient.java @@ -7,7 +7,7 @@ import com.provectus.kafka.ui.model.KsqlCommandResponseDTO; import com.provectus.kafka.ui.strategy.ksql.statement.BaseStrategy; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.stereotype.Service; @@ -18,7 +18,7 @@ import reactor.core.publisher.Mono; @Service @RequiredArgsConstructor -@Log4j2 +@Slf4j public class KsqlClient { private final WebClient webClient; private final ObjectMapper mapper; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java index 372a484016..39d0741865 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java @@ -9,7 +9,7 @@ import com.provectus.kafka.ui.exception.ValidationException; import java.time.Duration; import java.util.List; import java.util.Map; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -22,7 +22,7 @@ import reactor.core.publisher.Mono; import reactor.util.retry.Retry; import reactor.util.retry.RetryBackoffSpec; -@Log4j2 +@Slf4j public class RetryingKafkaConnectClient extends KafkaConnectClientApi { private static final int MAX_RETRIES = 5; private static final Duration RETRIES_DELAY = Duration.ofMillis(200); diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AuthController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AuthController.java index b847e58f99..558b4dcf09 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AuthController.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AuthController.java @@ -2,7 +2,7 @@ package com.provectus.kafka.ui.controller; import java.nio.charset.Charset; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.springframework.security.web.server.csrf.CsrfToken; import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.GetMapping; @@ -12,7 +12,7 @@ import reactor.core.publisher.Mono; @RestController @RequiredArgsConstructor -@Log4j2 +@Slf4j public class AuthController { @GetMapping(value = "/auth", produces = { "text/html" }) diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java index a2de575692..cae7f9fffe 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java @@ -10,7 +10,7 @@ import com.provectus.kafka.ui.model.BrokersLogdirsDTO; import com.provectus.kafka.ui.service.BrokerService; import java.util.List; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ServerWebExchange; @@ -19,7 +19,7 @@ import reactor.core.publisher.Mono; @RestController @RequiredArgsConstructor -@Log4j2 +@Slf4j public class BrokersController extends AbstractController implements BrokersApi { private final BrokerService brokerService; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ClustersController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ClustersController.java index fa99bbb7ea..c06947308b 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ClustersController.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ClustersController.java @@ -6,7 +6,7 @@ import com.provectus.kafka.ui.model.ClusterMetricsDTO; import com.provectus.kafka.ui.model.ClusterStatsDTO; import com.provectus.kafka.ui.service.ClusterService; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ServerWebExchange; @@ -15,7 +15,7 @@ import reactor.core.publisher.Mono; @RestController @RequiredArgsConstructor -@Log4j2 +@Slf4j public class ClustersController extends AbstractController implements ClustersApi { private final ClusterService clusterService; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java index 0f0defde22..2fd2321655 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java @@ -13,7 +13,7 @@ import com.provectus.kafka.ui.service.OffsetsResetService; import java.util.Map; import java.util.Optional; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.RestController; @@ -23,7 +23,7 @@ import reactor.core.publisher.Mono; @RestController @RequiredArgsConstructor -@Log4j2 +@Slf4j public class ConsumerGroupsController extends AbstractController implements ConsumerGroupsApi { private final ConsumerGroupService consumerGroupService; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java index a0a1ac7b18..9abc3884f9 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java @@ -13,7 +13,7 @@ import com.provectus.kafka.ui.service.KafkaConnectService; import java.util.Map; import javax.validation.Valid; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ServerWebExchange; @@ -22,7 +22,7 @@ import reactor.core.publisher.Mono; @RestController @RequiredArgsConstructor -@Log4j2 +@Slf4j public class KafkaConnectController extends AbstractController implements KafkaConnectApi { private final KafkaConnectService kafkaConnectService; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java index c1bf6c2b63..152113d29d 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ServerWebExchange; @@ -21,7 +21,7 @@ import reactor.core.publisher.Mono; @RestController @RequiredArgsConstructor -@Log4j2 +@Slf4j public class KsqlController extends AbstractController implements KsqlApi { private final KsqlService ksqlService; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java index 0b10510262..a7abe364b8 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java @@ -15,7 +15,7 @@ import java.util.Optional; import java.util.function.Function; import javax.validation.Valid; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.tuple.Pair; import org.apache.kafka.common.TopicPartition; import org.springframework.http.ResponseEntity; @@ -26,7 +26,7 @@ import reactor.core.publisher.Mono; @RestController @RequiredArgsConstructor -@Log4j2 +@Slf4j public class MessagesController extends AbstractController implements MessagesApi { private final MessagesService messagesService; private final TopicsService topicsService; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java index f7a0374e00..10b5208b64 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java @@ -10,7 +10,7 @@ import com.provectus.kafka.ui.model.SchemaSubjectDTO; import com.provectus.kafka.ui.service.SchemaRegistryService; import javax.validation.Valid; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ServerWebExchange; @@ -19,7 +19,7 @@ import reactor.core.publisher.Mono; @RestController @RequiredArgsConstructor -@Log4j2 +@Slf4j public class SchemasController extends AbstractController implements SchemasApi { private final SchemaRegistryService schemaRegistryService; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/StaticController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/StaticController.java index f8278701c0..c00500fdea 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/StaticController.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/StaticController.java @@ -5,7 +5,7 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.web.ServerProperties; import org.springframework.core.io.Resource; @@ -17,7 +17,7 @@ import reactor.core.publisher.Mono; @RestController @RequiredArgsConstructor -@Log4j2 +@Slf4j public class StaticController { @Value("classpath:static/index.html") diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java index c3fd6c4859..fcbbb52053 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java @@ -16,7 +16,7 @@ import com.provectus.kafka.ui.service.TopicsService; import java.util.Optional; import javax.validation.Valid; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RestController; @@ -26,7 +26,7 @@ import reactor.core.publisher.Mono; @RestController @RequiredArgsConstructor -@Log4j2 +@Slf4j public class TopicsController extends AbstractController implements TopicsApi { private final TopicsService topicsService; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java index f20e3c591d..f21c1533d0 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java @@ -11,7 +11,7 @@ import java.util.SortedMap; import java.util.TreeMap; import java.util.function.Function; import java.util.stream.Collectors; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; @@ -20,7 +20,7 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.utils.Bytes; import reactor.core.publisher.FluxSink; -@Log4j2 +@Slf4j public class BackwardRecordEmitter extends AbstractEmitter implements java.util.function.Consumer> { diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java index c1d9f6c225..3e33fbabb7 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java @@ -6,14 +6,14 @@ import com.provectus.kafka.ui.util.OffsetsSeek; import java.time.Duration; import java.time.Instant; import java.util.function.Supplier; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.common.utils.Bytes; import reactor.core.publisher.FluxSink; -@Log4j2 +@Slf4j public class ForwardRecordEmitter extends AbstractEmitter implements java.util.function.Consumer> { diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ErrorCode.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ErrorCode.java index e9f33f2e2c..522ac2cef2 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ErrorCode.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ErrorCode.java @@ -1,7 +1,7 @@ package com.provectus.kafka.ui.exception; import java.util.HashSet; -import org.apache.logging.log4j.LogManager; +import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; @@ -31,7 +31,7 @@ public enum ErrorCode { var codes = new HashSet(); for (ErrorCode value : ErrorCode.values()) { if (!codes.add(value.code())) { - LogManager.getLogger() + LoggerFactory.getLogger(ErrorCode.class) .warn("Multiple {} values refer to code {}", ErrorCode.class, value.code); } } diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/DeserializationService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/DeserializationService.java index 51e4491591..ca4ff8078a 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/DeserializationService.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/DeserializationService.java @@ -8,10 +8,10 @@ import java.util.Map; import java.util.stream.Collectors; import javax.annotation.PostConstruct; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -@Log4j2 +@Slf4j @Component @RequiredArgsConstructor public class DeserializationService { diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/SchemaRegistryAwareRecordSerDe.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/SchemaRegistryAwareRecordSerDe.java index c137585ae4..9d54b11424 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/SchemaRegistryAwareRecordSerDe.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/SchemaRegistryAwareRecordSerDe.java @@ -37,12 +37,12 @@ import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; import javax.annotation.Nullable; import lombok.SneakyThrows; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.utils.Bytes; -@Log4j2 +@Slf4j public class SchemaRegistryAwareRecordSerDe implements RecordSerDe { private static final int CLIENT_IDENTITY_MAP_CAPACITY = 100; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java index f92ea1e1d5..7b93b1420e 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java @@ -7,7 +7,7 @@ import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; import lombok.RequiredArgsConstructor; import lombok.Setter; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.admin.AdminClient; import org.apache.kafka.clients.admin.AdminClientConfig; import org.springframework.beans.factory.annotation.Value; @@ -16,7 +16,7 @@ import reactor.core.publisher.Mono; @Service @RequiredArgsConstructor -@Log4j2 +@Slf4j public class AdminClientServiceImpl implements AdminClientService, Closeable { private final Map adminClientCache = new ConcurrentHashMap<>(); @Setter // used in tests diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java index 59043f8161..e51d60e2b6 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.admin.ConfigEntry; import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicPartitionReplica; @@ -34,7 +34,7 @@ import reactor.core.publisher.Mono; @Service @RequiredArgsConstructor -@Log4j2 +@Slf4j public class BrokerService { private final MetricsCache metricsCache; @@ -109,7 +109,7 @@ public class BrokerService { e -> Mono.error(new TopicOrPartitionNotFoundException())) .onErrorResume(LogDirNotFoundException.class, e -> Mono.error(new LogDirNotFoundApiException())) - .doOnError(log::error); + .doOnError(e -> log.error("Unexpected error", e)); } public Mono updateBrokerConfigByName(KafkaCluster cluster, @@ -120,7 +120,7 @@ public class BrokerService { .flatMap(ac -> ac.updateBrokerConfigByName(broker, name, value)) .onErrorResume(InvalidRequestException.class, e -> Mono.error(new InvalidRequestApiException(e.getMessage()))) - .doOnError(log::error); + .doOnError(e -> log.error("Unexpected error", e)); } private Mono>> getClusterLogDirs( diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClusterService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClusterService.java index b4c2c97413..d38af2a18c 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClusterService.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClusterService.java @@ -9,13 +9,13 @@ import com.provectus.kafka.ui.model.KafkaCluster; import java.util.List; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import reactor.core.publisher.Mono; @Service @RequiredArgsConstructor -@Log4j2 +@Slf4j public class ClusterService { private final MetricsCache metricsCache; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClustersMetricsScheduler.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClustersMetricsScheduler.java index 9a54c885a9..53fff7060b 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClustersMetricsScheduler.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClustersMetricsScheduler.java @@ -1,7 +1,7 @@ package com.provectus.kafka.ui.service; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import reactor.core.publisher.Flux; @@ -9,7 +9,7 @@ import reactor.core.scheduler.Schedulers; @Component @RequiredArgsConstructor -@Log4j2 +@Slf4j public class ClustersMetricsScheduler { private final ClustersStorage clustersStorage; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java index 29fc34b644..b7d4c0881a 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java @@ -9,7 +9,7 @@ import java.util.Optional; import java.util.function.Predicate; import javax.annotation.Nullable; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.kafka.common.Node; import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; @@ -17,7 +17,7 @@ import reactor.core.publisher.Mono; @Service @RequiredArgsConstructor -@Log4j2 +@Slf4j public class FeatureService { private static final String DELETE_TOPIC_ENABLED_SERVER_PROPERTY = "delete.topic.enable"; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java index 1e0e27b354..74730e29f6 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java @@ -32,7 +32,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.web.reactive.function.client.WebClientResponseException; @@ -42,7 +42,7 @@ import reactor.util.function.Tuple2; import reactor.util.function.Tuples; @Service -@Log4j2 +@Slf4j @RequiredArgsConstructor public class KafkaConnectService { private final ClusterMapper clusterMapper; @@ -146,7 +146,7 @@ public class KafkaConnectService { return getConnectAddress(cluster, connectName) .flatMapMany(connect -> KafkaConnectClients.withBaseUrl(connect).getConnectors(null) - .doOnError(log::error) + .doOnError(e -> log.error("Unexpected error upon getting connectors", e)) ); } diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java index e09e2865ad..923b4ad178 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java @@ -23,7 +23,7 @@ import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; import javax.annotation.Nullable; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.admin.OffsetSpec; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerConfig; @@ -43,7 +43,7 @@ import reactor.core.scheduler.Schedulers; @Service @RequiredArgsConstructor -@Log4j2 +@Slf4j public class MessagesService { private static final int MAX_LOAD_RECORD_LIMIT = 100; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MetricsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MetricsService.java index cd909d4a1d..f6bf6b552d 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MetricsService.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MetricsService.java @@ -8,7 +8,7 @@ import com.provectus.kafka.ui.util.JmxClusterUtil; import java.util.List; import java.util.Map; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.admin.ConfigEntry; import org.apache.kafka.clients.admin.TopicDescription; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import reactor.core.publisher.Mono; @Service @RequiredArgsConstructor -@Log4j2 +@Slf4j public class MetricsService { private final ZookeeperService zookeeperService; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/OffsetsResetService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/OffsetsResetService.java index 190b13add6..b2675d51be 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/OffsetsResetService.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/OffsetsResetService.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Set; import javax.annotation.Nullable; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.admin.OffsetSpec; import org.apache.kafka.common.TopicPartition; import org.springframework.stereotype.Component; @@ -27,7 +27,7 @@ import reactor.core.publisher.Mono; * to works like "kafka-consumer-groups --reset-offsets" console command * (see kafka.admin.ConsumerGroupCommand) */ -@Log4j2 +@Slf4j @Component @RequiredArgsConstructor public class OffsetsResetService { diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java index 88aa085773..a16e15dfd8 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java @@ -23,7 +23,7 @@ import java.util.stream.Stream; import javax.annotation.Nullable; import lombok.RequiredArgsConstructor; import lombok.Value; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.admin.AdminClient; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.Config; @@ -55,7 +55,7 @@ import reactor.util.function.Tuple2; import reactor.util.function.Tuples; -@Log4j2 +@Slf4j @RequiredArgsConstructor public class ReactiveAdminClient implements Closeable { diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java index 52db7d7ee3..02db53f23b 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java @@ -25,7 +25,7 @@ import java.util.Objects; import java.util.Optional; import java.util.function.Function; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -39,7 +39,7 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @Service -@Log4j2 +@Slf4j @RequiredArgsConstructor public class SchemaRegistryService { public static final String NO_SUCH_SCHEMA_VERSION = "No such schema %s with version %s"; @@ -68,7 +68,7 @@ public class SchemaRegistryService { URL_SUBJECTS) .retrieve() .bodyToMono(String[].class) - .doOnError(log::error); + .doOnError(e -> log.error("Unexpected error", e)); } public Flux getAllVersionsBySubject(KafkaCluster cluster, String subject) { diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ZookeeperService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ZookeeperService.java index 94ba9f5cab..d7563fc458 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ZookeeperService.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ZookeeperService.java @@ -9,7 +9,7 @@ import java.util.concurrent.ConcurrentHashMap; import javax.annotation.Nullable; import lombok.RequiredArgsConstructor; import lombok.Value; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.ZooKeeper; import org.springframework.stereotype.Service; @@ -19,7 +19,7 @@ import reactor.core.scheduler.Schedulers; @Service @RequiredArgsConstructor -@Log4j2 +@Slf4j public class ZookeeperService { private final Map cachedZkClient = new ConcurrentHashMap<>(); diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ClusterUtil.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ClusterUtil.java index d2e1a18b0e..7a075e29f7 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ClusterUtil.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ClusterUtil.java @@ -21,7 +21,7 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.admin.ConsumerGroupDescription; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.OffsetAndMetadata; @@ -31,7 +31,7 @@ import org.apache.kafka.common.record.TimestampType; import org.apache.kafka.common.utils.Bytes; -@Log4j2 +@Slf4j public class ClusterUtil { private static final ZoneId UTC_ZONE_ID = ZoneId.of("UTC"); diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxClusterUtil.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxClusterUtil.java index 1be1e1a8d8..834e346d88 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxClusterUtil.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxClusterUtil.java @@ -28,7 +28,7 @@ import lombok.Builder; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.Value; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.pool2.KeyedObjectPool; import org.apache.kafka.common.Node; import org.jetbrains.annotations.Nullable; @@ -39,7 +39,7 @@ import reactor.util.function.Tuple2; import reactor.util.function.Tuples; @Component -@Log4j2 +@Slf4j @RequiredArgsConstructor public class JmxClusterUtil { diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxPoolFactory.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxPoolFactory.java index 405d30b0b4..c5e7f91fe8 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxPoolFactory.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxPoolFactory.java @@ -8,13 +8,13 @@ import javax.management.remote.JMXConnector; import javax.management.remote.JMXConnectorFactory; import javax.management.remote.JMXServiceURL; import javax.rmi.ssl.SslRMIClientSocketFactory; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.pool2.BaseKeyedPooledObjectFactory; import org.apache.commons.pool2.PooledObject; import org.apache.commons.pool2.impl.DefaultPooledObject; -@Log4j2 +@Slf4j public class JmxPoolFactory extends BaseKeyedPooledObjectFactory { @Override diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/NumberUtil.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/NumberUtil.java index d01dfafb38..cb1f08b3ab 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/NumberUtil.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/NumberUtil.java @@ -1,9 +1,9 @@ package com.provectus.kafka.ui.util; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.math.NumberUtils; -@Log4j2 +@Slf4j public class NumberUtil { private NumberUtil() { diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeek.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeek.java index bc2ed06471..371f20bdb7 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeek.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeek.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.TopicPartition; @@ -14,7 +14,7 @@ import org.apache.kafka.common.utils.Bytes; import reactor.util.function.Tuple2; import reactor.util.function.Tuples; -@Log4j2 +@Slf4j public abstract class OffsetsSeek { protected final String topic; protected final ConsumerPosition consumerPosition; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeekBackward.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeekBackward.java index 674562a0b7..c05791c293 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeekBackward.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeekBackward.java @@ -8,14 +8,14 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.utils.Bytes; import reactor.util.function.Tuple2; import reactor.util.function.Tuples; -@Log4j2 +@Slf4j public class OffsetsSeekBackward extends OffsetsSeek { private final int maxMessages; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeekForward.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeekForward.java index b0e8117258..733726eae8 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeekForward.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeekForward.java @@ -6,12 +6,12 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.utils.Bytes; -@Log4j2 +@Slf4j public class OffsetsSeekForward extends OffsetsSeek { public OffsetsSeekForward(String topic, ConsumerPosition consumerPosition) { diff --git a/kafka-ui-api/src/main/resources/application.yml b/kafka-ui-api/src/main/resources/application.yml index 54d4c09011..9815f375bf 100644 --- a/kafka-ui-api/src/main/resources/application.yml +++ b/kafka-ui-api/src/main/resources/application.yml @@ -9,4 +9,12 @@ management: endpoints: web: exposure: - include: "info,health" \ No newline at end of file + include: "info,health" + +logging: + level: + root: INFO + com.provectus: DEBUG + #org.springframework.http.codec.json.Jackson2JsonEncoder: DEBUG + #org.springframework.http.codec.json.Jackson2JsonDecoder: DEBUG + reactor.netty.http.server.AccessLog: INFO \ No newline at end of file diff --git a/kafka-ui-api/src/main/resources/log4j2.xml b/kafka-ui-api/src/main/resources/log4j2.xml deleted file mode 100644 index 7ae5626dc7..0000000000 --- a/kafka-ui-api/src/main/resources/log4j2.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/kafka-ui-api/src/main/resources/logback-spring.xml b/kafka-ui-api/src/main/resources/logback-spring.xml new file mode 100644 index 0000000000..a070512817 --- /dev/null +++ b/kafka-ui-api/src/main/resources/logback-spring.xml @@ -0,0 +1,17 @@ + + + + + + + %black(%d{ISO8601}) %highlight(%-5level) [%blue(%t)] %yellow(%c{1}): %msg%n%throwable + + + + + + + + + diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConnectServiceTests.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConnectServiceTests.java index ec41b05321..a88ba72bbe 100644 --- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConnectServiceTests.java +++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConnectServiceTests.java @@ -16,7 +16,7 @@ import com.provectus.kafka.ui.model.TaskIdDTO; import java.util.List; import java.util.Map; import java.util.UUID; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -27,7 +27,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.web.reactive.server.WebTestClient; @ContextConfiguration(initializers = {AbstractBaseTest.Initializer.class}) -@Log4j2 +@Slf4j @AutoConfigureWebTestClient(timeout = "60000") public class KafkaConnectServiceTests extends AbstractBaseTest { private final String connectName = "kafka-connect"; diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConsumerGroupTests.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConsumerGroupTests.java index 9f7d744a84..90e64e6216 100644 --- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConsumerGroupTests.java +++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConsumerGroupTests.java @@ -4,7 +4,7 @@ import java.time.Duration; import java.util.List; import java.util.Properties; import java.util.UUID; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import lombok.val; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -18,7 +18,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.web.reactive.server.WebTestClient; @ContextConfiguration(initializers = {AbstractBaseTest.Initializer.class}) -@Log4j2 +@Slf4j @AutoConfigureWebTestClient(timeout = "10000") public class KafkaConsumerGroupTests extends AbstractBaseTest { @Autowired diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConsumerTests.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConsumerTests.java index 4c392f890d..73d9331b41 100644 --- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConsumerTests.java +++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConsumerTests.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; import java.util.stream.Stream; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -24,7 +24,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.web.reactive.server.WebTestClient; @ContextConfiguration(initializers = {AbstractBaseTest.Initializer.class}) -@Log4j2 +@Slf4j @AutoConfigureWebTestClient(timeout = "60000") public class KafkaConsumerTests extends AbstractBaseTest { diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaTopicCreateTests.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaTopicCreateTests.java index 5d54c33dae..6470865bc0 100644 --- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaTopicCreateTests.java +++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaTopicCreateTests.java @@ -2,7 +2,7 @@ package com.provectus.kafka.ui; import com.provectus.kafka.ui.model.TopicCreationDTO; import java.util.UUID; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -11,7 +11,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.web.reactive.server.WebTestClient; @ContextConfiguration(initializers = {AbstractBaseTest.Initializer.class}) -@Log4j2 +@Slf4j @AutoConfigureWebTestClient(timeout = "10000") public class KafkaTopicCreateTests extends AbstractBaseTest { @Autowired diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/ReadOnlyModeTests.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/ReadOnlyModeTests.java index f0f1c00c7d..9aa7f7cfac 100644 --- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/ReadOnlyModeTests.java +++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/ReadOnlyModeTests.java @@ -4,7 +4,7 @@ import com.provectus.kafka.ui.model.TopicCreationDTO; import com.provectus.kafka.ui.model.TopicUpdateDTO; import java.util.Map; import java.util.UUID; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; @@ -13,7 +13,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.web.reactive.server.WebTestClient; @ContextConfiguration(initializers = {AbstractBaseTest.Initializer.class}) -@Log4j2 +@Slf4j @AutoConfigureWebTestClient(timeout = "60000") public class ReadOnlyModeTests extends AbstractBaseTest { diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/SchemaRegistryServiceTests.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/SchemaRegistryServiceTests.java index a5947c64c4..01c5eb123a 100644 --- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/SchemaRegistryServiceTests.java +++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/SchemaRegistryServiceTests.java @@ -6,7 +6,7 @@ import com.provectus.kafka.ui.model.SchemaSubjectDTO; import com.provectus.kafka.ui.model.SchemaTypeDTO; import java.util.List; import java.util.UUID; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import lombok.val; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -22,7 +22,7 @@ import org.springframework.web.reactive.function.BodyInserters; import reactor.core.publisher.Mono; @ContextConfiguration(initializers = {AbstractBaseTest.Initializer.class}) -@Log4j2 +@Slf4j @AutoConfigureWebTestClient(timeout = "10000") class SchemaRegistryServiceTests extends AbstractBaseTest { @Autowired diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java index 2037be586d..280aceac86 100644 --- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java +++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java @@ -26,7 +26,7 @@ import java.util.UUID; import java.util.concurrent.ThreadLocalRandom; import java.util.stream.Collectors; import lombok.Value; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.KafkaConsumer; @@ -41,7 +41,7 @@ import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; import reactor.core.publisher.Flux; -@Log4j2 +@Slf4j @ContextConfiguration(initializers = {AbstractBaseTest.Initializer.class}) class RecordEmitterTest extends AbstractBaseTest { diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java index 477f7ed49c..a5ac78f566 100644 --- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java +++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java @@ -9,7 +9,7 @@ import com.provectus.kafka.ui.steps.Steps; import io.github.cdimascio.dotenv.Dotenv; import io.qameta.allure.selenide.AllureSelenide; import lombok.SneakyThrows; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.DisplayNameGeneration; @@ -22,7 +22,7 @@ import java.io.File; import java.io.IOException; import java.util.Arrays; -@Log4j2 +@Slf4j @DisplayNameGeneration(CamelCaseToSpacedDisplayNameGenerator.class) public class BaseTest {