From ab3d70da04acbdad773d4e07d6439970cc192d2d Mon Sep 17 00:00:00 2001 From: Ming-Yen Chung Date: Thu, 25 Jul 2024 00:26:31 +0800 Subject: [PATCH 1/4] Make all loggers to static to avoid creating multiple logger instances --- .../org/apache/kafka/clients/ClusterConnectionStates.java | 4 ++-- .../java/org/apache/kafka/clients/FetchSessionHandler.java | 2 +- .../src/main/java/org/apache/kafka/clients/Metadata.java | 2 +- .../main/java/org/apache/kafka/clients/NetworkClient.java | 2 +- .../org/apache/kafka/clients/admin/KafkaAdminClient.java | 2 +- .../clients/admin/internals/AbortTransactionHandler.java | 2 +- .../kafka/clients/admin/internals/AdminApiDriver.java | 2 +- .../kafka/clients/admin/internals/AdminMetadataManager.java | 2 +- .../kafka/clients/admin/internals/AllBrokersStrategy.java | 2 +- .../admin/internals/AlterConsumerGroupOffsetsHandler.java | 2 +- .../kafka/clients/admin/internals/CoordinatorStrategy.java | 2 +- .../admin/internals/DeleteConsumerGroupOffsetsHandler.java | 2 +- .../admin/internals/DeleteConsumerGroupsHandler.java | 2 +- .../kafka/clients/admin/internals/DeleteRecordsHandler.java | 2 +- .../admin/internals/DescribeConsumerGroupsHandler.java | 2 +- .../clients/admin/internals/DescribeProducersHandler.java | 2 +- .../admin/internals/DescribeTransactionsHandler.java | 2 +- .../clients/admin/internals/FenceProducersHandler.java | 2 +- .../admin/internals/ListConsumerGroupOffsetsHandler.java | 2 +- .../kafka/clients/admin/internals/ListOffsetsHandler.java | 2 +- .../clients/admin/internals/ListTransactionsHandler.java | 2 +- .../clients/admin/internals/PartitionLeaderStrategy.java | 2 +- .../internals/RemoveMembersFromConsumerGroupHandler.java | 2 +- .../clients/consumer/internals/AbstractCoordinator.java | 2 +- .../kafka/clients/consumer/internals/AbstractFetch.java | 2 +- .../kafka/clients/consumer/internals/AsyncClient.java | 2 +- .../clients/consumer/internals/CommitRequestManager.java | 4 ++-- .../kafka/clients/consumer/internals/CompletedFetch.java | 2 +- .../clients/consumer/internals/ConsumerCoordinator.java | 2 +- .../clients/consumer/internals/ConsumerNetworkClient.java | 2 +- .../clients/consumer/internals/ConsumerNetworkThread.java | 2 +- .../internals/ConsumerRebalanceListenerInvoker.java | 2 +- .../consumer/internals/CoordinatorRequestManager.java | 2 +- .../kafka/clients/consumer/internals/FetchBuffer.java | 2 +- .../kafka/clients/consumer/internals/FetchCollector.java | 2 +- .../apache/kafka/clients/consumer/internals/Fetcher.java | 2 +- .../apache/kafka/clients/consumer/internals/Heartbeat.java | 2 +- .../clients/consumer/internals/HeartbeatRequestManager.java | 2 +- .../clients/consumer/internals/MembershipManagerImpl.java | 2 +- .../clients/consumer/internals/NetworkClientDelegate.java | 2 +- .../kafka/clients/consumer/internals/OffsetFetcher.java | 2 +- .../clients/consumer/internals/OffsetFetcherUtils.java | 2 +- .../clients/consumer/internals/OffsetsRequestManager.java | 2 +- .../kafka/clients/consumer/internals/RequestManagers.java | 2 +- .../kafka/clients/consumer/internals/RequestState.java | 2 +- .../clients/consumer/internals/ShareCompletedFetch.java | 2 +- .../consumer/internals/ShareConsumeRequestManager.java | 2 +- .../kafka/clients/consumer/internals/ShareFetchBuffer.java | 2 +- .../clients/consumer/internals/ShareFetchCollector.java | 2 +- .../consumer/internals/ShareHeartbeatRequestManager.java | 2 +- .../clients/consumer/internals/ShareMembershipManager.java | 2 +- .../clients/consumer/internals/ShareSessionHandler.java | 2 +- .../kafka/clients/consumer/internals/SubscriptionState.java | 2 +- .../clients/consumer/internals/TopicMetadataFetcher.java | 2 +- .../consumer/internals/TopicMetadataRequestManager.java | 2 +- .../consumer/internals/events/ApplicationEventHandler.java | 2 +- .../internals/events/ApplicationEventProcessor.java | 2 +- .../consumer/internals/events/CompletableEventReaper.java | 2 +- .../org/apache/kafka/clients/producer/KafkaProducer.java | 2 +- .../clients/producer/internals/BuiltInPartitioner.java | 2 +- .../kafka/clients/producer/internals/ProducerMetadata.java | 2 +- .../kafka/clients/producer/internals/RecordAccumulator.java | 2 +- .../org/apache/kafka/clients/producer/internals/Sender.java | 2 +- .../clients/producer/internals/TransactionManager.java | 2 +- .../kafka/clients/producer/internals/TxnPartitionMap.java | 2 +- .../java/org/apache/kafka/common/config/AbstractConfig.java | 2 +- .../kafka/common/metrics/internals/IntGaugeSuite.java | 2 +- .../org/apache/kafka/common/metrics/stats/Percentiles.java | 2 +- .../org/apache/kafka/common/network/SaslChannelBuilder.java | 2 +- .../main/java/org/apache/kafka/common/network/Selector.java | 2 +- .../org/apache/kafka/common/network/SslTransportLayer.java | 2 +- .../security/authenticator/SaslClientAuthenticator.java | 2 +- .../unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java | 2 +- .../java/org/apache/kafka/common/utils/KafkaThread.java | 2 +- .../main/java/org/apache/kafka/common/utils/LogContext.java | 2 +- .../clients/consumer/internals/FetchRequestManagerTest.java | 2 +- .../apache/kafka/connect/runtime/WorkerSinkTaskContext.java | 2 +- .../connect/runtime/distributed/DistributedHerder.java | 2 +- .../kafka/connect/runtime/distributed/EagerAssignor.java | 2 +- .../runtime/distributed/IncrementalCooperativeAssignor.java | 2 +- .../connect/runtime/distributed/WorkerCoordinator.java | 2 +- .../connect/runtime/distributed/WorkerGroupMember.java | 2 +- .../java/org/apache/kafka/connect/runtime/LoggersTest.java | 2 +- core/src/main/java/kafka/log/remote/RemoteLogManager.java | 6 +++--- .../main/java/kafka/server/logger/RuntimeLoggerManager.java | 2 +- .../kafka/coordinator/group/GroupCoordinatorService.java | 2 +- .../kafka/coordinator/group/GroupCoordinatorShard.java | 2 +- .../kafka/coordinator/group/GroupMetadataManager.java | 2 +- .../kafka/coordinator/group/OffsetMetadataManager.java | 2 +- .../kafka/coordinator/group/classic/ClassicGroup.java | 2 +- .../kafka/coordinator/group/runtime/CoordinatorRuntime.java | 2 +- .../group/runtime/MultiThreadedEventProcessor.java | 4 ++-- .../coordinator/group/runtime/SnapshottableCoordinator.java | 2 +- .../java/org/apache/kafka/controller/AclControlManager.java | 2 +- .../org/apache/kafka/controller/BrokerHeartbeatManager.java | 2 +- .../apache/kafka/controller/ClientQuotaControlManager.java | 2 +- .../org/apache/kafka/controller/ClusterControlManager.java | 2 +- .../kafka/controller/ConfigurationControlManager.java | 2 +- .../kafka/controller/DelegationTokenControlManager.java | 2 +- .../org/apache/kafka/controller/FeatureControlManager.java | 2 +- .../java/org/apache/kafka/controller/LogReplayTracker.java | 2 +- .../org/apache/kafka/controller/OffsetControlManager.java | 2 +- .../apache/kafka/controller/ProducerIdControlManager.java | 2 +- .../java/org/apache/kafka/controller/QuorumController.java | 2 +- .../apache/kafka/controller/ReplicationControlManager.java | 2 +- .../org/apache/kafka/controller/ScramControlManager.java | 2 +- .../org/apache/kafka/image/loader/MetadataBatchLoader.java | 2 +- .../java/org/apache/kafka/image/loader/MetadataLoader.java | 2 +- .../kafka/image/publisher/BrokerRegistrationTracker.java | 2 +- .../org/apache/kafka/image/publisher/SnapshotEmitter.java | 2 +- .../org/apache/kafka/image/publisher/SnapshotGenerator.java | 2 +- .../kafka/metadata/migration/KRaftMigrationDriver.java | 2 +- .../apache/kafka/metadata/publisher/FeaturesPublisher.java | 2 +- .../test/java/org/apache/kafka/metalog/LocalLogManager.java | 4 ++-- .../src/main/java/org/apache/kafka/raft/CandidateState.java | 2 +- raft/src/main/java/org/apache/kafka/raft/FollowerState.java | 2 +- .../main/java/org/apache/kafka/raft/KafkaRaftClient.java | 4 ++-- .../java/org/apache/kafka/raft/KafkaRaftClientDriver.java | 2 +- raft/src/main/java/org/apache/kafka/raft/LeaderState.java | 2 +- raft/src/main/java/org/apache/kafka/raft/QuorumState.java | 2 +- .../main/java/org/apache/kafka/raft/ReplicatedCounter.java | 2 +- raft/src/main/java/org/apache/kafka/raft/ResignedState.java | 2 +- .../main/java/org/apache/kafka/raft/UnattachedState.java | 2 +- raft/src/main/java/org/apache/kafka/raft/VotedState.java | 2 +- .../org/apache/kafka/raft/internals/AddVoterHandler.java | 2 +- .../apache/kafka/raft/internals/DefaultRequestSender.java | 2 +- .../raft/internals/KRaftControlRecordStateMachine.java | 2 +- raft/src/test/java/org/apache/kafka/raft/MockLog.java | 2 +- .../java/org/apache/kafka/deferred/DeferredEventQueue.java | 2 +- .../src/main/java/org/apache/kafka/queue/EventQueue.java | 2 +- .../main/java/org/apache/kafka/queue/KafkaEventQueue.java | 2 +- .../apache/kafka/server/network/EndpointReadyFutures.java | 2 +- .../main/java/org/apache/kafka/server/util/TopicFilter.java | 2 +- .../java/org/apache/kafka/timeline/SnapshotRegistry.java | 2 +- .../internals/checkpoint/CleanShutdownFileHandler.java | 2 +- .../kafka/storage/internals/epoch/LeaderEpochFileCache.java | 2 +- .../kafka/storage/internals/log/ProducerStateManager.java | 2 +- .../main/java/org/apache/kafka/streams/KafkaStreams.java | 2 +- .../kstream/internals/KStreamSlidingWindowAggregate.java | 2 +- .../streams/kstream/internals/KStreamWindowAggregate.java | 2 +- .../streams/kstream/internals/graph/StreamSourceNode.java | 2 +- .../streams/processor/internals/ActiveTaskCreator.java | 2 +- .../kafka/streams/processor/internals/ChangelogTopics.java | 2 +- .../streams/processor/internals/DefaultStateUpdater.java | 2 +- .../streams/processor/internals/GlobalStateManagerImpl.java | 2 +- .../streams/processor/internals/GlobalStateUpdateTask.java | 2 +- .../streams/processor/internals/GlobalStreamThread.java | 4 ++-- .../streams/processor/internals/InternalTopicManager.java | 2 +- .../kafka/streams/processor/internals/PartitionGroup.java | 2 +- .../kafka/streams/processor/internals/ProcessorNode.java | 2 +- .../streams/processor/internals/ProcessorTopology.java | 2 +- .../streams/processor/internals/RecordCollectorImpl.java | 2 +- .../streams/processor/internals/RecordDeserializer.java | 2 +- .../kafka/streams/processor/internals/RecordQueue.java | 2 +- .../streams/processor/internals/RepartitionTopics.java | 2 +- .../streams/processor/internals/StandbyTaskCreator.java | 2 +- .../streams/processor/internals/StoreChangelogReader.java | 2 +- .../kafka/streams/processor/internals/StreamThread.java | 2 +- .../streams/processor/internals/StreamsMetadataState.java | 2 +- .../kafka/streams/processor/internals/StreamsProducer.java | 2 +- .../processor/internals/StreamsRebalanceListener.java | 2 +- .../streams/processor/internals/TaskExecutionMetadata.java | 2 +- .../kafka/streams/processor/internals/TaskExecutor.java | 2 +- .../kafka/streams/processor/internals/TaskManager.java | 2 +- .../org/apache/kafka/streams/processor/internals/Tasks.java | 2 +- .../internals/assignment/AssignorConfiguration.java | 2 +- .../internals/assignment/CopartitionedTopicsEnforcer.java | 2 +- .../namedtopology/KafkaStreamsNamedTopologyWrapper.java | 2 +- .../internals/namedtopology/RemoveNamedTopologyResult.java | 2 +- .../processor/internals/tasks/DefaultTaskExecutor.java | 4 ++-- .../processor/internals/tasks/DefaultTaskManager.java | 2 +- .../apache/kafka/streams/state/internals/ThreadCache.java | 2 +- .../kafka/streams/state/internals/WindowStoreBuilder.java | 2 +- .../state/internals/metrics/RocksDBMetricsRecorder.java | 2 +- .../processor/internals/RepartitionOptimizingTest.java | 2 +- .../internals/RepartitionWithMergeOptimizingTest.java | 2 +- .../processor/internals/StreamsAssignmentScaleTest.java | 2 +- .../org/apache/kafka/streams/tests/StreamsUpgradeTest.java | 2 +- .../apache/kafka/trogdor/coordinator/CoordinatorClient.java | 2 +- .../kafka/trogdor/workload/TimestampRecordProcessor.java | 2 +- 180 files changed, 189 insertions(+), 189 deletions(-) diff --git a/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java b/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java index 0f2fdff475c7a..372f4acd983f4 100644 --- a/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java +++ b/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java @@ -42,7 +42,7 @@ final class ClusterConnectionStates { static final int CONNECTION_SETUP_TIMEOUT_EXP_BASE = 2; static final double CONNECTION_SETUP_TIMEOUT_JITTER = 0.2; private final Map nodeState; - private final Logger log; + private static final Logger log; private final HostResolver hostResolver; private final Set connectingNodes; private final ExponentialBackoff reconnectBackoff; @@ -466,7 +466,7 @@ public List nodesWithConnectionSetupTimeout(long now) { private static class NodeConnectionState { private final String host; private final HostResolver hostResolver; - private final Logger log; + private static final Logger log; ConnectionState state; AuthenticationException authenticationException; diff --git a/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java b/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java index 101dce5ab06fb..f2bf805d235d1 100644 --- a/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java @@ -58,7 +58,7 @@ * class on the receiving broker side is FetchManager. */ public class FetchSessionHandler { - private final Logger log; + private static final Logger log; private final int node; diff --git a/clients/src/main/java/org/apache/kafka/clients/Metadata.java b/clients/src/main/java/org/apache/kafka/clients/Metadata.java index 5f2a412550a88..ee8b20042626d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/Metadata.java +++ b/clients/src/main/java/org/apache/kafka/clients/Metadata.java @@ -65,7 +65,7 @@ * manage topics while producers rely on topic expiry to limit the refresh set. */ public class Metadata implements Closeable { - private final Logger log; + private static final Logger log; private final ExponentialBackoff refreshBackoff; private final long metadataExpireMs; private int updateVersion; // bumped on every metadata response diff --git a/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java b/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java index 4f0b3d11d7937..443926f5f6aec 100644 --- a/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java @@ -82,7 +82,7 @@ private enum State { CLOSED } - private final Logger log; + private static final Logger log; /* the selector used to perform network i/o */ private final Selectable selector; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java b/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java index 640a08a3786a7..5201c258272f8 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java @@ -336,7 +336,7 @@ public class KafkaAdminClient extends AdminClient { */ static final String NETWORK_THREAD_PREFIX = "kafka-admin-client-thread"; - private final Logger log; + private static final Logger log; private final LogContext logContext; /** diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java index 0f5f4781080b2..0fcfbfe62e9cf 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java @@ -40,7 +40,7 @@ import static java.util.Collections.singletonList; public class AbortTransactionHandler extends AdminApiHandler.Batched { - private final Logger log; + private static final Logger log; private final AbortTransactionSpec abortSpec; private final PartitionLeaderStrategy lookupStrategy; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java index 92e724e74f5b9..8935e18a28683 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java @@ -83,7 +83,7 @@ * when the key type is a consumer `GroupId`) */ public class AdminApiDriver { - private final Logger log; + private static final Logger log; private final ExponentialBackoff retryBackoff; private final long deadlineMs; private final AdminApiHandler handler; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java index 90b237aa749eb..3082550a9ce51 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java @@ -43,7 +43,7 @@ * service thread (which also uses the NetworkClient). */ public class AdminMetadataManager { - private final Logger log; + private static final Logger log; /** * The minimum amount of time that we should wait between subsequent diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java index 433d25e8e54ca..1109402e66226 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java @@ -52,7 +52,7 @@ public class AllBrokersStrategy implements AdminApiLookupStrategy offsets; - private final Logger log; + private static final Logger log; private final AdminApiLookupStrategy lookupStrategy; public AlterConsumerGroupOffsetsHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java index 46cba73e75a18..2a5532c16c048 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java @@ -41,7 +41,7 @@ public class CoordinatorStrategy implements AdminApiLookupStrategy unrepresentableKeys = Collections.emptySet(); diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java index ebafe634db627..2538ba9d2986f 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java @@ -43,7 +43,7 @@ public class DeleteConsumerGroupOffsetsHandler extends AdminApiHandler.Batched partitions; - private final Logger log; + private static final Logger log; private final AdminApiLookupStrategy lookupStrategy; public DeleteConsumerGroupOffsetsHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java index 0d581243ddc7b..fa6a7c157d243 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java @@ -39,7 +39,7 @@ public class DeleteConsumerGroupsHandler extends AdminApiHandler.Batched { - private final Logger log; + private static final Logger log; private final AdminApiLookupStrategy lookupStrategy; public DeleteConsumerGroupsHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java index 836f2bc2a5910..fb6a5fac7443e 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java @@ -47,7 +47,7 @@ public final class DeleteRecordsHandler extends Batched { private final Map recordsToDelete; - private final Logger log; + private static final Logger log; private final AdminApiLookupStrategy lookupStrategy; private final int timeout; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java index a2531db90ae5e..6b1f978e2d3bb 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java @@ -61,7 +61,7 @@ public class DescribeConsumerGroupsHandler implements AdminApiHandler { private final boolean includeAuthorizedOperations; - private final Logger log; + private static final Logger log; private final AdminApiLookupStrategy lookupStrategy; private final Set useClassicGroupApi; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java index e4b203545bdae..4804fb269f7ee 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java @@ -48,7 +48,7 @@ import java.util.stream.Collectors; public class DescribeProducersHandler extends AdminApiHandler.Batched { - private final Logger log; + private static final Logger log; private final DescribeProducersOptions options; private final AdminApiLookupStrategy lookupStrategy; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java index b68521bd0005a..49cf26cc3e60d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java @@ -45,7 +45,7 @@ import java.util.stream.Collectors; public class DescribeTransactionsHandler extends AdminApiHandler.Batched { - private final Logger log; + private static final Logger log; private final AdminApiLookupStrategy lookupStrategy; public DescribeTransactionsHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java index f2dea06c7b3af..b1fa89d0b6a55 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java @@ -38,7 +38,7 @@ import java.util.stream.Collectors; public class FenceProducersHandler extends AdminApiHandler.Unbatched { - private final Logger log; + private static final Logger log; private final AdminApiLookupStrategy lookupStrategy; private final int txnTimeoutMs; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java index 4c0e3db925404..e22050fa89788 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java @@ -43,7 +43,7 @@ public class ListConsumerGroupOffsetsHandler implements AdminApiHandler groupSpecs; - private final Logger log; + private static final Logger log; private final CoordinatorStrategy lookupStrategy; public ListConsumerGroupOffsetsHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java index 0bb42ed7696e2..4e277858a4f68 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java @@ -52,7 +52,7 @@ public final class ListOffsetsHandler extends Batched offsetTimestampsByPartition; private final ListOffsetsOptions options; - private final Logger log; + private static final Logger log; private final AdminApiLookupStrategy lookupStrategy; public ListOffsetsHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java index 56318fc0acc04..7cfbb5c79a0c2 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java @@ -37,7 +37,7 @@ import java.util.stream.Collectors; public class ListTransactionsHandler extends AdminApiHandler.Batched> { - private final Logger log; + private static final Logger log; private final ListTransactionsOptions options; private final AllBrokersStrategy lookupStrategy; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java index 9d52327b3c4f4..54b829e95f74a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java @@ -42,7 +42,7 @@ public class PartitionLeaderStrategy implements AdminApiLookupStrategy members; - private final Logger log; + private static final Logger log; private final AdminApiLookupStrategy lookupStrategy; public RemoveMembersFromConsumerGroupHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java index f177dad62b97c..a9fd628b0ba7a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java @@ -130,7 +130,7 @@ public boolean hasNotJoinedGroup() { } } - private final Logger log; + private static final Logger log; private final Heartbeat heartbeat; private final GroupCoordinatorMetrics sensors; private final GroupRebalanceConfig rebalanceConfig; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java index 8f5691d17c005..084d710e28638 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java @@ -60,7 +60,7 @@ */ public abstract class AbstractFetch implements Closeable { - private final Logger log; + private static final Logger log; private final IdempotentCloser idempotentCloser = new IdempotentCloser(); protected final LogContext logContext; protected final ConsumerMetadata metadata; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java index d4265e72c04ab..43405e358cf62 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java @@ -26,7 +26,7 @@ public abstract class AsyncClient { - private final Logger log; + private static final Logger log; private final ConsumerNetworkClient client; AsyncClient(ConsumerNetworkClient client, LogContext logContext) { diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java index 814250e09491a..95626445df9f5 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java @@ -73,7 +73,7 @@ public class CommitRequestManager implements RequestManager, MemberStateListener private final Time time; private final SubscriptionState subscriptions; private final LogContext logContext; - private final Logger log; + private static final Logger log; private final Optional autoCommitState; private final CoordinatorRequestManager coordinatorRequestManager; private final OffsetCommitCallbackInvoker offsetCommitCallbackInvoker; @@ -1252,7 +1252,7 @@ private static class AutoCommitState { private final long autoCommitInterval; private boolean hasInflightCommit; - private final Logger log; + private static final Logger log; public AutoCommitState( final Time time, diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java index 2cba76588e5f0..2553f96f08a06 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java @@ -63,7 +63,7 @@ public class CompletedFetch { final FetchResponseData.PartitionData partitionData; final short requestVersion; - private final Logger log; + private static final Logger log; private final SubscriptionState subscriptions; private final BufferSupplier decompressionBufferSupplier; private final Iterator batches; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java index 785df2362ab9e..92ef07ab47c9c 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java @@ -100,7 +100,7 @@ public final class ConsumerCoordinator extends AbstractCoordinator { private static final TopicPartitionComparator COMPARATOR = new TopicPartitionComparator(); private final GroupRebalanceConfig rebalanceConfig; - private final Logger log; + private static final Logger log; private final List assignors; private final ConsumerMetadata metadata; private final ConsumerCoordinatorMetrics coordinatorMetrics; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java index 1f07bbcaa2f9a..4f1d7e9a1e637 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java @@ -58,7 +58,7 @@ public class ConsumerNetworkClient implements Closeable { // the mutable state of this class is protected by the object's monitor (excluding the wakeup // flag and the request completion queue below). - private final Logger log; + private static final Logger log; private final KafkaClient client; private final UnsentRequests unsent = new UnsentRequests(); private final Metadata metadata; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java index a91ea11d2f332..86a2a7fe7e1ca 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java @@ -54,7 +54,7 @@ public class ConsumerNetworkThread extends KafkaThread implements Closeable { static final long MAX_POLL_TIMEOUT_MS = 5000; private static final String BACKGROUND_THREAD_NAME = "consumer_background_thread"; private final Time time; - private final Logger log; + private static final Logger log; private final BlockingQueue applicationEventQueue; private final CompletableEventReaper applicationEventReaper; private final Supplier applicationEventProcessorSupplier; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java index b42cf85a8602a..132fff7804ece 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java @@ -39,7 +39,7 @@ */ public class ConsumerRebalanceListenerInvoker { - private final Logger log; + private static final Logger log; private final SubscriptionState subscriptions; private final Time time; private final RebalanceCallbackMetricsManager metricsManager; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java index 5144b41f574aa..552e62cac4ffd 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java @@ -51,7 +51,7 @@ */ public class CoordinatorRequestManager implements RequestManager { private static final long COORDINATOR_DISCONNECT_LOGGING_INTERVAL_MS = 60 * 1000; - private final Logger log; + private static final Logger log; private final BackgroundEventHandler backgroundEventHandler; private final String groupId; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java index 23adf9c9afaaa..d35fe5a14a924 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java @@ -48,7 +48,7 @@ */ public class FetchBuffer implements AutoCloseable { - private final Logger log; + private static final Logger log; private final ConcurrentLinkedQueue completedFetches; private final Lock lock; private final Condition notEmptyCondition; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java index 5dfa31248e34c..96aeafe1ff771 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java @@ -52,7 +52,7 @@ */ public class FetchCollector { - private final Logger log; + private static final Logger log; private final ConsumerMetadata metadata; private final SubscriptionState subscriptions; private final FetchConfig fetchConfig; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java index 745bbfde99289..bb4fd9365b1f3 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java @@ -58,7 +58,7 @@ */ public class Fetcher extends AbstractFetch { - private final Logger log; + private static final Logger log; private final ConsumerNetworkClient client; private final FetchCollector fetchCollector; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Heartbeat.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Heartbeat.java index 20852dfe55e8a..835a840288bfc 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Heartbeat.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Heartbeat.java @@ -35,7 +35,7 @@ public final class Heartbeat { private final Timer heartbeatTimer; private final Timer sessionTimer; private final Timer pollTimer; - private final Logger log; + private static final Logger log; private final ExponentialBackoff retryBackoff; private volatile long lastHeartbeatSend = 0L; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManager.java index 8a62051b2f42e..388c9cd4aeaf5 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManager.java @@ -74,7 +74,7 @@ */ public class HeartbeatRequestManager implements RequestManager { - private final Logger logger; + private static final Logger logger; /** * Time that the group coordinator will wait on member to revoke its partitions. This is provided by the group diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImpl.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImpl.java index a0e3a06d0087f..70085495877b5 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImpl.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImpl.java @@ -194,7 +194,7 @@ public class MembershipManagerImpl implements MembershipManager { /** * Logger. */ - private final Logger log; + private static final Logger log; /** * Manager to perform commit requests needed before revoking partitions (if auto-commit is diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java index 56e4d6977480a..17198bd662dcd 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java @@ -65,7 +65,7 @@ public class NetworkClientDelegate implements AutoCloseable { private final BackgroundEventHandler backgroundEventHandler; private final Metadata metadata; private final Time time; - private final Logger log; + private static final Logger log; private final int requestTimeoutMs; private final Queue unsentRequests; private final long retryBackoffMs; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java index f624941c525c1..ce8bdb316f1cc 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java @@ -61,7 +61,7 @@ */ public class OffsetFetcher { - private final Logger log; + private static final Logger log; private final ConsumerMetadata metadata; private final SubscriptionState subscriptions; private final ConsumerNetworkClient client; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java index f504c57b4aecc..889a610d1a3b2 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java @@ -64,7 +64,7 @@ class OffsetFetcherUtils { private final Time time; private final long retryBackoffMs; private final ApiVersions apiVersions; - private final Logger log; + private static final Logger log; /** * Exception that occurred while validating positions, that will be propagated on the next diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java index b4f637141287d..05d292de97c6a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java @@ -76,7 +76,7 @@ public class OffsetsRequestManager implements RequestManager, ClusterResourceLis private final ConsumerMetadata metadata; private final IsolationLevel isolationLevel; - private final Logger log; + private static final Logger log; private final OffsetFetcherUtils offsetFetcherUtils; private final SubscriptionState subscriptionState; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java index 618c5e3d4d5f2..e118aa76ecbf0 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java @@ -45,7 +45,7 @@ */ public class RequestManagers implements Closeable { - private final Logger log; + private static final Logger log; public final Optional coordinatorRequestManager; public final Optional commitRequestManager; public final Optional heartbeatRequestManager; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java index b509f675fc858..4a6acca9d08d7 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java @@ -23,7 +23,7 @@ class RequestState { - private final Logger log; + private static final Logger log; protected final String owner; static final int RETRY_BACKOFF_EXP_BASE = 2; static final double RETRY_BACKOFF_JITTER = 0.2; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java index 51c5e5ee45317..5ec3c03f0c974 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java @@ -60,7 +60,7 @@ public class ShareCompletedFetch { final ShareFetchResponseData.PartitionData partitionData; final short requestVersion; - private final Logger log; + private static final Logger log; private final BufferSupplier decompressionBufferSupplier; private final Iterator batches; private int recordsRead; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java index 7427edbb88069..4f7dba2dde2aa 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java @@ -69,7 +69,7 @@ @SuppressWarnings("NPathComplexity") public class ShareConsumeRequestManager implements RequestManager, MemberStateListener, Closeable { private final Time time; - private final Logger log; + private static final Logger log; private final LogContext logContext; private final String groupId; private final ConsumerMetadata metadata; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchBuffer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchBuffer.java index ebd86583ec6f8..623cfeb06b976 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchBuffer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchBuffer.java @@ -44,7 +44,7 @@ */ public class ShareFetchBuffer implements AutoCloseable { - private final Logger log; + private static final Logger log; private final ConcurrentLinkedQueue completedFetches; private final Lock lock; private final Condition notEmptyCondition; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollector.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollector.java index 3d073fa92eb82..362da2b7bdb0d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollector.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollector.java @@ -41,7 +41,7 @@ */ public class ShareFetchCollector { - private final Logger log; + private static final Logger log; private final ConsumerMetadata metadata; private final SubscriptionState subscriptions; private final FetchConfig fetchConfig; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManager.java index b68b59298f477..ea5268e4cb36c 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManager.java @@ -68,7 +68,7 @@ */ public class ShareHeartbeatRequestManager implements RequestManager { - private final Logger logger; + private static final Logger logger; /** * Time that the group coordinator will wait on member to revoke its partitions. This is provided by the group diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManager.java index 46b17f29db6dd..7f49da5bfedb1 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManager.java @@ -93,7 +93,7 @@ public class ShareMembershipManager implements RequestManager { /** * Logger. */ - private final Logger log; + private static final Logger log; /** * TopicPartition comparator based on topic name and partition id. diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandler.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandler.java index 3aa97f6c780d1..6f18c5457fc32 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandler.java @@ -54,7 +54,7 @@ * which partitions need to be included in each ShareFetch/ShareAcknowledge request. */ public class ShareSessionHandler { - private final Logger log; + private static final Logger log; private final int node; private final Uuid memberId; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java index bc7d20d11e0d3..17e665c098f50 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java @@ -75,7 +75,7 @@ public class SubscriptionState { private static final String SUBSCRIPTION_EXCEPTION_MESSAGE = "Subscription to topics, partitions and pattern are mutually exclusive"; - private final Logger log; + private static final Logger log; private enum SubscriptionType { NONE, AUTO_TOPICS, AUTO_PATTERN, USER_ASSIGNED, AUTO_TOPICS_SHARE diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java index f86457891e2cf..f29818c9f889b 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java @@ -47,7 +47,7 @@ */ public class TopicMetadataFetcher { - private final Logger log; + private static final Logger log; private final ConsumerNetworkClient client; private final ExponentialBackoff retryBackoff; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java index 2d9cab0dd9686..e83ee74b9f2df 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java @@ -68,7 +68,7 @@ public class TopicMetadataRequestManager implements RequestManager { private final List inflightRequests; private final long retryBackoffMs; private final long retryBackoffMaxMs; - private final Logger log; + private static final Logger log; private final LogContext logContext; public TopicMetadataRequestManager(final LogContext context, final Time time, final ConsumerConfig config) { diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java index d8fc13830f716..347e157a5626d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java @@ -40,7 +40,7 @@ */ public class ApplicationEventHandler implements Closeable { - private final Logger log; + private static final Logger log; private final BlockingQueue applicationEventQueue; private final ConsumerNetworkThread networkThread; private final IdempotentCloser closer = new IdempotentCloser(); diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java index e0c6911f6792f..ae0ee53c113a2 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java @@ -48,7 +48,7 @@ */ public class ApplicationEventProcessor implements EventProcessor { - private final Logger log; + private static final Logger log; private final ConsumerMetadata metadata; private final SubscriptionState subscriptions; private final RequestManagers requestManagers; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java index 9f91617c73579..22a8ac6956637 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java @@ -38,7 +38,7 @@ */ public class CompletableEventReaper { - private final Logger log; + private static final Logger log; /** * List of tracked events that are candidates for expiration. diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java b/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java index e71f1d5755351..b684f4d7373c4 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java @@ -237,7 +237,7 @@ */ public class KafkaProducer implements Producer { - private final Logger log; + private static final Logger log; private static final String JMX_PREFIX = "kafka.producer"; public static final String NETWORK_THREAD_PREFIX = "kafka-producer-network-thread"; public static final String PRODUCER_METRIC_GROUP_NAME = "producer-metrics"; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java index 98386324f7bda..8396619155f20 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java @@ -37,7 +37,7 @@ * (described in detail in KIP-794). There is one partitioner object per topic. */ public class BuiltInPartitioner { - private final Logger log; + private static final Logger log; private final String topic; private final int stickyBatchSize; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java index 0c77ef5fc4c69..c512ac1ae08cb 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java @@ -41,7 +41,7 @@ public class ProducerMetadata extends Metadata { /* Topics with expiry time */ private final Map topics = new HashMap<>(); private final Set newTopics = new HashSet<>(); - private final Logger log; + private static final Logger log; private final Time time; private Map errors = null; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java index ec50dc9bc26d1..b9214aad00815 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java @@ -70,7 +70,7 @@ public class RecordAccumulator { private final LogContext logContext; - private final Logger log; + private static final Logger log; private volatile boolean closed; private final AtomicInteger flushesInProgress; private final AtomicInteger appendsInProgress; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java index 39f5616465154..e9d1880db8432 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java @@ -79,7 +79,7 @@ */ public class Sender implements Runnable { - private final Logger log; + private static final Logger log; /* the state of each nodes connection */ private final KafkaClient client; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java index 10239be6d9812..c00b60a4f64ab 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java @@ -92,7 +92,7 @@ public class TransactionManager { private static final int NO_INFLIGHT_REQUEST_CORRELATION_ID = -1; - private final Logger log; + private static final Logger log; private final String transactionalId; private final int transactionTimeoutMs; private final ApiVersions apiVersions; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java index 05a0fa3fbbc30..6430defe12f34 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java @@ -31,7 +31,7 @@ class TxnPartitionMap { - private final Logger log; + private static final Logger log; private final Map topicPartitions = new HashMap<>(); diff --git a/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java b/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java index 247bab18d5565..8653930f6dba3 100644 --- a/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java +++ b/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java @@ -45,7 +45,7 @@ */ public class AbstractConfig { - private final Logger log = LoggerFactory.getLogger(getClass()); + private static final Logger log = LoggerFactory.getLogger(getClass()); /** * Configs for which values have been requested, used to detect unused configs. diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/internals/IntGaugeSuite.java b/clients/src/main/java/org/apache/kafka/common/metrics/internals/IntGaugeSuite.java index 61ff49b0adfcc..2415bbd671147 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/internals/IntGaugeSuite.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/internals/IntGaugeSuite.java @@ -41,7 +41,7 @@ public final class IntGaugeSuite implements AutoCloseable { /** * The log4j logger. */ - private final Logger log; + private static final Logger log; /** * The name of this suite. diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java index c7c882496bf8e..5cb1da4f65376 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java @@ -33,7 +33,7 @@ */ public class Percentiles extends SampledStat implements CompoundStat { - private final Logger log = LoggerFactory.getLogger(Percentiles.class); + private static final Logger log = LoggerFactory.getLogger(Percentiles.class); public enum BucketSizing { CONSTANT, LINEAR diff --git a/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java b/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java index 4c73e4e3e4c94..e3b894293761c 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java +++ b/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java @@ -96,7 +96,7 @@ public class SaslChannelBuilder implements ChannelBuilder, ListenerReconfigurabl private final Map connectionsMaxReauthMsByMechanism; private final Time time; private final LogContext logContext; - private final Logger log; + private static final Logger log; private SslFactory sslFactory; private Map configs; diff --git a/clients/src/main/java/org/apache/kafka/common/network/Selector.java b/clients/src/main/java/org/apache/kafka/common/network/Selector.java index 68698ab7b8d21..9c861fd9c5dbd 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/Selector.java +++ b/clients/src/main/java/org/apache/kafka/common/network/Selector.java @@ -102,7 +102,7 @@ private enum CloseMode { } } - private final Logger log; + private static final Logger log; private final java.nio.channels.Selector nioSelector; private final Map channels; private final Set explicitlyMutedChannels; diff --git a/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java b/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java index d047c79ce8a1c..64cbe642e79e8 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java +++ b/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java @@ -79,7 +79,7 @@ private enum State { private final SelectionKey key; private final SocketChannel socketChannel; private final ChannelMetadataRegistry metadataRegistry; - private final Logger log; + private static final Logger log; private HandshakeStatus handshakeStatus; private SSLEngineResult handshakeResult; diff --git a/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java b/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java index a327c4b6c1b59..6f8c750855c5e 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java +++ b/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java @@ -149,7 +149,7 @@ public static boolean isReserved(int correlationId) { private final String clientPrincipalName; private final AuthenticateCallbackHandler callbackHandler; private final Time time; - private final Logger log; + private static final Logger log; private final ReauthInfo reauthInfo; // buffers used in `authenticate` diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java index daae977d72729..2241eb50fdc07 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java @@ -99,7 +99,7 @@ * broker configuration property. */ public class OAuthBearerUnsecuredLoginCallbackHandler implements AuthenticateCallbackHandler { - private final Logger log = LoggerFactory.getLogger(OAuthBearerUnsecuredLoginCallbackHandler.class); + private static final Logger log = LoggerFactory.getLogger(OAuthBearerUnsecuredLoginCallbackHandler.class); private static final String OPTION_PREFIX = "unsecuredLogin"; private static final String PRINCIPAL_CLAIM_NAME_OPTION = OPTION_PREFIX + "PrincipalClaimName"; private static final String LIFETIME_SECONDS_OPTION = OPTION_PREFIX + "LifetimeSeconds"; diff --git a/clients/src/main/java/org/apache/kafka/common/utils/KafkaThread.java b/clients/src/main/java/org/apache/kafka/common/utils/KafkaThread.java index 2f5e15f46349e..897ed8eed8670 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/KafkaThread.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/KafkaThread.java @@ -24,7 +24,7 @@ */ public class KafkaThread extends Thread { - private final Logger log = LoggerFactory.getLogger(getClass()); + private static final Logger log = LoggerFactory.getLogger(getClass()); public static KafkaThread daemon(final String name, Runnable runnable) { return new KafkaThread(name, runnable, true); diff --git a/clients/src/main/java/org/apache/kafka/common/utils/LogContext.java b/clients/src/main/java/org/apache/kafka/common/utils/LogContext.java index 10acf32ccd47f..0b0ad1208a469 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/LogContext.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/LogContext.java @@ -436,7 +436,7 @@ private void writeLog(Marker marker, int level, String format, Object[] args, Th } private static class LocationIgnorantKafkaLogger extends AbstractKafkaLogger { - private final Logger logger; + private static final Logger logger; LocationIgnorantKafkaLogger(String logPrefix, Logger logger) { super(logPrefix); diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java index ce242e4bc74d5..79acda8429593 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java @@ -3673,7 +3673,7 @@ private void clearBufferedDataForUnassignedPartitions(Set partit private class TestableNetworkClientDelegate extends NetworkClientDelegate { - private final Logger log = LoggerFactory.getLogger(NetworkClientDelegate.class); + private static final Logger log = LoggerFactory.getLogger(NetworkClientDelegate.class); private final ConcurrentLinkedQueue pendingDisconnects = new ConcurrentLinkedQueue<>(); public TestableNetworkClientDelegate(Time time, diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerSinkTaskContext.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerSinkTaskContext.java index 3baf4772b5bda..66fd8a80d3a20 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerSinkTaskContext.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerSinkTaskContext.java @@ -35,7 +35,7 @@ public class WorkerSinkTaskContext implements SinkTaskContext { - private final Logger log = LoggerFactory.getLogger(getClass()); + private static final Logger log = LoggerFactory.getLogger(getClass()); private final Map offsets; private final Consumer consumer; private final WorkerSinkTask sinkTask; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java index 174adea8cdd6c..0e8c36c6dcef9 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java @@ -153,7 +153,7 @@ *

*/ public class DistributedHerder extends AbstractHerder implements Runnable { - private final Logger log; + private static final Logger log; private static final long FORWARD_REQUEST_SHUTDOWN_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(10); private static final long START_AND_STOP_SHUTDOWN_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(1); diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/EagerAssignor.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/EagerAssignor.java index 0663d9e571052..cbe4d4deae5cb 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/EagerAssignor.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/EagerAssignor.java @@ -45,7 +45,7 @@ * Note that this class is NOT thread-safe. */ public class EagerAssignor implements ConnectAssignor { - private final Logger log; + private static final Logger log; public EagerAssignor(LogContext logContext) { this.log = logContext.logger(EagerAssignor.class); diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignor.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignor.java index 676ae78753002..d589dde1f5d71 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignor.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignor.java @@ -62,7 +62,7 @@ * */ public class IncrementalCooperativeAssignor implements ConnectAssignor { - private final Logger log; + private static final Logger log; private final Time time; private final int maxDelay; private ConnectorsAndTasks previousAssignment; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinator.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinator.java index 138bf9fc51473..28d1417027535 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinator.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinator.java @@ -56,7 +56,7 @@ * to workers. */ public class WorkerCoordinator extends AbstractCoordinator implements Closeable { - private final Logger log; + private static final Logger log; private final String restUrl; private final ConfigBackingStore configStorage; private volatile ExtendedAssignment assignmentSnapshot; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMember.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMember.java index f4fdcaf801edc..fdf74f857b4a8 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMember.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMember.java @@ -63,7 +63,7 @@ public class WorkerGroupMember { private static final String JMX_PREFIX = "kafka.connect"; - private final Logger log; + private static final Logger log; private final String clientId; private final ConsumerNetworkClient client; private final Metrics metrics; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/LoggersTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/LoggersTest.java index 3dbe688a076a2..a955db08faf3f 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/LoggersTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/LoggersTest.java @@ -214,7 +214,7 @@ public void testSetLevelNullArguments() { private class TestLoggers extends Loggers { - private final Logger rootLogger; + private static final Logger rootLogger; private final Map currentLoggers; public TestLoggers(Logger rootLogger, Logger... knownLoggers) { diff --git a/core/src/main/java/kafka/log/remote/RemoteLogManager.java b/core/src/main/java/kafka/log/remote/RemoteLogManager.java index f3f0ccc11ad2d..eb1f99aea0bef 100644 --- a/core/src/main/java/kafka/log/remote/RemoteLogManager.java +++ b/core/src/main/java/kafka/log/remote/RemoteLogManager.java @@ -705,7 +705,7 @@ RLMTask rlmCopyTask(TopicIdPartition topicIdPartition) { abstract class RLMTask extends CancellableRunnable { protected final TopicIdPartition topicIdPartition; - private final Logger logger; + private static final Logger logger; public RLMTask(TopicIdPartition topicIdPartition) { this.topicIdPartition = topicIdPartition; @@ -750,7 +750,7 @@ public String toString() { class RLMCopyTask extends RLMTask { private final int customMetadataSizeLimit; - private final Logger logger; + private static final Logger logger; // The copied and log-start offset is empty initially for a new RLMCopyTask, and needs to be fetched inside // the task's run() method. @@ -992,7 +992,7 @@ private Path toPathIfExists(File file) { } class RLMExpirationTask extends RLMTask { - private final Logger logger; + private static final Logger logger; public RLMExpirationTask(TopicIdPartition topicIdPartition) { super(topicIdPartition); diff --git a/core/src/main/java/kafka/server/logger/RuntimeLoggerManager.java b/core/src/main/java/kafka/server/logger/RuntimeLoggerManager.java index 14d1b72c10942..0d052e9d7e809 100644 --- a/core/src/main/java/kafka/server/logger/RuntimeLoggerManager.java +++ b/core/src/main/java/kafka/server/logger/RuntimeLoggerManager.java @@ -48,7 +48,7 @@ public class RuntimeLoggerManager { } private final int nodeId; - private final Logger log; + private static final Logger log; public RuntimeLoggerManager(int nodeId, Logger log) { this.nodeId = nodeId; diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java index e132e85ec21c6..b820d7e6ca6d3 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java @@ -206,7 +206,7 @@ public GroupCoordinatorService build() { /** * The logger. */ - private final Logger log; + private static final Logger log; /** * The group coordinator configurations. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorShard.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorShard.java index c633a4bddd642..a6066717221a6 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorShard.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorShard.java @@ -234,7 +234,7 @@ public GroupCoordinatorShard build() { /** * The logger. */ - private final Logger log; + private static final Logger log; /** * The group metadata manager. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java index ff96a98f28ce5..805b3e44be59b 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java @@ -357,7 +357,7 @@ GroupMetadataManager build() { /** * The logger. */ - private final Logger log; + private static final Logger log; /** * The snapshot registry. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java index dad69db30b97a..5777bc069b37b 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java @@ -155,7 +155,7 @@ public OffsetMetadataManager build() { /** * The logger. */ - private final Logger log; + private static final Logger log; /** * The snapshot registry. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/classic/ClassicGroup.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/classic/ClassicGroup.java index ad75634cf497d..d701e73d11425 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/classic/ClassicGroup.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/classic/ClassicGroup.java @@ -91,7 +91,7 @@ public class ClassicGroup implements Group { /** * The slf4j logger. */ - private final Logger log; + private static final Logger log; /** * The group id. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntime.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntime.java index 82d18343deb0f..5546122ff467d 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntime.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntime.java @@ -1790,7 +1790,7 @@ public void onHighWatermarkUpdated( /** * The logger. */ - private final Logger log; + private static final Logger log; /** * The system time. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/MultiThreadedEventProcessor.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/MultiThreadedEventProcessor.java index fa1f734c1c70c..61734da075cef 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/MultiThreadedEventProcessor.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/MultiThreadedEventProcessor.java @@ -44,7 +44,7 @@ public class MultiThreadedEventProcessor implements CoordinatorEventProcessor { /** * The logger. */ - private final Logger log; + private static final Logger log; /** * The accumulator. @@ -118,7 +118,7 @@ public MultiThreadedEventProcessor( * accumulator and runs them. */ private class EventProcessorThread extends Thread { - private final Logger log; + private static final Logger log; EventProcessorThread( String name diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/SnapshottableCoordinator.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/SnapshottableCoordinator.java index b7f74748c4597..4df71ce20ce73 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/SnapshottableCoordinator.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/SnapshottableCoordinator.java @@ -34,7 +34,7 @@ class SnapshottableCoordinator, U> implements Coor /** * The logger. */ - private final Logger log; + private static final Logger log; /** * The snapshot registry backing the coordinator. diff --git a/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java index d7c5dd1a3e585..62a8108203910 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java @@ -79,7 +79,7 @@ AclControlManager build() { } } - private final Logger log; + private static final Logger log; private final TimelineHashMap idToAcl; private final TimelineHashSet existingAcls; diff --git a/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java b/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java index e1734c52fbc37..4e2493f1f943c 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java @@ -224,7 +224,7 @@ public BrokerHeartbeatState next() { } } - private final Logger log; + private static final Logger log; /** * The Kafka clock object to use. diff --git a/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java index 64b8a41f5c4d5..0c572a635ce05 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java @@ -72,7 +72,7 @@ ClientQuotaControlManager build() { } } - private final Logger log; + private static final Logger log; private final SnapshotRegistry snapshotRegistry; diff --git a/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java index 7f77455abcc52..58719fb1fb5bd 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java @@ -208,7 +208,7 @@ boolean check() { /** * The SLF4J log object. */ - private final Logger log; + private static final Logger log; /** * The Kafka clock object to use. diff --git a/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java index 4ea7d9757d987..c790770990455 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java @@ -57,7 +57,7 @@ public class ConfigurationControlManager { public static final ConfigResource DEFAULT_NODE = new ConfigResource(Type.BROKER, ""); - private final Logger log; + private static final Logger log; private final SnapshotRegistry snapshotRegistry; private final KafkaConfigSchema configSchema; private final Consumer existenceChecker; diff --git a/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java index fa50570a48f79..f344f178f205c 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java @@ -104,7 +104,7 @@ DelegationTokenControlManager build() { } } - private final Logger log; + private static final Logger log; private final DelegationTokenCache tokenCache; private final String tokenSecretKeyString; private final long tokenDefaultMaxLifetimeMs; diff --git a/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java index 4d7f2b862fbf5..cca3ea35945b5 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java @@ -120,7 +120,7 @@ public FeatureControlManager build() { } } - private final Logger log; + private static final Logger log; /** * An immutable map containing the features supported by this controller's software. diff --git a/metadata/src/main/java/org/apache/kafka/controller/LogReplayTracker.java b/metadata/src/main/java/org/apache/kafka/controller/LogReplayTracker.java index 8777306029100..3933e011f3250 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/LogReplayTracker.java +++ b/metadata/src/main/java/org/apache/kafka/controller/LogReplayTracker.java @@ -45,7 +45,7 @@ public LogReplayTracker build() { /** * The slf4j logger. */ - private final Logger log; + private static final Logger log; /** * True if we haven't replayed any records yet. diff --git a/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java index 4094c34e58006..977a93b03f191 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java @@ -87,7 +87,7 @@ public OffsetControlManager build() { /** * The slf4j logger. */ - private final Logger log; + private static final Logger log; /** * The snapshot registry. diff --git a/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java index 2c1a0b49e4c98..41e1c292f6f2f 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java @@ -65,7 +65,7 @@ ProducerIdControlManager build() { } } - private final Logger log; + private static final Logger log; private final ClusterControlManager clusterControlManager; private final TimelineObject nextProducerBlock; private final TimelineLong brokerEpoch; diff --git a/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java b/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java index 5632720d83798..c1baabfe29d39 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java +++ b/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java @@ -1579,7 +1579,7 @@ private void replay(ApiMessage message, Optional snapshotId, lon /** * The slf4j logger. */ - private final Logger log; + private static final Logger log; /** * The ID of this controller node. diff --git a/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java index 81abfbeb5371f..c16204f596f11 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java @@ -297,7 +297,7 @@ static Map translateCreationConfigs(CreatableTopicConfigCollecti } private final SnapshotRegistry snapshotRegistry; - private final Logger log; + private static final Logger log; /** * The KIP-464 default replication factor that is used if a CreateTopics request does diff --git a/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java index f593e2e0e4b2c..8e241555e0e16 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java @@ -161,7 +161,7 @@ public String toString() { } } - private final Logger log; + private static final Logger log; private final TimelineHashMap credentials; private ScramControlManager( diff --git a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java index 97d1a1f9c0fca..fd368305e5ed9 100644 --- a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java +++ b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java @@ -54,7 +54,7 @@ public interface MetadataUpdater { void update(MetadataDelta delta, MetadataImage image, LogDeltaManifest manifest); } - private final Logger log; + private static final Logger log; private final Time time; private final FaultHandler faultHandler; private final MetadataUpdater callback; diff --git a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java index 5702b992aaaf4..6a7a57172588f 100644 --- a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java +++ b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java @@ -136,7 +136,7 @@ public MetadataLoader build() { /** * The log4j logger for this loader. */ - private final Logger log; + private static final Logger log; /** * The clock used by this loader. diff --git a/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java b/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java index dfb97934cea7a..3dac223ed4564 100644 --- a/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java +++ b/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java @@ -39,7 +39,7 @@ * with the actual state, and try to make changes only if necessary. */ public class BrokerRegistrationTracker implements MetadataPublisher { - private final Logger log; + private static final Logger log; private final int id; private final Runnable refreshRegistrationCallback; diff --git a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java index d9f6b73742480..426985b74025a 100644 --- a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java +++ b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java @@ -93,7 +93,7 @@ public SnapshotEmitter build() { /** * The slf4j logger to use. */ - private final Logger log; + private static final Logger log; /** * The clock object. diff --git a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java index e427fbe61da31..9de08e8f53718 100644 --- a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java +++ b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java @@ -137,7 +137,7 @@ public interface Emitter { /** * The slf4j logger to use. */ - private final Logger log; + private static final Logger log; /** * The fault handler to use. diff --git a/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java b/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java index 61b95c091d6dc..5708e4f8e9f45 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java @@ -92,7 +92,7 @@ public long nextPollTimeMs() { static final int METADATA_COMMIT_MAX_WAIT_MS = 300_000; private final Time time; - private final Logger log; + private static final Logger log; private final int nodeId; private final MigrationClient zkMigrationClient; private final KRaftMigrationZkWriter zkMetadataWriter; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java b/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java index a03f08291b5d8..4fe1725376a9f 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java @@ -30,7 +30,7 @@ public class FeaturesPublisher implements MetadataPublisher { - private final Logger log; + private static final Logger log; private volatile FinalizedFeatures finalizedFeatures = FinalizedFeatures.fromKRaftVersion(MINIMUM_KRAFT_VERSION); public FeaturesPublisher( diff --git a/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java b/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java index ec733b3ca196f..69a74ebfddc71 100644 --- a/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java +++ b/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java @@ -163,7 +163,7 @@ public String toString() { } public static class SharedLogData { - private final Logger log = LoggerFactory.getLogger(SharedLogData.class); + private static final Logger log = LoggerFactory.getLogger(SharedLogData.class); /** * Maps node IDs to the matching log managers. @@ -466,7 +466,7 @@ void beginShutdown() { } } - private final Logger log; + private static final Logger log; /** * The node ID of this local log manager. Each log manager must have a unique ID. diff --git a/raft/src/main/java/org/apache/kafka/raft/CandidateState.java b/raft/src/main/java/org/apache/kafka/raft/CandidateState.java index 1fd71e5e5634a..8d52237c6a654 100644 --- a/raft/src/main/java/org/apache/kafka/raft/CandidateState.java +++ b/raft/src/main/java/org/apache/kafka/raft/CandidateState.java @@ -42,7 +42,7 @@ public class CandidateState implements EpochState { private final int electionTimeoutMs; private final Timer electionTimer; private final Timer backoffTimer; - private final Logger log; + private static final Logger log; /** * The lifetime of a candidate state is the following. diff --git a/raft/src/main/java/org/apache/kafka/raft/FollowerState.java b/raft/src/main/java/org/apache/kafka/raft/FollowerState.java index a4d635e038849..893e164aebb93 100644 --- a/raft/src/main/java/org/apache/kafka/raft/FollowerState.java +++ b/raft/src/main/java/org/apache/kafka/raft/FollowerState.java @@ -44,7 +44,7 @@ public class FollowerState implements EpochState { */ private Optional fetchingSnapshot = Optional.empty(); - private final Logger log; + private static final Logger log; public FollowerState( Time time, diff --git a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java index 07df77d1eab92..18327da747d91 100644 --- a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java +++ b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java @@ -163,7 +163,7 @@ public final class KafkaRaftClient implements RaftClient { private final Uuid nodeDirectoryId; private final AtomicReference shutdown = new AtomicReference<>(); private final LogContext logContext; - private final Logger logger; + private static final Logger logger; private final Time time; private final int fetchMaxWaitMs; private final String clusterId; @@ -2974,7 +2974,7 @@ private boolean maybeCompleteShutdown(long currentTimeMs) { * A simple timer based log cleaner */ private static class RaftMetadataLogCleanerManager { - private final Logger logger; + private static final Logger logger; private final Timer timer; private final long delayMs; private final Runnable cleaner; diff --git a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClientDriver.java b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClientDriver.java index 2af7d7d207f87..cbe4ac8e4f94f 100644 --- a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClientDriver.java +++ b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClientDriver.java @@ -43,7 +43,7 @@ public class KafkaRaftClientDriver extends ShutdownableThread { * Closed in {@link #shutdown()} after shutdown completes. */ private final KafkaRaftClient client; - private final Logger log; + private static final Logger log; private final FaultHandler fatalFaultHandler; public KafkaRaftClientDriver( diff --git a/raft/src/main/java/org/apache/kafka/raft/LeaderState.java b/raft/src/main/java/org/apache/kafka/raft/LeaderState.java index b58e0d833c0fa..18f5c037643ec 100644 --- a/raft/src/main/java/org/apache/kafka/raft/LeaderState.java +++ b/raft/src/main/java/org/apache/kafka/raft/LeaderState.java @@ -75,7 +75,7 @@ public class LeaderState implements EpochState { private Map voterStates = new HashMap<>(); private Optional addVoterHandlerState = Optional.empty(); private final Map observerStates = new HashMap<>(); - private final Logger log; + private static final Logger log; private final BatchAccumulator accumulator; // The set includes all of the followers voters that FETCH or FETCH_SNAPSHOT during the current checkQuorumTimer interval. private final Set fetchedVoters = new HashSet<>(); diff --git a/raft/src/main/java/org/apache/kafka/raft/QuorumState.java b/raft/src/main/java/org/apache/kafka/raft/QuorumState.java index d84e274990e10..f9cbc3ca47dfe 100644 --- a/raft/src/main/java/org/apache/kafka/raft/QuorumState.java +++ b/raft/src/main/java/org/apache/kafka/raft/QuorumState.java @@ -80,7 +80,7 @@ public class QuorumState { private final OptionalInt localId; private final Uuid localDirectoryId; private final Time time; - private final Logger log; + private static final Logger log; private final QuorumStateStore store; private final KRaftControlRecordStateMachine partitionState; private final Endpoints localListeners; diff --git a/raft/src/main/java/org/apache/kafka/raft/ReplicatedCounter.java b/raft/src/main/java/org/apache/kafka/raft/ReplicatedCounter.java index 2758481ef6936..1876bdceae7fb 100644 --- a/raft/src/main/java/org/apache/kafka/raft/ReplicatedCounter.java +++ b/raft/src/main/java/org/apache/kafka/raft/ReplicatedCounter.java @@ -33,7 +33,7 @@ public class ReplicatedCounter implements RaftClient.Listener { private static final int SNAPSHOT_DELAY_IN_RECORDS = 10; private final int nodeId; - private final Logger log; + private static final Logger log; private final RaftClient client; private int committed = 0; diff --git a/raft/src/main/java/org/apache/kafka/raft/ResignedState.java b/raft/src/main/java/org/apache/kafka/raft/ResignedState.java index 267a88ad787cd..03ab6676f6849 100644 --- a/raft/src/main/java/org/apache/kafka/raft/ResignedState.java +++ b/raft/src/main/java/org/apache/kafka/raft/ResignedState.java @@ -50,7 +50,7 @@ public class ResignedState implements EpochState { private final Set unackedVoters; private final Timer electionTimer; private final List preferredSuccessors; - private final Logger log; + private static final Logger log; public ResignedState( Time time, diff --git a/raft/src/main/java/org/apache/kafka/raft/UnattachedState.java b/raft/src/main/java/org/apache/kafka/raft/UnattachedState.java index 1dba6a70f28cf..b4ceaa15ae2a5 100644 --- a/raft/src/main/java/org/apache/kafka/raft/UnattachedState.java +++ b/raft/src/main/java/org/apache/kafka/raft/UnattachedState.java @@ -46,7 +46,7 @@ public class UnattachedState implements EpochState { private final long electionTimeoutMs; private final Timer electionTimer; private final Optional highWatermark; - private final Logger log; + private static final Logger log; public UnattachedState( Time time, diff --git a/raft/src/main/java/org/apache/kafka/raft/VotedState.java b/raft/src/main/java/org/apache/kafka/raft/VotedState.java index c7710903399ef..15c87cdafbdfa 100644 --- a/raft/src/main/java/org/apache/kafka/raft/VotedState.java +++ b/raft/src/main/java/org/apache/kafka/raft/VotedState.java @@ -40,7 +40,7 @@ public class VotedState implements EpochState { private final int electionTimeoutMs; private final Timer electionTimer; private final Optional highWatermark; - private final Logger log; + private static final Logger log; public VotedState( Time time, diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/AddVoterHandler.java b/raft/src/main/java/org/apache/kafka/raft/internals/AddVoterHandler.java index 9bbd203ca9c28..ad8f66a2c679d 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/AddVoterHandler.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/AddVoterHandler.java @@ -67,7 +67,7 @@ public final class AddVoterHandler { private final KRaftControlRecordStateMachine partitionState; private final RequestSender requestSender; private final Time time; - private final Logger logger; + private static final Logger logger; public AddVoterHandler( KRaftControlRecordStateMachine partitionState, diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/DefaultRequestSender.java b/raft/src/main/java/org/apache/kafka/raft/internals/DefaultRequestSender.java index 0cee3c255d1b0..f61c8443508eb 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/DefaultRequestSender.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/DefaultRequestSender.java @@ -38,7 +38,7 @@ public final class DefaultRequestSender implements RequestSender { private final RequestManager requestManager; private final NetworkChannel channel; private final RaftMessageQueue messageQueue; - private final Logger logger; + private static final Logger logger; public DefaultRequestSender( RequestManager requestManager, diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java b/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java index 82f1435a30eaf..ddfc07b818db1 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java @@ -53,7 +53,7 @@ public final class KRaftControlRecordStateMachine { private final ReplicatedLog log; private final RecordSerde serde; private final BufferSupplier bufferSupplier; - private final Logger logger; + private static final Logger logger; private final int maxBatchSizeBytes; // These objects are synchronized using their respective object monitor. The two actors diff --git a/raft/src/test/java/org/apache/kafka/raft/MockLog.java b/raft/src/test/java/org/apache/kafka/raft/MockLog.java index 29281fa633fc7..f6aa62931e57a 100644 --- a/raft/src/test/java/org/apache/kafka/raft/MockLog.java +++ b/raft/src/test/java/org/apache/kafka/raft/MockLog.java @@ -62,7 +62,7 @@ public class MockLog implements ReplicatedLog { private final NavigableMap snapshots = new TreeMap<>(); private final TopicPartition topicPartition; private final Uuid topicId; - private final Logger logger; + private static final Logger logger; private long nextId = ID_GENERATOR.getAndIncrement(); private LogOffsetMetadata highWatermark = new LogOffsetMetadata(0, Optional.empty()); diff --git a/server-common/src/main/java/org/apache/kafka/deferred/DeferredEventQueue.java b/server-common/src/main/java/org/apache/kafka/deferred/DeferredEventQueue.java index 2af9ef54fa39d..661b631eb7f9b 100644 --- a/server-common/src/main/java/org/apache/kafka/deferred/DeferredEventQueue.java +++ b/server-common/src/main/java/org/apache/kafka/deferred/DeferredEventQueue.java @@ -33,7 +33,7 @@ * We wait for the high watermark of the log to advance before completing them. */ public class DeferredEventQueue { - private final Logger log; + private static final Logger log; /** * A map from log offsets to events. Each event will be completed once the log diff --git a/server-common/src/main/java/org/apache/kafka/queue/EventQueue.java b/server-common/src/main/java/org/apache/kafka/queue/EventQueue.java index 8914931448d83..10d33ad529763 100644 --- a/server-common/src/main/java/org/apache/kafka/queue/EventQueue.java +++ b/server-common/src/main/java/org/apache/kafka/queue/EventQueue.java @@ -45,7 +45,7 @@ default void handleException(Throwable e) {} } abstract class FailureLoggingEvent implements Event { - private final Logger log; + private static final Logger log; public FailureLoggingEvent(Logger log) { this.log = log; diff --git a/server-common/src/main/java/org/apache/kafka/queue/KafkaEventQueue.java b/server-common/src/main/java/org/apache/kafka/queue/KafkaEventQueue.java index b32183a214f82..9294386bd4ed4 100644 --- a/server-common/src/main/java/org/apache/kafka/queue/KafkaEventQueue.java +++ b/server-common/src/main/java/org/apache/kafka/queue/KafkaEventQueue.java @@ -417,7 +417,7 @@ int size() { /** * The log4j logger to use. */ - private final Logger log; + private static final Logger log; /** * The runnable that our thread executes. diff --git a/server-common/src/main/java/org/apache/kafka/server/network/EndpointReadyFutures.java b/server-common/src/main/java/org/apache/kafka/server/network/EndpointReadyFutures.java index 212f2b9fbd7ba..55d14c8676243 100644 --- a/server-common/src/main/java/org/apache/kafka/server/network/EndpointReadyFutures.java +++ b/server-common/src/main/java/org/apache/kafka/server/network/EndpointReadyFutures.java @@ -182,7 +182,7 @@ void failStage(String what, Throwable exception) { } } - private final Logger log; + private static final Logger log; private final Map> futures; diff --git a/server-common/src/main/java/org/apache/kafka/server/util/TopicFilter.java b/server-common/src/main/java/org/apache/kafka/server/util/TopicFilter.java index 1dbebdfdecc4d..64c8f8441b97c 100644 --- a/server-common/src/main/java/org/apache/kafka/server/util/TopicFilter.java +++ b/server-common/src/main/java/org/apache/kafka/server/util/TopicFilter.java @@ -54,7 +54,7 @@ public Pattern getPattern() { } public static class IncludeList extends TopicFilter { - private final Logger log = LoggerFactory.getLogger(IncludeList.class); + private static final Logger log = LoggerFactory.getLogger(IncludeList.class); public IncludeList(String rawRegex) { super(rawRegex); } diff --git a/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java b/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java index b35670a0bccb0..c45cb48490012 100644 --- a/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java +++ b/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java @@ -94,7 +94,7 @@ public Snapshot next() { } } - private final Logger log; + private static final Logger log; /** * A map from snapshot epochs to snapshot data structures. diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java b/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java index 42c41226783a4..4d7e1f7323f10 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java @@ -49,7 +49,7 @@ public class CleanShutdownFileHandler { // Visible for testing final File cleanShutdownFile; private static final int CURRENT_VERSION = 0; - private final Logger logger; + private static final Logger logger; @JsonIgnoreProperties(ignoreUnknown = true) private static class Content { diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java b/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java index 496cde779961e..6506e52898ce0 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java @@ -55,7 +55,7 @@ public class LeaderEpochFileCache { private final TopicPartition topicPartition; private final LeaderEpochCheckpointFile checkpoint; private final Scheduler scheduler; - private final Logger log; + private static final Logger log; private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); private final TreeMap epochs = new TreeMap<>(); diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java index 883f2059a4bc2..c29576759bcb2 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java @@ -105,7 +105,7 @@ public class ProducerStateManager { new Field(CRC_FIELD, Type.UNSIGNED_INT32, "CRC of the snapshot data"), new Field(PRODUCER_ENTRIES_FIELD, new ArrayOf(PRODUCER_SNAPSHOT_ENTRY_SCHEMA), "The entries in the producer table")); - private final Logger log; + private static final Logger log; private final TopicPartition topicPartition; private final int maxTransactionTimeoutMs; diff --git a/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java b/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java index e9496c0cdc653..65052092662a4 100644 --- a/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java +++ b/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java @@ -164,7 +164,7 @@ public class KafkaStreams implements AutoCloseable { // of the co-location of stream thread's consumers. It is for internal // usage only and should not be exposed to users at all. private final Time time; - private final Logger log; + private static final Logger log; protected final String clientId; private final Metrics metrics; protected final StreamsConfig applicationConfigs; diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamSlidingWindowAggregate.java b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamSlidingWindowAggregate.java index 6b5a1753c8bf9..f2b0b7cf06e2b 100644 --- a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamSlidingWindowAggregate.java +++ b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamSlidingWindowAggregate.java @@ -43,7 +43,7 @@ public class KStreamSlidingWindowAggregate implements KStreamAggProcessorSupplier, VAgg> { - private final Logger log = LoggerFactory.getLogger(getClass()); + private static final Logger log = LoggerFactory.getLogger(getClass()); private final String storeName; private final SlidingWindows windows; diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregate.java b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregate.java index 44169cf0eb2da..6519478efe19e 100644 --- a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregate.java +++ b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregate.java @@ -41,7 +41,7 @@ public class KStreamWindowAggregate implements KStreamAggProcessorSupplier, VAgg> { - private final Logger log = LoggerFactory.getLogger(getClass()); + private static final Logger log = LoggerFactory.getLogger(getClass()); private final String storeName; private final Windows windows; diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/StreamSourceNode.java b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/StreamSourceNode.java index 003298cc870d4..97b686eaff632 100644 --- a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/StreamSourceNode.java +++ b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/StreamSourceNode.java @@ -30,7 +30,7 @@ public class StreamSourceNode extends SourceGraphNode { - private final Logger log = LoggerFactory.getLogger(StreamSourceNode.class); + private static final Logger log = LoggerFactory.getLogger(StreamSourceNode.class); public StreamSourceNode(final String nodeName, final Collection topicNames, diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreator.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreator.java index c4be67d720275..3a5d19ca37d4c 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreator.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreator.java @@ -60,7 +60,7 @@ class ActiveTaskCreator { private final Time time; private final KafkaClientSupplier clientSupplier; private final String threadId; - private final Logger log; + private static final Logger log; private final Sensor createTaskSensor; private final StreamsProducer threadProducer; private final Map taskProducers; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ChangelogTopics.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ChangelogTopics.java index aaf8ba16a51b2..99bb64728d41d 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ChangelogTopics.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ChangelogTopics.java @@ -43,7 +43,7 @@ public class ChangelogTopics { private final Set preExistingNonSourceTopicBasedChangelogPartitions = new HashSet<>(); private final Set sourceTopicBasedChangelogTopics = new HashSet<>(); private final Set preExistingSourceTopicBasedChangelogPartitions = new HashSet<>(); - private final Logger log; + private static final Logger log; public ChangelogTopics(final InternalTopicManager internalTopicManager, final Map topicGroups, diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java index 3ab94f689f77c..858193418bcd6 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java @@ -745,7 +745,7 @@ private void recordMetrics(final long now, final long totalLatency, final long t } private final Time time; - private final Logger log; + private static final Logger log; private final String name; private final Metrics metrics; private final Consumer restoreConsumer; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java index b1263ddc58df6..261ec44a1f2c2 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java @@ -70,7 +70,7 @@ public class GlobalStateManagerImpl implements GlobalStateManager { private static final long NO_DEADLINE = -1L; private final Time time; - private final Logger log; + private static final Logger log; private final File baseDir; private final long taskTimeoutMs; private final ProcessorTopology topology; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateUpdateTask.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateUpdateTask.java index 1713efb52a9bd..d32298262df70 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateUpdateTask.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateUpdateTask.java @@ -38,7 +38,7 @@ * Updates the state for all Global State Stores. */ public class GlobalStateUpdateTask implements GlobalStateMaintainer { - private final Logger log; + private static final Logger log; private final LogContext logContext; private final ProcessorTopology topology; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStreamThread.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStreamThread.java index 1c7194b1913e6..7b5aa142fb31a 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStreamThread.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStreamThread.java @@ -58,7 +58,7 @@ */ public class GlobalStreamThread extends Thread { - private final Logger log; + private static final Logger log; private final LogContext logContext; private final StreamsConfig config; private final Consumer globalConsumer; @@ -230,7 +230,7 @@ static class StateConsumer { private final Consumer globalConsumer; private final GlobalStateMaintainer stateMaintainer; private final Duration pollTime; - private final Logger log; + private static final Logger log; StateConsumer(final LogContext logContext, final Consumer globalConsumer, diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java index aeaa84f911d79..ef251752aa3e8 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java @@ -70,7 +70,7 @@ public class InternalTopicManager { "Please report at https://issues.apache.org/jira/projects/KAFKA/issues or to the dev-mailing list (https://kafka.apache.org/contact)."; private static final String INTERRUPTED_ERROR_MESSAGE = "Thread got interrupted. " + BUG_ERROR_MESSAGE; - private final Logger log; + private static final Logger log; private final Time time; private final Admin adminClient; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/PartitionGroup.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/PartitionGroup.java index ac85a17ca0ec7..42ec58117dfde 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/PartitionGroup.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/PartitionGroup.java @@ -59,7 +59,7 @@ */ class PartitionGroup extends AbstractPartitionGroup { - private final Logger logger; + private static final Logger logger; private final Map partitionQueues; private final Function lagProvider; private final Sensor enforcedProcessingSensor; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorNode.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorNode.java index eabf9e3d5c471..3f117088fbded 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorNode.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorNode.java @@ -45,7 +45,7 @@ public class ProcessorNode { - private final Logger log = LoggerFactory.getLogger(ProcessorNode.class); + private static final Logger log = LoggerFactory.getLogger(ProcessorNode.class); private final List> children; private final Map> childByName; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorTopology.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorTopology.java index b65bba4e16edf..b0fc1f6851188 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorTopology.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorTopology.java @@ -31,7 +31,7 @@ import java.util.Set; public class ProcessorTopology { - private final Logger log = LoggerFactory.getLogger(ProcessorTopology.class); + private static final Logger log = LoggerFactory.getLogger(ProcessorTopology.class); private final List> processorNodes; private final Map> sourceNodesByName; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java index 16d67666ccb22..bc20a96425d4a 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java @@ -65,7 +65,7 @@ public class RecordCollectorImpl implements RecordCollector { private static final String SEND_EXCEPTION_MESSAGE = "Error encountered sending record to topic %s for task %s due to:%n%s"; - private final Logger log; + private static final Logger log; private final TaskId taskId; private final StreamsProducer streamsProducer; private final ProductionExceptionHandler productionExceptionHandler; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordDeserializer.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordDeserializer.java index 2680c179b5453..9460bbb802fbd 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordDeserializer.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordDeserializer.java @@ -31,7 +31,7 @@ import static org.apache.kafka.streams.StreamsConfig.DEFAULT_DESERIALIZATION_EXCEPTION_HANDLER_CLASS_CONFIG; public class RecordDeserializer { - private final Logger log; + private static final Logger log; private final SourceNode sourceNode; private final Sensor droppedRecordsSensor; private final DeserializationExceptionHandler deserializationExceptionHandler; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordQueue.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordQueue.java index a3c9ea67f067d..44d37fbbe0fd5 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordQueue.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordQueue.java @@ -42,7 +42,7 @@ public class RecordQueue { public static final long UNKNOWN = ConsumerRecord.NO_TIMESTAMP; - private final Logger log; + private static final Logger log; private final SourceNode source; private final TopicPartition partition; private final ProcessorContext processorContext; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java index ff217925f9d04..4951ff5675305 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java @@ -50,7 +50,7 @@ public class RepartitionTopics { private final TopologyMetadata topologyMetadata; private final Cluster clusterMetadata; private final CopartitionedTopicsEnforcer copartitionedTopicsEnforcer; - private final Logger log; + private static final Logger log; private final Map topicPartitionInfos = new HashMap<>(); private final Map> missingInputTopicsBySubtopology = new HashMap<>(); diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTaskCreator.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTaskCreator.java index 5eb7418425712..394710a8946a8 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTaskCreator.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTaskCreator.java @@ -42,7 +42,7 @@ class StandbyTaskCreator { private final StateDirectory stateDirectory; private final ChangelogReader storeChangelogReader; private final ThreadCache dummyCache; - private final Logger log; + private static final Logger log; private final Sensor createTaskSensor; private final boolean stateUpdaterEnabled; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java index dbd25b62eb510..b9483ae3fb0f4 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java @@ -195,7 +195,7 @@ int bufferedLimitIndex() { private ChangelogReaderState state; private final Time time; - private final Logger log; + private static final Logger log; private final Duration pollTime; private final long updateOffsetIntervalMs; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java index 05c832811adc4..f7526eb62b27e 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java @@ -278,7 +278,7 @@ public boolean isStartingRunningOrPartitionAssigned() { } private final Time time; - private final Logger log; + private static final Logger log; private final String logPrefix; public final Object stateLock; private final Duration pollTime; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsMetadataState.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsMetadataState.java index 9328004a6b038..1ad4f222692cb 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsMetadataState.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsMetadataState.java @@ -54,7 +54,7 @@ * in a KafkaStreams application */ public class StreamsMetadataState { - private final Logger log; + private static final Logger log; public static final HostInfo UNKNOWN_HOST = HostInfo.unavailable(); private final TopologyMetadata topologyMetadata; private final Set globalStores; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsProducer.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsProducer.java index ccd0f415045f7..b07a2590efd3b 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsProducer.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsProducer.java @@ -68,7 +68,7 @@ * For non-EOS, the user should not call transaction related methods. */ public class StreamsProducer { - private final Logger log; + private static final Logger log; private final String logPrefix; private final Map eosV2ProducerConfigs; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsRebalanceListener.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsRebalanceListener.java index 9ee34d8398b61..ee9941293dd9d 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsRebalanceListener.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsRebalanceListener.java @@ -34,7 +34,7 @@ public class StreamsRebalanceListener implements ConsumerRebalanceListener { private final Time time; private final TaskManager taskManager; private final StreamThread streamThread; - private final Logger log; + private static final Logger log; private final AtomicInteger assignmentErrorCode; StreamsRebalanceListener(final Time time, diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadata.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadata.java index 86001ba413073..d98f907c4b785 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadata.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadata.java @@ -111,7 +111,7 @@ void clearSuccessfullyProcessed() { } private class NamedTopologyMetadata { - private final Logger log; + private static final Logger log; private final Map tasksToErrorTime = new ConcurrentHashMap<>(); public NamedTopologyMetadata(final String topologyName) { diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutor.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutor.java index e2145a94121be..3e52b1a055005 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutor.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutor.java @@ -47,7 +47,7 @@ */ public class TaskExecutor { - private final Logger log; + private static final Logger log; private final TasksRegistry tasks; private final TaskManager taskManager; private final TaskExecutionMetadata executionMetadata; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java index bde092cfe49f7..38d99e58fd57c 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java @@ -82,7 +82,7 @@ public class TaskManager { // initialize the task list // activeTasks needs to be concurrent as it can be accessed // by QueryableState - private final Logger log; + private static final Logger log; private final Time time; private final TasksRegistry tasks; private final ProcessId processId; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/Tasks.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/Tasks.java index e30333aabfb7a..c010e37898850 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/Tasks.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/Tasks.java @@ -44,7 +44,7 @@ * processed by the latter. */ class Tasks implements TasksRegistry { - private final Logger log; + private static final Logger log; // TODO: convert to Stream/StandbyTask when we remove TaskManager#StateMachineTask with mocks // note that these two maps may be accessed by concurrent threads and hence diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java index 3fc522f85b445..5c4127fde93d9 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java @@ -43,7 +43,7 @@ public final class AssignorConfiguration { private final String internalTaskAssignorClass; private final String logPrefix; - private final Logger log; + private static final Logger log; private final ReferenceContainer referenceContainer; private final StreamsConfig streamsConfig; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/CopartitionedTopicsEnforcer.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/CopartitionedTopicsEnforcer.java index 865db9e73b976..1313605b93fee 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/CopartitionedTopicsEnforcer.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/CopartitionedTopicsEnforcer.java @@ -34,7 +34,7 @@ public class CopartitionedTopicsEnforcer { private final String logPrefix; - private final Logger log; + private static final Logger log; public CopartitionedTopicsEnforcer(final String logPrefix) { this.logPrefix = logPrefix; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/KafkaStreamsNamedTopologyWrapper.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/KafkaStreamsNamedTopologyWrapper.java index 6c08c06f2aec6..f1fa0c4d1811d 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/KafkaStreamsNamedTopologyWrapper.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/KafkaStreamsNamedTopologyWrapper.java @@ -71,7 +71,7 @@ @Unstable public class KafkaStreamsNamedTopologyWrapper extends KafkaStreams { - private final Logger log; + private static final Logger log; /** * An empty Kafka Streams application that allows NamedTopologies to be added at a later point diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/RemoveNamedTopologyResult.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/RemoveNamedTopologyResult.java index 9cd52dfe59cd7..4baa535e9abcf 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/RemoveNamedTopologyResult.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/RemoveNamedTopologyResult.java @@ -69,7 +69,7 @@ public final KafkaFuture all() { } private static class ResetOffsetsFuture extends KafkaFutureImpl { - private final Logger log; + private static final Logger log; final Runnable resetOffsets; final KafkaFutureImpl removeTopologyFuture; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutor.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutor.java index 84b49d1cd13f4..b8f5a6f453cbb 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutor.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutor.java @@ -46,7 +46,7 @@ private class TaskExecutorThread extends Thread implements ProcessingThread { private final AtomicBoolean shutdownRequested = new AtomicBoolean(false); private final AtomicReference> taskReleaseRequested = new AtomicReference<>(null); - private final Logger log; + private static final Logger log; public TaskExecutorThread(final String name) { super(name); @@ -219,7 +219,7 @@ private StreamTask unassignCurrentTask() { private final String name; private final TaskManager taskManager; private final TaskExecutionMetadata taskExecutionMetadata; - private final Logger log; + private static final Logger log; private StreamTask currentTask = null; private TaskExecutorThread taskExecutorThread = null; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManager.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManager.java index 5d2db3c27925c..b3602b89bbb41 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManager.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManager.java @@ -54,7 +54,7 @@ public class DefaultTaskManager implements TaskManager { private final Time time; - private final Logger log; + private static final Logger log; private final TasksRegistry tasks; private final Lock tasksLock = new ReentrantLock(); diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java index 4f5a837c00b30..97874dcadc545 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java @@ -37,7 +37,7 @@ * record based */ public class ThreadCache { - private final Logger log; + private static final Logger log; private volatile long maxCacheSizeBytes; private final StreamsMetricsImpl metrics; private final Map caches = new HashMap<>(); diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreBuilder.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreBuilder.java index 10f75f2bd06ad..d57d5318c680c 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreBuilder.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreBuilder.java @@ -29,7 +29,7 @@ import java.util.Objects; public class WindowStoreBuilder extends AbstractStoreBuilder> { - private final Logger log = LoggerFactory.getLogger(WindowStoreBuilder.class); + private static final Logger log = LoggerFactory.getLogger(WindowStoreBuilder.class); private final WindowBytesStoreSupplier storeSupplier; diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorder.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorder.java index fd7adab1b5728..2fb855c0b3264 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorder.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorder.java @@ -85,7 +85,7 @@ public DbAndCacheAndStatistics(final RocksDB db, final Cache cache, final Statis private static final String ROCKSDB_PROPERTIES_PREFIX = "rocksdb."; - private final Logger logger; + private static final Logger logger; private Sensor bytesWrittenToDatabaseSensor; private Sensor bytesReadFromDatabaseSensor; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionOptimizingTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionOptimizingTest.java index cac44dbb5e94c..91b95b87a7fee 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionOptimizingTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionOptimizingTest.java @@ -72,7 +72,7 @@ @SuppressWarnings("deprecation") public class RepartitionOptimizingTest { - private final Logger log = LoggerFactory.getLogger(RepartitionOptimizingTest.class); + private static final Logger log = LoggerFactory.getLogger(RepartitionOptimizingTest.class); private static final String INPUT_TOPIC = "input"; private static final String COUNT_TOPIC = "outputTopic_0"; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionWithMergeOptimizingTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionWithMergeOptimizingTest.java index f6a12d6477b8e..a9287fc3e5993 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionWithMergeOptimizingTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionWithMergeOptimizingTest.java @@ -60,7 +60,7 @@ public class RepartitionWithMergeOptimizingTest { - private final Logger log = LoggerFactory.getLogger(RepartitionWithMergeOptimizingTest.class); + private static final Logger log = LoggerFactory.getLogger(RepartitionWithMergeOptimizingTest.class); private static final String INPUT_A_TOPIC = "inputA"; private static final String INPUT_B_TOPIC = "inputB"; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java index d61c530c92ed1..b195600c3925e 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java @@ -82,7 +82,7 @@ public class StreamsAssignmentScaleTest { static final long MAX_ASSIGNMENT_DURATION = 120 * 1000L; // we should stay below `max.poll.interval.ms` static final String APPLICATION_ID = "streams-assignment-scale-test"; - private final Logger log = LoggerFactory.getLogger(StreamsAssignmentScaleTest.class); + private static final Logger log = LoggerFactory.getLogger(StreamsAssignmentScaleTest.class); /* HighAvailabilityTaskAssignor tests */ diff --git a/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java b/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java index 6e216dcdbca8f..64cf3c7eb0b51 100644 --- a/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java @@ -154,7 +154,7 @@ public Consumer getConsumer(final Map config) { public static class FutureStreamsPartitionAssignor extends StreamsPartitionAssignor { private static final Map CLIENT_TAGS = mkMap(mkEntry("t1", "v1"), mkEntry("t2", "v2")); - private final Logger log = LoggerFactory.getLogger(FutureStreamsPartitionAssignor.class); + private static final Logger log = LoggerFactory.getLogger(FutureStreamsPartitionAssignor.class); private AtomicInteger usedSubscriptionMetadataVersionPeek; private AtomicLong nextScheduledRebalanceMs; diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/CoordinatorClient.java b/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/CoordinatorClient.java index 00c26adc4c4c8..a90578deb94b3 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/CoordinatorClient.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/CoordinatorClient.java @@ -76,7 +76,7 @@ * A client for the Trogdor coordinator. */ public class CoordinatorClient { - private final Logger log; + private static final Logger log; /** * The maximum number of tries to make. diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java index 529e228c38c4d..19d1d32d174d0 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java @@ -55,7 +55,7 @@ public class TimestampRecordProcessor implements RecordProcessor { private final ByteBuffer buffer; private final Histogram histogram; - private final Logger log = LoggerFactory.getLogger(TimestampRecordProcessor.class); + private static final Logger log = LoggerFactory.getLogger(TimestampRecordProcessor.class); static final float[] PERCENTILES = {0.5f, 0.95f, 0.99f}; From 00b63173cd0a2fbd80afbca85fbc97f45d84b560 Mon Sep 17 00:00:00 2001 From: Ming-Yen Chung Date: Thu, 25 Jul 2024 00:26:31 +0800 Subject: [PATCH 2/4] Make all loggers to static to avoid creating multiple logger instances --- .../org/apache/kafka/clients/ClusterConnectionStates.java | 4 ++-- .../java/org/apache/kafka/clients/FetchSessionHandler.java | 2 +- .../src/main/java/org/apache/kafka/clients/Metadata.java | 2 +- .../main/java/org/apache/kafka/clients/NetworkClient.java | 2 +- .../org/apache/kafka/clients/admin/KafkaAdminClient.java | 2 +- .../clients/admin/internals/AbortTransactionHandler.java | 2 +- .../kafka/clients/admin/internals/AdminApiDriver.java | 2 +- .../kafka/clients/admin/internals/AdminMetadataManager.java | 2 +- .../kafka/clients/admin/internals/AllBrokersStrategy.java | 2 +- .../admin/internals/AlterConsumerGroupOffsetsHandler.java | 2 +- .../kafka/clients/admin/internals/CoordinatorStrategy.java | 2 +- .../admin/internals/DeleteConsumerGroupOffsetsHandler.java | 2 +- .../admin/internals/DeleteConsumerGroupsHandler.java | 2 +- .../kafka/clients/admin/internals/DeleteRecordsHandler.java | 2 +- .../admin/internals/DescribeConsumerGroupsHandler.java | 2 +- .../clients/admin/internals/DescribeProducersHandler.java | 2 +- .../admin/internals/DescribeTransactionsHandler.java | 2 +- .../clients/admin/internals/FenceProducersHandler.java | 2 +- .../admin/internals/ListConsumerGroupOffsetsHandler.java | 2 +- .../kafka/clients/admin/internals/ListOffsetsHandler.java | 2 +- .../clients/admin/internals/ListTransactionsHandler.java | 2 +- .../clients/admin/internals/PartitionLeaderStrategy.java | 2 +- .../internals/RemoveMembersFromConsumerGroupHandler.java | 2 +- .../clients/consumer/internals/AbstractCoordinator.java | 2 +- .../kafka/clients/consumer/internals/AbstractFetch.java | 2 +- .../kafka/clients/consumer/internals/AsyncClient.java | 2 +- .../clients/consumer/internals/CommitRequestManager.java | 4 ++-- .../kafka/clients/consumer/internals/CompletedFetch.java | 2 +- .../clients/consumer/internals/ConsumerCoordinator.java | 2 +- .../clients/consumer/internals/ConsumerNetworkClient.java | 2 +- .../clients/consumer/internals/ConsumerNetworkThread.java | 2 +- .../internals/ConsumerRebalanceListenerInvoker.java | 2 +- .../consumer/internals/CoordinatorRequestManager.java | 2 +- .../kafka/clients/consumer/internals/FetchBuffer.java | 2 +- .../kafka/clients/consumer/internals/FetchCollector.java | 2 +- .../apache/kafka/clients/consumer/internals/Fetcher.java | 2 +- .../apache/kafka/clients/consumer/internals/Heartbeat.java | 2 +- .../clients/consumer/internals/HeartbeatRequestManager.java | 2 +- .../clients/consumer/internals/MembershipManagerImpl.java | 2 +- .../clients/consumer/internals/NetworkClientDelegate.java | 2 +- .../kafka/clients/consumer/internals/OffsetFetcher.java | 2 +- .../clients/consumer/internals/OffsetFetcherUtils.java | 2 +- .../clients/consumer/internals/OffsetsRequestManager.java | 2 +- .../kafka/clients/consumer/internals/RequestManagers.java | 2 +- .../kafka/clients/consumer/internals/RequestState.java | 2 +- .../clients/consumer/internals/ShareCompletedFetch.java | 2 +- .../consumer/internals/ShareConsumeRequestManager.java | 2 +- .../kafka/clients/consumer/internals/ShareFetchBuffer.java | 2 +- .../clients/consumer/internals/ShareFetchCollector.java | 2 +- .../consumer/internals/ShareHeartbeatRequestManager.java | 2 +- .../clients/consumer/internals/ShareMembershipManager.java | 2 +- .../clients/consumer/internals/ShareSessionHandler.java | 2 +- .../kafka/clients/consumer/internals/SubscriptionState.java | 2 +- .../clients/consumer/internals/TopicMetadataFetcher.java | 2 +- .../consumer/internals/TopicMetadataRequestManager.java | 2 +- .../consumer/internals/events/ApplicationEventHandler.java | 2 +- .../internals/events/ApplicationEventProcessor.java | 2 +- .../consumer/internals/events/CompletableEventReaper.java | 2 +- .../org/apache/kafka/clients/producer/KafkaProducer.java | 2 +- .../clients/producer/internals/BuiltInPartitioner.java | 2 +- .../kafka/clients/producer/internals/ProducerMetadata.java | 2 +- .../kafka/clients/producer/internals/RecordAccumulator.java | 2 +- .../org/apache/kafka/clients/producer/internals/Sender.java | 2 +- .../clients/producer/internals/TransactionManager.java | 2 +- .../kafka/clients/producer/internals/TxnPartitionMap.java | 2 +- .../java/org/apache/kafka/common/config/AbstractConfig.java | 2 +- .../kafka/common/metrics/internals/IntGaugeSuite.java | 2 +- .../org/apache/kafka/common/metrics/stats/Percentiles.java | 2 +- .../org/apache/kafka/common/network/SaslChannelBuilder.java | 2 +- .../main/java/org/apache/kafka/common/network/Selector.java | 2 +- .../org/apache/kafka/common/network/SslTransportLayer.java | 2 +- .../security/authenticator/SaslClientAuthenticator.java | 2 +- .../unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java | 2 +- .../java/org/apache/kafka/common/utils/KafkaThread.java | 2 +- .../main/java/org/apache/kafka/common/utils/LogContext.java | 2 +- .../clients/consumer/internals/FetchRequestManagerTest.java | 2 +- .../apache/kafka/connect/runtime/WorkerSinkTaskContext.java | 2 +- .../connect/runtime/distributed/DistributedHerder.java | 2 +- .../kafka/connect/runtime/distributed/EagerAssignor.java | 2 +- .../runtime/distributed/IncrementalCooperativeAssignor.java | 2 +- .../connect/runtime/distributed/WorkerCoordinator.java | 2 +- .../connect/runtime/distributed/WorkerGroupMember.java | 2 +- .../java/org/apache/kafka/connect/runtime/LoggersTest.java | 2 +- core/src/main/java/kafka/log/remote/RemoteLogManager.java | 6 +++--- .../main/java/kafka/server/logger/RuntimeLoggerManager.java | 2 +- .../kafka/coordinator/group/GroupCoordinatorService.java | 2 +- .../kafka/coordinator/group/GroupCoordinatorShard.java | 2 +- .../kafka/coordinator/group/GroupMetadataManager.java | 2 +- .../kafka/coordinator/group/OffsetMetadataManager.java | 2 +- .../kafka/coordinator/group/classic/ClassicGroup.java | 2 +- .../kafka/coordinator/group/runtime/CoordinatorRuntime.java | 2 +- .../group/runtime/MultiThreadedEventProcessor.java | 4 ++-- .../coordinator/group/runtime/SnapshottableCoordinator.java | 2 +- .../java/org/apache/kafka/controller/AclControlManager.java | 2 +- .../org/apache/kafka/controller/BrokerHeartbeatManager.java | 2 +- .../apache/kafka/controller/ClientQuotaControlManager.java | 2 +- .../org/apache/kafka/controller/ClusterControlManager.java | 2 +- .../kafka/controller/ConfigurationControlManager.java | 2 +- .../kafka/controller/DelegationTokenControlManager.java | 2 +- .../org/apache/kafka/controller/FeatureControlManager.java | 2 +- .../java/org/apache/kafka/controller/LogReplayTracker.java | 2 +- .../org/apache/kafka/controller/OffsetControlManager.java | 2 +- .../apache/kafka/controller/ProducerIdControlManager.java | 2 +- .../java/org/apache/kafka/controller/QuorumController.java | 2 +- .../apache/kafka/controller/ReplicationControlManager.java | 2 +- .../org/apache/kafka/controller/ScramControlManager.java | 2 +- .../org/apache/kafka/image/loader/MetadataBatchLoader.java | 2 +- .../java/org/apache/kafka/image/loader/MetadataLoader.java | 2 +- .../kafka/image/publisher/BrokerRegistrationTracker.java | 2 +- .../org/apache/kafka/image/publisher/SnapshotEmitter.java | 2 +- .../org/apache/kafka/image/publisher/SnapshotGenerator.java | 2 +- .../kafka/metadata/migration/KRaftMigrationDriver.java | 2 +- .../apache/kafka/metadata/publisher/FeaturesPublisher.java | 2 +- .../test/java/org/apache/kafka/metalog/LocalLogManager.java | 4 ++-- .../src/main/java/org/apache/kafka/raft/CandidateState.java | 2 +- raft/src/main/java/org/apache/kafka/raft/FollowerState.java | 2 +- .../main/java/org/apache/kafka/raft/KafkaRaftClient.java | 4 ++-- .../java/org/apache/kafka/raft/KafkaRaftClientDriver.java | 2 +- raft/src/main/java/org/apache/kafka/raft/LeaderState.java | 2 +- raft/src/main/java/org/apache/kafka/raft/QuorumState.java | 2 +- .../main/java/org/apache/kafka/raft/ReplicatedCounter.java | 2 +- raft/src/main/java/org/apache/kafka/raft/ResignedState.java | 2 +- .../main/java/org/apache/kafka/raft/UnattachedState.java | 2 +- raft/src/main/java/org/apache/kafka/raft/VotedState.java | 2 +- .../org/apache/kafka/raft/internals/AddVoterHandler.java | 2 +- .../apache/kafka/raft/internals/DefaultRequestSender.java | 2 +- .../raft/internals/KRaftControlRecordStateMachine.java | 2 +- raft/src/test/java/org/apache/kafka/raft/MockLog.java | 2 +- .../java/org/apache/kafka/deferred/DeferredEventQueue.java | 2 +- .../src/main/java/org/apache/kafka/queue/EventQueue.java | 2 +- .../main/java/org/apache/kafka/queue/KafkaEventQueue.java | 2 +- .../apache/kafka/server/network/EndpointReadyFutures.java | 2 +- .../main/java/org/apache/kafka/server/util/TopicFilter.java | 2 +- .../java/org/apache/kafka/timeline/SnapshotRegistry.java | 2 +- .../internals/checkpoint/CleanShutdownFileHandler.java | 2 +- .../kafka/storage/internals/epoch/LeaderEpochFileCache.java | 2 +- .../kafka/storage/internals/log/ProducerStateManager.java | 2 +- .../main/java/org/apache/kafka/streams/KafkaStreams.java | 2 +- .../kstream/internals/KStreamSlidingWindowAggregate.java | 2 +- .../streams/kstream/internals/KStreamWindowAggregate.java | 2 +- .../streams/kstream/internals/graph/StreamSourceNode.java | 2 +- .../streams/processor/internals/ActiveTaskCreator.java | 2 +- .../kafka/streams/processor/internals/ChangelogTopics.java | 2 +- .../streams/processor/internals/DefaultStateUpdater.java | 2 +- .../streams/processor/internals/GlobalStateManagerImpl.java | 2 +- .../streams/processor/internals/GlobalStateUpdateTask.java | 2 +- .../streams/processor/internals/GlobalStreamThread.java | 4 ++-- .../streams/processor/internals/InternalTopicManager.java | 2 +- .../kafka/streams/processor/internals/PartitionGroup.java | 2 +- .../kafka/streams/processor/internals/ProcessorNode.java | 2 +- .../streams/processor/internals/ProcessorTopology.java | 2 +- .../streams/processor/internals/RecordCollectorImpl.java | 2 +- .../streams/processor/internals/RecordDeserializer.java | 2 +- .../kafka/streams/processor/internals/RecordQueue.java | 2 +- .../streams/processor/internals/RepartitionTopics.java | 2 +- .../streams/processor/internals/StandbyTaskCreator.java | 2 +- .../streams/processor/internals/StoreChangelogReader.java | 2 +- .../kafka/streams/processor/internals/StreamThread.java | 2 +- .../streams/processor/internals/StreamsMetadataState.java | 2 +- .../kafka/streams/processor/internals/StreamsProducer.java | 2 +- .../processor/internals/StreamsRebalanceListener.java | 2 +- .../streams/processor/internals/TaskExecutionMetadata.java | 2 +- .../kafka/streams/processor/internals/TaskExecutor.java | 2 +- .../kafka/streams/processor/internals/TaskManager.java | 2 +- .../org/apache/kafka/streams/processor/internals/Tasks.java | 2 +- .../internals/assignment/AssignorConfiguration.java | 2 +- .../internals/assignment/CopartitionedTopicsEnforcer.java | 2 +- .../namedtopology/KafkaStreamsNamedTopologyWrapper.java | 2 +- .../internals/namedtopology/RemoveNamedTopologyResult.java | 2 +- .../processor/internals/tasks/DefaultTaskExecutor.java | 4 ++-- .../processor/internals/tasks/DefaultTaskManager.java | 2 +- .../apache/kafka/streams/state/internals/ThreadCache.java | 2 +- .../kafka/streams/state/internals/WindowStoreBuilder.java | 2 +- .../state/internals/metrics/RocksDBMetricsRecorder.java | 2 +- .../processor/internals/RepartitionOptimizingTest.java | 2 +- .../internals/RepartitionWithMergeOptimizingTest.java | 2 +- .../processor/internals/StreamsAssignmentScaleTest.java | 2 +- .../org/apache/kafka/streams/tests/StreamsUpgradeTest.java | 2 +- .../apache/kafka/trogdor/coordinator/CoordinatorClient.java | 2 +- .../kafka/trogdor/workload/TimestampRecordProcessor.java | 2 +- 180 files changed, 189 insertions(+), 189 deletions(-) diff --git a/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java b/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java index 0f2fdff475c7a..372f4acd983f4 100644 --- a/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java +++ b/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java @@ -42,7 +42,7 @@ final class ClusterConnectionStates { static final int CONNECTION_SETUP_TIMEOUT_EXP_BASE = 2; static final double CONNECTION_SETUP_TIMEOUT_JITTER = 0.2; private final Map nodeState; - private final Logger log; + private static final Logger log; private final HostResolver hostResolver; private final Set connectingNodes; private final ExponentialBackoff reconnectBackoff; @@ -466,7 +466,7 @@ public List nodesWithConnectionSetupTimeout(long now) { private static class NodeConnectionState { private final String host; private final HostResolver hostResolver; - private final Logger log; + private static final Logger log; ConnectionState state; AuthenticationException authenticationException; diff --git a/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java b/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java index 101dce5ab06fb..f2bf805d235d1 100644 --- a/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java @@ -58,7 +58,7 @@ * class on the receiving broker side is FetchManager. */ public class FetchSessionHandler { - private final Logger log; + private static final Logger log; private final int node; diff --git a/clients/src/main/java/org/apache/kafka/clients/Metadata.java b/clients/src/main/java/org/apache/kafka/clients/Metadata.java index 5f2a412550a88..ee8b20042626d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/Metadata.java +++ b/clients/src/main/java/org/apache/kafka/clients/Metadata.java @@ -65,7 +65,7 @@ * manage topics while producers rely on topic expiry to limit the refresh set. */ public class Metadata implements Closeable { - private final Logger log; + private static final Logger log; private final ExponentialBackoff refreshBackoff; private final long metadataExpireMs; private int updateVersion; // bumped on every metadata response diff --git a/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java b/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java index 4f0b3d11d7937..443926f5f6aec 100644 --- a/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java @@ -82,7 +82,7 @@ private enum State { CLOSED } - private final Logger log; + private static final Logger log; /* the selector used to perform network i/o */ private final Selectable selector; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java b/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java index 640a08a3786a7..5201c258272f8 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java @@ -336,7 +336,7 @@ public class KafkaAdminClient extends AdminClient { */ static final String NETWORK_THREAD_PREFIX = "kafka-admin-client-thread"; - private final Logger log; + private static final Logger log; private final LogContext logContext; /** diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java index 0f5f4781080b2..0fcfbfe62e9cf 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java @@ -40,7 +40,7 @@ import static java.util.Collections.singletonList; public class AbortTransactionHandler extends AdminApiHandler.Batched { - private final Logger log; + private static final Logger log; private final AbortTransactionSpec abortSpec; private final PartitionLeaderStrategy lookupStrategy; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java index 92e724e74f5b9..8935e18a28683 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java @@ -83,7 +83,7 @@ * when the key type is a consumer `GroupId`) */ public class AdminApiDriver { - private final Logger log; + private static final Logger log; private final ExponentialBackoff retryBackoff; private final long deadlineMs; private final AdminApiHandler handler; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java index 90b237aa749eb..3082550a9ce51 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java @@ -43,7 +43,7 @@ * service thread (which also uses the NetworkClient). */ public class AdminMetadataManager { - private final Logger log; + private static final Logger log; /** * The minimum amount of time that we should wait between subsequent diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java index 433d25e8e54ca..1109402e66226 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java @@ -52,7 +52,7 @@ public class AllBrokersStrategy implements AdminApiLookupStrategy offsets; - private final Logger log; + private static final Logger log; private final AdminApiLookupStrategy lookupStrategy; public AlterConsumerGroupOffsetsHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java index 46cba73e75a18..2a5532c16c048 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java @@ -41,7 +41,7 @@ public class CoordinatorStrategy implements AdminApiLookupStrategy unrepresentableKeys = Collections.emptySet(); diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java index ebafe634db627..2538ba9d2986f 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java @@ -43,7 +43,7 @@ public class DeleteConsumerGroupOffsetsHandler extends AdminApiHandler.Batched partitions; - private final Logger log; + private static final Logger log; private final AdminApiLookupStrategy lookupStrategy; public DeleteConsumerGroupOffsetsHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java index 0d581243ddc7b..fa6a7c157d243 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java @@ -39,7 +39,7 @@ public class DeleteConsumerGroupsHandler extends AdminApiHandler.Batched { - private final Logger log; + private static final Logger log; private final AdminApiLookupStrategy lookupStrategy; public DeleteConsumerGroupsHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java index 836f2bc2a5910..fb6a5fac7443e 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java @@ -47,7 +47,7 @@ public final class DeleteRecordsHandler extends Batched { private final Map recordsToDelete; - private final Logger log; + private static final Logger log; private final AdminApiLookupStrategy lookupStrategy; private final int timeout; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java index a2531db90ae5e..6b1f978e2d3bb 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java @@ -61,7 +61,7 @@ public class DescribeConsumerGroupsHandler implements AdminApiHandler { private final boolean includeAuthorizedOperations; - private final Logger log; + private static final Logger log; private final AdminApiLookupStrategy lookupStrategy; private final Set useClassicGroupApi; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java index e4b203545bdae..4804fb269f7ee 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java @@ -48,7 +48,7 @@ import java.util.stream.Collectors; public class DescribeProducersHandler extends AdminApiHandler.Batched { - private final Logger log; + private static final Logger log; private final DescribeProducersOptions options; private final AdminApiLookupStrategy lookupStrategy; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java index b68521bd0005a..49cf26cc3e60d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java @@ -45,7 +45,7 @@ import java.util.stream.Collectors; public class DescribeTransactionsHandler extends AdminApiHandler.Batched { - private final Logger log; + private static final Logger log; private final AdminApiLookupStrategy lookupStrategy; public DescribeTransactionsHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java index f2dea06c7b3af..b1fa89d0b6a55 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java @@ -38,7 +38,7 @@ import java.util.stream.Collectors; public class FenceProducersHandler extends AdminApiHandler.Unbatched { - private final Logger log; + private static final Logger log; private final AdminApiLookupStrategy lookupStrategy; private final int txnTimeoutMs; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java index 4c0e3db925404..e22050fa89788 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java @@ -43,7 +43,7 @@ public class ListConsumerGroupOffsetsHandler implements AdminApiHandler groupSpecs; - private final Logger log; + private static final Logger log; private final CoordinatorStrategy lookupStrategy; public ListConsumerGroupOffsetsHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java index 0bb42ed7696e2..4e277858a4f68 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java @@ -52,7 +52,7 @@ public final class ListOffsetsHandler extends Batched offsetTimestampsByPartition; private final ListOffsetsOptions options; - private final Logger log; + private static final Logger log; private final AdminApiLookupStrategy lookupStrategy; public ListOffsetsHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java index 56318fc0acc04..7cfbb5c79a0c2 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java @@ -37,7 +37,7 @@ import java.util.stream.Collectors; public class ListTransactionsHandler extends AdminApiHandler.Batched> { - private final Logger log; + private static final Logger log; private final ListTransactionsOptions options; private final AllBrokersStrategy lookupStrategy; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java index 9d52327b3c4f4..54b829e95f74a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java @@ -42,7 +42,7 @@ public class PartitionLeaderStrategy implements AdminApiLookupStrategy members; - private final Logger log; + private static final Logger log; private final AdminApiLookupStrategy lookupStrategy; public RemoveMembersFromConsumerGroupHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java index f177dad62b97c..a9fd628b0ba7a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java @@ -130,7 +130,7 @@ public boolean hasNotJoinedGroup() { } } - private final Logger log; + private static final Logger log; private final Heartbeat heartbeat; private final GroupCoordinatorMetrics sensors; private final GroupRebalanceConfig rebalanceConfig; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java index 8f5691d17c005..084d710e28638 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java @@ -60,7 +60,7 @@ */ public abstract class AbstractFetch implements Closeable { - private final Logger log; + private static final Logger log; private final IdempotentCloser idempotentCloser = new IdempotentCloser(); protected final LogContext logContext; protected final ConsumerMetadata metadata; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java index d4265e72c04ab..43405e358cf62 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java @@ -26,7 +26,7 @@ public abstract class AsyncClient { - private final Logger log; + private static final Logger log; private final ConsumerNetworkClient client; AsyncClient(ConsumerNetworkClient client, LogContext logContext) { diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java index 814250e09491a..95626445df9f5 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java @@ -73,7 +73,7 @@ public class CommitRequestManager implements RequestManager, MemberStateListener private final Time time; private final SubscriptionState subscriptions; private final LogContext logContext; - private final Logger log; + private static final Logger log; private final Optional autoCommitState; private final CoordinatorRequestManager coordinatorRequestManager; private final OffsetCommitCallbackInvoker offsetCommitCallbackInvoker; @@ -1252,7 +1252,7 @@ private static class AutoCommitState { private final long autoCommitInterval; private boolean hasInflightCommit; - private final Logger log; + private static final Logger log; public AutoCommitState( final Time time, diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java index 2cba76588e5f0..2553f96f08a06 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java @@ -63,7 +63,7 @@ public class CompletedFetch { final FetchResponseData.PartitionData partitionData; final short requestVersion; - private final Logger log; + private static final Logger log; private final SubscriptionState subscriptions; private final BufferSupplier decompressionBufferSupplier; private final Iterator batches; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java index 785df2362ab9e..92ef07ab47c9c 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java @@ -100,7 +100,7 @@ public final class ConsumerCoordinator extends AbstractCoordinator { private static final TopicPartitionComparator COMPARATOR = new TopicPartitionComparator(); private final GroupRebalanceConfig rebalanceConfig; - private final Logger log; + private static final Logger log; private final List assignors; private final ConsumerMetadata metadata; private final ConsumerCoordinatorMetrics coordinatorMetrics; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java index 1f07bbcaa2f9a..4f1d7e9a1e637 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java @@ -58,7 +58,7 @@ public class ConsumerNetworkClient implements Closeable { // the mutable state of this class is protected by the object's monitor (excluding the wakeup // flag and the request completion queue below). - private final Logger log; + private static final Logger log; private final KafkaClient client; private final UnsentRequests unsent = new UnsentRequests(); private final Metadata metadata; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java index a91ea11d2f332..86a2a7fe7e1ca 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java @@ -54,7 +54,7 @@ public class ConsumerNetworkThread extends KafkaThread implements Closeable { static final long MAX_POLL_TIMEOUT_MS = 5000; private static final String BACKGROUND_THREAD_NAME = "consumer_background_thread"; private final Time time; - private final Logger log; + private static final Logger log; private final BlockingQueue applicationEventQueue; private final CompletableEventReaper applicationEventReaper; private final Supplier applicationEventProcessorSupplier; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java index b42cf85a8602a..132fff7804ece 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java @@ -39,7 +39,7 @@ */ public class ConsumerRebalanceListenerInvoker { - private final Logger log; + private static final Logger log; private final SubscriptionState subscriptions; private final Time time; private final RebalanceCallbackMetricsManager metricsManager; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java index 5144b41f574aa..552e62cac4ffd 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java @@ -51,7 +51,7 @@ */ public class CoordinatorRequestManager implements RequestManager { private static final long COORDINATOR_DISCONNECT_LOGGING_INTERVAL_MS = 60 * 1000; - private final Logger log; + private static final Logger log; private final BackgroundEventHandler backgroundEventHandler; private final String groupId; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java index 23adf9c9afaaa..d35fe5a14a924 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java @@ -48,7 +48,7 @@ */ public class FetchBuffer implements AutoCloseable { - private final Logger log; + private static final Logger log; private final ConcurrentLinkedQueue completedFetches; private final Lock lock; private final Condition notEmptyCondition; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java index 5dfa31248e34c..96aeafe1ff771 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java @@ -52,7 +52,7 @@ */ public class FetchCollector { - private final Logger log; + private static final Logger log; private final ConsumerMetadata metadata; private final SubscriptionState subscriptions; private final FetchConfig fetchConfig; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java index 745bbfde99289..bb4fd9365b1f3 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java @@ -58,7 +58,7 @@ */ public class Fetcher extends AbstractFetch { - private final Logger log; + private static final Logger log; private final ConsumerNetworkClient client; private final FetchCollector fetchCollector; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Heartbeat.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Heartbeat.java index 20852dfe55e8a..835a840288bfc 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Heartbeat.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Heartbeat.java @@ -35,7 +35,7 @@ public final class Heartbeat { private final Timer heartbeatTimer; private final Timer sessionTimer; private final Timer pollTimer; - private final Logger log; + private static final Logger log; private final ExponentialBackoff retryBackoff; private volatile long lastHeartbeatSend = 0L; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManager.java index 8a62051b2f42e..388c9cd4aeaf5 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManager.java @@ -74,7 +74,7 @@ */ public class HeartbeatRequestManager implements RequestManager { - private final Logger logger; + private static final Logger logger; /** * Time that the group coordinator will wait on member to revoke its partitions. This is provided by the group diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImpl.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImpl.java index a0e3a06d0087f..70085495877b5 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImpl.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImpl.java @@ -194,7 +194,7 @@ public class MembershipManagerImpl implements MembershipManager { /** * Logger. */ - private final Logger log; + private static final Logger log; /** * Manager to perform commit requests needed before revoking partitions (if auto-commit is diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java index 56e4d6977480a..17198bd662dcd 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java @@ -65,7 +65,7 @@ public class NetworkClientDelegate implements AutoCloseable { private final BackgroundEventHandler backgroundEventHandler; private final Metadata metadata; private final Time time; - private final Logger log; + private static final Logger log; private final int requestTimeoutMs; private final Queue unsentRequests; private final long retryBackoffMs; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java index f624941c525c1..ce8bdb316f1cc 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java @@ -61,7 +61,7 @@ */ public class OffsetFetcher { - private final Logger log; + private static final Logger log; private final ConsumerMetadata metadata; private final SubscriptionState subscriptions; private final ConsumerNetworkClient client; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java index f504c57b4aecc..889a610d1a3b2 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java @@ -64,7 +64,7 @@ class OffsetFetcherUtils { private final Time time; private final long retryBackoffMs; private final ApiVersions apiVersions; - private final Logger log; + private static final Logger log; /** * Exception that occurred while validating positions, that will be propagated on the next diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java index b4f637141287d..05d292de97c6a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java @@ -76,7 +76,7 @@ public class OffsetsRequestManager implements RequestManager, ClusterResourceLis private final ConsumerMetadata metadata; private final IsolationLevel isolationLevel; - private final Logger log; + private static final Logger log; private final OffsetFetcherUtils offsetFetcherUtils; private final SubscriptionState subscriptionState; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java index 618c5e3d4d5f2..e118aa76ecbf0 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java @@ -45,7 +45,7 @@ */ public class RequestManagers implements Closeable { - private final Logger log; + private static final Logger log; public final Optional coordinatorRequestManager; public final Optional commitRequestManager; public final Optional heartbeatRequestManager; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java index b509f675fc858..4a6acca9d08d7 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java @@ -23,7 +23,7 @@ class RequestState { - private final Logger log; + private static final Logger log; protected final String owner; static final int RETRY_BACKOFF_EXP_BASE = 2; static final double RETRY_BACKOFF_JITTER = 0.2; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java index 51c5e5ee45317..5ec3c03f0c974 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java @@ -60,7 +60,7 @@ public class ShareCompletedFetch { final ShareFetchResponseData.PartitionData partitionData; final short requestVersion; - private final Logger log; + private static final Logger log; private final BufferSupplier decompressionBufferSupplier; private final Iterator batches; private int recordsRead; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java index 7427edbb88069..4f7dba2dde2aa 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java @@ -69,7 +69,7 @@ @SuppressWarnings("NPathComplexity") public class ShareConsumeRequestManager implements RequestManager, MemberStateListener, Closeable { private final Time time; - private final Logger log; + private static final Logger log; private final LogContext logContext; private final String groupId; private final ConsumerMetadata metadata; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchBuffer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchBuffer.java index ebd86583ec6f8..623cfeb06b976 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchBuffer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchBuffer.java @@ -44,7 +44,7 @@ */ public class ShareFetchBuffer implements AutoCloseable { - private final Logger log; + private static final Logger log; private final ConcurrentLinkedQueue completedFetches; private final Lock lock; private final Condition notEmptyCondition; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollector.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollector.java index 3d073fa92eb82..362da2b7bdb0d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollector.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollector.java @@ -41,7 +41,7 @@ */ public class ShareFetchCollector { - private final Logger log; + private static final Logger log; private final ConsumerMetadata metadata; private final SubscriptionState subscriptions; private final FetchConfig fetchConfig; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManager.java index b68b59298f477..ea5268e4cb36c 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManager.java @@ -68,7 +68,7 @@ */ public class ShareHeartbeatRequestManager implements RequestManager { - private final Logger logger; + private static final Logger logger; /** * Time that the group coordinator will wait on member to revoke its partitions. This is provided by the group diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManager.java index 46b17f29db6dd..7f49da5bfedb1 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManager.java @@ -93,7 +93,7 @@ public class ShareMembershipManager implements RequestManager { /** * Logger. */ - private final Logger log; + private static final Logger log; /** * TopicPartition comparator based on topic name and partition id. diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandler.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandler.java index 3aa97f6c780d1..6f18c5457fc32 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandler.java @@ -54,7 +54,7 @@ * which partitions need to be included in each ShareFetch/ShareAcknowledge request. */ public class ShareSessionHandler { - private final Logger log; + private static final Logger log; private final int node; private final Uuid memberId; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java index bc7d20d11e0d3..17e665c098f50 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java @@ -75,7 +75,7 @@ public class SubscriptionState { private static final String SUBSCRIPTION_EXCEPTION_MESSAGE = "Subscription to topics, partitions and pattern are mutually exclusive"; - private final Logger log; + private static final Logger log; private enum SubscriptionType { NONE, AUTO_TOPICS, AUTO_PATTERN, USER_ASSIGNED, AUTO_TOPICS_SHARE diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java index f86457891e2cf..f29818c9f889b 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java @@ -47,7 +47,7 @@ */ public class TopicMetadataFetcher { - private final Logger log; + private static final Logger log; private final ConsumerNetworkClient client; private final ExponentialBackoff retryBackoff; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java index 2d9cab0dd9686..e83ee74b9f2df 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java @@ -68,7 +68,7 @@ public class TopicMetadataRequestManager implements RequestManager { private final List inflightRequests; private final long retryBackoffMs; private final long retryBackoffMaxMs; - private final Logger log; + private static final Logger log; private final LogContext logContext; public TopicMetadataRequestManager(final LogContext context, final Time time, final ConsumerConfig config) { diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java index d8fc13830f716..347e157a5626d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java @@ -40,7 +40,7 @@ */ public class ApplicationEventHandler implements Closeable { - private final Logger log; + private static final Logger log; private final BlockingQueue applicationEventQueue; private final ConsumerNetworkThread networkThread; private final IdempotentCloser closer = new IdempotentCloser(); diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java index e0c6911f6792f..ae0ee53c113a2 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java @@ -48,7 +48,7 @@ */ public class ApplicationEventProcessor implements EventProcessor { - private final Logger log; + private static final Logger log; private final ConsumerMetadata metadata; private final SubscriptionState subscriptions; private final RequestManagers requestManagers; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java index 9f91617c73579..22a8ac6956637 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java @@ -38,7 +38,7 @@ */ public class CompletableEventReaper { - private final Logger log; + private static final Logger log; /** * List of tracked events that are candidates for expiration. diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java b/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java index e71f1d5755351..b684f4d7373c4 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java @@ -237,7 +237,7 @@ */ public class KafkaProducer implements Producer { - private final Logger log; + private static final Logger log; private static final String JMX_PREFIX = "kafka.producer"; public static final String NETWORK_THREAD_PREFIX = "kafka-producer-network-thread"; public static final String PRODUCER_METRIC_GROUP_NAME = "producer-metrics"; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java index 98386324f7bda..8396619155f20 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java @@ -37,7 +37,7 @@ * (described in detail in KIP-794). There is one partitioner object per topic. */ public class BuiltInPartitioner { - private final Logger log; + private static final Logger log; private final String topic; private final int stickyBatchSize; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java index 0c77ef5fc4c69..c512ac1ae08cb 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java @@ -41,7 +41,7 @@ public class ProducerMetadata extends Metadata { /* Topics with expiry time */ private final Map topics = new HashMap<>(); private final Set newTopics = new HashSet<>(); - private final Logger log; + private static final Logger log; private final Time time; private Map errors = null; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java index ec50dc9bc26d1..b9214aad00815 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java @@ -70,7 +70,7 @@ public class RecordAccumulator { private final LogContext logContext; - private final Logger log; + private static final Logger log; private volatile boolean closed; private final AtomicInteger flushesInProgress; private final AtomicInteger appendsInProgress; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java index 39f5616465154..e9d1880db8432 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java @@ -79,7 +79,7 @@ */ public class Sender implements Runnable { - private final Logger log; + private static final Logger log; /* the state of each nodes connection */ private final KafkaClient client; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java index 10239be6d9812..c00b60a4f64ab 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java @@ -92,7 +92,7 @@ public class TransactionManager { private static final int NO_INFLIGHT_REQUEST_CORRELATION_ID = -1; - private final Logger log; + private static final Logger log; private final String transactionalId; private final int transactionTimeoutMs; private final ApiVersions apiVersions; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java index 05a0fa3fbbc30..6430defe12f34 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java @@ -31,7 +31,7 @@ class TxnPartitionMap { - private final Logger log; + private static final Logger log; private final Map topicPartitions = new HashMap<>(); diff --git a/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java b/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java index 247bab18d5565..8653930f6dba3 100644 --- a/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java +++ b/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java @@ -45,7 +45,7 @@ */ public class AbstractConfig { - private final Logger log = LoggerFactory.getLogger(getClass()); + private static final Logger log = LoggerFactory.getLogger(getClass()); /** * Configs for which values have been requested, used to detect unused configs. diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/internals/IntGaugeSuite.java b/clients/src/main/java/org/apache/kafka/common/metrics/internals/IntGaugeSuite.java index 61ff49b0adfcc..2415bbd671147 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/internals/IntGaugeSuite.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/internals/IntGaugeSuite.java @@ -41,7 +41,7 @@ public final class IntGaugeSuite implements AutoCloseable { /** * The log4j logger. */ - private final Logger log; + private static final Logger log; /** * The name of this suite. diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java index c7c882496bf8e..5cb1da4f65376 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java @@ -33,7 +33,7 @@ */ public class Percentiles extends SampledStat implements CompoundStat { - private final Logger log = LoggerFactory.getLogger(Percentiles.class); + private static final Logger log = LoggerFactory.getLogger(Percentiles.class); public enum BucketSizing { CONSTANT, LINEAR diff --git a/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java b/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java index 4c73e4e3e4c94..e3b894293761c 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java +++ b/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java @@ -96,7 +96,7 @@ public class SaslChannelBuilder implements ChannelBuilder, ListenerReconfigurabl private final Map connectionsMaxReauthMsByMechanism; private final Time time; private final LogContext logContext; - private final Logger log; + private static final Logger log; private SslFactory sslFactory; private Map configs; diff --git a/clients/src/main/java/org/apache/kafka/common/network/Selector.java b/clients/src/main/java/org/apache/kafka/common/network/Selector.java index 68698ab7b8d21..9c861fd9c5dbd 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/Selector.java +++ b/clients/src/main/java/org/apache/kafka/common/network/Selector.java @@ -102,7 +102,7 @@ private enum CloseMode { } } - private final Logger log; + private static final Logger log; private final java.nio.channels.Selector nioSelector; private final Map channels; private final Set explicitlyMutedChannels; diff --git a/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java b/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java index d047c79ce8a1c..64cbe642e79e8 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java +++ b/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java @@ -79,7 +79,7 @@ private enum State { private final SelectionKey key; private final SocketChannel socketChannel; private final ChannelMetadataRegistry metadataRegistry; - private final Logger log; + private static final Logger log; private HandshakeStatus handshakeStatus; private SSLEngineResult handshakeResult; diff --git a/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java b/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java index a327c4b6c1b59..6f8c750855c5e 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java +++ b/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java @@ -149,7 +149,7 @@ public static boolean isReserved(int correlationId) { private final String clientPrincipalName; private final AuthenticateCallbackHandler callbackHandler; private final Time time; - private final Logger log; + private static final Logger log; private final ReauthInfo reauthInfo; // buffers used in `authenticate` diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java index daae977d72729..2241eb50fdc07 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java @@ -99,7 +99,7 @@ * broker configuration property. */ public class OAuthBearerUnsecuredLoginCallbackHandler implements AuthenticateCallbackHandler { - private final Logger log = LoggerFactory.getLogger(OAuthBearerUnsecuredLoginCallbackHandler.class); + private static final Logger log = LoggerFactory.getLogger(OAuthBearerUnsecuredLoginCallbackHandler.class); private static final String OPTION_PREFIX = "unsecuredLogin"; private static final String PRINCIPAL_CLAIM_NAME_OPTION = OPTION_PREFIX + "PrincipalClaimName"; private static final String LIFETIME_SECONDS_OPTION = OPTION_PREFIX + "LifetimeSeconds"; diff --git a/clients/src/main/java/org/apache/kafka/common/utils/KafkaThread.java b/clients/src/main/java/org/apache/kafka/common/utils/KafkaThread.java index 2f5e15f46349e..897ed8eed8670 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/KafkaThread.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/KafkaThread.java @@ -24,7 +24,7 @@ */ public class KafkaThread extends Thread { - private final Logger log = LoggerFactory.getLogger(getClass()); + private static final Logger log = LoggerFactory.getLogger(getClass()); public static KafkaThread daemon(final String name, Runnable runnable) { return new KafkaThread(name, runnable, true); diff --git a/clients/src/main/java/org/apache/kafka/common/utils/LogContext.java b/clients/src/main/java/org/apache/kafka/common/utils/LogContext.java index 10acf32ccd47f..0b0ad1208a469 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/LogContext.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/LogContext.java @@ -436,7 +436,7 @@ private void writeLog(Marker marker, int level, String format, Object[] args, Th } private static class LocationIgnorantKafkaLogger extends AbstractKafkaLogger { - private final Logger logger; + private static final Logger logger; LocationIgnorantKafkaLogger(String logPrefix, Logger logger) { super(logPrefix); diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java index ce242e4bc74d5..79acda8429593 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java @@ -3673,7 +3673,7 @@ private void clearBufferedDataForUnassignedPartitions(Set partit private class TestableNetworkClientDelegate extends NetworkClientDelegate { - private final Logger log = LoggerFactory.getLogger(NetworkClientDelegate.class); + private static final Logger log = LoggerFactory.getLogger(NetworkClientDelegate.class); private final ConcurrentLinkedQueue pendingDisconnects = new ConcurrentLinkedQueue<>(); public TestableNetworkClientDelegate(Time time, diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerSinkTaskContext.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerSinkTaskContext.java index 3baf4772b5bda..66fd8a80d3a20 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerSinkTaskContext.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerSinkTaskContext.java @@ -35,7 +35,7 @@ public class WorkerSinkTaskContext implements SinkTaskContext { - private final Logger log = LoggerFactory.getLogger(getClass()); + private static final Logger log = LoggerFactory.getLogger(getClass()); private final Map offsets; private final Consumer consumer; private final WorkerSinkTask sinkTask; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java index 174adea8cdd6c..0e8c36c6dcef9 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java @@ -153,7 +153,7 @@ *

*/ public class DistributedHerder extends AbstractHerder implements Runnable { - private final Logger log; + private static final Logger log; private static final long FORWARD_REQUEST_SHUTDOWN_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(10); private static final long START_AND_STOP_SHUTDOWN_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(1); diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/EagerAssignor.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/EagerAssignor.java index 0663d9e571052..cbe4d4deae5cb 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/EagerAssignor.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/EagerAssignor.java @@ -45,7 +45,7 @@ * Note that this class is NOT thread-safe. */ public class EagerAssignor implements ConnectAssignor { - private final Logger log; + private static final Logger log; public EagerAssignor(LogContext logContext) { this.log = logContext.logger(EagerAssignor.class); diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignor.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignor.java index 676ae78753002..d589dde1f5d71 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignor.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignor.java @@ -62,7 +62,7 @@ * */ public class IncrementalCooperativeAssignor implements ConnectAssignor { - private final Logger log; + private static final Logger log; private final Time time; private final int maxDelay; private ConnectorsAndTasks previousAssignment; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinator.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinator.java index 138bf9fc51473..28d1417027535 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinator.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinator.java @@ -56,7 +56,7 @@ * to workers. */ public class WorkerCoordinator extends AbstractCoordinator implements Closeable { - private final Logger log; + private static final Logger log; private final String restUrl; private final ConfigBackingStore configStorage; private volatile ExtendedAssignment assignmentSnapshot; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMember.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMember.java index f4fdcaf801edc..fdf74f857b4a8 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMember.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMember.java @@ -63,7 +63,7 @@ public class WorkerGroupMember { private static final String JMX_PREFIX = "kafka.connect"; - private final Logger log; + private static final Logger log; private final String clientId; private final ConsumerNetworkClient client; private final Metrics metrics; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/LoggersTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/LoggersTest.java index 3dbe688a076a2..a955db08faf3f 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/LoggersTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/LoggersTest.java @@ -214,7 +214,7 @@ public void testSetLevelNullArguments() { private class TestLoggers extends Loggers { - private final Logger rootLogger; + private static final Logger rootLogger; private final Map currentLoggers; public TestLoggers(Logger rootLogger, Logger... knownLoggers) { diff --git a/core/src/main/java/kafka/log/remote/RemoteLogManager.java b/core/src/main/java/kafka/log/remote/RemoteLogManager.java index f3f0ccc11ad2d..eb1f99aea0bef 100644 --- a/core/src/main/java/kafka/log/remote/RemoteLogManager.java +++ b/core/src/main/java/kafka/log/remote/RemoteLogManager.java @@ -705,7 +705,7 @@ RLMTask rlmCopyTask(TopicIdPartition topicIdPartition) { abstract class RLMTask extends CancellableRunnable { protected final TopicIdPartition topicIdPartition; - private final Logger logger; + private static final Logger logger; public RLMTask(TopicIdPartition topicIdPartition) { this.topicIdPartition = topicIdPartition; @@ -750,7 +750,7 @@ public String toString() { class RLMCopyTask extends RLMTask { private final int customMetadataSizeLimit; - private final Logger logger; + private static final Logger logger; // The copied and log-start offset is empty initially for a new RLMCopyTask, and needs to be fetched inside // the task's run() method. @@ -992,7 +992,7 @@ private Path toPathIfExists(File file) { } class RLMExpirationTask extends RLMTask { - private final Logger logger; + private static final Logger logger; public RLMExpirationTask(TopicIdPartition topicIdPartition) { super(topicIdPartition); diff --git a/core/src/main/java/kafka/server/logger/RuntimeLoggerManager.java b/core/src/main/java/kafka/server/logger/RuntimeLoggerManager.java index 14d1b72c10942..0d052e9d7e809 100644 --- a/core/src/main/java/kafka/server/logger/RuntimeLoggerManager.java +++ b/core/src/main/java/kafka/server/logger/RuntimeLoggerManager.java @@ -48,7 +48,7 @@ public class RuntimeLoggerManager { } private final int nodeId; - private final Logger log; + private static final Logger log; public RuntimeLoggerManager(int nodeId, Logger log) { this.nodeId = nodeId; diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java index e132e85ec21c6..b820d7e6ca6d3 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java @@ -206,7 +206,7 @@ public GroupCoordinatorService build() { /** * The logger. */ - private final Logger log; + private static final Logger log; /** * The group coordinator configurations. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorShard.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorShard.java index c633a4bddd642..a6066717221a6 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorShard.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorShard.java @@ -234,7 +234,7 @@ public GroupCoordinatorShard build() { /** * The logger. */ - private final Logger log; + private static final Logger log; /** * The group metadata manager. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java index ff96a98f28ce5..805b3e44be59b 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java @@ -357,7 +357,7 @@ GroupMetadataManager build() { /** * The logger. */ - private final Logger log; + private static final Logger log; /** * The snapshot registry. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java index dad69db30b97a..5777bc069b37b 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java @@ -155,7 +155,7 @@ public OffsetMetadataManager build() { /** * The logger. */ - private final Logger log; + private static final Logger log; /** * The snapshot registry. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/classic/ClassicGroup.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/classic/ClassicGroup.java index ad75634cf497d..d701e73d11425 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/classic/ClassicGroup.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/classic/ClassicGroup.java @@ -91,7 +91,7 @@ public class ClassicGroup implements Group { /** * The slf4j logger. */ - private final Logger log; + private static final Logger log; /** * The group id. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntime.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntime.java index 82d18343deb0f..5546122ff467d 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntime.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntime.java @@ -1790,7 +1790,7 @@ public void onHighWatermarkUpdated( /** * The logger. */ - private final Logger log; + private static final Logger log; /** * The system time. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/MultiThreadedEventProcessor.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/MultiThreadedEventProcessor.java index fa1f734c1c70c..61734da075cef 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/MultiThreadedEventProcessor.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/MultiThreadedEventProcessor.java @@ -44,7 +44,7 @@ public class MultiThreadedEventProcessor implements CoordinatorEventProcessor { /** * The logger. */ - private final Logger log; + private static final Logger log; /** * The accumulator. @@ -118,7 +118,7 @@ public MultiThreadedEventProcessor( * accumulator and runs them. */ private class EventProcessorThread extends Thread { - private final Logger log; + private static final Logger log; EventProcessorThread( String name diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/SnapshottableCoordinator.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/SnapshottableCoordinator.java index b7f74748c4597..4df71ce20ce73 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/SnapshottableCoordinator.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/SnapshottableCoordinator.java @@ -34,7 +34,7 @@ class SnapshottableCoordinator, U> implements Coor /** * The logger. */ - private final Logger log; + private static final Logger log; /** * The snapshot registry backing the coordinator. diff --git a/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java index d7c5dd1a3e585..62a8108203910 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java @@ -79,7 +79,7 @@ AclControlManager build() { } } - private final Logger log; + private static final Logger log; private final TimelineHashMap idToAcl; private final TimelineHashSet existingAcls; diff --git a/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java b/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java index e1734c52fbc37..4e2493f1f943c 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java @@ -224,7 +224,7 @@ public BrokerHeartbeatState next() { } } - private final Logger log; + private static final Logger log; /** * The Kafka clock object to use. diff --git a/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java index 64b8a41f5c4d5..0c572a635ce05 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java @@ -72,7 +72,7 @@ ClientQuotaControlManager build() { } } - private final Logger log; + private static final Logger log; private final SnapshotRegistry snapshotRegistry; diff --git a/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java index 7f77455abcc52..58719fb1fb5bd 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java @@ -208,7 +208,7 @@ boolean check() { /** * The SLF4J log object. */ - private final Logger log; + private static final Logger log; /** * The Kafka clock object to use. diff --git a/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java index 4ea7d9757d987..c790770990455 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java @@ -57,7 +57,7 @@ public class ConfigurationControlManager { public static final ConfigResource DEFAULT_NODE = new ConfigResource(Type.BROKER, ""); - private final Logger log; + private static final Logger log; private final SnapshotRegistry snapshotRegistry; private final KafkaConfigSchema configSchema; private final Consumer existenceChecker; diff --git a/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java index fa50570a48f79..f344f178f205c 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java @@ -104,7 +104,7 @@ DelegationTokenControlManager build() { } } - private final Logger log; + private static final Logger log; private final DelegationTokenCache tokenCache; private final String tokenSecretKeyString; private final long tokenDefaultMaxLifetimeMs; diff --git a/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java index 4d7f2b862fbf5..cca3ea35945b5 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java @@ -120,7 +120,7 @@ public FeatureControlManager build() { } } - private final Logger log; + private static final Logger log; /** * An immutable map containing the features supported by this controller's software. diff --git a/metadata/src/main/java/org/apache/kafka/controller/LogReplayTracker.java b/metadata/src/main/java/org/apache/kafka/controller/LogReplayTracker.java index 8777306029100..3933e011f3250 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/LogReplayTracker.java +++ b/metadata/src/main/java/org/apache/kafka/controller/LogReplayTracker.java @@ -45,7 +45,7 @@ public LogReplayTracker build() { /** * The slf4j logger. */ - private final Logger log; + private static final Logger log; /** * True if we haven't replayed any records yet. diff --git a/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java index 4094c34e58006..977a93b03f191 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java @@ -87,7 +87,7 @@ public OffsetControlManager build() { /** * The slf4j logger. */ - private final Logger log; + private static final Logger log; /** * The snapshot registry. diff --git a/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java index 2c1a0b49e4c98..41e1c292f6f2f 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java @@ -65,7 +65,7 @@ ProducerIdControlManager build() { } } - private final Logger log; + private static final Logger log; private final ClusterControlManager clusterControlManager; private final TimelineObject nextProducerBlock; private final TimelineLong brokerEpoch; diff --git a/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java b/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java index 5632720d83798..c1baabfe29d39 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java +++ b/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java @@ -1579,7 +1579,7 @@ private void replay(ApiMessage message, Optional snapshotId, lon /** * The slf4j logger. */ - private final Logger log; + private static final Logger log; /** * The ID of this controller node. diff --git a/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java index 81abfbeb5371f..c16204f596f11 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java @@ -297,7 +297,7 @@ static Map translateCreationConfigs(CreatableTopicConfigCollecti } private final SnapshotRegistry snapshotRegistry; - private final Logger log; + private static final Logger log; /** * The KIP-464 default replication factor that is used if a CreateTopics request does diff --git a/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java index f593e2e0e4b2c..8e241555e0e16 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java @@ -161,7 +161,7 @@ public String toString() { } } - private final Logger log; + private static final Logger log; private final TimelineHashMap credentials; private ScramControlManager( diff --git a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java index 97d1a1f9c0fca..fd368305e5ed9 100644 --- a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java +++ b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java @@ -54,7 +54,7 @@ public interface MetadataUpdater { void update(MetadataDelta delta, MetadataImage image, LogDeltaManifest manifest); } - private final Logger log; + private static final Logger log; private final Time time; private final FaultHandler faultHandler; private final MetadataUpdater callback; diff --git a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java index 5702b992aaaf4..6a7a57172588f 100644 --- a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java +++ b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java @@ -136,7 +136,7 @@ public MetadataLoader build() { /** * The log4j logger for this loader. */ - private final Logger log; + private static final Logger log; /** * The clock used by this loader. diff --git a/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java b/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java index dfb97934cea7a..3dac223ed4564 100644 --- a/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java +++ b/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java @@ -39,7 +39,7 @@ * with the actual state, and try to make changes only if necessary. */ public class BrokerRegistrationTracker implements MetadataPublisher { - private final Logger log; + private static final Logger log; private final int id; private final Runnable refreshRegistrationCallback; diff --git a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java index d9f6b73742480..426985b74025a 100644 --- a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java +++ b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java @@ -93,7 +93,7 @@ public SnapshotEmitter build() { /** * The slf4j logger to use. */ - private final Logger log; + private static final Logger log; /** * The clock object. diff --git a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java index e427fbe61da31..9de08e8f53718 100644 --- a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java +++ b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java @@ -137,7 +137,7 @@ public interface Emitter { /** * The slf4j logger to use. */ - private final Logger log; + private static final Logger log; /** * The fault handler to use. diff --git a/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java b/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java index 61b95c091d6dc..5708e4f8e9f45 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java @@ -92,7 +92,7 @@ public long nextPollTimeMs() { static final int METADATA_COMMIT_MAX_WAIT_MS = 300_000; private final Time time; - private final Logger log; + private static final Logger log; private final int nodeId; private final MigrationClient zkMigrationClient; private final KRaftMigrationZkWriter zkMetadataWriter; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java b/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java index a03f08291b5d8..4fe1725376a9f 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java @@ -30,7 +30,7 @@ public class FeaturesPublisher implements MetadataPublisher { - private final Logger log; + private static final Logger log; private volatile FinalizedFeatures finalizedFeatures = FinalizedFeatures.fromKRaftVersion(MINIMUM_KRAFT_VERSION); public FeaturesPublisher( diff --git a/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java b/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java index ec733b3ca196f..69a74ebfddc71 100644 --- a/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java +++ b/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java @@ -163,7 +163,7 @@ public String toString() { } public static class SharedLogData { - private final Logger log = LoggerFactory.getLogger(SharedLogData.class); + private static final Logger log = LoggerFactory.getLogger(SharedLogData.class); /** * Maps node IDs to the matching log managers. @@ -466,7 +466,7 @@ void beginShutdown() { } } - private final Logger log; + private static final Logger log; /** * The node ID of this local log manager. Each log manager must have a unique ID. diff --git a/raft/src/main/java/org/apache/kafka/raft/CandidateState.java b/raft/src/main/java/org/apache/kafka/raft/CandidateState.java index 1fd71e5e5634a..8d52237c6a654 100644 --- a/raft/src/main/java/org/apache/kafka/raft/CandidateState.java +++ b/raft/src/main/java/org/apache/kafka/raft/CandidateState.java @@ -42,7 +42,7 @@ public class CandidateState implements EpochState { private final int electionTimeoutMs; private final Timer electionTimer; private final Timer backoffTimer; - private final Logger log; + private static final Logger log; /** * The lifetime of a candidate state is the following. diff --git a/raft/src/main/java/org/apache/kafka/raft/FollowerState.java b/raft/src/main/java/org/apache/kafka/raft/FollowerState.java index a4d635e038849..893e164aebb93 100644 --- a/raft/src/main/java/org/apache/kafka/raft/FollowerState.java +++ b/raft/src/main/java/org/apache/kafka/raft/FollowerState.java @@ -44,7 +44,7 @@ public class FollowerState implements EpochState { */ private Optional fetchingSnapshot = Optional.empty(); - private final Logger log; + private static final Logger log; public FollowerState( Time time, diff --git a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java index 07df77d1eab92..18327da747d91 100644 --- a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java +++ b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java @@ -163,7 +163,7 @@ public final class KafkaRaftClient implements RaftClient { private final Uuid nodeDirectoryId; private final AtomicReference shutdown = new AtomicReference<>(); private final LogContext logContext; - private final Logger logger; + private static final Logger logger; private final Time time; private final int fetchMaxWaitMs; private final String clusterId; @@ -2974,7 +2974,7 @@ private boolean maybeCompleteShutdown(long currentTimeMs) { * A simple timer based log cleaner */ private static class RaftMetadataLogCleanerManager { - private final Logger logger; + private static final Logger logger; private final Timer timer; private final long delayMs; private final Runnable cleaner; diff --git a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClientDriver.java b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClientDriver.java index 2af7d7d207f87..cbe4ac8e4f94f 100644 --- a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClientDriver.java +++ b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClientDriver.java @@ -43,7 +43,7 @@ public class KafkaRaftClientDriver extends ShutdownableThread { * Closed in {@link #shutdown()} after shutdown completes. */ private final KafkaRaftClient client; - private final Logger log; + private static final Logger log; private final FaultHandler fatalFaultHandler; public KafkaRaftClientDriver( diff --git a/raft/src/main/java/org/apache/kafka/raft/LeaderState.java b/raft/src/main/java/org/apache/kafka/raft/LeaderState.java index b58e0d833c0fa..18f5c037643ec 100644 --- a/raft/src/main/java/org/apache/kafka/raft/LeaderState.java +++ b/raft/src/main/java/org/apache/kafka/raft/LeaderState.java @@ -75,7 +75,7 @@ public class LeaderState implements EpochState { private Map voterStates = new HashMap<>(); private Optional addVoterHandlerState = Optional.empty(); private final Map observerStates = new HashMap<>(); - private final Logger log; + private static final Logger log; private final BatchAccumulator accumulator; // The set includes all of the followers voters that FETCH or FETCH_SNAPSHOT during the current checkQuorumTimer interval. private final Set fetchedVoters = new HashSet<>(); diff --git a/raft/src/main/java/org/apache/kafka/raft/QuorumState.java b/raft/src/main/java/org/apache/kafka/raft/QuorumState.java index d84e274990e10..f9cbc3ca47dfe 100644 --- a/raft/src/main/java/org/apache/kafka/raft/QuorumState.java +++ b/raft/src/main/java/org/apache/kafka/raft/QuorumState.java @@ -80,7 +80,7 @@ public class QuorumState { private final OptionalInt localId; private final Uuid localDirectoryId; private final Time time; - private final Logger log; + private static final Logger log; private final QuorumStateStore store; private final KRaftControlRecordStateMachine partitionState; private final Endpoints localListeners; diff --git a/raft/src/main/java/org/apache/kafka/raft/ReplicatedCounter.java b/raft/src/main/java/org/apache/kafka/raft/ReplicatedCounter.java index 2758481ef6936..1876bdceae7fb 100644 --- a/raft/src/main/java/org/apache/kafka/raft/ReplicatedCounter.java +++ b/raft/src/main/java/org/apache/kafka/raft/ReplicatedCounter.java @@ -33,7 +33,7 @@ public class ReplicatedCounter implements RaftClient.Listener { private static final int SNAPSHOT_DELAY_IN_RECORDS = 10; private final int nodeId; - private final Logger log; + private static final Logger log; private final RaftClient client; private int committed = 0; diff --git a/raft/src/main/java/org/apache/kafka/raft/ResignedState.java b/raft/src/main/java/org/apache/kafka/raft/ResignedState.java index 267a88ad787cd..03ab6676f6849 100644 --- a/raft/src/main/java/org/apache/kafka/raft/ResignedState.java +++ b/raft/src/main/java/org/apache/kafka/raft/ResignedState.java @@ -50,7 +50,7 @@ public class ResignedState implements EpochState { private final Set unackedVoters; private final Timer electionTimer; private final List preferredSuccessors; - private final Logger log; + private static final Logger log; public ResignedState( Time time, diff --git a/raft/src/main/java/org/apache/kafka/raft/UnattachedState.java b/raft/src/main/java/org/apache/kafka/raft/UnattachedState.java index 1dba6a70f28cf..b4ceaa15ae2a5 100644 --- a/raft/src/main/java/org/apache/kafka/raft/UnattachedState.java +++ b/raft/src/main/java/org/apache/kafka/raft/UnattachedState.java @@ -46,7 +46,7 @@ public class UnattachedState implements EpochState { private final long electionTimeoutMs; private final Timer electionTimer; private final Optional highWatermark; - private final Logger log; + private static final Logger log; public UnattachedState( Time time, diff --git a/raft/src/main/java/org/apache/kafka/raft/VotedState.java b/raft/src/main/java/org/apache/kafka/raft/VotedState.java index c7710903399ef..15c87cdafbdfa 100644 --- a/raft/src/main/java/org/apache/kafka/raft/VotedState.java +++ b/raft/src/main/java/org/apache/kafka/raft/VotedState.java @@ -40,7 +40,7 @@ public class VotedState implements EpochState { private final int electionTimeoutMs; private final Timer electionTimer; private final Optional highWatermark; - private final Logger log; + private static final Logger log; public VotedState( Time time, diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/AddVoterHandler.java b/raft/src/main/java/org/apache/kafka/raft/internals/AddVoterHandler.java index 9bbd203ca9c28..ad8f66a2c679d 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/AddVoterHandler.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/AddVoterHandler.java @@ -67,7 +67,7 @@ public final class AddVoterHandler { private final KRaftControlRecordStateMachine partitionState; private final RequestSender requestSender; private final Time time; - private final Logger logger; + private static final Logger logger; public AddVoterHandler( KRaftControlRecordStateMachine partitionState, diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/DefaultRequestSender.java b/raft/src/main/java/org/apache/kafka/raft/internals/DefaultRequestSender.java index 0cee3c255d1b0..f61c8443508eb 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/DefaultRequestSender.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/DefaultRequestSender.java @@ -38,7 +38,7 @@ public final class DefaultRequestSender implements RequestSender { private final RequestManager requestManager; private final NetworkChannel channel; private final RaftMessageQueue messageQueue; - private final Logger logger; + private static final Logger logger; public DefaultRequestSender( RequestManager requestManager, diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java b/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java index 82f1435a30eaf..ddfc07b818db1 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java @@ -53,7 +53,7 @@ public final class KRaftControlRecordStateMachine { private final ReplicatedLog log; private final RecordSerde serde; private final BufferSupplier bufferSupplier; - private final Logger logger; + private static final Logger logger; private final int maxBatchSizeBytes; // These objects are synchronized using their respective object monitor. The two actors diff --git a/raft/src/test/java/org/apache/kafka/raft/MockLog.java b/raft/src/test/java/org/apache/kafka/raft/MockLog.java index 29281fa633fc7..f6aa62931e57a 100644 --- a/raft/src/test/java/org/apache/kafka/raft/MockLog.java +++ b/raft/src/test/java/org/apache/kafka/raft/MockLog.java @@ -62,7 +62,7 @@ public class MockLog implements ReplicatedLog { private final NavigableMap snapshots = new TreeMap<>(); private final TopicPartition topicPartition; private final Uuid topicId; - private final Logger logger; + private static final Logger logger; private long nextId = ID_GENERATOR.getAndIncrement(); private LogOffsetMetadata highWatermark = new LogOffsetMetadata(0, Optional.empty()); diff --git a/server-common/src/main/java/org/apache/kafka/deferred/DeferredEventQueue.java b/server-common/src/main/java/org/apache/kafka/deferred/DeferredEventQueue.java index 2af9ef54fa39d..661b631eb7f9b 100644 --- a/server-common/src/main/java/org/apache/kafka/deferred/DeferredEventQueue.java +++ b/server-common/src/main/java/org/apache/kafka/deferred/DeferredEventQueue.java @@ -33,7 +33,7 @@ * We wait for the high watermark of the log to advance before completing them. */ public class DeferredEventQueue { - private final Logger log; + private static final Logger log; /** * A map from log offsets to events. Each event will be completed once the log diff --git a/server-common/src/main/java/org/apache/kafka/queue/EventQueue.java b/server-common/src/main/java/org/apache/kafka/queue/EventQueue.java index 8914931448d83..10d33ad529763 100644 --- a/server-common/src/main/java/org/apache/kafka/queue/EventQueue.java +++ b/server-common/src/main/java/org/apache/kafka/queue/EventQueue.java @@ -45,7 +45,7 @@ default void handleException(Throwable e) {} } abstract class FailureLoggingEvent implements Event { - private final Logger log; + private static final Logger log; public FailureLoggingEvent(Logger log) { this.log = log; diff --git a/server-common/src/main/java/org/apache/kafka/queue/KafkaEventQueue.java b/server-common/src/main/java/org/apache/kafka/queue/KafkaEventQueue.java index b32183a214f82..9294386bd4ed4 100644 --- a/server-common/src/main/java/org/apache/kafka/queue/KafkaEventQueue.java +++ b/server-common/src/main/java/org/apache/kafka/queue/KafkaEventQueue.java @@ -417,7 +417,7 @@ int size() { /** * The log4j logger to use. */ - private final Logger log; + private static final Logger log; /** * The runnable that our thread executes. diff --git a/server-common/src/main/java/org/apache/kafka/server/network/EndpointReadyFutures.java b/server-common/src/main/java/org/apache/kafka/server/network/EndpointReadyFutures.java index 212f2b9fbd7ba..55d14c8676243 100644 --- a/server-common/src/main/java/org/apache/kafka/server/network/EndpointReadyFutures.java +++ b/server-common/src/main/java/org/apache/kafka/server/network/EndpointReadyFutures.java @@ -182,7 +182,7 @@ void failStage(String what, Throwable exception) { } } - private final Logger log; + private static final Logger log; private final Map> futures; diff --git a/server-common/src/main/java/org/apache/kafka/server/util/TopicFilter.java b/server-common/src/main/java/org/apache/kafka/server/util/TopicFilter.java index 1dbebdfdecc4d..64c8f8441b97c 100644 --- a/server-common/src/main/java/org/apache/kafka/server/util/TopicFilter.java +++ b/server-common/src/main/java/org/apache/kafka/server/util/TopicFilter.java @@ -54,7 +54,7 @@ public Pattern getPattern() { } public static class IncludeList extends TopicFilter { - private final Logger log = LoggerFactory.getLogger(IncludeList.class); + private static final Logger log = LoggerFactory.getLogger(IncludeList.class); public IncludeList(String rawRegex) { super(rawRegex); } diff --git a/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java b/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java index b35670a0bccb0..c45cb48490012 100644 --- a/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java +++ b/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java @@ -94,7 +94,7 @@ public Snapshot next() { } } - private final Logger log; + private static final Logger log; /** * A map from snapshot epochs to snapshot data structures. diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java b/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java index 42c41226783a4..4d7e1f7323f10 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java @@ -49,7 +49,7 @@ public class CleanShutdownFileHandler { // Visible for testing final File cleanShutdownFile; private static final int CURRENT_VERSION = 0; - private final Logger logger; + private static final Logger logger; @JsonIgnoreProperties(ignoreUnknown = true) private static class Content { diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java b/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java index ece9f4b6468e7..a798b1cfc14eb 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java @@ -55,7 +55,7 @@ public class LeaderEpochFileCache { private final TopicPartition topicPartition; private final LeaderEpochCheckpointFile checkpoint; private final Scheduler scheduler; - private final Logger log; + private static final Logger log; private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); private final TreeMap epochs = new TreeMap<>(); diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java index 883f2059a4bc2..c29576759bcb2 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java @@ -105,7 +105,7 @@ public class ProducerStateManager { new Field(CRC_FIELD, Type.UNSIGNED_INT32, "CRC of the snapshot data"), new Field(PRODUCER_ENTRIES_FIELD, new ArrayOf(PRODUCER_SNAPSHOT_ENTRY_SCHEMA), "The entries in the producer table")); - private final Logger log; + private static final Logger log; private final TopicPartition topicPartition; private final int maxTransactionTimeoutMs; diff --git a/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java b/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java index e9496c0cdc653..65052092662a4 100644 --- a/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java +++ b/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java @@ -164,7 +164,7 @@ public class KafkaStreams implements AutoCloseable { // of the co-location of stream thread's consumers. It is for internal // usage only and should not be exposed to users at all. private final Time time; - private final Logger log; + private static final Logger log; protected final String clientId; private final Metrics metrics; protected final StreamsConfig applicationConfigs; diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamSlidingWindowAggregate.java b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamSlidingWindowAggregate.java index 6b5a1753c8bf9..f2b0b7cf06e2b 100644 --- a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamSlidingWindowAggregate.java +++ b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamSlidingWindowAggregate.java @@ -43,7 +43,7 @@ public class KStreamSlidingWindowAggregate implements KStreamAggProcessorSupplier, VAgg> { - private final Logger log = LoggerFactory.getLogger(getClass()); + private static final Logger log = LoggerFactory.getLogger(getClass()); private final String storeName; private final SlidingWindows windows; diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregate.java b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregate.java index 44169cf0eb2da..6519478efe19e 100644 --- a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregate.java +++ b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregate.java @@ -41,7 +41,7 @@ public class KStreamWindowAggregate implements KStreamAggProcessorSupplier, VAgg> { - private final Logger log = LoggerFactory.getLogger(getClass()); + private static final Logger log = LoggerFactory.getLogger(getClass()); private final String storeName; private final Windows windows; diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/StreamSourceNode.java b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/StreamSourceNode.java index 003298cc870d4..97b686eaff632 100644 --- a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/StreamSourceNode.java +++ b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/StreamSourceNode.java @@ -30,7 +30,7 @@ public class StreamSourceNode extends SourceGraphNode { - private final Logger log = LoggerFactory.getLogger(StreamSourceNode.class); + private static final Logger log = LoggerFactory.getLogger(StreamSourceNode.class); public StreamSourceNode(final String nodeName, final Collection topicNames, diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreator.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreator.java index c4be67d720275..3a5d19ca37d4c 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreator.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreator.java @@ -60,7 +60,7 @@ class ActiveTaskCreator { private final Time time; private final KafkaClientSupplier clientSupplier; private final String threadId; - private final Logger log; + private static final Logger log; private final Sensor createTaskSensor; private final StreamsProducer threadProducer; private final Map taskProducers; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ChangelogTopics.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ChangelogTopics.java index aaf8ba16a51b2..99bb64728d41d 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ChangelogTopics.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ChangelogTopics.java @@ -43,7 +43,7 @@ public class ChangelogTopics { private final Set preExistingNonSourceTopicBasedChangelogPartitions = new HashSet<>(); private final Set sourceTopicBasedChangelogTopics = new HashSet<>(); private final Set preExistingSourceTopicBasedChangelogPartitions = new HashSet<>(); - private final Logger log; + private static final Logger log; public ChangelogTopics(final InternalTopicManager internalTopicManager, final Map topicGroups, diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java index 3ab94f689f77c..858193418bcd6 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java @@ -745,7 +745,7 @@ private void recordMetrics(final long now, final long totalLatency, final long t } private final Time time; - private final Logger log; + private static final Logger log; private final String name; private final Metrics metrics; private final Consumer restoreConsumer; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java index b1263ddc58df6..261ec44a1f2c2 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java @@ -70,7 +70,7 @@ public class GlobalStateManagerImpl implements GlobalStateManager { private static final long NO_DEADLINE = -1L; private final Time time; - private final Logger log; + private static final Logger log; private final File baseDir; private final long taskTimeoutMs; private final ProcessorTopology topology; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateUpdateTask.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateUpdateTask.java index 1713efb52a9bd..d32298262df70 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateUpdateTask.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateUpdateTask.java @@ -38,7 +38,7 @@ * Updates the state for all Global State Stores. */ public class GlobalStateUpdateTask implements GlobalStateMaintainer { - private final Logger log; + private static final Logger log; private final LogContext logContext; private final ProcessorTopology topology; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStreamThread.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStreamThread.java index 1c7194b1913e6..7b5aa142fb31a 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStreamThread.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStreamThread.java @@ -58,7 +58,7 @@ */ public class GlobalStreamThread extends Thread { - private final Logger log; + private static final Logger log; private final LogContext logContext; private final StreamsConfig config; private final Consumer globalConsumer; @@ -230,7 +230,7 @@ static class StateConsumer { private final Consumer globalConsumer; private final GlobalStateMaintainer stateMaintainer; private final Duration pollTime; - private final Logger log; + private static final Logger log; StateConsumer(final LogContext logContext, final Consumer globalConsumer, diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java index aeaa84f911d79..ef251752aa3e8 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java @@ -70,7 +70,7 @@ public class InternalTopicManager { "Please report at https://issues.apache.org/jira/projects/KAFKA/issues or to the dev-mailing list (https://kafka.apache.org/contact)."; private static final String INTERRUPTED_ERROR_MESSAGE = "Thread got interrupted. " + BUG_ERROR_MESSAGE; - private final Logger log; + private static final Logger log; private final Time time; private final Admin adminClient; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/PartitionGroup.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/PartitionGroup.java index ac85a17ca0ec7..42ec58117dfde 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/PartitionGroup.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/PartitionGroup.java @@ -59,7 +59,7 @@ */ class PartitionGroup extends AbstractPartitionGroup { - private final Logger logger; + private static final Logger logger; private final Map partitionQueues; private final Function lagProvider; private final Sensor enforcedProcessingSensor; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorNode.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorNode.java index eabf9e3d5c471..3f117088fbded 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorNode.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorNode.java @@ -45,7 +45,7 @@ public class ProcessorNode { - private final Logger log = LoggerFactory.getLogger(ProcessorNode.class); + private static final Logger log = LoggerFactory.getLogger(ProcessorNode.class); private final List> children; private final Map> childByName; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorTopology.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorTopology.java index b65bba4e16edf..b0fc1f6851188 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorTopology.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorTopology.java @@ -31,7 +31,7 @@ import java.util.Set; public class ProcessorTopology { - private final Logger log = LoggerFactory.getLogger(ProcessorTopology.class); + private static final Logger log = LoggerFactory.getLogger(ProcessorTopology.class); private final List> processorNodes; private final Map> sourceNodesByName; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java index 16d67666ccb22..bc20a96425d4a 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java @@ -65,7 +65,7 @@ public class RecordCollectorImpl implements RecordCollector { private static final String SEND_EXCEPTION_MESSAGE = "Error encountered sending record to topic %s for task %s due to:%n%s"; - private final Logger log; + private static final Logger log; private final TaskId taskId; private final StreamsProducer streamsProducer; private final ProductionExceptionHandler productionExceptionHandler; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordDeserializer.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordDeserializer.java index 2680c179b5453..9460bbb802fbd 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordDeserializer.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordDeserializer.java @@ -31,7 +31,7 @@ import static org.apache.kafka.streams.StreamsConfig.DEFAULT_DESERIALIZATION_EXCEPTION_HANDLER_CLASS_CONFIG; public class RecordDeserializer { - private final Logger log; + private static final Logger log; private final SourceNode sourceNode; private final Sensor droppedRecordsSensor; private final DeserializationExceptionHandler deserializationExceptionHandler; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordQueue.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordQueue.java index a3c9ea67f067d..44d37fbbe0fd5 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordQueue.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordQueue.java @@ -42,7 +42,7 @@ public class RecordQueue { public static final long UNKNOWN = ConsumerRecord.NO_TIMESTAMP; - private final Logger log; + private static final Logger log; private final SourceNode source; private final TopicPartition partition; private final ProcessorContext processorContext; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java index ff217925f9d04..4951ff5675305 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java @@ -50,7 +50,7 @@ public class RepartitionTopics { private final TopologyMetadata topologyMetadata; private final Cluster clusterMetadata; private final CopartitionedTopicsEnforcer copartitionedTopicsEnforcer; - private final Logger log; + private static final Logger log; private final Map topicPartitionInfos = new HashMap<>(); private final Map> missingInputTopicsBySubtopology = new HashMap<>(); diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTaskCreator.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTaskCreator.java index 5eb7418425712..394710a8946a8 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTaskCreator.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTaskCreator.java @@ -42,7 +42,7 @@ class StandbyTaskCreator { private final StateDirectory stateDirectory; private final ChangelogReader storeChangelogReader; private final ThreadCache dummyCache; - private final Logger log; + private static final Logger log; private final Sensor createTaskSensor; private final boolean stateUpdaterEnabled; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java index dbd25b62eb510..b9483ae3fb0f4 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java @@ -195,7 +195,7 @@ int bufferedLimitIndex() { private ChangelogReaderState state; private final Time time; - private final Logger log; + private static final Logger log; private final Duration pollTime; private final long updateOffsetIntervalMs; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java index 05c832811adc4..f7526eb62b27e 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java @@ -278,7 +278,7 @@ public boolean isStartingRunningOrPartitionAssigned() { } private final Time time; - private final Logger log; + private static final Logger log; private final String logPrefix; public final Object stateLock; private final Duration pollTime; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsMetadataState.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsMetadataState.java index 9328004a6b038..1ad4f222692cb 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsMetadataState.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsMetadataState.java @@ -54,7 +54,7 @@ * in a KafkaStreams application */ public class StreamsMetadataState { - private final Logger log; + private static final Logger log; public static final HostInfo UNKNOWN_HOST = HostInfo.unavailable(); private final TopologyMetadata topologyMetadata; private final Set globalStores; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsProducer.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsProducer.java index ccd0f415045f7..b07a2590efd3b 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsProducer.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsProducer.java @@ -68,7 +68,7 @@ * For non-EOS, the user should not call transaction related methods. */ public class StreamsProducer { - private final Logger log; + private static final Logger log; private final String logPrefix; private final Map eosV2ProducerConfigs; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsRebalanceListener.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsRebalanceListener.java index 9ee34d8398b61..ee9941293dd9d 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsRebalanceListener.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsRebalanceListener.java @@ -34,7 +34,7 @@ public class StreamsRebalanceListener implements ConsumerRebalanceListener { private final Time time; private final TaskManager taskManager; private final StreamThread streamThread; - private final Logger log; + private static final Logger log; private final AtomicInteger assignmentErrorCode; StreamsRebalanceListener(final Time time, diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadata.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadata.java index 86001ba413073..d98f907c4b785 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadata.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadata.java @@ -111,7 +111,7 @@ void clearSuccessfullyProcessed() { } private class NamedTopologyMetadata { - private final Logger log; + private static final Logger log; private final Map tasksToErrorTime = new ConcurrentHashMap<>(); public NamedTopologyMetadata(final String topologyName) { diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutor.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutor.java index e2145a94121be..3e52b1a055005 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutor.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutor.java @@ -47,7 +47,7 @@ */ public class TaskExecutor { - private final Logger log; + private static final Logger log; private final TasksRegistry tasks; private final TaskManager taskManager; private final TaskExecutionMetadata executionMetadata; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java index bde092cfe49f7..38d99e58fd57c 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java @@ -82,7 +82,7 @@ public class TaskManager { // initialize the task list // activeTasks needs to be concurrent as it can be accessed // by QueryableState - private final Logger log; + private static final Logger log; private final Time time; private final TasksRegistry tasks; private final ProcessId processId; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/Tasks.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/Tasks.java index e30333aabfb7a..c010e37898850 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/Tasks.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/Tasks.java @@ -44,7 +44,7 @@ * processed by the latter. */ class Tasks implements TasksRegistry { - private final Logger log; + private static final Logger log; // TODO: convert to Stream/StandbyTask when we remove TaskManager#StateMachineTask with mocks // note that these two maps may be accessed by concurrent threads and hence diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java index 3fc522f85b445..5c4127fde93d9 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java @@ -43,7 +43,7 @@ public final class AssignorConfiguration { private final String internalTaskAssignorClass; private final String logPrefix; - private final Logger log; + private static final Logger log; private final ReferenceContainer referenceContainer; private final StreamsConfig streamsConfig; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/CopartitionedTopicsEnforcer.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/CopartitionedTopicsEnforcer.java index 865db9e73b976..1313605b93fee 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/CopartitionedTopicsEnforcer.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/CopartitionedTopicsEnforcer.java @@ -34,7 +34,7 @@ public class CopartitionedTopicsEnforcer { private final String logPrefix; - private final Logger log; + private static final Logger log; public CopartitionedTopicsEnforcer(final String logPrefix) { this.logPrefix = logPrefix; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/KafkaStreamsNamedTopologyWrapper.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/KafkaStreamsNamedTopologyWrapper.java index 6c08c06f2aec6..f1fa0c4d1811d 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/KafkaStreamsNamedTopologyWrapper.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/KafkaStreamsNamedTopologyWrapper.java @@ -71,7 +71,7 @@ @Unstable public class KafkaStreamsNamedTopologyWrapper extends KafkaStreams { - private final Logger log; + private static final Logger log; /** * An empty Kafka Streams application that allows NamedTopologies to be added at a later point diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/RemoveNamedTopologyResult.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/RemoveNamedTopologyResult.java index 9cd52dfe59cd7..4baa535e9abcf 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/RemoveNamedTopologyResult.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/RemoveNamedTopologyResult.java @@ -69,7 +69,7 @@ public final KafkaFuture all() { } private static class ResetOffsetsFuture extends KafkaFutureImpl { - private final Logger log; + private static final Logger log; final Runnable resetOffsets; final KafkaFutureImpl removeTopologyFuture; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutor.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutor.java index 84b49d1cd13f4..b8f5a6f453cbb 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutor.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutor.java @@ -46,7 +46,7 @@ private class TaskExecutorThread extends Thread implements ProcessingThread { private final AtomicBoolean shutdownRequested = new AtomicBoolean(false); private final AtomicReference> taskReleaseRequested = new AtomicReference<>(null); - private final Logger log; + private static final Logger log; public TaskExecutorThread(final String name) { super(name); @@ -219,7 +219,7 @@ private StreamTask unassignCurrentTask() { private final String name; private final TaskManager taskManager; private final TaskExecutionMetadata taskExecutionMetadata; - private final Logger log; + private static final Logger log; private StreamTask currentTask = null; private TaskExecutorThread taskExecutorThread = null; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManager.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManager.java index 5d2db3c27925c..b3602b89bbb41 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManager.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManager.java @@ -54,7 +54,7 @@ public class DefaultTaskManager implements TaskManager { private final Time time; - private final Logger log; + private static final Logger log; private final TasksRegistry tasks; private final Lock tasksLock = new ReentrantLock(); diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java index 4f5a837c00b30..97874dcadc545 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java @@ -37,7 +37,7 @@ * record based */ public class ThreadCache { - private final Logger log; + private static final Logger log; private volatile long maxCacheSizeBytes; private final StreamsMetricsImpl metrics; private final Map caches = new HashMap<>(); diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreBuilder.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreBuilder.java index 10f75f2bd06ad..d57d5318c680c 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreBuilder.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreBuilder.java @@ -29,7 +29,7 @@ import java.util.Objects; public class WindowStoreBuilder extends AbstractStoreBuilder> { - private final Logger log = LoggerFactory.getLogger(WindowStoreBuilder.class); + private static final Logger log = LoggerFactory.getLogger(WindowStoreBuilder.class); private final WindowBytesStoreSupplier storeSupplier; diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorder.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorder.java index fd7adab1b5728..2fb855c0b3264 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorder.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorder.java @@ -85,7 +85,7 @@ public DbAndCacheAndStatistics(final RocksDB db, final Cache cache, final Statis private static final String ROCKSDB_PROPERTIES_PREFIX = "rocksdb."; - private final Logger logger; + private static final Logger logger; private Sensor bytesWrittenToDatabaseSensor; private Sensor bytesReadFromDatabaseSensor; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionOptimizingTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionOptimizingTest.java index cac44dbb5e94c..91b95b87a7fee 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionOptimizingTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionOptimizingTest.java @@ -72,7 +72,7 @@ @SuppressWarnings("deprecation") public class RepartitionOptimizingTest { - private final Logger log = LoggerFactory.getLogger(RepartitionOptimizingTest.class); + private static final Logger log = LoggerFactory.getLogger(RepartitionOptimizingTest.class); private static final String INPUT_TOPIC = "input"; private static final String COUNT_TOPIC = "outputTopic_0"; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionWithMergeOptimizingTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionWithMergeOptimizingTest.java index f6a12d6477b8e..a9287fc3e5993 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionWithMergeOptimizingTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionWithMergeOptimizingTest.java @@ -60,7 +60,7 @@ public class RepartitionWithMergeOptimizingTest { - private final Logger log = LoggerFactory.getLogger(RepartitionWithMergeOptimizingTest.class); + private static final Logger log = LoggerFactory.getLogger(RepartitionWithMergeOptimizingTest.class); private static final String INPUT_A_TOPIC = "inputA"; private static final String INPUT_B_TOPIC = "inputB"; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java index d61c530c92ed1..b195600c3925e 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java @@ -82,7 +82,7 @@ public class StreamsAssignmentScaleTest { static final long MAX_ASSIGNMENT_DURATION = 120 * 1000L; // we should stay below `max.poll.interval.ms` static final String APPLICATION_ID = "streams-assignment-scale-test"; - private final Logger log = LoggerFactory.getLogger(StreamsAssignmentScaleTest.class); + private static final Logger log = LoggerFactory.getLogger(StreamsAssignmentScaleTest.class); /* HighAvailabilityTaskAssignor tests */ diff --git a/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java b/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java index 6e216dcdbca8f..64cf3c7eb0b51 100644 --- a/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java @@ -154,7 +154,7 @@ public Consumer getConsumer(final Map config) { public static class FutureStreamsPartitionAssignor extends StreamsPartitionAssignor { private static final Map CLIENT_TAGS = mkMap(mkEntry("t1", "v1"), mkEntry("t2", "v2")); - private final Logger log = LoggerFactory.getLogger(FutureStreamsPartitionAssignor.class); + private static final Logger log = LoggerFactory.getLogger(FutureStreamsPartitionAssignor.class); private AtomicInteger usedSubscriptionMetadataVersionPeek; private AtomicLong nextScheduledRebalanceMs; diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/CoordinatorClient.java b/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/CoordinatorClient.java index 00c26adc4c4c8..a90578deb94b3 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/CoordinatorClient.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/CoordinatorClient.java @@ -76,7 +76,7 @@ * A client for the Trogdor coordinator. */ public class CoordinatorClient { - private final Logger log; + private static final Logger log; /** * The maximum number of tries to make. diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java index 529e228c38c4d..19d1d32d174d0 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java @@ -55,7 +55,7 @@ public class TimestampRecordProcessor implements RecordProcessor { private final ByteBuffer buffer; private final Histogram histogram; - private final Logger log = LoggerFactory.getLogger(TimestampRecordProcessor.class); + private static final Logger log = LoggerFactory.getLogger(TimestampRecordProcessor.class); static final float[] PERCENTILES = {0.5f, 0.95f, 0.99f}; From 23e1335039ce59665a783f69cbfba7d369a76685 Mon Sep 17 00:00:00 2001 From: Ming-Yen Chung Date: Thu, 25 Jul 2024 16:21:08 +0800 Subject: [PATCH 3/4] Revert "Make all loggers to static to avoid creating multiple logger instances" This reverts commit 00b63173cd0a2fbd80afbca85fbc97f45d84b560. --- .../org/apache/kafka/clients/ClusterConnectionStates.java | 4 ++-- .../java/org/apache/kafka/clients/FetchSessionHandler.java | 2 +- .../src/main/java/org/apache/kafka/clients/Metadata.java | 2 +- .../main/java/org/apache/kafka/clients/NetworkClient.java | 2 +- .../org/apache/kafka/clients/admin/KafkaAdminClient.java | 2 +- .../clients/admin/internals/AbortTransactionHandler.java | 2 +- .../kafka/clients/admin/internals/AdminApiDriver.java | 2 +- .../kafka/clients/admin/internals/AdminMetadataManager.java | 2 +- .../kafka/clients/admin/internals/AllBrokersStrategy.java | 2 +- .../admin/internals/AlterConsumerGroupOffsetsHandler.java | 2 +- .../kafka/clients/admin/internals/CoordinatorStrategy.java | 2 +- .../admin/internals/DeleteConsumerGroupOffsetsHandler.java | 2 +- .../admin/internals/DeleteConsumerGroupsHandler.java | 2 +- .../kafka/clients/admin/internals/DeleteRecordsHandler.java | 2 +- .../admin/internals/DescribeConsumerGroupsHandler.java | 2 +- .../clients/admin/internals/DescribeProducersHandler.java | 2 +- .../admin/internals/DescribeTransactionsHandler.java | 2 +- .../clients/admin/internals/FenceProducersHandler.java | 2 +- .../admin/internals/ListConsumerGroupOffsetsHandler.java | 2 +- .../kafka/clients/admin/internals/ListOffsetsHandler.java | 2 +- .../clients/admin/internals/ListTransactionsHandler.java | 2 +- .../clients/admin/internals/PartitionLeaderStrategy.java | 2 +- .../internals/RemoveMembersFromConsumerGroupHandler.java | 2 +- .../clients/consumer/internals/AbstractCoordinator.java | 2 +- .../kafka/clients/consumer/internals/AbstractFetch.java | 2 +- .../kafka/clients/consumer/internals/AsyncClient.java | 2 +- .../clients/consumer/internals/CommitRequestManager.java | 4 ++-- .../kafka/clients/consumer/internals/CompletedFetch.java | 2 +- .../clients/consumer/internals/ConsumerCoordinator.java | 2 +- .../clients/consumer/internals/ConsumerNetworkClient.java | 2 +- .../clients/consumer/internals/ConsumerNetworkThread.java | 2 +- .../internals/ConsumerRebalanceListenerInvoker.java | 2 +- .../consumer/internals/CoordinatorRequestManager.java | 2 +- .../kafka/clients/consumer/internals/FetchBuffer.java | 2 +- .../kafka/clients/consumer/internals/FetchCollector.java | 2 +- .../apache/kafka/clients/consumer/internals/Fetcher.java | 2 +- .../apache/kafka/clients/consumer/internals/Heartbeat.java | 2 +- .../clients/consumer/internals/HeartbeatRequestManager.java | 2 +- .../clients/consumer/internals/MembershipManagerImpl.java | 2 +- .../clients/consumer/internals/NetworkClientDelegate.java | 2 +- .../kafka/clients/consumer/internals/OffsetFetcher.java | 2 +- .../clients/consumer/internals/OffsetFetcherUtils.java | 2 +- .../clients/consumer/internals/OffsetsRequestManager.java | 2 +- .../kafka/clients/consumer/internals/RequestManagers.java | 2 +- .../kafka/clients/consumer/internals/RequestState.java | 2 +- .../clients/consumer/internals/ShareCompletedFetch.java | 2 +- .../consumer/internals/ShareConsumeRequestManager.java | 2 +- .../kafka/clients/consumer/internals/ShareFetchBuffer.java | 2 +- .../clients/consumer/internals/ShareFetchCollector.java | 2 +- .../consumer/internals/ShareHeartbeatRequestManager.java | 2 +- .../clients/consumer/internals/ShareMembershipManager.java | 2 +- .../clients/consumer/internals/ShareSessionHandler.java | 2 +- .../kafka/clients/consumer/internals/SubscriptionState.java | 2 +- .../clients/consumer/internals/TopicMetadataFetcher.java | 2 +- .../consumer/internals/TopicMetadataRequestManager.java | 2 +- .../consumer/internals/events/ApplicationEventHandler.java | 2 +- .../internals/events/ApplicationEventProcessor.java | 2 +- .../consumer/internals/events/CompletableEventReaper.java | 2 +- .../org/apache/kafka/clients/producer/KafkaProducer.java | 2 +- .../clients/producer/internals/BuiltInPartitioner.java | 2 +- .../kafka/clients/producer/internals/ProducerMetadata.java | 2 +- .../kafka/clients/producer/internals/RecordAccumulator.java | 2 +- .../org/apache/kafka/clients/producer/internals/Sender.java | 2 +- .../clients/producer/internals/TransactionManager.java | 2 +- .../kafka/clients/producer/internals/TxnPartitionMap.java | 2 +- .../java/org/apache/kafka/common/config/AbstractConfig.java | 2 +- .../kafka/common/metrics/internals/IntGaugeSuite.java | 2 +- .../org/apache/kafka/common/metrics/stats/Percentiles.java | 2 +- .../org/apache/kafka/common/network/SaslChannelBuilder.java | 2 +- .../main/java/org/apache/kafka/common/network/Selector.java | 2 +- .../org/apache/kafka/common/network/SslTransportLayer.java | 2 +- .../security/authenticator/SaslClientAuthenticator.java | 2 +- .../unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java | 2 +- .../java/org/apache/kafka/common/utils/KafkaThread.java | 2 +- .../main/java/org/apache/kafka/common/utils/LogContext.java | 2 +- .../clients/consumer/internals/FetchRequestManagerTest.java | 2 +- .../apache/kafka/connect/runtime/WorkerSinkTaskContext.java | 2 +- .../connect/runtime/distributed/DistributedHerder.java | 2 +- .../kafka/connect/runtime/distributed/EagerAssignor.java | 2 +- .../runtime/distributed/IncrementalCooperativeAssignor.java | 2 +- .../connect/runtime/distributed/WorkerCoordinator.java | 2 +- .../connect/runtime/distributed/WorkerGroupMember.java | 2 +- .../java/org/apache/kafka/connect/runtime/LoggersTest.java | 2 +- core/src/main/java/kafka/log/remote/RemoteLogManager.java | 6 +++--- .../main/java/kafka/server/logger/RuntimeLoggerManager.java | 2 +- .../kafka/coordinator/group/GroupCoordinatorService.java | 2 +- .../kafka/coordinator/group/GroupCoordinatorShard.java | 2 +- .../kafka/coordinator/group/GroupMetadataManager.java | 2 +- .../kafka/coordinator/group/OffsetMetadataManager.java | 2 +- .../kafka/coordinator/group/classic/ClassicGroup.java | 2 +- .../kafka/coordinator/group/runtime/CoordinatorRuntime.java | 2 +- .../group/runtime/MultiThreadedEventProcessor.java | 4 ++-- .../coordinator/group/runtime/SnapshottableCoordinator.java | 2 +- .../java/org/apache/kafka/controller/AclControlManager.java | 2 +- .../org/apache/kafka/controller/BrokerHeartbeatManager.java | 2 +- .../apache/kafka/controller/ClientQuotaControlManager.java | 2 +- .../org/apache/kafka/controller/ClusterControlManager.java | 2 +- .../kafka/controller/ConfigurationControlManager.java | 2 +- .../kafka/controller/DelegationTokenControlManager.java | 2 +- .../org/apache/kafka/controller/FeatureControlManager.java | 2 +- .../java/org/apache/kafka/controller/LogReplayTracker.java | 2 +- .../org/apache/kafka/controller/OffsetControlManager.java | 2 +- .../apache/kafka/controller/ProducerIdControlManager.java | 2 +- .../java/org/apache/kafka/controller/QuorumController.java | 2 +- .../apache/kafka/controller/ReplicationControlManager.java | 2 +- .../org/apache/kafka/controller/ScramControlManager.java | 2 +- .../org/apache/kafka/image/loader/MetadataBatchLoader.java | 2 +- .../java/org/apache/kafka/image/loader/MetadataLoader.java | 2 +- .../kafka/image/publisher/BrokerRegistrationTracker.java | 2 +- .../org/apache/kafka/image/publisher/SnapshotEmitter.java | 2 +- .../org/apache/kafka/image/publisher/SnapshotGenerator.java | 2 +- .../kafka/metadata/migration/KRaftMigrationDriver.java | 2 +- .../apache/kafka/metadata/publisher/FeaturesPublisher.java | 2 +- .../test/java/org/apache/kafka/metalog/LocalLogManager.java | 4 ++-- .../src/main/java/org/apache/kafka/raft/CandidateState.java | 2 +- raft/src/main/java/org/apache/kafka/raft/FollowerState.java | 2 +- .../main/java/org/apache/kafka/raft/KafkaRaftClient.java | 4 ++-- .../java/org/apache/kafka/raft/KafkaRaftClientDriver.java | 2 +- raft/src/main/java/org/apache/kafka/raft/LeaderState.java | 2 +- raft/src/main/java/org/apache/kafka/raft/QuorumState.java | 2 +- .../main/java/org/apache/kafka/raft/ReplicatedCounter.java | 2 +- raft/src/main/java/org/apache/kafka/raft/ResignedState.java | 2 +- .../main/java/org/apache/kafka/raft/UnattachedState.java | 2 +- raft/src/main/java/org/apache/kafka/raft/VotedState.java | 2 +- .../org/apache/kafka/raft/internals/AddVoterHandler.java | 2 +- .../apache/kafka/raft/internals/DefaultRequestSender.java | 2 +- .../raft/internals/KRaftControlRecordStateMachine.java | 2 +- raft/src/test/java/org/apache/kafka/raft/MockLog.java | 2 +- .../java/org/apache/kafka/deferred/DeferredEventQueue.java | 2 +- .../src/main/java/org/apache/kafka/queue/EventQueue.java | 2 +- .../main/java/org/apache/kafka/queue/KafkaEventQueue.java | 2 +- .../apache/kafka/server/network/EndpointReadyFutures.java | 2 +- .../main/java/org/apache/kafka/server/util/TopicFilter.java | 2 +- .../java/org/apache/kafka/timeline/SnapshotRegistry.java | 2 +- .../internals/checkpoint/CleanShutdownFileHandler.java | 2 +- .../kafka/storage/internals/epoch/LeaderEpochFileCache.java | 2 +- .../kafka/storage/internals/log/ProducerStateManager.java | 2 +- .../main/java/org/apache/kafka/streams/KafkaStreams.java | 2 +- .../kstream/internals/KStreamSlidingWindowAggregate.java | 2 +- .../streams/kstream/internals/KStreamWindowAggregate.java | 2 +- .../streams/kstream/internals/graph/StreamSourceNode.java | 2 +- .../streams/processor/internals/ActiveTaskCreator.java | 2 +- .../kafka/streams/processor/internals/ChangelogTopics.java | 2 +- .../streams/processor/internals/DefaultStateUpdater.java | 2 +- .../streams/processor/internals/GlobalStateManagerImpl.java | 2 +- .../streams/processor/internals/GlobalStateUpdateTask.java | 2 +- .../streams/processor/internals/GlobalStreamThread.java | 4 ++-- .../streams/processor/internals/InternalTopicManager.java | 2 +- .../kafka/streams/processor/internals/PartitionGroup.java | 2 +- .../kafka/streams/processor/internals/ProcessorNode.java | 2 +- .../streams/processor/internals/ProcessorTopology.java | 2 +- .../streams/processor/internals/RecordCollectorImpl.java | 2 +- .../streams/processor/internals/RecordDeserializer.java | 2 +- .../kafka/streams/processor/internals/RecordQueue.java | 2 +- .../streams/processor/internals/RepartitionTopics.java | 2 +- .../streams/processor/internals/StandbyTaskCreator.java | 2 +- .../streams/processor/internals/StoreChangelogReader.java | 2 +- .../kafka/streams/processor/internals/StreamThread.java | 2 +- .../streams/processor/internals/StreamsMetadataState.java | 2 +- .../kafka/streams/processor/internals/StreamsProducer.java | 2 +- .../processor/internals/StreamsRebalanceListener.java | 2 +- .../streams/processor/internals/TaskExecutionMetadata.java | 2 +- .../kafka/streams/processor/internals/TaskExecutor.java | 2 +- .../kafka/streams/processor/internals/TaskManager.java | 2 +- .../org/apache/kafka/streams/processor/internals/Tasks.java | 2 +- .../internals/assignment/AssignorConfiguration.java | 2 +- .../internals/assignment/CopartitionedTopicsEnforcer.java | 2 +- .../namedtopology/KafkaStreamsNamedTopologyWrapper.java | 2 +- .../internals/namedtopology/RemoveNamedTopologyResult.java | 2 +- .../processor/internals/tasks/DefaultTaskExecutor.java | 4 ++-- .../processor/internals/tasks/DefaultTaskManager.java | 2 +- .../apache/kafka/streams/state/internals/ThreadCache.java | 2 +- .../kafka/streams/state/internals/WindowStoreBuilder.java | 2 +- .../state/internals/metrics/RocksDBMetricsRecorder.java | 2 +- .../processor/internals/RepartitionOptimizingTest.java | 2 +- .../internals/RepartitionWithMergeOptimizingTest.java | 2 +- .../processor/internals/StreamsAssignmentScaleTest.java | 2 +- .../org/apache/kafka/streams/tests/StreamsUpgradeTest.java | 2 +- .../apache/kafka/trogdor/coordinator/CoordinatorClient.java | 2 +- .../kafka/trogdor/workload/TimestampRecordProcessor.java | 2 +- 180 files changed, 189 insertions(+), 189 deletions(-) diff --git a/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java b/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java index 372f4acd983f4..0f2fdff475c7a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java +++ b/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java @@ -42,7 +42,7 @@ final class ClusterConnectionStates { static final int CONNECTION_SETUP_TIMEOUT_EXP_BASE = 2; static final double CONNECTION_SETUP_TIMEOUT_JITTER = 0.2; private final Map nodeState; - private static final Logger log; + private final Logger log; private final HostResolver hostResolver; private final Set connectingNodes; private final ExponentialBackoff reconnectBackoff; @@ -466,7 +466,7 @@ public List nodesWithConnectionSetupTimeout(long now) { private static class NodeConnectionState { private final String host; private final HostResolver hostResolver; - private static final Logger log; + private final Logger log; ConnectionState state; AuthenticationException authenticationException; diff --git a/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java b/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java index f2bf805d235d1..101dce5ab06fb 100644 --- a/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java @@ -58,7 +58,7 @@ * class on the receiving broker side is FetchManager. */ public class FetchSessionHandler { - private static final Logger log; + private final Logger log; private final int node; diff --git a/clients/src/main/java/org/apache/kafka/clients/Metadata.java b/clients/src/main/java/org/apache/kafka/clients/Metadata.java index ee8b20042626d..5f2a412550a88 100644 --- a/clients/src/main/java/org/apache/kafka/clients/Metadata.java +++ b/clients/src/main/java/org/apache/kafka/clients/Metadata.java @@ -65,7 +65,7 @@ * manage topics while producers rely on topic expiry to limit the refresh set. */ public class Metadata implements Closeable { - private static final Logger log; + private final Logger log; private final ExponentialBackoff refreshBackoff; private final long metadataExpireMs; private int updateVersion; // bumped on every metadata response diff --git a/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java b/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java index 443926f5f6aec..4f0b3d11d7937 100644 --- a/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java @@ -82,7 +82,7 @@ private enum State { CLOSED } - private static final Logger log; + private final Logger log; /* the selector used to perform network i/o */ private final Selectable selector; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java b/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java index 5201c258272f8..640a08a3786a7 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java @@ -336,7 +336,7 @@ public class KafkaAdminClient extends AdminClient { */ static final String NETWORK_THREAD_PREFIX = "kafka-admin-client-thread"; - private static final Logger log; + private final Logger log; private final LogContext logContext; /** diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java index 0fcfbfe62e9cf..0f5f4781080b2 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java @@ -40,7 +40,7 @@ import static java.util.Collections.singletonList; public class AbortTransactionHandler extends AdminApiHandler.Batched { - private static final Logger log; + private final Logger log; private final AbortTransactionSpec abortSpec; private final PartitionLeaderStrategy lookupStrategy; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java index 8935e18a28683..92e724e74f5b9 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java @@ -83,7 +83,7 @@ * when the key type is a consumer `GroupId`) */ public class AdminApiDriver { - private static final Logger log; + private final Logger log; private final ExponentialBackoff retryBackoff; private final long deadlineMs; private final AdminApiHandler handler; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java index 3082550a9ce51..90b237aa749eb 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java @@ -43,7 +43,7 @@ * service thread (which also uses the NetworkClient). */ public class AdminMetadataManager { - private static final Logger log; + private final Logger log; /** * The minimum amount of time that we should wait between subsequent diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java index 1109402e66226..433d25e8e54ca 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java @@ -52,7 +52,7 @@ public class AllBrokersStrategy implements AdminApiLookupStrategy offsets; - private static final Logger log; + private final Logger log; private final AdminApiLookupStrategy lookupStrategy; public AlterConsumerGroupOffsetsHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java index 2a5532c16c048..46cba73e75a18 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java @@ -41,7 +41,7 @@ public class CoordinatorStrategy implements AdminApiLookupStrategy unrepresentableKeys = Collections.emptySet(); diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java index 2538ba9d2986f..ebafe634db627 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java @@ -43,7 +43,7 @@ public class DeleteConsumerGroupOffsetsHandler extends AdminApiHandler.Batched partitions; - private static final Logger log; + private final Logger log; private final AdminApiLookupStrategy lookupStrategy; public DeleteConsumerGroupOffsetsHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java index fa6a7c157d243..0d581243ddc7b 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java @@ -39,7 +39,7 @@ public class DeleteConsumerGroupsHandler extends AdminApiHandler.Batched { - private static final Logger log; + private final Logger log; private final AdminApiLookupStrategy lookupStrategy; public DeleteConsumerGroupsHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java index fb6a5fac7443e..836f2bc2a5910 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java @@ -47,7 +47,7 @@ public final class DeleteRecordsHandler extends Batched { private final Map recordsToDelete; - private static final Logger log; + private final Logger log; private final AdminApiLookupStrategy lookupStrategy; private final int timeout; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java index 6b1f978e2d3bb..a2531db90ae5e 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java @@ -61,7 +61,7 @@ public class DescribeConsumerGroupsHandler implements AdminApiHandler { private final boolean includeAuthorizedOperations; - private static final Logger log; + private final Logger log; private final AdminApiLookupStrategy lookupStrategy; private final Set useClassicGroupApi; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java index 4804fb269f7ee..e4b203545bdae 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java @@ -48,7 +48,7 @@ import java.util.stream.Collectors; public class DescribeProducersHandler extends AdminApiHandler.Batched { - private static final Logger log; + private final Logger log; private final DescribeProducersOptions options; private final AdminApiLookupStrategy lookupStrategy; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java index 49cf26cc3e60d..b68521bd0005a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java @@ -45,7 +45,7 @@ import java.util.stream.Collectors; public class DescribeTransactionsHandler extends AdminApiHandler.Batched { - private static final Logger log; + private final Logger log; private final AdminApiLookupStrategy lookupStrategy; public DescribeTransactionsHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java index b1fa89d0b6a55..f2dea06c7b3af 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java @@ -38,7 +38,7 @@ import java.util.stream.Collectors; public class FenceProducersHandler extends AdminApiHandler.Unbatched { - private static final Logger log; + private final Logger log; private final AdminApiLookupStrategy lookupStrategy; private final int txnTimeoutMs; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java index e22050fa89788..4c0e3db925404 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java @@ -43,7 +43,7 @@ public class ListConsumerGroupOffsetsHandler implements AdminApiHandler groupSpecs; - private static final Logger log; + private final Logger log; private final CoordinatorStrategy lookupStrategy; public ListConsumerGroupOffsetsHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java index 4e277858a4f68..0bb42ed7696e2 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java @@ -52,7 +52,7 @@ public final class ListOffsetsHandler extends Batched offsetTimestampsByPartition; private final ListOffsetsOptions options; - private static final Logger log; + private final Logger log; private final AdminApiLookupStrategy lookupStrategy; public ListOffsetsHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java index 7cfbb5c79a0c2..56318fc0acc04 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java @@ -37,7 +37,7 @@ import java.util.stream.Collectors; public class ListTransactionsHandler extends AdminApiHandler.Batched> { - private static final Logger log; + private final Logger log; private final ListTransactionsOptions options; private final AllBrokersStrategy lookupStrategy; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java index 54b829e95f74a..9d52327b3c4f4 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java @@ -42,7 +42,7 @@ public class PartitionLeaderStrategy implements AdminApiLookupStrategy members; - private static final Logger log; + private final Logger log; private final AdminApiLookupStrategy lookupStrategy; public RemoveMembersFromConsumerGroupHandler( diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java index a9fd628b0ba7a..f177dad62b97c 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java @@ -130,7 +130,7 @@ public boolean hasNotJoinedGroup() { } } - private static final Logger log; + private final Logger log; private final Heartbeat heartbeat; private final GroupCoordinatorMetrics sensors; private final GroupRebalanceConfig rebalanceConfig; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java index 084d710e28638..8f5691d17c005 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java @@ -60,7 +60,7 @@ */ public abstract class AbstractFetch implements Closeable { - private static final Logger log; + private final Logger log; private final IdempotentCloser idempotentCloser = new IdempotentCloser(); protected final LogContext logContext; protected final ConsumerMetadata metadata; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java index 43405e358cf62..d4265e72c04ab 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java @@ -26,7 +26,7 @@ public abstract class AsyncClient { - private static final Logger log; + private final Logger log; private final ConsumerNetworkClient client; AsyncClient(ConsumerNetworkClient client, LogContext logContext) { diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java index 95626445df9f5..814250e09491a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java @@ -73,7 +73,7 @@ public class CommitRequestManager implements RequestManager, MemberStateListener private final Time time; private final SubscriptionState subscriptions; private final LogContext logContext; - private static final Logger log; + private final Logger log; private final Optional autoCommitState; private final CoordinatorRequestManager coordinatorRequestManager; private final OffsetCommitCallbackInvoker offsetCommitCallbackInvoker; @@ -1252,7 +1252,7 @@ private static class AutoCommitState { private final long autoCommitInterval; private boolean hasInflightCommit; - private static final Logger log; + private final Logger log; public AutoCommitState( final Time time, diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java index 2553f96f08a06..2cba76588e5f0 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java @@ -63,7 +63,7 @@ public class CompletedFetch { final FetchResponseData.PartitionData partitionData; final short requestVersion; - private static final Logger log; + private final Logger log; private final SubscriptionState subscriptions; private final BufferSupplier decompressionBufferSupplier; private final Iterator batches; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java index 92ef07ab47c9c..785df2362ab9e 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java @@ -100,7 +100,7 @@ public final class ConsumerCoordinator extends AbstractCoordinator { private static final TopicPartitionComparator COMPARATOR = new TopicPartitionComparator(); private final GroupRebalanceConfig rebalanceConfig; - private static final Logger log; + private final Logger log; private final List assignors; private final ConsumerMetadata metadata; private final ConsumerCoordinatorMetrics coordinatorMetrics; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java index 4f1d7e9a1e637..1f07bbcaa2f9a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java @@ -58,7 +58,7 @@ public class ConsumerNetworkClient implements Closeable { // the mutable state of this class is protected by the object's monitor (excluding the wakeup // flag and the request completion queue below). - private static final Logger log; + private final Logger log; private final KafkaClient client; private final UnsentRequests unsent = new UnsentRequests(); private final Metadata metadata; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java index 86a2a7fe7e1ca..a91ea11d2f332 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java @@ -54,7 +54,7 @@ public class ConsumerNetworkThread extends KafkaThread implements Closeable { static final long MAX_POLL_TIMEOUT_MS = 5000; private static final String BACKGROUND_THREAD_NAME = "consumer_background_thread"; private final Time time; - private static final Logger log; + private final Logger log; private final BlockingQueue applicationEventQueue; private final CompletableEventReaper applicationEventReaper; private final Supplier applicationEventProcessorSupplier; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java index 132fff7804ece..b42cf85a8602a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java @@ -39,7 +39,7 @@ */ public class ConsumerRebalanceListenerInvoker { - private static final Logger log; + private final Logger log; private final SubscriptionState subscriptions; private final Time time; private final RebalanceCallbackMetricsManager metricsManager; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java index 552e62cac4ffd..5144b41f574aa 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java @@ -51,7 +51,7 @@ */ public class CoordinatorRequestManager implements RequestManager { private static final long COORDINATOR_DISCONNECT_LOGGING_INTERVAL_MS = 60 * 1000; - private static final Logger log; + private final Logger log; private final BackgroundEventHandler backgroundEventHandler; private final String groupId; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java index d35fe5a14a924..23adf9c9afaaa 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java @@ -48,7 +48,7 @@ */ public class FetchBuffer implements AutoCloseable { - private static final Logger log; + private final Logger log; private final ConcurrentLinkedQueue completedFetches; private final Lock lock; private final Condition notEmptyCondition; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java index 96aeafe1ff771..5dfa31248e34c 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java @@ -52,7 +52,7 @@ */ public class FetchCollector { - private static final Logger log; + private final Logger log; private final ConsumerMetadata metadata; private final SubscriptionState subscriptions; private final FetchConfig fetchConfig; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java index bb4fd9365b1f3..745bbfde99289 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java @@ -58,7 +58,7 @@ */ public class Fetcher extends AbstractFetch { - private static final Logger log; + private final Logger log; private final ConsumerNetworkClient client; private final FetchCollector fetchCollector; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Heartbeat.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Heartbeat.java index 835a840288bfc..20852dfe55e8a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Heartbeat.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Heartbeat.java @@ -35,7 +35,7 @@ public final class Heartbeat { private final Timer heartbeatTimer; private final Timer sessionTimer; private final Timer pollTimer; - private static final Logger log; + private final Logger log; private final ExponentialBackoff retryBackoff; private volatile long lastHeartbeatSend = 0L; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManager.java index 388c9cd4aeaf5..8a62051b2f42e 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManager.java @@ -74,7 +74,7 @@ */ public class HeartbeatRequestManager implements RequestManager { - private static final Logger logger; + private final Logger logger; /** * Time that the group coordinator will wait on member to revoke its partitions. This is provided by the group diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImpl.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImpl.java index 70085495877b5..a0e3a06d0087f 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImpl.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImpl.java @@ -194,7 +194,7 @@ public class MembershipManagerImpl implements MembershipManager { /** * Logger. */ - private static final Logger log; + private final Logger log; /** * Manager to perform commit requests needed before revoking partitions (if auto-commit is diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java index 17198bd662dcd..56e4d6977480a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java @@ -65,7 +65,7 @@ public class NetworkClientDelegate implements AutoCloseable { private final BackgroundEventHandler backgroundEventHandler; private final Metadata metadata; private final Time time; - private static final Logger log; + private final Logger log; private final int requestTimeoutMs; private final Queue unsentRequests; private final long retryBackoffMs; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java index ce8bdb316f1cc..f624941c525c1 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java @@ -61,7 +61,7 @@ */ public class OffsetFetcher { - private static final Logger log; + private final Logger log; private final ConsumerMetadata metadata; private final SubscriptionState subscriptions; private final ConsumerNetworkClient client; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java index 889a610d1a3b2..f504c57b4aecc 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java @@ -64,7 +64,7 @@ class OffsetFetcherUtils { private final Time time; private final long retryBackoffMs; private final ApiVersions apiVersions; - private static final Logger log; + private final Logger log; /** * Exception that occurred while validating positions, that will be propagated on the next diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java index 05d292de97c6a..b4f637141287d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java @@ -76,7 +76,7 @@ public class OffsetsRequestManager implements RequestManager, ClusterResourceLis private final ConsumerMetadata metadata; private final IsolationLevel isolationLevel; - private static final Logger log; + private final Logger log; private final OffsetFetcherUtils offsetFetcherUtils; private final SubscriptionState subscriptionState; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java index e118aa76ecbf0..618c5e3d4d5f2 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java @@ -45,7 +45,7 @@ */ public class RequestManagers implements Closeable { - private static final Logger log; + private final Logger log; public final Optional coordinatorRequestManager; public final Optional commitRequestManager; public final Optional heartbeatRequestManager; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java index 4a6acca9d08d7..b509f675fc858 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java @@ -23,7 +23,7 @@ class RequestState { - private static final Logger log; + private final Logger log; protected final String owner; static final int RETRY_BACKOFF_EXP_BASE = 2; static final double RETRY_BACKOFF_JITTER = 0.2; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java index 5ec3c03f0c974..51c5e5ee45317 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java @@ -60,7 +60,7 @@ public class ShareCompletedFetch { final ShareFetchResponseData.PartitionData partitionData; final short requestVersion; - private static final Logger log; + private final Logger log; private final BufferSupplier decompressionBufferSupplier; private final Iterator batches; private int recordsRead; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java index 4f7dba2dde2aa..7427edbb88069 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java @@ -69,7 +69,7 @@ @SuppressWarnings("NPathComplexity") public class ShareConsumeRequestManager implements RequestManager, MemberStateListener, Closeable { private final Time time; - private static final Logger log; + private final Logger log; private final LogContext logContext; private final String groupId; private final ConsumerMetadata metadata; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchBuffer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchBuffer.java index 623cfeb06b976..ebd86583ec6f8 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchBuffer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchBuffer.java @@ -44,7 +44,7 @@ */ public class ShareFetchBuffer implements AutoCloseable { - private static final Logger log; + private final Logger log; private final ConcurrentLinkedQueue completedFetches; private final Lock lock; private final Condition notEmptyCondition; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollector.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollector.java index 362da2b7bdb0d..3d073fa92eb82 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollector.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollector.java @@ -41,7 +41,7 @@ */ public class ShareFetchCollector { - private static final Logger log; + private final Logger log; private final ConsumerMetadata metadata; private final SubscriptionState subscriptions; private final FetchConfig fetchConfig; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManager.java index ea5268e4cb36c..b68b59298f477 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManager.java @@ -68,7 +68,7 @@ */ public class ShareHeartbeatRequestManager implements RequestManager { - private static final Logger logger; + private final Logger logger; /** * Time that the group coordinator will wait on member to revoke its partitions. This is provided by the group diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManager.java index 7f49da5bfedb1..46b17f29db6dd 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareMembershipManager.java @@ -93,7 +93,7 @@ public class ShareMembershipManager implements RequestManager { /** * Logger. */ - private static final Logger log; + private final Logger log; /** * TopicPartition comparator based on topic name and partition id. diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandler.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandler.java index 6f18c5457fc32..3aa97f6c780d1 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareSessionHandler.java @@ -54,7 +54,7 @@ * which partitions need to be included in each ShareFetch/ShareAcknowledge request. */ public class ShareSessionHandler { - private static final Logger log; + private final Logger log; private final int node; private final Uuid memberId; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java index 17e665c098f50..bc7d20d11e0d3 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java @@ -75,7 +75,7 @@ public class SubscriptionState { private static final String SUBSCRIPTION_EXCEPTION_MESSAGE = "Subscription to topics, partitions and pattern are mutually exclusive"; - private static final Logger log; + private final Logger log; private enum SubscriptionType { NONE, AUTO_TOPICS, AUTO_PATTERN, USER_ASSIGNED, AUTO_TOPICS_SHARE diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java index f29818c9f889b..f86457891e2cf 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java @@ -47,7 +47,7 @@ */ public class TopicMetadataFetcher { - private static final Logger log; + private final Logger log; private final ConsumerNetworkClient client; private final ExponentialBackoff retryBackoff; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java index e83ee74b9f2df..2d9cab0dd9686 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java @@ -68,7 +68,7 @@ public class TopicMetadataRequestManager implements RequestManager { private final List inflightRequests; private final long retryBackoffMs; private final long retryBackoffMaxMs; - private static final Logger log; + private final Logger log; private final LogContext logContext; public TopicMetadataRequestManager(final LogContext context, final Time time, final ConsumerConfig config) { diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java index 347e157a5626d..d8fc13830f716 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java @@ -40,7 +40,7 @@ */ public class ApplicationEventHandler implements Closeable { - private static final Logger log; + private final Logger log; private final BlockingQueue applicationEventQueue; private final ConsumerNetworkThread networkThread; private final IdempotentCloser closer = new IdempotentCloser(); diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java index ae0ee53c113a2..e0c6911f6792f 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java @@ -48,7 +48,7 @@ */ public class ApplicationEventProcessor implements EventProcessor { - private static final Logger log; + private final Logger log; private final ConsumerMetadata metadata; private final SubscriptionState subscriptions; private final RequestManagers requestManagers; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java index 22a8ac6956637..9f91617c73579 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java @@ -38,7 +38,7 @@ */ public class CompletableEventReaper { - private static final Logger log; + private final Logger log; /** * List of tracked events that are candidates for expiration. diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java b/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java index b684f4d7373c4..e71f1d5755351 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java @@ -237,7 +237,7 @@ */ public class KafkaProducer implements Producer { - private static final Logger log; + private final Logger log; private static final String JMX_PREFIX = "kafka.producer"; public static final String NETWORK_THREAD_PREFIX = "kafka-producer-network-thread"; public static final String PRODUCER_METRIC_GROUP_NAME = "producer-metrics"; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java index 8396619155f20..98386324f7bda 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java @@ -37,7 +37,7 @@ * (described in detail in KIP-794). There is one partitioner object per topic. */ public class BuiltInPartitioner { - private static final Logger log; + private final Logger log; private final String topic; private final int stickyBatchSize; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java index c512ac1ae08cb..0c77ef5fc4c69 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java @@ -41,7 +41,7 @@ public class ProducerMetadata extends Metadata { /* Topics with expiry time */ private final Map topics = new HashMap<>(); private final Set newTopics = new HashSet<>(); - private static final Logger log; + private final Logger log; private final Time time; private Map errors = null; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java index b9214aad00815..ec50dc9bc26d1 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java @@ -70,7 +70,7 @@ public class RecordAccumulator { private final LogContext logContext; - private static final Logger log; + private final Logger log; private volatile boolean closed; private final AtomicInteger flushesInProgress; private final AtomicInteger appendsInProgress; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java index e9d1880db8432..39f5616465154 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java @@ -79,7 +79,7 @@ */ public class Sender implements Runnable { - private static final Logger log; + private final Logger log; /* the state of each nodes connection */ private final KafkaClient client; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java index c00b60a4f64ab..10239be6d9812 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java @@ -92,7 +92,7 @@ public class TransactionManager { private static final int NO_INFLIGHT_REQUEST_CORRELATION_ID = -1; - private static final Logger log; + private final Logger log; private final String transactionalId; private final int transactionTimeoutMs; private final ApiVersions apiVersions; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java index 6430defe12f34..05a0fa3fbbc30 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java @@ -31,7 +31,7 @@ class TxnPartitionMap { - private static final Logger log; + private final Logger log; private final Map topicPartitions = new HashMap<>(); diff --git a/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java b/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java index 8653930f6dba3..247bab18d5565 100644 --- a/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java +++ b/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java @@ -45,7 +45,7 @@ */ public class AbstractConfig { - private static final Logger log = LoggerFactory.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); /** * Configs for which values have been requested, used to detect unused configs. diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/internals/IntGaugeSuite.java b/clients/src/main/java/org/apache/kafka/common/metrics/internals/IntGaugeSuite.java index 2415bbd671147..61ff49b0adfcc 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/internals/IntGaugeSuite.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/internals/IntGaugeSuite.java @@ -41,7 +41,7 @@ public final class IntGaugeSuite implements AutoCloseable { /** * The log4j logger. */ - private static final Logger log; + private final Logger log; /** * The name of this suite. diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java index 5cb1da4f65376..c7c882496bf8e 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java @@ -33,7 +33,7 @@ */ public class Percentiles extends SampledStat implements CompoundStat { - private static final Logger log = LoggerFactory.getLogger(Percentiles.class); + private final Logger log = LoggerFactory.getLogger(Percentiles.class); public enum BucketSizing { CONSTANT, LINEAR diff --git a/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java b/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java index e3b894293761c..4c73e4e3e4c94 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java +++ b/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java @@ -96,7 +96,7 @@ public class SaslChannelBuilder implements ChannelBuilder, ListenerReconfigurabl private final Map connectionsMaxReauthMsByMechanism; private final Time time; private final LogContext logContext; - private static final Logger log; + private final Logger log; private SslFactory sslFactory; private Map configs; diff --git a/clients/src/main/java/org/apache/kafka/common/network/Selector.java b/clients/src/main/java/org/apache/kafka/common/network/Selector.java index 9c861fd9c5dbd..68698ab7b8d21 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/Selector.java +++ b/clients/src/main/java/org/apache/kafka/common/network/Selector.java @@ -102,7 +102,7 @@ private enum CloseMode { } } - private static final Logger log; + private final Logger log; private final java.nio.channels.Selector nioSelector; private final Map channels; private final Set explicitlyMutedChannels; diff --git a/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java b/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java index 64cbe642e79e8..d047c79ce8a1c 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java +++ b/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java @@ -79,7 +79,7 @@ private enum State { private final SelectionKey key; private final SocketChannel socketChannel; private final ChannelMetadataRegistry metadataRegistry; - private static final Logger log; + private final Logger log; private HandshakeStatus handshakeStatus; private SSLEngineResult handshakeResult; diff --git a/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java b/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java index 6f8c750855c5e..a327c4b6c1b59 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java +++ b/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java @@ -149,7 +149,7 @@ public static boolean isReserved(int correlationId) { private final String clientPrincipalName; private final AuthenticateCallbackHandler callbackHandler; private final Time time; - private static final Logger log; + private final Logger log; private final ReauthInfo reauthInfo; // buffers used in `authenticate` diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java index 2241eb50fdc07..daae977d72729 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java @@ -99,7 +99,7 @@ * broker configuration property. */ public class OAuthBearerUnsecuredLoginCallbackHandler implements AuthenticateCallbackHandler { - private static final Logger log = LoggerFactory.getLogger(OAuthBearerUnsecuredLoginCallbackHandler.class); + private final Logger log = LoggerFactory.getLogger(OAuthBearerUnsecuredLoginCallbackHandler.class); private static final String OPTION_PREFIX = "unsecuredLogin"; private static final String PRINCIPAL_CLAIM_NAME_OPTION = OPTION_PREFIX + "PrincipalClaimName"; private static final String LIFETIME_SECONDS_OPTION = OPTION_PREFIX + "LifetimeSeconds"; diff --git a/clients/src/main/java/org/apache/kafka/common/utils/KafkaThread.java b/clients/src/main/java/org/apache/kafka/common/utils/KafkaThread.java index 897ed8eed8670..2f5e15f46349e 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/KafkaThread.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/KafkaThread.java @@ -24,7 +24,7 @@ */ public class KafkaThread extends Thread { - private static final Logger log = LoggerFactory.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); public static KafkaThread daemon(final String name, Runnable runnable) { return new KafkaThread(name, runnable, true); diff --git a/clients/src/main/java/org/apache/kafka/common/utils/LogContext.java b/clients/src/main/java/org/apache/kafka/common/utils/LogContext.java index 0b0ad1208a469..10acf32ccd47f 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/LogContext.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/LogContext.java @@ -436,7 +436,7 @@ private void writeLog(Marker marker, int level, String format, Object[] args, Th } private static class LocationIgnorantKafkaLogger extends AbstractKafkaLogger { - private static final Logger logger; + private final Logger logger; LocationIgnorantKafkaLogger(String logPrefix, Logger logger) { super(logPrefix); diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java index 79acda8429593..ce242e4bc74d5 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java @@ -3673,7 +3673,7 @@ private void clearBufferedDataForUnassignedPartitions(Set partit private class TestableNetworkClientDelegate extends NetworkClientDelegate { - private static final Logger log = LoggerFactory.getLogger(NetworkClientDelegate.class); + private final Logger log = LoggerFactory.getLogger(NetworkClientDelegate.class); private final ConcurrentLinkedQueue pendingDisconnects = new ConcurrentLinkedQueue<>(); public TestableNetworkClientDelegate(Time time, diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerSinkTaskContext.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerSinkTaskContext.java index 66fd8a80d3a20..3baf4772b5bda 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerSinkTaskContext.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerSinkTaskContext.java @@ -35,7 +35,7 @@ public class WorkerSinkTaskContext implements SinkTaskContext { - private static final Logger log = LoggerFactory.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final Map offsets; private final Consumer consumer; private final WorkerSinkTask sinkTask; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java index 0e8c36c6dcef9..174adea8cdd6c 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java @@ -153,7 +153,7 @@ *

*/ public class DistributedHerder extends AbstractHerder implements Runnable { - private static final Logger log; + private final Logger log; private static final long FORWARD_REQUEST_SHUTDOWN_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(10); private static final long START_AND_STOP_SHUTDOWN_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(1); diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/EagerAssignor.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/EagerAssignor.java index cbe4d4deae5cb..0663d9e571052 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/EagerAssignor.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/EagerAssignor.java @@ -45,7 +45,7 @@ * Note that this class is NOT thread-safe. */ public class EagerAssignor implements ConnectAssignor { - private static final Logger log; + private final Logger log; public EagerAssignor(LogContext logContext) { this.log = logContext.logger(EagerAssignor.class); diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignor.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignor.java index d589dde1f5d71..676ae78753002 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignor.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignor.java @@ -62,7 +62,7 @@ * */ public class IncrementalCooperativeAssignor implements ConnectAssignor { - private static final Logger log; + private final Logger log; private final Time time; private final int maxDelay; private ConnectorsAndTasks previousAssignment; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinator.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinator.java index 28d1417027535..138bf9fc51473 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinator.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinator.java @@ -56,7 +56,7 @@ * to workers. */ public class WorkerCoordinator extends AbstractCoordinator implements Closeable { - private static final Logger log; + private final Logger log; private final String restUrl; private final ConfigBackingStore configStorage; private volatile ExtendedAssignment assignmentSnapshot; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMember.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMember.java index fdf74f857b4a8..f4fdcaf801edc 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMember.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMember.java @@ -63,7 +63,7 @@ public class WorkerGroupMember { private static final String JMX_PREFIX = "kafka.connect"; - private static final Logger log; + private final Logger log; private final String clientId; private final ConsumerNetworkClient client; private final Metrics metrics; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/LoggersTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/LoggersTest.java index a955db08faf3f..3dbe688a076a2 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/LoggersTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/LoggersTest.java @@ -214,7 +214,7 @@ public void testSetLevelNullArguments() { private class TestLoggers extends Loggers { - private static final Logger rootLogger; + private final Logger rootLogger; private final Map currentLoggers; public TestLoggers(Logger rootLogger, Logger... knownLoggers) { diff --git a/core/src/main/java/kafka/log/remote/RemoteLogManager.java b/core/src/main/java/kafka/log/remote/RemoteLogManager.java index eb1f99aea0bef..f3f0ccc11ad2d 100644 --- a/core/src/main/java/kafka/log/remote/RemoteLogManager.java +++ b/core/src/main/java/kafka/log/remote/RemoteLogManager.java @@ -705,7 +705,7 @@ RLMTask rlmCopyTask(TopicIdPartition topicIdPartition) { abstract class RLMTask extends CancellableRunnable { protected final TopicIdPartition topicIdPartition; - private static final Logger logger; + private final Logger logger; public RLMTask(TopicIdPartition topicIdPartition) { this.topicIdPartition = topicIdPartition; @@ -750,7 +750,7 @@ public String toString() { class RLMCopyTask extends RLMTask { private final int customMetadataSizeLimit; - private static final Logger logger; + private final Logger logger; // The copied and log-start offset is empty initially for a new RLMCopyTask, and needs to be fetched inside // the task's run() method. @@ -992,7 +992,7 @@ private Path toPathIfExists(File file) { } class RLMExpirationTask extends RLMTask { - private static final Logger logger; + private final Logger logger; public RLMExpirationTask(TopicIdPartition topicIdPartition) { super(topicIdPartition); diff --git a/core/src/main/java/kafka/server/logger/RuntimeLoggerManager.java b/core/src/main/java/kafka/server/logger/RuntimeLoggerManager.java index 0d052e9d7e809..14d1b72c10942 100644 --- a/core/src/main/java/kafka/server/logger/RuntimeLoggerManager.java +++ b/core/src/main/java/kafka/server/logger/RuntimeLoggerManager.java @@ -48,7 +48,7 @@ public class RuntimeLoggerManager { } private final int nodeId; - private static final Logger log; + private final Logger log; public RuntimeLoggerManager(int nodeId, Logger log) { this.nodeId = nodeId; diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java index b820d7e6ca6d3..e132e85ec21c6 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java @@ -206,7 +206,7 @@ public GroupCoordinatorService build() { /** * The logger. */ - private static final Logger log; + private final Logger log; /** * The group coordinator configurations. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorShard.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorShard.java index a6066717221a6..c633a4bddd642 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorShard.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorShard.java @@ -234,7 +234,7 @@ public GroupCoordinatorShard build() { /** * The logger. */ - private static final Logger log; + private final Logger log; /** * The group metadata manager. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java index 805b3e44be59b..ff96a98f28ce5 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java @@ -357,7 +357,7 @@ GroupMetadataManager build() { /** * The logger. */ - private static final Logger log; + private final Logger log; /** * The snapshot registry. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java index 5777bc069b37b..dad69db30b97a 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java @@ -155,7 +155,7 @@ public OffsetMetadataManager build() { /** * The logger. */ - private static final Logger log; + private final Logger log; /** * The snapshot registry. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/classic/ClassicGroup.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/classic/ClassicGroup.java index d701e73d11425..ad75634cf497d 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/classic/ClassicGroup.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/classic/ClassicGroup.java @@ -91,7 +91,7 @@ public class ClassicGroup implements Group { /** * The slf4j logger. */ - private static final Logger log; + private final Logger log; /** * The group id. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntime.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntime.java index 5546122ff467d..82d18343deb0f 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntime.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/CoordinatorRuntime.java @@ -1790,7 +1790,7 @@ public void onHighWatermarkUpdated( /** * The logger. */ - private static final Logger log; + private final Logger log; /** * The system time. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/MultiThreadedEventProcessor.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/MultiThreadedEventProcessor.java index 61734da075cef..fa1f734c1c70c 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/MultiThreadedEventProcessor.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/MultiThreadedEventProcessor.java @@ -44,7 +44,7 @@ public class MultiThreadedEventProcessor implements CoordinatorEventProcessor { /** * The logger. */ - private static final Logger log; + private final Logger log; /** * The accumulator. @@ -118,7 +118,7 @@ public MultiThreadedEventProcessor( * accumulator and runs them. */ private class EventProcessorThread extends Thread { - private static final Logger log; + private final Logger log; EventProcessorThread( String name diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/SnapshottableCoordinator.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/SnapshottableCoordinator.java index 4df71ce20ce73..b7f74748c4597 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/SnapshottableCoordinator.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/SnapshottableCoordinator.java @@ -34,7 +34,7 @@ class SnapshottableCoordinator, U> implements Coor /** * The logger. */ - private static final Logger log; + private final Logger log; /** * The snapshot registry backing the coordinator. diff --git a/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java index 62a8108203910..d7c5dd1a3e585 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java @@ -79,7 +79,7 @@ AclControlManager build() { } } - private static final Logger log; + private final Logger log; private final TimelineHashMap idToAcl; private final TimelineHashSet existingAcls; diff --git a/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java b/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java index 4e2493f1f943c..e1734c52fbc37 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java @@ -224,7 +224,7 @@ public BrokerHeartbeatState next() { } } - private static final Logger log; + private final Logger log; /** * The Kafka clock object to use. diff --git a/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java index 0c572a635ce05..64b8a41f5c4d5 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java @@ -72,7 +72,7 @@ ClientQuotaControlManager build() { } } - private static final Logger log; + private final Logger log; private final SnapshotRegistry snapshotRegistry; diff --git a/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java index 58719fb1fb5bd..7f77455abcc52 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java @@ -208,7 +208,7 @@ boolean check() { /** * The SLF4J log object. */ - private static final Logger log; + private final Logger log; /** * The Kafka clock object to use. diff --git a/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java index c790770990455..4ea7d9757d987 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java @@ -57,7 +57,7 @@ public class ConfigurationControlManager { public static final ConfigResource DEFAULT_NODE = new ConfigResource(Type.BROKER, ""); - private static final Logger log; + private final Logger log; private final SnapshotRegistry snapshotRegistry; private final KafkaConfigSchema configSchema; private final Consumer existenceChecker; diff --git a/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java index f344f178f205c..fa50570a48f79 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java @@ -104,7 +104,7 @@ DelegationTokenControlManager build() { } } - private static final Logger log; + private final Logger log; private final DelegationTokenCache tokenCache; private final String tokenSecretKeyString; private final long tokenDefaultMaxLifetimeMs; diff --git a/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java index cca3ea35945b5..4d7f2b862fbf5 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java @@ -120,7 +120,7 @@ public FeatureControlManager build() { } } - private static final Logger log; + private final Logger log; /** * An immutable map containing the features supported by this controller's software. diff --git a/metadata/src/main/java/org/apache/kafka/controller/LogReplayTracker.java b/metadata/src/main/java/org/apache/kafka/controller/LogReplayTracker.java index 3933e011f3250..8777306029100 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/LogReplayTracker.java +++ b/metadata/src/main/java/org/apache/kafka/controller/LogReplayTracker.java @@ -45,7 +45,7 @@ public LogReplayTracker build() { /** * The slf4j logger. */ - private static final Logger log; + private final Logger log; /** * True if we haven't replayed any records yet. diff --git a/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java index 977a93b03f191..4094c34e58006 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java @@ -87,7 +87,7 @@ public OffsetControlManager build() { /** * The slf4j logger. */ - private static final Logger log; + private final Logger log; /** * The snapshot registry. diff --git a/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java index 41e1c292f6f2f..2c1a0b49e4c98 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java @@ -65,7 +65,7 @@ ProducerIdControlManager build() { } } - private static final Logger log; + private final Logger log; private final ClusterControlManager clusterControlManager; private final TimelineObject nextProducerBlock; private final TimelineLong brokerEpoch; diff --git a/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java b/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java index c1baabfe29d39..5632720d83798 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java +++ b/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java @@ -1579,7 +1579,7 @@ private void replay(ApiMessage message, Optional snapshotId, lon /** * The slf4j logger. */ - private static final Logger log; + private final Logger log; /** * The ID of this controller node. diff --git a/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java index c16204f596f11..81abfbeb5371f 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java @@ -297,7 +297,7 @@ static Map translateCreationConfigs(CreatableTopicConfigCollecti } private final SnapshotRegistry snapshotRegistry; - private static final Logger log; + private final Logger log; /** * The KIP-464 default replication factor that is used if a CreateTopics request does diff --git a/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java index 8e241555e0e16..f593e2e0e4b2c 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java @@ -161,7 +161,7 @@ public String toString() { } } - private static final Logger log; + private final Logger log; private final TimelineHashMap credentials; private ScramControlManager( diff --git a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java index fd368305e5ed9..97d1a1f9c0fca 100644 --- a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java +++ b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java @@ -54,7 +54,7 @@ public interface MetadataUpdater { void update(MetadataDelta delta, MetadataImage image, LogDeltaManifest manifest); } - private static final Logger log; + private final Logger log; private final Time time; private final FaultHandler faultHandler; private final MetadataUpdater callback; diff --git a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java index 6a7a57172588f..5702b992aaaf4 100644 --- a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java +++ b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java @@ -136,7 +136,7 @@ public MetadataLoader build() { /** * The log4j logger for this loader. */ - private static final Logger log; + private final Logger log; /** * The clock used by this loader. diff --git a/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java b/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java index 3dac223ed4564..dfb97934cea7a 100644 --- a/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java +++ b/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java @@ -39,7 +39,7 @@ * with the actual state, and try to make changes only if necessary. */ public class BrokerRegistrationTracker implements MetadataPublisher { - private static final Logger log; + private final Logger log; private final int id; private final Runnable refreshRegistrationCallback; diff --git a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java index 426985b74025a..d9f6b73742480 100644 --- a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java +++ b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java @@ -93,7 +93,7 @@ public SnapshotEmitter build() { /** * The slf4j logger to use. */ - private static final Logger log; + private final Logger log; /** * The clock object. diff --git a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java index 9de08e8f53718..e427fbe61da31 100644 --- a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java +++ b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java @@ -137,7 +137,7 @@ public interface Emitter { /** * The slf4j logger to use. */ - private static final Logger log; + private final Logger log; /** * The fault handler to use. diff --git a/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java b/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java index 5708e4f8e9f45..61b95c091d6dc 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java @@ -92,7 +92,7 @@ public long nextPollTimeMs() { static final int METADATA_COMMIT_MAX_WAIT_MS = 300_000; private final Time time; - private static final Logger log; + private final Logger log; private final int nodeId; private final MigrationClient zkMigrationClient; private final KRaftMigrationZkWriter zkMetadataWriter; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java b/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java index 4fe1725376a9f..a03f08291b5d8 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java @@ -30,7 +30,7 @@ public class FeaturesPublisher implements MetadataPublisher { - private static final Logger log; + private final Logger log; private volatile FinalizedFeatures finalizedFeatures = FinalizedFeatures.fromKRaftVersion(MINIMUM_KRAFT_VERSION); public FeaturesPublisher( diff --git a/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java b/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java index 69a74ebfddc71..ec733b3ca196f 100644 --- a/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java +++ b/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java @@ -163,7 +163,7 @@ public String toString() { } public static class SharedLogData { - private static final Logger log = LoggerFactory.getLogger(SharedLogData.class); + private final Logger log = LoggerFactory.getLogger(SharedLogData.class); /** * Maps node IDs to the matching log managers. @@ -466,7 +466,7 @@ void beginShutdown() { } } - private static final Logger log; + private final Logger log; /** * The node ID of this local log manager. Each log manager must have a unique ID. diff --git a/raft/src/main/java/org/apache/kafka/raft/CandidateState.java b/raft/src/main/java/org/apache/kafka/raft/CandidateState.java index 8d52237c6a654..1fd71e5e5634a 100644 --- a/raft/src/main/java/org/apache/kafka/raft/CandidateState.java +++ b/raft/src/main/java/org/apache/kafka/raft/CandidateState.java @@ -42,7 +42,7 @@ public class CandidateState implements EpochState { private final int electionTimeoutMs; private final Timer electionTimer; private final Timer backoffTimer; - private static final Logger log; + private final Logger log; /** * The lifetime of a candidate state is the following. diff --git a/raft/src/main/java/org/apache/kafka/raft/FollowerState.java b/raft/src/main/java/org/apache/kafka/raft/FollowerState.java index 893e164aebb93..a4d635e038849 100644 --- a/raft/src/main/java/org/apache/kafka/raft/FollowerState.java +++ b/raft/src/main/java/org/apache/kafka/raft/FollowerState.java @@ -44,7 +44,7 @@ public class FollowerState implements EpochState { */ private Optional fetchingSnapshot = Optional.empty(); - private static final Logger log; + private final Logger log; public FollowerState( Time time, diff --git a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java index 18327da747d91..07df77d1eab92 100644 --- a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java +++ b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java @@ -163,7 +163,7 @@ public final class KafkaRaftClient implements RaftClient { private final Uuid nodeDirectoryId; private final AtomicReference shutdown = new AtomicReference<>(); private final LogContext logContext; - private static final Logger logger; + private final Logger logger; private final Time time; private final int fetchMaxWaitMs; private final String clusterId; @@ -2974,7 +2974,7 @@ private boolean maybeCompleteShutdown(long currentTimeMs) { * A simple timer based log cleaner */ private static class RaftMetadataLogCleanerManager { - private static final Logger logger; + private final Logger logger; private final Timer timer; private final long delayMs; private final Runnable cleaner; diff --git a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClientDriver.java b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClientDriver.java index cbe4ac8e4f94f..2af7d7d207f87 100644 --- a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClientDriver.java +++ b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClientDriver.java @@ -43,7 +43,7 @@ public class KafkaRaftClientDriver extends ShutdownableThread { * Closed in {@link #shutdown()} after shutdown completes. */ private final KafkaRaftClient client; - private static final Logger log; + private final Logger log; private final FaultHandler fatalFaultHandler; public KafkaRaftClientDriver( diff --git a/raft/src/main/java/org/apache/kafka/raft/LeaderState.java b/raft/src/main/java/org/apache/kafka/raft/LeaderState.java index 18f5c037643ec..b58e0d833c0fa 100644 --- a/raft/src/main/java/org/apache/kafka/raft/LeaderState.java +++ b/raft/src/main/java/org/apache/kafka/raft/LeaderState.java @@ -75,7 +75,7 @@ public class LeaderState implements EpochState { private Map voterStates = new HashMap<>(); private Optional addVoterHandlerState = Optional.empty(); private final Map observerStates = new HashMap<>(); - private static final Logger log; + private final Logger log; private final BatchAccumulator accumulator; // The set includes all of the followers voters that FETCH or FETCH_SNAPSHOT during the current checkQuorumTimer interval. private final Set fetchedVoters = new HashSet<>(); diff --git a/raft/src/main/java/org/apache/kafka/raft/QuorumState.java b/raft/src/main/java/org/apache/kafka/raft/QuorumState.java index f9cbc3ca47dfe..d84e274990e10 100644 --- a/raft/src/main/java/org/apache/kafka/raft/QuorumState.java +++ b/raft/src/main/java/org/apache/kafka/raft/QuorumState.java @@ -80,7 +80,7 @@ public class QuorumState { private final OptionalInt localId; private final Uuid localDirectoryId; private final Time time; - private static final Logger log; + private final Logger log; private final QuorumStateStore store; private final KRaftControlRecordStateMachine partitionState; private final Endpoints localListeners; diff --git a/raft/src/main/java/org/apache/kafka/raft/ReplicatedCounter.java b/raft/src/main/java/org/apache/kafka/raft/ReplicatedCounter.java index 1876bdceae7fb..2758481ef6936 100644 --- a/raft/src/main/java/org/apache/kafka/raft/ReplicatedCounter.java +++ b/raft/src/main/java/org/apache/kafka/raft/ReplicatedCounter.java @@ -33,7 +33,7 @@ public class ReplicatedCounter implements RaftClient.Listener { private static final int SNAPSHOT_DELAY_IN_RECORDS = 10; private final int nodeId; - private static final Logger log; + private final Logger log; private final RaftClient client; private int committed = 0; diff --git a/raft/src/main/java/org/apache/kafka/raft/ResignedState.java b/raft/src/main/java/org/apache/kafka/raft/ResignedState.java index 03ab6676f6849..267a88ad787cd 100644 --- a/raft/src/main/java/org/apache/kafka/raft/ResignedState.java +++ b/raft/src/main/java/org/apache/kafka/raft/ResignedState.java @@ -50,7 +50,7 @@ public class ResignedState implements EpochState { private final Set unackedVoters; private final Timer electionTimer; private final List preferredSuccessors; - private static final Logger log; + private final Logger log; public ResignedState( Time time, diff --git a/raft/src/main/java/org/apache/kafka/raft/UnattachedState.java b/raft/src/main/java/org/apache/kafka/raft/UnattachedState.java index b4ceaa15ae2a5..1dba6a70f28cf 100644 --- a/raft/src/main/java/org/apache/kafka/raft/UnattachedState.java +++ b/raft/src/main/java/org/apache/kafka/raft/UnattachedState.java @@ -46,7 +46,7 @@ public class UnattachedState implements EpochState { private final long electionTimeoutMs; private final Timer electionTimer; private final Optional highWatermark; - private static final Logger log; + private final Logger log; public UnattachedState( Time time, diff --git a/raft/src/main/java/org/apache/kafka/raft/VotedState.java b/raft/src/main/java/org/apache/kafka/raft/VotedState.java index 15c87cdafbdfa..c7710903399ef 100644 --- a/raft/src/main/java/org/apache/kafka/raft/VotedState.java +++ b/raft/src/main/java/org/apache/kafka/raft/VotedState.java @@ -40,7 +40,7 @@ public class VotedState implements EpochState { private final int electionTimeoutMs; private final Timer electionTimer; private final Optional highWatermark; - private static final Logger log; + private final Logger log; public VotedState( Time time, diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/AddVoterHandler.java b/raft/src/main/java/org/apache/kafka/raft/internals/AddVoterHandler.java index ad8f66a2c679d..9bbd203ca9c28 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/AddVoterHandler.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/AddVoterHandler.java @@ -67,7 +67,7 @@ public final class AddVoterHandler { private final KRaftControlRecordStateMachine partitionState; private final RequestSender requestSender; private final Time time; - private static final Logger logger; + private final Logger logger; public AddVoterHandler( KRaftControlRecordStateMachine partitionState, diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/DefaultRequestSender.java b/raft/src/main/java/org/apache/kafka/raft/internals/DefaultRequestSender.java index f61c8443508eb..0cee3c255d1b0 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/DefaultRequestSender.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/DefaultRequestSender.java @@ -38,7 +38,7 @@ public final class DefaultRequestSender implements RequestSender { private final RequestManager requestManager; private final NetworkChannel channel; private final RaftMessageQueue messageQueue; - private static final Logger logger; + private final Logger logger; public DefaultRequestSender( RequestManager requestManager, diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java b/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java index ddfc07b818db1..82f1435a30eaf 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java @@ -53,7 +53,7 @@ public final class KRaftControlRecordStateMachine { private final ReplicatedLog log; private final RecordSerde serde; private final BufferSupplier bufferSupplier; - private static final Logger logger; + private final Logger logger; private final int maxBatchSizeBytes; // These objects are synchronized using their respective object monitor. The two actors diff --git a/raft/src/test/java/org/apache/kafka/raft/MockLog.java b/raft/src/test/java/org/apache/kafka/raft/MockLog.java index f6aa62931e57a..29281fa633fc7 100644 --- a/raft/src/test/java/org/apache/kafka/raft/MockLog.java +++ b/raft/src/test/java/org/apache/kafka/raft/MockLog.java @@ -62,7 +62,7 @@ public class MockLog implements ReplicatedLog { private final NavigableMap snapshots = new TreeMap<>(); private final TopicPartition topicPartition; private final Uuid topicId; - private static final Logger logger; + private final Logger logger; private long nextId = ID_GENERATOR.getAndIncrement(); private LogOffsetMetadata highWatermark = new LogOffsetMetadata(0, Optional.empty()); diff --git a/server-common/src/main/java/org/apache/kafka/deferred/DeferredEventQueue.java b/server-common/src/main/java/org/apache/kafka/deferred/DeferredEventQueue.java index 661b631eb7f9b..2af9ef54fa39d 100644 --- a/server-common/src/main/java/org/apache/kafka/deferred/DeferredEventQueue.java +++ b/server-common/src/main/java/org/apache/kafka/deferred/DeferredEventQueue.java @@ -33,7 +33,7 @@ * We wait for the high watermark of the log to advance before completing them. */ public class DeferredEventQueue { - private static final Logger log; + private final Logger log; /** * A map from log offsets to events. Each event will be completed once the log diff --git a/server-common/src/main/java/org/apache/kafka/queue/EventQueue.java b/server-common/src/main/java/org/apache/kafka/queue/EventQueue.java index 10d33ad529763..8914931448d83 100644 --- a/server-common/src/main/java/org/apache/kafka/queue/EventQueue.java +++ b/server-common/src/main/java/org/apache/kafka/queue/EventQueue.java @@ -45,7 +45,7 @@ default void handleException(Throwable e) {} } abstract class FailureLoggingEvent implements Event { - private static final Logger log; + private final Logger log; public FailureLoggingEvent(Logger log) { this.log = log; diff --git a/server-common/src/main/java/org/apache/kafka/queue/KafkaEventQueue.java b/server-common/src/main/java/org/apache/kafka/queue/KafkaEventQueue.java index 9294386bd4ed4..b32183a214f82 100644 --- a/server-common/src/main/java/org/apache/kafka/queue/KafkaEventQueue.java +++ b/server-common/src/main/java/org/apache/kafka/queue/KafkaEventQueue.java @@ -417,7 +417,7 @@ int size() { /** * The log4j logger to use. */ - private static final Logger log; + private final Logger log; /** * The runnable that our thread executes. diff --git a/server-common/src/main/java/org/apache/kafka/server/network/EndpointReadyFutures.java b/server-common/src/main/java/org/apache/kafka/server/network/EndpointReadyFutures.java index 55d14c8676243..212f2b9fbd7ba 100644 --- a/server-common/src/main/java/org/apache/kafka/server/network/EndpointReadyFutures.java +++ b/server-common/src/main/java/org/apache/kafka/server/network/EndpointReadyFutures.java @@ -182,7 +182,7 @@ void failStage(String what, Throwable exception) { } } - private static final Logger log; + private final Logger log; private final Map> futures; diff --git a/server-common/src/main/java/org/apache/kafka/server/util/TopicFilter.java b/server-common/src/main/java/org/apache/kafka/server/util/TopicFilter.java index 64c8f8441b97c..1dbebdfdecc4d 100644 --- a/server-common/src/main/java/org/apache/kafka/server/util/TopicFilter.java +++ b/server-common/src/main/java/org/apache/kafka/server/util/TopicFilter.java @@ -54,7 +54,7 @@ public Pattern getPattern() { } public static class IncludeList extends TopicFilter { - private static final Logger log = LoggerFactory.getLogger(IncludeList.class); + private final Logger log = LoggerFactory.getLogger(IncludeList.class); public IncludeList(String rawRegex) { super(rawRegex); } diff --git a/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java b/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java index c45cb48490012..b35670a0bccb0 100644 --- a/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java +++ b/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java @@ -94,7 +94,7 @@ public Snapshot next() { } } - private static final Logger log; + private final Logger log; /** * A map from snapshot epochs to snapshot data structures. diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java b/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java index 4d7e1f7323f10..42c41226783a4 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java @@ -49,7 +49,7 @@ public class CleanShutdownFileHandler { // Visible for testing final File cleanShutdownFile; private static final int CURRENT_VERSION = 0; - private static final Logger logger; + private final Logger logger; @JsonIgnoreProperties(ignoreUnknown = true) private static class Content { diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java b/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java index a798b1cfc14eb..ece9f4b6468e7 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java @@ -55,7 +55,7 @@ public class LeaderEpochFileCache { private final TopicPartition topicPartition; private final LeaderEpochCheckpointFile checkpoint; private final Scheduler scheduler; - private static final Logger log; + private final Logger log; private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); private final TreeMap epochs = new TreeMap<>(); diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java index c29576759bcb2..883f2059a4bc2 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java @@ -105,7 +105,7 @@ public class ProducerStateManager { new Field(CRC_FIELD, Type.UNSIGNED_INT32, "CRC of the snapshot data"), new Field(PRODUCER_ENTRIES_FIELD, new ArrayOf(PRODUCER_SNAPSHOT_ENTRY_SCHEMA), "The entries in the producer table")); - private static final Logger log; + private final Logger log; private final TopicPartition topicPartition; private final int maxTransactionTimeoutMs; diff --git a/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java b/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java index 65052092662a4..e9496c0cdc653 100644 --- a/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java +++ b/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java @@ -164,7 +164,7 @@ public class KafkaStreams implements AutoCloseable { // of the co-location of stream thread's consumers. It is for internal // usage only and should not be exposed to users at all. private final Time time; - private static final Logger log; + private final Logger log; protected final String clientId; private final Metrics metrics; protected final StreamsConfig applicationConfigs; diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamSlidingWindowAggregate.java b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamSlidingWindowAggregate.java index f2b0b7cf06e2b..6b5a1753c8bf9 100644 --- a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamSlidingWindowAggregate.java +++ b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamSlidingWindowAggregate.java @@ -43,7 +43,7 @@ public class KStreamSlidingWindowAggregate implements KStreamAggProcessorSupplier, VAgg> { - private static final Logger log = LoggerFactory.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final String storeName; private final SlidingWindows windows; diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregate.java b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregate.java index 6519478efe19e..44169cf0eb2da 100644 --- a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregate.java +++ b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregate.java @@ -41,7 +41,7 @@ public class KStreamWindowAggregate implements KStreamAggProcessorSupplier, VAgg> { - private static final Logger log = LoggerFactory.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final String storeName; private final Windows windows; diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/StreamSourceNode.java b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/StreamSourceNode.java index 97b686eaff632..003298cc870d4 100644 --- a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/StreamSourceNode.java +++ b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/StreamSourceNode.java @@ -30,7 +30,7 @@ public class StreamSourceNode extends SourceGraphNode { - private static final Logger log = LoggerFactory.getLogger(StreamSourceNode.class); + private final Logger log = LoggerFactory.getLogger(StreamSourceNode.class); public StreamSourceNode(final String nodeName, final Collection topicNames, diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreator.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreator.java index 3a5d19ca37d4c..c4be67d720275 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreator.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ActiveTaskCreator.java @@ -60,7 +60,7 @@ class ActiveTaskCreator { private final Time time; private final KafkaClientSupplier clientSupplier; private final String threadId; - private static final Logger log; + private final Logger log; private final Sensor createTaskSensor; private final StreamsProducer threadProducer; private final Map taskProducers; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ChangelogTopics.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ChangelogTopics.java index 99bb64728d41d..aaf8ba16a51b2 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ChangelogTopics.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ChangelogTopics.java @@ -43,7 +43,7 @@ public class ChangelogTopics { private final Set preExistingNonSourceTopicBasedChangelogPartitions = new HashSet<>(); private final Set sourceTopicBasedChangelogTopics = new HashSet<>(); private final Set preExistingSourceTopicBasedChangelogPartitions = new HashSet<>(); - private static final Logger log; + private final Logger log; public ChangelogTopics(final InternalTopicManager internalTopicManager, final Map topicGroups, diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java index 858193418bcd6..3ab94f689f77c 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java @@ -745,7 +745,7 @@ private void recordMetrics(final long now, final long totalLatency, final long t } private final Time time; - private static final Logger log; + private final Logger log; private final String name; private final Metrics metrics; private final Consumer restoreConsumer; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java index 261ec44a1f2c2..b1263ddc58df6 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java @@ -70,7 +70,7 @@ public class GlobalStateManagerImpl implements GlobalStateManager { private static final long NO_DEADLINE = -1L; private final Time time; - private static final Logger log; + private final Logger log; private final File baseDir; private final long taskTimeoutMs; private final ProcessorTopology topology; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateUpdateTask.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateUpdateTask.java index d32298262df70..1713efb52a9bd 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateUpdateTask.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateUpdateTask.java @@ -38,7 +38,7 @@ * Updates the state for all Global State Stores. */ public class GlobalStateUpdateTask implements GlobalStateMaintainer { - private static final Logger log; + private final Logger log; private final LogContext logContext; private final ProcessorTopology topology; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStreamThread.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStreamThread.java index 7b5aa142fb31a..1c7194b1913e6 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStreamThread.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStreamThread.java @@ -58,7 +58,7 @@ */ public class GlobalStreamThread extends Thread { - private static final Logger log; + private final Logger log; private final LogContext logContext; private final StreamsConfig config; private final Consumer globalConsumer; @@ -230,7 +230,7 @@ static class StateConsumer { private final Consumer globalConsumer; private final GlobalStateMaintainer stateMaintainer; private final Duration pollTime; - private static final Logger log; + private final Logger log; StateConsumer(final LogContext logContext, final Consumer globalConsumer, diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java index ef251752aa3e8..aeaa84f911d79 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java @@ -70,7 +70,7 @@ public class InternalTopicManager { "Please report at https://issues.apache.org/jira/projects/KAFKA/issues or to the dev-mailing list (https://kafka.apache.org/contact)."; private static final String INTERRUPTED_ERROR_MESSAGE = "Thread got interrupted. " + BUG_ERROR_MESSAGE; - private static final Logger log; + private final Logger log; private final Time time; private final Admin adminClient; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/PartitionGroup.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/PartitionGroup.java index 42ec58117dfde..ac85a17ca0ec7 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/PartitionGroup.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/PartitionGroup.java @@ -59,7 +59,7 @@ */ class PartitionGroup extends AbstractPartitionGroup { - private static final Logger logger; + private final Logger logger; private final Map partitionQueues; private final Function lagProvider; private final Sensor enforcedProcessingSensor; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorNode.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorNode.java index 3f117088fbded..eabf9e3d5c471 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorNode.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorNode.java @@ -45,7 +45,7 @@ public class ProcessorNode { - private static final Logger log = LoggerFactory.getLogger(ProcessorNode.class); + private final Logger log = LoggerFactory.getLogger(ProcessorNode.class); private final List> children; private final Map> childByName; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorTopology.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorTopology.java index b0fc1f6851188..b65bba4e16edf 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorTopology.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorTopology.java @@ -31,7 +31,7 @@ import java.util.Set; public class ProcessorTopology { - private static final Logger log = LoggerFactory.getLogger(ProcessorTopology.class); + private final Logger log = LoggerFactory.getLogger(ProcessorTopology.class); private final List> processorNodes; private final Map> sourceNodesByName; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java index bc20a96425d4a..16d67666ccb22 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java @@ -65,7 +65,7 @@ public class RecordCollectorImpl implements RecordCollector { private static final String SEND_EXCEPTION_MESSAGE = "Error encountered sending record to topic %s for task %s due to:%n%s"; - private static final Logger log; + private final Logger log; private final TaskId taskId; private final StreamsProducer streamsProducer; private final ProductionExceptionHandler productionExceptionHandler; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordDeserializer.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordDeserializer.java index 9460bbb802fbd..2680c179b5453 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordDeserializer.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordDeserializer.java @@ -31,7 +31,7 @@ import static org.apache.kafka.streams.StreamsConfig.DEFAULT_DESERIALIZATION_EXCEPTION_HANDLER_CLASS_CONFIG; public class RecordDeserializer { - private static final Logger log; + private final Logger log; private final SourceNode sourceNode; private final Sensor droppedRecordsSensor; private final DeserializationExceptionHandler deserializationExceptionHandler; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordQueue.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordQueue.java index 44d37fbbe0fd5..a3c9ea67f067d 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordQueue.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordQueue.java @@ -42,7 +42,7 @@ public class RecordQueue { public static final long UNKNOWN = ConsumerRecord.NO_TIMESTAMP; - private static final Logger log; + private final Logger log; private final SourceNode source; private final TopicPartition partition; private final ProcessorContext processorContext; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java index 4951ff5675305..ff217925f9d04 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RepartitionTopics.java @@ -50,7 +50,7 @@ public class RepartitionTopics { private final TopologyMetadata topologyMetadata; private final Cluster clusterMetadata; private final CopartitionedTopicsEnforcer copartitionedTopicsEnforcer; - private static final Logger log; + private final Logger log; private final Map topicPartitionInfos = new HashMap<>(); private final Map> missingInputTopicsBySubtopology = new HashMap<>(); diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTaskCreator.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTaskCreator.java index 394710a8946a8..5eb7418425712 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTaskCreator.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTaskCreator.java @@ -42,7 +42,7 @@ class StandbyTaskCreator { private final StateDirectory stateDirectory; private final ChangelogReader storeChangelogReader; private final ThreadCache dummyCache; - private static final Logger log; + private final Logger log; private final Sensor createTaskSensor; private final boolean stateUpdaterEnabled; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java index b9483ae3fb0f4..dbd25b62eb510 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java @@ -195,7 +195,7 @@ int bufferedLimitIndex() { private ChangelogReaderState state; private final Time time; - private static final Logger log; + private final Logger log; private final Duration pollTime; private final long updateOffsetIntervalMs; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java index f7526eb62b27e..05c832811adc4 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java @@ -278,7 +278,7 @@ public boolean isStartingRunningOrPartitionAssigned() { } private final Time time; - private static final Logger log; + private final Logger log; private final String logPrefix; public final Object stateLock; private final Duration pollTime; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsMetadataState.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsMetadataState.java index 1ad4f222692cb..9328004a6b038 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsMetadataState.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsMetadataState.java @@ -54,7 +54,7 @@ * in a KafkaStreams application */ public class StreamsMetadataState { - private static final Logger log; + private final Logger log; public static final HostInfo UNKNOWN_HOST = HostInfo.unavailable(); private final TopologyMetadata topologyMetadata; private final Set globalStores; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsProducer.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsProducer.java index b07a2590efd3b..ccd0f415045f7 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsProducer.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsProducer.java @@ -68,7 +68,7 @@ * For non-EOS, the user should not call transaction related methods. */ public class StreamsProducer { - private static final Logger log; + private final Logger log; private final String logPrefix; private final Map eosV2ProducerConfigs; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsRebalanceListener.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsRebalanceListener.java index ee9941293dd9d..9ee34d8398b61 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsRebalanceListener.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamsRebalanceListener.java @@ -34,7 +34,7 @@ public class StreamsRebalanceListener implements ConsumerRebalanceListener { private final Time time; private final TaskManager taskManager; private final StreamThread streamThread; - private static final Logger log; + private final Logger log; private final AtomicInteger assignmentErrorCode; StreamsRebalanceListener(final Time time, diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadata.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadata.java index d98f907c4b785..86001ba413073 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadata.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadata.java @@ -111,7 +111,7 @@ void clearSuccessfullyProcessed() { } private class NamedTopologyMetadata { - private static final Logger log; + private final Logger log; private final Map tasksToErrorTime = new ConcurrentHashMap<>(); public NamedTopologyMetadata(final String topologyName) { diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutor.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutor.java index 3e52b1a055005..e2145a94121be 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutor.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskExecutor.java @@ -47,7 +47,7 @@ */ public class TaskExecutor { - private static final Logger log; + private final Logger log; private final TasksRegistry tasks; private final TaskManager taskManager; private final TaskExecutionMetadata executionMetadata; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java index 38d99e58fd57c..bde092cfe49f7 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java @@ -82,7 +82,7 @@ public class TaskManager { // initialize the task list // activeTasks needs to be concurrent as it can be accessed // by QueryableState - private static final Logger log; + private final Logger log; private final Time time; private final TasksRegistry tasks; private final ProcessId processId; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/Tasks.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/Tasks.java index c010e37898850..e30333aabfb7a 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/Tasks.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/Tasks.java @@ -44,7 +44,7 @@ * processed by the latter. */ class Tasks implements TasksRegistry { - private static final Logger log; + private final Logger log; // TODO: convert to Stream/StandbyTask when we remove TaskManager#StateMachineTask with mocks // note that these two maps may be accessed by concurrent threads and hence diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java index 5c4127fde93d9..3fc522f85b445 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignorConfiguration.java @@ -43,7 +43,7 @@ public final class AssignorConfiguration { private final String internalTaskAssignorClass; private final String logPrefix; - private static final Logger log; + private final Logger log; private final ReferenceContainer referenceContainer; private final StreamsConfig streamsConfig; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/CopartitionedTopicsEnforcer.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/CopartitionedTopicsEnforcer.java index 1313605b93fee..865db9e73b976 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/CopartitionedTopicsEnforcer.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/CopartitionedTopicsEnforcer.java @@ -34,7 +34,7 @@ public class CopartitionedTopicsEnforcer { private final String logPrefix; - private static final Logger log; + private final Logger log; public CopartitionedTopicsEnforcer(final String logPrefix) { this.logPrefix = logPrefix; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/KafkaStreamsNamedTopologyWrapper.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/KafkaStreamsNamedTopologyWrapper.java index f1fa0c4d1811d..6c08c06f2aec6 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/KafkaStreamsNamedTopologyWrapper.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/KafkaStreamsNamedTopologyWrapper.java @@ -71,7 +71,7 @@ @Unstable public class KafkaStreamsNamedTopologyWrapper extends KafkaStreams { - private static final Logger log; + private final Logger log; /** * An empty Kafka Streams application that allows NamedTopologies to be added at a later point diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/RemoveNamedTopologyResult.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/RemoveNamedTopologyResult.java index 4baa535e9abcf..9cd52dfe59cd7 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/RemoveNamedTopologyResult.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/namedtopology/RemoveNamedTopologyResult.java @@ -69,7 +69,7 @@ public final KafkaFuture all() { } private static class ResetOffsetsFuture extends KafkaFutureImpl { - private static final Logger log; + private final Logger log; final Runnable resetOffsets; final KafkaFutureImpl removeTopologyFuture; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutor.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutor.java index b8f5a6f453cbb..84b49d1cd13f4 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutor.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutor.java @@ -46,7 +46,7 @@ private class TaskExecutorThread extends Thread implements ProcessingThread { private final AtomicBoolean shutdownRequested = new AtomicBoolean(false); private final AtomicReference> taskReleaseRequested = new AtomicReference<>(null); - private static final Logger log; + private final Logger log; public TaskExecutorThread(final String name) { super(name); @@ -219,7 +219,7 @@ private StreamTask unassignCurrentTask() { private final String name; private final TaskManager taskManager; private final TaskExecutionMetadata taskExecutionMetadata; - private static final Logger log; + private final Logger log; private StreamTask currentTask = null; private TaskExecutorThread taskExecutorThread = null; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManager.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManager.java index b3602b89bbb41..5d2db3c27925c 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManager.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManager.java @@ -54,7 +54,7 @@ public class DefaultTaskManager implements TaskManager { private final Time time; - private static final Logger log; + private final Logger log; private final TasksRegistry tasks; private final Lock tasksLock = new ReentrantLock(); diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java index 97874dcadc545..4f5a837c00b30 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java @@ -37,7 +37,7 @@ * record based */ public class ThreadCache { - private static final Logger log; + private final Logger log; private volatile long maxCacheSizeBytes; private final StreamsMetricsImpl metrics; private final Map caches = new HashMap<>(); diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreBuilder.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreBuilder.java index d57d5318c680c..10f75f2bd06ad 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreBuilder.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreBuilder.java @@ -29,7 +29,7 @@ import java.util.Objects; public class WindowStoreBuilder extends AbstractStoreBuilder> { - private static final Logger log = LoggerFactory.getLogger(WindowStoreBuilder.class); + private final Logger log = LoggerFactory.getLogger(WindowStoreBuilder.class); private final WindowBytesStoreSupplier storeSupplier; diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorder.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorder.java index 2fb855c0b3264..fd7adab1b5728 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorder.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorder.java @@ -85,7 +85,7 @@ public DbAndCacheAndStatistics(final RocksDB db, final Cache cache, final Statis private static final String ROCKSDB_PROPERTIES_PREFIX = "rocksdb."; - private static final Logger logger; + private final Logger logger; private Sensor bytesWrittenToDatabaseSensor; private Sensor bytesReadFromDatabaseSensor; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionOptimizingTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionOptimizingTest.java index 91b95b87a7fee..cac44dbb5e94c 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionOptimizingTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionOptimizingTest.java @@ -72,7 +72,7 @@ @SuppressWarnings("deprecation") public class RepartitionOptimizingTest { - private static final Logger log = LoggerFactory.getLogger(RepartitionOptimizingTest.class); + private final Logger log = LoggerFactory.getLogger(RepartitionOptimizingTest.class); private static final String INPUT_TOPIC = "input"; private static final String COUNT_TOPIC = "outputTopic_0"; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionWithMergeOptimizingTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionWithMergeOptimizingTest.java index a9287fc3e5993..f6a12d6477b8e 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionWithMergeOptimizingTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionWithMergeOptimizingTest.java @@ -60,7 +60,7 @@ public class RepartitionWithMergeOptimizingTest { - private static final Logger log = LoggerFactory.getLogger(RepartitionWithMergeOptimizingTest.class); + private final Logger log = LoggerFactory.getLogger(RepartitionWithMergeOptimizingTest.class); private static final String INPUT_A_TOPIC = "inputA"; private static final String INPUT_B_TOPIC = "inputB"; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java index b195600c3925e..d61c530c92ed1 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java @@ -82,7 +82,7 @@ public class StreamsAssignmentScaleTest { static final long MAX_ASSIGNMENT_DURATION = 120 * 1000L; // we should stay below `max.poll.interval.ms` static final String APPLICATION_ID = "streams-assignment-scale-test"; - private static final Logger log = LoggerFactory.getLogger(StreamsAssignmentScaleTest.class); + private final Logger log = LoggerFactory.getLogger(StreamsAssignmentScaleTest.class); /* HighAvailabilityTaskAssignor tests */ diff --git a/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java b/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java index 64cf3c7eb0b51..6e216dcdbca8f 100644 --- a/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java @@ -154,7 +154,7 @@ public Consumer getConsumer(final Map config) { public static class FutureStreamsPartitionAssignor extends StreamsPartitionAssignor { private static final Map CLIENT_TAGS = mkMap(mkEntry("t1", "v1"), mkEntry("t2", "v2")); - private static final Logger log = LoggerFactory.getLogger(FutureStreamsPartitionAssignor.class); + private final Logger log = LoggerFactory.getLogger(FutureStreamsPartitionAssignor.class); private AtomicInteger usedSubscriptionMetadataVersionPeek; private AtomicLong nextScheduledRebalanceMs; diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/CoordinatorClient.java b/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/CoordinatorClient.java index a90578deb94b3..00c26adc4c4c8 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/CoordinatorClient.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/CoordinatorClient.java @@ -76,7 +76,7 @@ * A client for the Trogdor coordinator. */ public class CoordinatorClient { - private static final Logger log; + private final Logger log; /** * The maximum number of tries to make. diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java index 19d1d32d174d0..529e228c38c4d 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java @@ -55,7 +55,7 @@ public class TimestampRecordProcessor implements RecordProcessor { private final ByteBuffer buffer; private final Histogram histogram; - private static final Logger log = LoggerFactory.getLogger(TimestampRecordProcessor.class); + private final Logger log = LoggerFactory.getLogger(TimestampRecordProcessor.class); static final float[] PERCENTILES = {0.5f, 0.95f, 0.99f}; From aa09d47ecdd5d62a6e2b1c127e83219c1a73c6d9 Mon Sep 17 00:00:00 2001 From: Ming-Yen Chung Date: Thu, 25 Jul 2024 17:50:45 +0800 Subject: [PATCH 4/4] Declare logger as static to prevent multiple logger instances --- .../java/org/apache/kafka/common/config/AbstractConfig.java | 2 +- .../java/org/apache/kafka/common/metrics/stats/Percentiles.java | 2 +- .../unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java | 2 +- .../main/java/org/apache/kafka/common/utils/KafkaThread.java | 2 +- .../org/apache/kafka/connect/runtime/WorkerSinkTaskContext.java | 2 +- .../src/test/java/org/apache/kafka/metalog/LocalLogManager.java | 2 +- .../src/main/java/org/apache/kafka/server/util/TopicFilter.java | 2 +- .../kstream/internals/KStreamSlidingWindowAggregate.java | 2 +- .../kafka/streams/kstream/internals/KStreamWindowAggregate.java | 2 +- .../kafka/streams/kstream/internals/graph/StreamSourceNode.java | 2 +- .../apache/kafka/streams/processor/internals/ProcessorNode.java | 2 +- .../kafka/streams/processor/internals/ProcessorTopology.java | 2 +- .../kafka/streams/state/internals/WindowStoreBuilder.java | 2 +- .../streams/processor/internals/RepartitionOptimizingTest.java | 2 +- .../processor/internals/RepartitionWithMergeOptimizingTest.java | 2 +- .../streams/processor/internals/StreamsAssignmentScaleTest.java | 2 +- .../java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java | 2 +- .../apache/kafka/trogdor/workload/TimestampRecordProcessor.java | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java b/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java index 247bab18d5565..72038b4564cd3 100644 --- a/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java +++ b/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java @@ -45,7 +45,7 @@ */ public class AbstractConfig { - private final Logger log = LoggerFactory.getLogger(getClass()); + private static final Logger log = LoggerFactory.getLogger(AbstractConfig.class); /** * Configs for which values have been requested, used to detect unused configs. diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java index c7c882496bf8e..5cb1da4f65376 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java @@ -33,7 +33,7 @@ */ public class Percentiles extends SampledStat implements CompoundStat { - private final Logger log = LoggerFactory.getLogger(Percentiles.class); + private static final Logger log = LoggerFactory.getLogger(Percentiles.class); public enum BucketSizing { CONSTANT, LINEAR diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java index daae977d72729..2241eb50fdc07 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java @@ -99,7 +99,7 @@ * broker configuration property. */ public class OAuthBearerUnsecuredLoginCallbackHandler implements AuthenticateCallbackHandler { - private final Logger log = LoggerFactory.getLogger(OAuthBearerUnsecuredLoginCallbackHandler.class); + private static final Logger log = LoggerFactory.getLogger(OAuthBearerUnsecuredLoginCallbackHandler.class); private static final String OPTION_PREFIX = "unsecuredLogin"; private static final String PRINCIPAL_CLAIM_NAME_OPTION = OPTION_PREFIX + "PrincipalClaimName"; private static final String LIFETIME_SECONDS_OPTION = OPTION_PREFIX + "LifetimeSeconds"; diff --git a/clients/src/main/java/org/apache/kafka/common/utils/KafkaThread.java b/clients/src/main/java/org/apache/kafka/common/utils/KafkaThread.java index 2f5e15f46349e..a2ea3dc88b663 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/KafkaThread.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/KafkaThread.java @@ -24,7 +24,7 @@ */ public class KafkaThread extends Thread { - private final Logger log = LoggerFactory.getLogger(getClass()); + private static final Logger log = LoggerFactory.getLogger(KafkaThread.class); public static KafkaThread daemon(final String name, Runnable runnable) { return new KafkaThread(name, runnable, true); diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerSinkTaskContext.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerSinkTaskContext.java index 3baf4772b5bda..e767c7640b47a 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerSinkTaskContext.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerSinkTaskContext.java @@ -35,7 +35,7 @@ public class WorkerSinkTaskContext implements SinkTaskContext { - private final Logger log = LoggerFactory.getLogger(getClass()); + private static final Logger log = LoggerFactory.getLogger(WorkerSinkTaskContext.class); private final Map offsets; private final Consumer consumer; private final WorkerSinkTask sinkTask; diff --git a/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java b/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java index ec733b3ca196f..52a5792ced1f3 100644 --- a/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java +++ b/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java @@ -163,7 +163,7 @@ public String toString() { } public static class SharedLogData { - private final Logger log = LoggerFactory.getLogger(SharedLogData.class); + private static final Logger log = LoggerFactory.getLogger(SharedLogData.class); /** * Maps node IDs to the matching log managers. diff --git a/server-common/src/main/java/org/apache/kafka/server/util/TopicFilter.java b/server-common/src/main/java/org/apache/kafka/server/util/TopicFilter.java index 1dbebdfdecc4d..64c8f8441b97c 100644 --- a/server-common/src/main/java/org/apache/kafka/server/util/TopicFilter.java +++ b/server-common/src/main/java/org/apache/kafka/server/util/TopicFilter.java @@ -54,7 +54,7 @@ public Pattern getPattern() { } public static class IncludeList extends TopicFilter { - private final Logger log = LoggerFactory.getLogger(IncludeList.class); + private static final Logger log = LoggerFactory.getLogger(IncludeList.class); public IncludeList(String rawRegex) { super(rawRegex); } diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamSlidingWindowAggregate.java b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamSlidingWindowAggregate.java index 6b5a1753c8bf9..4a288bb0e83f6 100644 --- a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamSlidingWindowAggregate.java +++ b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamSlidingWindowAggregate.java @@ -43,7 +43,7 @@ public class KStreamSlidingWindowAggregate implements KStreamAggProcessorSupplier, VAgg> { - private final Logger log = LoggerFactory.getLogger(getClass()); + private static final Logger log = LoggerFactory.getLogger(KStreamSlidingWindowAggregate.class); private final String storeName; private final SlidingWindows windows; diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregate.java b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregate.java index 44169cf0eb2da..340ce82d85670 100644 --- a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregate.java +++ b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamWindowAggregate.java @@ -41,7 +41,7 @@ public class KStreamWindowAggregate implements KStreamAggProcessorSupplier, VAgg> { - private final Logger log = LoggerFactory.getLogger(getClass()); + private static final Logger log = LoggerFactory.getLogger(KStreamWindowAggregate.class); private final String storeName; private final Windows windows; diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/StreamSourceNode.java b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/StreamSourceNode.java index 003298cc870d4..97b686eaff632 100644 --- a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/StreamSourceNode.java +++ b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/StreamSourceNode.java @@ -30,7 +30,7 @@ public class StreamSourceNode extends SourceGraphNode { - private final Logger log = LoggerFactory.getLogger(StreamSourceNode.class); + private static final Logger log = LoggerFactory.getLogger(StreamSourceNode.class); public StreamSourceNode(final String nodeName, final Collection topicNames, diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorNode.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorNode.java index eabf9e3d5c471..3f117088fbded 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorNode.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorNode.java @@ -45,7 +45,7 @@ public class ProcessorNode { - private final Logger log = LoggerFactory.getLogger(ProcessorNode.class); + private static final Logger log = LoggerFactory.getLogger(ProcessorNode.class); private final List> children; private final Map> childByName; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorTopology.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorTopology.java index b65bba4e16edf..b0fc1f6851188 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorTopology.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorTopology.java @@ -31,7 +31,7 @@ import java.util.Set; public class ProcessorTopology { - private final Logger log = LoggerFactory.getLogger(ProcessorTopology.class); + private static final Logger log = LoggerFactory.getLogger(ProcessorTopology.class); private final List> processorNodes; private final Map> sourceNodesByName; diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreBuilder.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreBuilder.java index 10f75f2bd06ad..d57d5318c680c 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreBuilder.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreBuilder.java @@ -29,7 +29,7 @@ import java.util.Objects; public class WindowStoreBuilder extends AbstractStoreBuilder> { - private final Logger log = LoggerFactory.getLogger(WindowStoreBuilder.class); + private static final Logger log = LoggerFactory.getLogger(WindowStoreBuilder.class); private final WindowBytesStoreSupplier storeSupplier; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionOptimizingTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionOptimizingTest.java index cac44dbb5e94c..91b95b87a7fee 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionOptimizingTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionOptimizingTest.java @@ -72,7 +72,7 @@ @SuppressWarnings("deprecation") public class RepartitionOptimizingTest { - private final Logger log = LoggerFactory.getLogger(RepartitionOptimizingTest.class); + private static final Logger log = LoggerFactory.getLogger(RepartitionOptimizingTest.class); private static final String INPUT_TOPIC = "input"; private static final String COUNT_TOPIC = "outputTopic_0"; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionWithMergeOptimizingTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionWithMergeOptimizingTest.java index f6a12d6477b8e..a9287fc3e5993 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionWithMergeOptimizingTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RepartitionWithMergeOptimizingTest.java @@ -60,7 +60,7 @@ public class RepartitionWithMergeOptimizingTest { - private final Logger log = LoggerFactory.getLogger(RepartitionWithMergeOptimizingTest.class); + private static final Logger log = LoggerFactory.getLogger(RepartitionWithMergeOptimizingTest.class); private static final String INPUT_A_TOPIC = "inputA"; private static final String INPUT_B_TOPIC = "inputB"; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java index d61c530c92ed1..b195600c3925e 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java @@ -82,7 +82,7 @@ public class StreamsAssignmentScaleTest { static final long MAX_ASSIGNMENT_DURATION = 120 * 1000L; // we should stay below `max.poll.interval.ms` static final String APPLICATION_ID = "streams-assignment-scale-test"; - private final Logger log = LoggerFactory.getLogger(StreamsAssignmentScaleTest.class); + private static final Logger log = LoggerFactory.getLogger(StreamsAssignmentScaleTest.class); /* HighAvailabilityTaskAssignor tests */ diff --git a/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java b/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java index 6e216dcdbca8f..64cf3c7eb0b51 100644 --- a/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java @@ -154,7 +154,7 @@ public Consumer getConsumer(final Map config) { public static class FutureStreamsPartitionAssignor extends StreamsPartitionAssignor { private static final Map CLIENT_TAGS = mkMap(mkEntry("t1", "v1"), mkEntry("t2", "v2")); - private final Logger log = LoggerFactory.getLogger(FutureStreamsPartitionAssignor.class); + private static final Logger log = LoggerFactory.getLogger(FutureStreamsPartitionAssignor.class); private AtomicInteger usedSubscriptionMetadataVersionPeek; private AtomicLong nextScheduledRebalanceMs; diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java index 529e228c38c4d..19d1d32d174d0 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java @@ -55,7 +55,7 @@ public class TimestampRecordProcessor implements RecordProcessor { private final ByteBuffer buffer; private final Histogram histogram; - private final Logger log = LoggerFactory.getLogger(TimestampRecordProcessor.class); + private static final Logger log = LoggerFactory.getLogger(TimestampRecordProcessor.class); static final float[] PERCENTILES = {0.5f, 0.95f, 0.99f};