This is an automated email from the ASF dual-hosted git repository.
chia7712 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new b4c977544fd KAFKA-20297 move KafkaThread, ThreadUtils,
ExponentialBackoff and ExponentialBackoffManager to internal (#22049)
b4c977544fd is described below
commit b4c977544fdf3280f3097fc2ebe1c87c26479027
Author: Chia-Yi Chiu <[email protected]>
AuthorDate: Wed Apr 15 02:25:22 2026 +0900
KAFKA-20297 move KafkaThread, ThreadUtils, ExponentialBackoff and
ExponentialBackoffManager to internal (#22049)
Summary: move `KafkaThread`, `ThreadUtils`, `ExponentialBackoff` and
`ExponentialBackoffManager` from utils to utils.internal
Reviewers: Christo Lolov <[email protected]>, Ken Huang
<[email protected]>, Chia-Ping Tsai <[email protected]>
---
.../main/java/org/apache/kafka/clients/ClusterConnectionStates.java | 2 +-
clients/src/main/java/org/apache/kafka/clients/Metadata.java | 2 +-
.../main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java | 4 ++--
.../java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java | 2 +-
.../apache/kafka/clients/consumer/internals/AbstractCoordinator.java | 2 +-
.../apache/kafka/clients/consumer/internals/BaseHeartbeatThread.java | 2 +-
.../kafka/clients/consumer/internals/ConsumerNetworkThread.java | 2 +-
.../java/org/apache/kafka/clients/consumer/internals/Heartbeat.java | 2 +-
.../org/apache/kafka/clients/consumer/internals/RequestState.java | 2 +-
.../apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java | 2 +-
.../apache/kafka/clients/producer/internals/RecordAccumulator.java | 2 +-
.../main/java/org/apache/kafka/clients/producer/internals/Sender.java | 2 +-
clients/src/main/java/org/apache/kafka/common/metrics/Metrics.java | 2 +-
.../java/org/apache/kafka/common/security/kerberos/KerberosLogin.java | 2 +-
.../internals/expiring/ExpiringCredentialRefreshingLogin.java | 2 +-
clients/src/main/java/org/apache/kafka/common/utils/Exit.java | 2 ++
clients/src/main/java/org/apache/kafka/common/utils/Shell.java | 2 ++
.../apache/kafka/common/utils/{ => internals}/ExponentialBackoff.java | 2 +-
.../kafka/common/utils/{ => internals}/ExponentialBackoffManager.java | 2 +-
.../org/apache/kafka/common/utils/{ => internals}/KafkaThread.java | 2 +-
.../org/apache/kafka/common/utils/{ => internals}/ThreadUtils.java | 2 +-
.../common/utils/{ => internals}/ExponentialBackoffManagerTest.java | 2 +-
.../kafka/common/utils/{ => internals}/ExponentialBackoffTest.java | 2 +-
.../apache/kafka/common/utils/{ => internals}/ThreadUtilsTest.java | 2 +-
.../org/apache/kafka/connect/runtime/SourceTaskOffsetCommitter.java | 2 +-
.../src/main/java/org/apache/kafka/connect/runtime/Worker.java | 2 +-
.../apache/kafka/connect/runtime/distributed/DistributedHerder.java | 4 ++--
.../connect/runtime/distributed/IncrementalCooperativeAssignor.java | 2 +-
.../org/apache/kafka/connect/runtime/standalone/StandaloneHerder.java | 2 +-
.../org/apache/kafka/connect/storage/KafkaStatusBackingStore.java | 2 +-
.../org/apache/kafka/connect/storage/MemoryOffsetBackingStore.java | 2 +-
.../apache/kafka/connect/integration/ErrantRecordSinkConnector.java | 2 +-
.../apache/kafka/connect/runtime/SourceTaskOffsetCommitterTest.java | 2 +-
.../common/runtime/CoordinatorBackgroundThreadPoolExecutor.java | 2 +-
.../org/apache/kafka/coordinator/common/runtime/HdrHistogramTest.java | 2 +-
core/src/main/scala/kafka/network/SocketServer.scala | 3 ++-
core/src/main/scala/kafka/server/KafkaRequestHandler.scala | 3 ++-
.../scala/unit/kafka/server/ControllerRegistrationManagerTest.scala | 2 +-
.../src/main/java/org/apache/kafka/queue/KafkaEventQueue.java | 2 +-
.../apache/kafka/server/share/persister/PersisterStateManager.java | 2 +-
.../src/main/java/org/apache/kafka/server/util/KafkaScheduler.java | 2 +-
.../src/main/java/org/apache/kafka/server/util/timer/SystemTimer.java | 4 ++--
server/src/main/java/org/apache/kafka/server/AssignmentsManager.java | 2 +-
.../org/apache/kafka/server/AssignmentsManagerDeadlineFunction.java | 2 +-
.../apache/kafka/server/controller/ControllerRegistrationManager.java | 2 +-
.../org/apache/kafka/server/purgatory/DelayedFuturePurgatory.java | 2 +-
.../org/apache/kafka/server/util/NetworkPartitionMetadataClient.java | 2 +-
.../apache/kafka/server/AssignmentsManagerDeadlineFunctionTest.java | 2 +-
.../src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java | 2 +-
.../apache/kafka/server/util/NetworkPartitionMetadataClientTest.java | 2 +-
.../kafka/server/log/remote/metadata/storage/ConsumerManager.java | 2 +-
.../remote/metadata/storage/TopicBasedRemoteLogMetadataManager.java | 2 +-
.../org/apache/kafka/server/log/remote/storage/RemoteLogManager.java | 2 +-
.../main/java/org/apache/kafka/storage/internals/log/LogManager.java | 2 +-
.../apache/kafka/storage/internals/log/RemoteStorageThreadPool.java | 2 +-
.../org/apache/kafka/streams/processor/internals/TaskManager.java | 2 +-
.../src/test/java/org/apache/kafka/streams/tests/SmokeTestClient.java | 2 +-
.../main/java/org/apache/kafka/common/test/KafkaClusterTestKit.java | 2 +-
.../src/main/java/org/apache/kafka/trogdor/agent/WorkerManager.java | 2 +-
.../main/java/org/apache/kafka/trogdor/coordinator/NodeManager.java | 2 +-
.../main/java/org/apache/kafka/trogdor/coordinator/TaskManager.java | 2 +-
.../src/main/java/org/apache/kafka/trogdor/rest/JsonRestServer.java | 2 +-
.../org/apache/kafka/trogdor/workload/ConfigurableProducerWorker.java | 2 +-
.../org/apache/kafka/trogdor/workload/ConnectionStressWorker.java | 2 +-
.../java/org/apache/kafka/trogdor/workload/ConsumeBenchWorker.java | 2 +-
.../java/org/apache/kafka/trogdor/workload/ExternalCommandWorker.java | 2 +-
.../java/org/apache/kafka/trogdor/workload/ProduceBenchWorker.java | 2 +-
.../java/org/apache/kafka/trogdor/workload/RoundTripWorkerBase.java | 2 +-
.../org/apache/kafka/trogdor/workload/ShareConsumeBenchWorker.java | 2 +-
.../org/apache/kafka/trogdor/workload/SustainedConnectionWorker.java | 2 +-
.../test/java/org/apache/kafka/trogdor/common/MiniTrogdorCluster.java | 2 +-
.../src/test/java/org/apache/kafka/trogdor/task/SampleTaskWorker.java | 2 +-
72 files changed, 79 insertions(+), 73 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 0f2fdff475c..dbab689b09f 100644
---
a/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java
+++
b/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java
@@ -17,8 +17,8 @@
package org.apache.kafka.clients;
import org.apache.kafka.common.errors.AuthenticationException;
-import org.apache.kafka.common.utils.ExponentialBackoff;
import org.apache.kafka.common.utils.LogContext;
+import org.apache.kafka.common.utils.internals.ExponentialBackoff;
import org.slf4j.Logger;
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 2686f042c2b..d7d9b5a315c 100644
--- a/clients/src/main/java/org/apache/kafka/clients/Metadata.java
+++ b/clients/src/main/java/org/apache/kafka/clients/Metadata.java
@@ -30,8 +30,8 @@ import org.apache.kafka.common.protocol.Errors;
import org.apache.kafka.common.requests.MetadataRequest;
import org.apache.kafka.common.requests.MetadataResponse;
import org.apache.kafka.common.requests.MetadataResponse.PartitionMetadata;
-import org.apache.kafka.common.utils.ExponentialBackoff;
import org.apache.kafka.common.utils.LogContext;
+import org.apache.kafka.common.utils.internals.ExponentialBackoff;
import org.slf4j.Logger;
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 8d2ea1982cb..a221d9e52a6 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
@@ -258,12 +258,12 @@ import
org.apache.kafka.common.security.token.delegation.TokenInformation;
import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter;
import org.apache.kafka.common.telemetry.internals.ClientTelemetryUtils;
import org.apache.kafka.common.utils.AppInfoParser;
-import org.apache.kafka.common.utils.ExponentialBackoff;
-import org.apache.kafka.common.utils.KafkaThread;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.ProducerIdAndEpoch;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ExponentialBackoff;
+import org.apache.kafka.common.utils.internals.KafkaThread;
import org.slf4j.Logger;
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 2db63c7ed57..0acfd289d8c 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
@@ -24,8 +24,8 @@ import org.apache.kafka.common.requests.AbstractRequest;
import org.apache.kafka.common.requests.AbstractResponse;
import
org.apache.kafka.common.requests.FindCoordinatorRequest.NoBatchedFindCoordinatorsException;
import
org.apache.kafka.common.requests.OffsetFetchRequest.NoBatchedOffsetFetchRequestException;
-import org.apache.kafka.common.utils.ExponentialBackoff;
import org.apache.kafka.common.utils.LogContext;
+import org.apache.kafka.common.utils.internals.ExponentialBackoff;
import org.slf4j.Logger;
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 42809ba7477..8acf9f27eb6 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
@@ -69,11 +69,11 @@ import org.apache.kafka.common.requests.SyncGroupRequest;
import org.apache.kafka.common.requests.SyncGroupResponse;
import org.apache.kafka.common.telemetry.internals.ClientTelemetryProvider;
import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter;
-import org.apache.kafka.common.utils.ExponentialBackoff;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Timer;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ExponentialBackoff;
import org.slf4j.Logger;
diff --git
a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/BaseHeartbeatThread.java
b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/BaseHeartbeatThread.java
index c9d96d807e3..1660f4146fe 100644
---
a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/BaseHeartbeatThread.java
+++
b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/BaseHeartbeatThread.java
@@ -16,7 +16,7 @@
*/
package org.apache.kafka.clients.consumer.internals;
-import org.apache.kafka.common.utils.KafkaThread;
+import org.apache.kafka.common.utils.internals.KafkaThread;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
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 74f6cd0a236..02f57c4b51a 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
@@ -31,10 +31,10 @@ import org.apache.kafka.common.errors.InterruptException;
import org.apache.kafka.common.errors.TimeoutException;
import org.apache.kafka.common.internals.IdempotentCloser;
import org.apache.kafka.common.requests.AbstractRequest;
-import org.apache.kafka.common.utils.KafkaThread;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Timer;
+import org.apache.kafka.common.utils.internals.KafkaThread;
import org.slf4j.Logger;
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 20852dfe55e..0700a531ce0 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
@@ -18,10 +18,10 @@ package org.apache.kafka.clients.consumer.internals;
import org.apache.kafka.clients.CommonClientConfigs;
import org.apache.kafka.clients.GroupRebalanceConfig;
-import org.apache.kafka.common.utils.ExponentialBackoff;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Timer;
+import org.apache.kafka.common.utils.internals.ExponentialBackoff;
import org.slf4j.Logger;
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 b509f675fc8..8b1f8f79109 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
@@ -16,8 +16,8 @@
*/
package org.apache.kafka.clients.consumer.internals;
-import org.apache.kafka.common.utils.ExponentialBackoff;
import org.apache.kafka.common.utils.LogContext;
+import org.apache.kafka.common.utils.internals.ExponentialBackoff;
import org.slf4j.Logger;
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 f86457891e2..aea2cb27c5f 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
@@ -29,9 +29,9 @@ import
org.apache.kafka.common.errors.TopicAuthorizationException;
import org.apache.kafka.common.protocol.Errors;
import org.apache.kafka.common.requests.MetadataRequest;
import org.apache.kafka.common.requests.MetadataResponse;
-import org.apache.kafka.common.utils.ExponentialBackoff;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Timer;
+import org.apache.kafka.common.utils.internals.ExponentialBackoff;
import org.slf4j.Logger;
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 ca3ab153d98..19c9728f011 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
@@ -36,10 +36,10 @@ import
org.apache.kafka.common.record.internal.MemoryRecordsBuilder;
import org.apache.kafka.common.record.internal.Record;
import org.apache.kafka.common.record.internal.RecordBatch;
import org.apache.kafka.common.utils.CopyOnWriteMap;
-import org.apache.kafka.common.utils.ExponentialBackoff;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.ProducerIdAndEpoch;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.ExponentialBackoff;
import org.slf4j.Logger;
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 a4e8c5253aa..a880110ab52 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
@@ -53,9 +53,9 @@ import
org.apache.kafka.common.requests.FindCoordinatorRequest;
import org.apache.kafka.common.requests.ProduceRequest;
import org.apache.kafka.common.requests.ProduceResponse;
import org.apache.kafka.common.requests.RequestHeader;
-import org.apache.kafka.common.utils.KafkaThread;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.KafkaThread;
import org.slf4j.Logger;
diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/Metrics.java
b/clients/src/main/java/org/apache/kafka/common/metrics/Metrics.java
index 182a8c74849..83a8f50cca0 100644
--- a/clients/src/main/java/org/apache/kafka/common/metrics/Metrics.java
+++ b/clients/src/main/java/org/apache/kafka/common/metrics/Metrics.java
@@ -19,8 +19,8 @@ package org.apache.kafka.common.metrics;
import org.apache.kafka.common.MetricName;
import org.apache.kafka.common.MetricNameTemplate;
import org.apache.kafka.common.metrics.internals.MetricsUtils;
-import org.apache.kafka.common.utils.KafkaThread;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.KafkaThread;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/clients/src/main/java/org/apache/kafka/common/security/kerberos/KerberosLogin.java
b/clients/src/main/java/org/apache/kafka/common/security/kerberos/KerberosLogin.java
index cbe4fd6e96d..d032f4c9439 100644
---
a/clients/src/main/java/org/apache/kafka/common/security/kerberos/KerberosLogin.java
+++
b/clients/src/main/java/org/apache/kafka/common/security/kerberos/KerberosLogin.java
@@ -21,9 +21,9 @@ import org.apache.kafka.common.security.JaasContext;
import org.apache.kafka.common.security.JaasUtils;
import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler;
import org.apache.kafka.common.security.authenticator.AbstractLogin;
-import org.apache.kafka.common.utils.KafkaThread;
import org.apache.kafka.common.utils.Shell;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.KafkaThread;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshingLogin.java
b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshingLogin.java
index b12ee7ffe61..d5734cfff2d 100644
---
a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshingLogin.java
+++
b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshingLogin.java
@@ -18,8 +18,8 @@ package
org.apache.kafka.common.security.oauthbearer.internals.expiring;
import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler;
import org.apache.kafka.common.security.auth.Login;
-import org.apache.kafka.common.utils.KafkaThread;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.KafkaThread;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/clients/src/main/java/org/apache/kafka/common/utils/Exit.java
b/clients/src/main/java/org/apache/kafka/common/utils/Exit.java
index 8af759f9b08..6dee6f96fe1 100644
--- a/clients/src/main/java/org/apache/kafka/common/utils/Exit.java
+++ b/clients/src/main/java/org/apache/kafka/common/utils/Exit.java
@@ -16,6 +16,8 @@
*/
package org.apache.kafka.common.utils;
+import org.apache.kafka.common.utils.internals.KafkaThread;
+
/**
* Internal class that should be used instead of `System.exit()` and
`Runtime.getRuntime().halt()` so that tests can
* easily change the behaviour.
diff --git a/clients/src/main/java/org/apache/kafka/common/utils/Shell.java
b/clients/src/main/java/org/apache/kafka/common/utils/Shell.java
index bbec711d017..05d9b211f23 100644
--- a/clients/src/main/java/org/apache/kafka/common/utils/Shell.java
+++ b/clients/src/main/java/org/apache/kafka/common/utils/Shell.java
@@ -16,6 +16,8 @@
*/
package org.apache.kafka.common.utils;
+import org.apache.kafka.common.utils.internals.KafkaThread;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/clients/src/main/java/org/apache/kafka/common/utils/ExponentialBackoff.java
b/clients/src/main/java/org/apache/kafka/common/utils/internals/ExponentialBackoff.java
similarity index 98%
rename from
clients/src/main/java/org/apache/kafka/common/utils/ExponentialBackoff.java
rename to
clients/src/main/java/org/apache/kafka/common/utils/internals/ExponentialBackoff.java
index 73d68b6cf44..0d93e0eeb28 100644
---
a/clients/src/main/java/org/apache/kafka/common/utils/ExponentialBackoff.java
+++
b/clients/src/main/java/org/apache/kafka/common/utils/internals/ExponentialBackoff.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.common.utils;
+package org.apache.kafka.common.utils.internals;
import java.util.concurrent.ThreadLocalRandom;
diff --git
a/clients/src/main/java/org/apache/kafka/common/utils/ExponentialBackoffManager.java
b/clients/src/main/java/org/apache/kafka/common/utils/internals/ExponentialBackoffManager.java
similarity index 97%
rename from
clients/src/main/java/org/apache/kafka/common/utils/ExponentialBackoffManager.java
rename to
clients/src/main/java/org/apache/kafka/common/utils/internals/ExponentialBackoffManager.java
index 87e730f9b76..78814f7da7f 100644
---
a/clients/src/main/java/org/apache/kafka/common/utils/ExponentialBackoffManager.java
+++
b/clients/src/main/java/org/apache/kafka/common/utils/internals/ExponentialBackoffManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.common.utils;
+package org.apache.kafka.common.utils.internals;
/**
* Manages retry attempts and exponential backoff for requests.
diff --git
a/clients/src/main/java/org/apache/kafka/common/utils/KafkaThread.java
b/clients/src/main/java/org/apache/kafka/common/utils/internals/KafkaThread.java
similarity index 97%
rename from clients/src/main/java/org/apache/kafka/common/utils/KafkaThread.java
rename to
clients/src/main/java/org/apache/kafka/common/utils/internals/KafkaThread.java
index a2ea3dc88b6..b1a591fde5b 100644
--- a/clients/src/main/java/org/apache/kafka/common/utils/KafkaThread.java
+++
b/clients/src/main/java/org/apache/kafka/common/utils/internals/KafkaThread.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kafka.common.utils;
+package org.apache.kafka.common.utils.internals;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/clients/src/main/java/org/apache/kafka/common/utils/ThreadUtils.java
b/clients/src/main/java/org/apache/kafka/common/utils/internals/ThreadUtils.java
similarity index 99%
rename from clients/src/main/java/org/apache/kafka/common/utils/ThreadUtils.java
rename to
clients/src/main/java/org/apache/kafka/common/utils/internals/ThreadUtils.java
index a47e9ddb36a..50ae68cb287 100644
--- a/clients/src/main/java/org/apache/kafka/common/utils/ThreadUtils.java
+++
b/clients/src/main/java/org/apache/kafka/common/utils/internals/ThreadUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.common.utils;
+package org.apache.kafka.common.utils.internals;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/clients/src/test/java/org/apache/kafka/common/utils/ExponentialBackoffManagerTest.java
b/clients/src/test/java/org/apache/kafka/common/utils/internals/ExponentialBackoffManagerTest.java
similarity index 98%
rename from
clients/src/test/java/org/apache/kafka/common/utils/ExponentialBackoffManagerTest.java
rename to
clients/src/test/java/org/apache/kafka/common/utils/internals/ExponentialBackoffManagerTest.java
index 87fe0985858..d50b3a3e3a2 100644
---
a/clients/src/test/java/org/apache/kafka/common/utils/ExponentialBackoffManagerTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/utils/internals/ExponentialBackoffManagerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.common.utils;
+package org.apache.kafka.common.utils.internals;
import org.junit.jupiter.api.Test;
diff --git
a/clients/src/test/java/org/apache/kafka/common/utils/ExponentialBackoffTest.java
b/clients/src/test/java/org/apache/kafka/common/utils/internals/ExponentialBackoffTest.java
similarity index 98%
rename from
clients/src/test/java/org/apache/kafka/common/utils/ExponentialBackoffTest.java
rename to
clients/src/test/java/org/apache/kafka/common/utils/internals/ExponentialBackoffTest.java
index fff921db29b..1865bdbe32d 100644
---
a/clients/src/test/java/org/apache/kafka/common/utils/ExponentialBackoffTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/utils/internals/ExponentialBackoffTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.common.utils;
+package org.apache.kafka.common.utils.internals;
import org.junit.jupiter.api.Test;
diff --git
a/clients/src/test/java/org/apache/kafka/common/utils/ThreadUtilsTest.java
b/clients/src/test/java/org/apache/kafka/common/utils/internals/ThreadUtilsTest.java
similarity index 98%
rename from
clients/src/test/java/org/apache/kafka/common/utils/ThreadUtilsTest.java
rename to
clients/src/test/java/org/apache/kafka/common/utils/internals/ThreadUtilsTest.java
index 0a299ddb005..79c0c415af5 100644
--- a/clients/src/test/java/org/apache/kafka/common/utils/ThreadUtilsTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/utils/internals/ThreadUtilsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kafka.common.utils;
+package org.apache.kafka.common.utils.internals;
import org.junit.jupiter.api.Test;
diff --git
a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/SourceTaskOffsetCommitter.java
b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/SourceTaskOffsetCommitter.java
index a4a04567d9d..2c68c2fcd9c 100644
---
a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/SourceTaskOffsetCommitter.java
+++
b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/SourceTaskOffsetCommitter.java
@@ -16,7 +16,7 @@
*/
package org.apache.kafka.connect.runtime;
-import org.apache.kafka.common.utils.ThreadUtils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.connect.errors.ConnectException;
import org.apache.kafka.connect.source.SourceTask;
import org.apache.kafka.connect.util.ConnectorTaskId;
diff --git
a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/Worker.java
b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/Worker.java
index adc9367085f..c7fe5ca20ac 100644
--- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/Worker.java
+++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/Worker.java
@@ -45,10 +45,10 @@ import
org.apache.kafka.common.errors.GroupNotEmptyException;
import org.apache.kafka.common.errors.GroupSubscribedToTopicException;
import org.apache.kafka.common.errors.UnknownMemberIdException;
import org.apache.kafka.common.internals.Plugin;
-import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Timer;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.connect.connector.ConnectRecord;
import org.apache.kafka.connect.connector.Connector;
import org.apache.kafka.connect.connector.Task;
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 6c4bed311d3..65b334c1d28 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
@@ -26,11 +26,11 @@ import org.apache.kafka.common.metrics.stats.Avg;
import org.apache.kafka.common.metrics.stats.CumulativeSum;
import org.apache.kafka.common.metrics.stats.Max;
import org.apache.kafka.common.utils.Exit;
-import org.apache.kafka.common.utils.ExponentialBackoff;
import org.apache.kafka.common.utils.LogContext;
-import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ExponentialBackoff;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import
org.apache.kafka.connect.connector.policy.ConnectorClientConfigOverridePolicy;
import org.apache.kafka.connect.errors.AlreadyExistsException;
import org.apache.kafka.connect.errors.ConnectException;
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 2b8f87c81c7..5ef35913553 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
@@ -16,9 +16,9 @@
*/
package org.apache.kafka.connect.runtime.distributed;
-import org.apache.kafka.common.utils.ExponentialBackoff;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.ExponentialBackoff;
import
org.apache.kafka.connect.runtime.distributed.WorkerCoordinator.ConnectorsAndTasks;
import
org.apache.kafka.connect.runtime.distributed.WorkerCoordinator.WorkerLoad;
import org.apache.kafka.connect.storage.ClusterConfigState;
diff --git
a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/standalone/StandaloneHerder.java
b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/standalone/StandaloneHerder.java
index e654ded2239..5f53d54bc1f 100644
---
a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/standalone/StandaloneHerder.java
+++
b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/standalone/StandaloneHerder.java
@@ -16,8 +16,8 @@
*/
package org.apache.kafka.connect.runtime.standalone;
-import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import
org.apache.kafka.connect.connector.policy.ConnectorClientConfigOverridePolicy;
import org.apache.kafka.connect.errors.AlreadyExistsException;
import org.apache.kafka.connect.errors.ConnectException;
diff --git
a/connect/runtime/src/main/java/org/apache/kafka/connect/storage/KafkaStatusBackingStore.java
b/connect/runtime/src/main/java/org/apache/kafka/connect/storage/KafkaStatusBackingStore.java
index 8de8d9ee18a..d2f50e97630 100644
---
a/connect/runtime/src/main/java/org/apache/kafka/connect/storage/KafkaStatusBackingStore.java
+++
b/connect/runtime/src/main/java/org/apache/kafka/connect/storage/KafkaStatusBackingStore.java
@@ -28,8 +28,8 @@ import
org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.kafka.common.serialization.ByteArraySerializer;
import org.apache.kafka.common.serialization.StringDeserializer;
import org.apache.kafka.common.serialization.StringSerializer;
-import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.connect.data.Schema;
import org.apache.kafka.connect.data.SchemaAndValue;
import org.apache.kafka.connect.data.SchemaBuilder;
diff --git
a/connect/runtime/src/main/java/org/apache/kafka/connect/storage/MemoryOffsetBackingStore.java
b/connect/runtime/src/main/java/org/apache/kafka/connect/storage/MemoryOffsetBackingStore.java
index 6e0ccc615be..79123d335a5 100644
---
a/connect/runtime/src/main/java/org/apache/kafka/connect/storage/MemoryOffsetBackingStore.java
+++
b/connect/runtime/src/main/java/org/apache/kafka/connect/storage/MemoryOffsetBackingStore.java
@@ -16,7 +16,7 @@
*/
package org.apache.kafka.connect.storage;
-import org.apache.kafka.common.utils.ThreadUtils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.connect.runtime.WorkerConfig;
import org.apache.kafka.connect.util.Callback;
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ErrantRecordSinkConnector.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ErrantRecordSinkConnector.java
index c87b854d4bb..c4e7b41080d 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ErrantRecordSinkConnector.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ErrantRecordSinkConnector.java
@@ -18,7 +18,7 @@
package org.apache.kafka.connect.integration;
import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.utils.ThreadUtils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.connect.connector.Task;
import org.apache.kafka.connect.sink.ErrantRecordReporter;
import org.apache.kafka.connect.sink.SinkRecord;
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SourceTaskOffsetCommitterTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SourceTaskOffsetCommitterTest.java
index 0b1f4efc850..e987f77d055 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SourceTaskOffsetCommitterTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SourceTaskOffsetCommitterTest.java
@@ -17,7 +17,7 @@
package org.apache.kafka.connect.runtime;
import org.apache.kafka.common.utils.LogCaptureAppender;
-import org.apache.kafka.common.utils.ThreadUtils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.connect.errors.ConnectException;
import org.apache.kafka.connect.runtime.standalone.StandaloneConfig;
import org.apache.kafka.connect.util.ConnectorTaskId;
diff --git
a/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorBackgroundThreadPoolExecutor.java
b/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorBackgroundThreadPoolExecutor.java
index b153f820dd7..ec433519842 100644
---
a/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorBackgroundThreadPoolExecutor.java
+++
b/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorBackgroundThreadPoolExecutor.java
@@ -16,8 +16,8 @@
*/
package org.apache.kafka.coordinator.common.runtime;
-import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import java.util.Objects;
import java.util.concurrent.LinkedBlockingQueue;
diff --git
a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/HdrHistogramTest.java
b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/HdrHistogramTest.java
index b16260a7c8a..b509c722050 100644
---
a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/HdrHistogramTest.java
+++
b/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/HdrHistogramTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.kafka.coordinator.common.runtime;
-import org.apache.kafka.common.utils.ThreadUtils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import com.yammer.metrics.core.Histogram;
import com.yammer.metrics.core.MetricName;
diff --git a/core/src/main/scala/kafka/network/SocketServer.scala
b/core/src/main/scala/kafka/network/SocketServer.scala
index 471dfb3242e..06d1c0f792f 100644
--- a/core/src/main/scala/kafka/network/SocketServer.scala
+++ b/core/src/main/scala/kafka/network/SocketServer.scala
@@ -40,13 +40,14 @@ import org.apache.kafka.common.network.{ChannelBuilder,
ChannelBuilders, ClientI
import org.apache.kafka.common.protocol.ApiKeys
import org.apache.kafka.common.requests.{ApiVersionsRequest, RequestContext,
RequestHeader}
import org.apache.kafka.common.security.auth.SecurityProtocol
-import org.apache.kafka.common.utils.{KafkaThread, LogContext, Time, Utils}
+import org.apache.kafka.common.utils.{LogContext, Time, Utils}
import org.apache.kafka.common.{Endpoint, KafkaException, MetricName,
Reconfigurable}
import org.apache.kafka.network.{ConnectionQuotaEntity,
ConnectionThrottledException, SocketServer => JSocketServer,
SocketServerConfigs, TooManyConnectionsException}
import org.apache.kafka.security.CredentialProvider
import org.apache.kafka.server.{ApiVersionManager, ServerSocketFactory}
import org.apache.kafka.server.config.QuotaConfig
import org.apache.kafka.common.metrics.internals.MetricsUtils
+import org.apache.kafka.common.utils.internals.KafkaThread
import org.apache.kafka.server.metrics.KafkaMetricsGroup
import org.apache.kafka.server.network.ConnectionDisconnectListener
import org.apache.kafka.server.quota.QuotaUtils
diff --git a/core/src/main/scala/kafka/server/KafkaRequestHandler.scala
b/core/src/main/scala/kafka/server/KafkaRequestHandler.scala
index e1f0176bbb7..a4385e7ce13 100755
--- a/core/src/main/scala/kafka/server/KafkaRequestHandler.scala
+++ b/core/src/main/scala/kafka/server/KafkaRequestHandler.scala
@@ -25,7 +25,8 @@ import java.util.concurrent.{CountDownLatch, TimeUnit}
import java.util.concurrent.atomic.AtomicInteger
import com.yammer.metrics.core.Meter
import org.apache.kafka.common.internals.FatalExitError
-import org.apache.kafka.common.utils.{Exit, KafkaThread, Time}
+import org.apache.kafka.common.utils.internals.KafkaThread
+import org.apache.kafka.common.utils.{Exit, Time}
import org.apache.kafka.server.common.RequestLocal
import org.apache.kafka.server.metrics.KafkaMetricsGroup
diff --git
a/core/src/test/scala/unit/kafka/server/ControllerRegistrationManagerTest.scala
b/core/src/test/scala/unit/kafka/server/ControllerRegistrationManagerTest.scala
index c643e4738fc..833df332b1f 100644
---
a/core/src/test/scala/unit/kafka/server/ControllerRegistrationManagerTest.scala
+++
b/core/src/test/scala/unit/kafka/server/ControllerRegistrationManagerTest.scala
@@ -22,7 +22,7 @@ import
org.apache.kafka.common.message.ControllerRegistrationResponseData
import org.apache.kafka.common.metadata.{FeatureLevelRecord,
RegisterControllerRecord}
import org.apache.kafka.common.protocol.Errors
import org.apache.kafka.common.requests.ControllerRegistrationResponse
-import org.apache.kafka.common.utils.ExponentialBackoff
+import org.apache.kafka.common.utils.internals.ExponentialBackoff
import org.apache.kafka.image.loader.{LogDeltaManifest, SnapshotManifest}
import org.apache.kafka.image.{MetadataDelta, MetadataImage,
MetadataProvenance}
import org.apache.kafka.metadata.{ListenerInfo, RecordTestUtils, VersionRange}
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 ea55d85f919..5c5ec4b15f7 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
@@ -18,9 +18,9 @@
package org.apache.kafka.queue;
import org.apache.kafka.common.errors.TimeoutException;
-import org.apache.kafka.common.utils.KafkaThread;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.KafkaThread;
import org.slf4j.Logger;
diff --git
a/server-common/src/main/java/org/apache/kafka/server/share/persister/PersisterStateManager.java
b/server-common/src/main/java/org/apache/kafka/server/share/persister/PersisterStateManager.java
index 6e15ab268e7..28c4c866f39 100644
---
a/server-common/src/main/java/org/apache/kafka/server/share/persister/PersisterStateManager.java
+++
b/server-common/src/main/java/org/apache/kafka/server/share/persister/PersisterStateManager.java
@@ -53,9 +53,9 @@ import
org.apache.kafka.common.requests.ReadShareGroupStateSummaryRequest;
import org.apache.kafka.common.requests.ReadShareGroupStateSummaryResponse;
import org.apache.kafka.common.requests.WriteShareGroupStateRequest;
import org.apache.kafka.common.requests.WriteShareGroupStateResponse;
-import org.apache.kafka.common.utils.ExponentialBackoffManager;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ExponentialBackoffManager;
import org.apache.kafka.server.share.SharePartitionKey;
import org.apache.kafka.server.util.InterBrokerSendThread;
import org.apache.kafka.server.util.RequestAndCompletionHandler;
diff --git
a/server-common/src/main/java/org/apache/kafka/server/util/KafkaScheduler.java
b/server-common/src/main/java/org/apache/kafka/server/util/KafkaScheduler.java
index a9fe4e3a373..8582e1a059d 100644
---
a/server-common/src/main/java/org/apache/kafka/server/util/KafkaScheduler.java
+++
b/server-common/src/main/java/org/apache/kafka/server/util/KafkaScheduler.java
@@ -16,7 +16,7 @@
*/
package org.apache.kafka.server.util;
-import org.apache.kafka.common.utils.KafkaThread;
+import org.apache.kafka.common.utils.internals.KafkaThread;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/server-common/src/main/java/org/apache/kafka/server/util/timer/SystemTimer.java
b/server-common/src/main/java/org/apache/kafka/server/util/timer/SystemTimer.java
index 1bf3b2a68eb..7c911fb49d1 100644
---
a/server-common/src/main/java/org/apache/kafka/server/util/timer/SystemTimer.java
+++
b/server-common/src/main/java/org/apache/kafka/server/util/timer/SystemTimer.java
@@ -16,9 +16,9 @@
*/
package org.apache.kafka.server.util.timer;
-import org.apache.kafka.common.utils.KafkaThread;
-import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.KafkaThread;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import java.util.concurrent.DelayQueue;
import java.util.concurrent.ExecutorService;
diff --git
a/server/src/main/java/org/apache/kafka/server/AssignmentsManager.java
b/server/src/main/java/org/apache/kafka/server/AssignmentsManager.java
index 34a0584e394..b768463e766 100644
--- a/server/src/main/java/org/apache/kafka/server/AssignmentsManager.java
+++ b/server/src/main/java/org/apache/kafka/server/AssignmentsManager.java
@@ -27,9 +27,9 @@ import
org.apache.kafka.common.message.AssignReplicasToDirsResponseData;
import org.apache.kafka.common.protocol.Errors;
import org.apache.kafka.common.requests.AssignReplicasToDirsRequest;
import org.apache.kafka.common.requests.AssignReplicasToDirsResponse;
-import org.apache.kafka.common.utils.ExponentialBackoff;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.ExponentialBackoff;
import org.apache.kafka.image.MetadataImage;
import org.apache.kafka.image.TopicImage;
import org.apache.kafka.queue.EventQueue;
diff --git
a/server/src/main/java/org/apache/kafka/server/AssignmentsManagerDeadlineFunction.java
b/server/src/main/java/org/apache/kafka/server/AssignmentsManagerDeadlineFunction.java
index 66c58297956..55271e9163a 100644
---
a/server/src/main/java/org/apache/kafka/server/AssignmentsManagerDeadlineFunction.java
+++
b/server/src/main/java/org/apache/kafka/server/AssignmentsManagerDeadlineFunction.java
@@ -17,7 +17,7 @@
package org.apache.kafka.server;
-import org.apache.kafka.common.utils.ExponentialBackoff;
+import org.apache.kafka.common.utils.internals.ExponentialBackoff;
import java.util.OptionalLong;
import java.util.function.UnaryOperator;
diff --git
a/server/src/main/java/org/apache/kafka/server/controller/ControllerRegistrationManager.java
b/server/src/main/java/org/apache/kafka/server/controller/ControllerRegistrationManager.java
index 6fbc5dda059..7b8e20a6469 100644
---
a/server/src/main/java/org/apache/kafka/server/controller/ControllerRegistrationManager.java
+++
b/server/src/main/java/org/apache/kafka/server/controller/ControllerRegistrationManager.java
@@ -22,9 +22,9 @@ import
org.apache.kafka.common.message.ControllerRegistrationRequestData;
import org.apache.kafka.common.protocol.Errors;
import org.apache.kafka.common.requests.ControllerRegistrationRequest;
import org.apache.kafka.common.requests.ControllerRegistrationResponse;
-import org.apache.kafka.common.utils.ExponentialBackoff;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.ExponentialBackoff;
import org.apache.kafka.image.MetadataDelta;
import org.apache.kafka.image.MetadataImage;
import org.apache.kafka.image.loader.LoaderManifest;
diff --git
a/server/src/main/java/org/apache/kafka/server/purgatory/DelayedFuturePurgatory.java
b/server/src/main/java/org/apache/kafka/server/purgatory/DelayedFuturePurgatory.java
index 637fdb1aab6..1bd62dcd604 100644
---
a/server/src/main/java/org/apache/kafka/server/purgatory/DelayedFuturePurgatory.java
+++
b/server/src/main/java/org/apache/kafka/server/purgatory/DelayedFuturePurgatory.java
@@ -17,7 +17,7 @@
package org.apache.kafka.server.purgatory;
-import org.apache.kafka.common.utils.KafkaThread;
+import org.apache.kafka.common.utils.internals.KafkaThread;
import java.util.List;
import java.util.concurrent.CompletableFuture;
diff --git
a/server/src/main/java/org/apache/kafka/server/util/NetworkPartitionMetadataClient.java
b/server/src/main/java/org/apache/kafka/server/util/NetworkPartitionMetadataClient.java
index e4a8528be11..e1ef0f8a503 100644
---
a/server/src/main/java/org/apache/kafka/server/util/NetworkPartitionMetadataClient.java
+++
b/server/src/main/java/org/apache/kafka/server/util/NetworkPartitionMetadataClient.java
@@ -30,9 +30,9 @@ import org.apache.kafka.common.network.ListenerName;
import org.apache.kafka.common.protocol.Errors;
import org.apache.kafka.common.requests.ListOffsetsRequest;
import org.apache.kafka.common.requests.ListOffsetsResponse;
-import org.apache.kafka.common.utils.ExponentialBackoffManager;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ExponentialBackoffManager;
import org.apache.kafka.metadata.MetadataCache;
import org.apache.kafka.server.util.timer.Timer;
import org.apache.kafka.server.util.timer.TimerTask;
diff --git
a/server/src/test/java/org/apache/kafka/server/AssignmentsManagerDeadlineFunctionTest.java
b/server/src/test/java/org/apache/kafka/server/AssignmentsManagerDeadlineFunctionTest.java
index b900c759af9..d309817db12 100644
---
a/server/src/test/java/org/apache/kafka/server/AssignmentsManagerDeadlineFunctionTest.java
+++
b/server/src/test/java/org/apache/kafka/server/AssignmentsManagerDeadlineFunctionTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.kafka.server;
-import org.apache.kafka.common.utils.ExponentialBackoff;
+import org.apache.kafka.common.utils.internals.ExponentialBackoff;
import org.junit.jupiter.api.Test;
diff --git
a/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java
b/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java
index 89f3a9b72d6..7534fe9ad83 100644
--- a/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java
+++ b/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java
@@ -33,8 +33,8 @@ import org.apache.kafka.common.requests.AbstractRequest;
import org.apache.kafka.common.requests.ApiVersionsResponse;
import org.apache.kafka.common.requests.AssignReplicasToDirsRequest;
import org.apache.kafka.common.requests.AssignReplicasToDirsResponse;
-import org.apache.kafka.common.utils.ExponentialBackoff;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.ExponentialBackoff;
import org.apache.kafka.image.MetadataDelta;
import org.apache.kafka.image.MetadataImage;
import org.apache.kafka.image.MetadataProvenance;
diff --git
a/server/src/test/java/org/apache/kafka/server/util/NetworkPartitionMetadataClientTest.java
b/server/src/test/java/org/apache/kafka/server/util/NetworkPartitionMetadataClientTest.java
index 8e82721d416..4af94c3c4fe 100644
---
a/server/src/test/java/org/apache/kafka/server/util/NetworkPartitionMetadataClientTest.java
+++
b/server/src/test/java/org/apache/kafka/server/util/NetworkPartitionMetadataClientTest.java
@@ -32,8 +32,8 @@ import org.apache.kafka.common.protocol.Errors;
import org.apache.kafka.common.requests.ListOffsetsRequest;
import org.apache.kafka.common.requests.ListOffsetsResponse;
import org.apache.kafka.common.security.auth.SecurityProtocol;
-import org.apache.kafka.common.utils.ExponentialBackoffManager;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.ExponentialBackoffManager;
import org.apache.kafka.metadata.MetadataCache;
import org.apache.kafka.server.util.timer.MockTimer;
import org.apache.kafka.server.util.timer.Timer;
diff --git
a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ConsumerManager.java
b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ConsumerManager.java
index 2860ac4b76e..37ca4831126 100644
---
a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ConsumerManager.java
+++
b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ConsumerManager.java
@@ -20,9 +20,9 @@ import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.apache.kafka.clients.producer.RecordMetadata;
import org.apache.kafka.common.KafkaException;
import org.apache.kafka.common.TopicIdPartition;
-import org.apache.kafka.common.utils.KafkaThread;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.KafkaThread;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManager.java
b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManager.java
index 00f20fb4f14..7e518db9ea8 100644
---
a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManager.java
+++
b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManager.java
@@ -28,9 +28,9 @@ import org.apache.kafka.common.errors.RetriableException;
import org.apache.kafka.common.errors.TopicExistsException;
import org.apache.kafka.common.errors.UnknownTopicOrPartitionException;
import org.apache.kafka.common.utils.Exit;
-import org.apache.kafka.common.utils.KafkaThread;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.KafkaThread;
import org.apache.kafka.server.log.remote.storage.RemoteLogMetadata;
import org.apache.kafka.server.log.remote.storage.RemoteLogMetadataManager;
import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadata;
diff --git
a/storage/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogManager.java
b/storage/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogManager.java
index c65cf5b1fe4..4f56f95c0b2 100644
---
a/storage/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogManager.java
+++
b/storage/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogManager.java
@@ -41,9 +41,9 @@ import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ChildFirstClassLoader;
import org.apache.kafka.common.utils.CloseableIterator;
import org.apache.kafka.common.utils.LogContext;
-import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.server.common.CheckpointFile;
import org.apache.kafka.server.common.OffsetAndEpoch;
import org.apache.kafka.server.common.StopPartition;
diff --git
a/storage/src/main/java/org/apache/kafka/storage/internals/log/LogManager.java
b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogManager.java
index 6aa3892a59f..2ee31dcf7cc 100644
---
a/storage/src/main/java/org/apache/kafka/storage/internals/log/LogManager.java
+++
b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogManager.java
@@ -25,9 +25,9 @@ import org.apache.kafka.common.errors.KafkaStorageException;
import org.apache.kafka.common.errors.LogDirNotFoundException;
import org.apache.kafka.common.internals.Topic;
import org.apache.kafka.common.utils.Exit;
-import org.apache.kafka.common.utils.KafkaThread;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.KafkaThread;
import org.apache.kafka.metadata.ConfigRepository;
import org.apache.kafka.metadata.properties.MetaProperties;
import org.apache.kafka.metadata.properties.MetaPropertiesEnsemble;
diff --git
a/storage/src/main/java/org/apache/kafka/storage/internals/log/RemoteStorageThreadPool.java
b/storage/src/main/java/org/apache/kafka/storage/internals/log/RemoteStorageThreadPool.java
index 6b73a55a5ef..3b1df530f8d 100644
---
a/storage/src/main/java/org/apache/kafka/storage/internals/log/RemoteStorageThreadPool.java
+++
b/storage/src/main/java/org/apache/kafka/storage/internals/log/RemoteStorageThreadPool.java
@@ -16,7 +16,7 @@
*/
package org.apache.kafka.storage.internals.log;
-import org.apache.kafka.common.utils.ThreadUtils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.server.log.remote.storage.RemoteStorageMetrics;
import org.apache.kafka.server.metrics.KafkaMetricsGroup;
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 1657b3a414b..4eb2ad36fc8 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
@@ -28,9 +28,9 @@ import org.apache.kafka.common.Metric;
import org.apache.kafka.common.MetricName;
import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.common.errors.TimeoutException;
-import org.apache.kafka.common.utils.ExponentialBackoff;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.ExponentialBackoff;
import org.apache.kafka.streams.errors.LockException;
import org.apache.kafka.streams.errors.StreamsException;
import org.apache.kafka.streams.errors.TaskCorruptedException;
diff --git
a/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestClient.java
b/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestClient.java
index b0012fa61b4..13b740ced0c 100644
--- a/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestClient.java
+++ b/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestClient.java
@@ -18,7 +18,7 @@ package org.apache.kafka.streams.tests;
import org.apache.kafka.common.serialization.Serdes;
import org.apache.kafka.common.utils.Bytes;
-import org.apache.kafka.common.utils.KafkaThread;
+import org.apache.kafka.common.utils.internals.KafkaThread;
import org.apache.kafka.streams.KafkaStreams;
import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.StreamsBuilder;
diff --git
a/test-common/test-common-runtime/src/main/java/org/apache/kafka/common/test/KafkaClusterTestKit.java
b/test-common/test-common-runtime/src/main/java/org/apache/kafka/common/test/KafkaClusterTestKit.java
index 4cf4e0770d0..b152a3b1dbe 100644
---
a/test-common/test-common-runtime/src/main/java/org/apache/kafka/common/test/KafkaClusterTestKit.java
+++
b/test-common/test-common-runtime/src/main/java/org/apache/kafka/common/test/KafkaClusterTestKit.java
@@ -35,9 +35,9 @@ import org.apache.kafka.common.metrics.Metrics;
import org.apache.kafka.common.network.ListenerName;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.apache.kafka.common.test.api.TestKitDefaults;
-import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.controller.Controller;
import org.apache.kafka.metadata.authorizer.StandardAuthorizer;
import org.apache.kafka.metadata.properties.MetaPropertiesEnsemble;
diff --git
a/trogdor/src/main/java/org/apache/kafka/trogdor/agent/WorkerManager.java
b/trogdor/src/main/java/org/apache/kafka/trogdor/agent/WorkerManager.java
index 4c7fdd6b874..5e5691a1ac5 100644
--- a/trogdor/src/main/java/org/apache/kafka/trogdor/agent/WorkerManager.java
+++ b/trogdor/src/main/java/org/apache/kafka/trogdor/agent/WorkerManager.java
@@ -20,9 +20,9 @@ package org.apache.kafka.trogdor.agent;
import org.apache.kafka.common.KafkaException;
import org.apache.kafka.common.KafkaFuture;
import org.apache.kafka.common.internals.KafkaFutureImpl;
-import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.trogdor.common.Platform;
import org.apache.kafka.trogdor.common.Scheduler;
import org.apache.kafka.trogdor.rest.RequestConflictException;
diff --git
a/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/NodeManager.java
b/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/NodeManager.java
index 577b22b8c67..60429f46927 100644
---
a/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/NodeManager.java
+++
b/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/NodeManager.java
@@ -43,7 +43,7 @@
package org.apache.kafka.trogdor.coordinator;
-import org.apache.kafka.common.utils.ThreadUtils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.trogdor.agent.AgentClient;
import org.apache.kafka.trogdor.common.Node;
import org.apache.kafka.trogdor.rest.AgentStatusResponse;
diff --git
a/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/TaskManager.java
b/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/TaskManager.java
index d8e8627a9ee..dd3b88c113e 100644
---
a/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/TaskManager.java
+++
b/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/TaskManager.java
@@ -19,9 +19,9 @@ package org.apache.kafka.trogdor.coordinator;
import org.apache.kafka.common.KafkaException;
import org.apache.kafka.common.errors.InvalidRequestException;
-import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.trogdor.common.JsonUtil;
import org.apache.kafka.trogdor.common.Node;
import org.apache.kafka.trogdor.common.Platform;
diff --git
a/trogdor/src/main/java/org/apache/kafka/trogdor/rest/JsonRestServer.java
b/trogdor/src/main/java/org/apache/kafka/trogdor/rest/JsonRestServer.java
index 108642ca105..407a81c1e4f 100644
--- a/trogdor/src/main/java/org/apache/kafka/trogdor/rest/JsonRestServer.java
+++ b/trogdor/src/main/java/org/apache/kafka/trogdor/rest/JsonRestServer.java
@@ -17,7 +17,7 @@
package org.apache.kafka.trogdor.rest;
-import org.apache.kafka.common.utils.ThreadUtils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.trogdor.common.JsonUtil;
import com.fasterxml.jackson.core.type.TypeReference;
diff --git
a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConfigurableProducerWorker.java
b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConfigurableProducerWorker.java
index 62ca5525572..585f43fcaeb 100644
---
a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConfigurableProducerWorker.java
+++
b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConfigurableProducerWorker.java
@@ -26,8 +26,8 @@ import org.apache.kafka.clients.producer.RecordMetadata;
import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.common.internals.KafkaFutureImpl;
import org.apache.kafka.common.serialization.ByteArraySerializer;
-import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.trogdor.common.JsonUtil;
import org.apache.kafka.trogdor.common.Platform;
import org.apache.kafka.trogdor.common.WorkerUtils;
diff --git
a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConnectionStressWorker.java
b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConnectionStressWorker.java
index 9452c03ec99..91e114f9914 100644
---
a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConnectionStressWorker.java
+++
b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConnectionStressWorker.java
@@ -33,9 +33,9 @@ import org.apache.kafka.common.metrics.Metrics;
import org.apache.kafka.common.network.ChannelBuilder;
import org.apache.kafka.common.network.Selector;
import org.apache.kafka.common.utils.LogContext;
-import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.trogdor.common.JsonUtil;
import org.apache.kafka.trogdor.common.Platform;
import org.apache.kafka.trogdor.common.WorkerUtils;
diff --git
a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConsumeBenchWorker.java
b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConsumeBenchWorker.java
index 0a51db48404..ad8764542d7 100644
---
a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConsumeBenchWorker.java
+++
b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConsumeBenchWorker.java
@@ -25,9 +25,9 @@ import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.common.config.ConfigException;
import org.apache.kafka.common.internals.KafkaFutureImpl;
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
-import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.trogdor.common.JsonUtil;
import org.apache.kafka.trogdor.common.Platform;
import org.apache.kafka.trogdor.common.WorkerUtils;
diff --git
a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ExternalCommandWorker.java
b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ExternalCommandWorker.java
index 85c53ca97a9..a056c779999 100644
---
a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ExternalCommandWorker.java
+++
b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ExternalCommandWorker.java
@@ -18,7 +18,7 @@
package org.apache.kafka.trogdor.workload;
import org.apache.kafka.common.internals.KafkaFutureImpl;
-import org.apache.kafka.common.utils.ThreadUtils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.trogdor.common.JsonUtil;
import org.apache.kafka.trogdor.common.Platform;
import org.apache.kafka.trogdor.task.TaskWorker;
diff --git
a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ProduceBenchWorker.java
b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ProduceBenchWorker.java
index 6d6d6e6979a..94f4844b70d 100644
---
a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ProduceBenchWorker.java
+++
b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ProduceBenchWorker.java
@@ -26,8 +26,8 @@ import org.apache.kafka.clients.producer.RecordMetadata;
import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.common.internals.KafkaFutureImpl;
import org.apache.kafka.common.serialization.ByteArraySerializer;
-import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.trogdor.common.JsonUtil;
import org.apache.kafka.trogdor.common.Platform;
import org.apache.kafka.trogdor.common.WorkerUtils;
diff --git
a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/RoundTripWorkerBase.java
b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/RoundTripWorkerBase.java
index 7adc1287d71..436fce0b68f 100644
---
a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/RoundTripWorkerBase.java
+++
b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/RoundTripWorkerBase.java
@@ -29,9 +29,9 @@ import org.apache.kafka.common.errors.TimeoutException;
import org.apache.kafka.common.errors.WakeupException;
import org.apache.kafka.common.internals.KafkaFutureImpl;
import org.apache.kafka.common.serialization.ByteArraySerializer;
-import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.trogdor.common.JsonUtil;
import org.apache.kafka.trogdor.common.Platform;
import org.apache.kafka.trogdor.common.WorkerUtils;
diff --git
a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ShareConsumeBenchWorker.java
b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ShareConsumeBenchWorker.java
index ddf064cd68d..f85324463f5 100644
---
a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ShareConsumeBenchWorker.java
+++
b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ShareConsumeBenchWorker.java
@@ -23,9 +23,9 @@ import org.apache.kafka.clients.consumer.ConsumerRecords;
import org.apache.kafka.clients.consumer.KafkaShareConsumer;
import org.apache.kafka.common.internals.KafkaFutureImpl;
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
-import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.trogdor.common.JsonUtil;
import org.apache.kafka.trogdor.common.Platform;
import org.apache.kafka.trogdor.common.WorkerUtils;
diff --git
a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/SustainedConnectionWorker.java
b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/SustainedConnectionWorker.java
index 3e8c3c7fd14..336544193e5 100644
---
a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/SustainedConnectionWorker.java
+++
b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/SustainedConnectionWorker.java
@@ -27,9 +27,9 @@ import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.common.internals.KafkaFutureImpl;
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.kafka.common.serialization.ByteArraySerializer;
-import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.trogdor.common.JsonUtil;
import org.apache.kafka.trogdor.common.Platform;
import org.apache.kafka.trogdor.common.WorkerUtils;
diff --git
a/trogdor/src/test/java/org/apache/kafka/trogdor/common/MiniTrogdorCluster.java
b/trogdor/src/test/java/org/apache/kafka/trogdor/common/MiniTrogdorCluster.java
index ec5f7b68cdf..a2ed463b83d 100644
---
a/trogdor/src/test/java/org/apache/kafka/trogdor/common/MiniTrogdorCluster.java
+++
b/trogdor/src/test/java/org/apache/kafka/trogdor/common/MiniTrogdorCluster.java
@@ -17,7 +17,7 @@
package org.apache.kafka.trogdor.common;
-import org.apache.kafka.common.utils.ThreadUtils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.trogdor.agent.Agent;
import org.apache.kafka.trogdor.agent.AgentClient;
import org.apache.kafka.trogdor.agent.AgentRestResource;
diff --git
a/trogdor/src/test/java/org/apache/kafka/trogdor/task/SampleTaskWorker.java
b/trogdor/src/test/java/org/apache/kafka/trogdor/task/SampleTaskWorker.java
index f3bd2a22fe1..9a04f3c705f 100644
--- a/trogdor/src/test/java/org/apache/kafka/trogdor/task/SampleTaskWorker.java
+++ b/trogdor/src/test/java/org/apache/kafka/trogdor/task/SampleTaskWorker.java
@@ -18,7 +18,7 @@
package org.apache.kafka.trogdor.task;
import org.apache.kafka.common.internals.KafkaFutureImpl;
-import org.apache.kafka.common.utils.ThreadUtils;
+import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.trogdor.common.Platform;
import com.fasterxml.jackson.databind.node.TextNode;
