From 4e09a7c01e34b5a8509306ae7b70f9eb804ae9ca Mon Sep 17 00:00:00 2001
From: Truc Nguyen <119303279+trnguyencflt@users.noreply.github.com>
Date: Tue, 18 Jun 2024 14:54:57 +0100
Subject: [PATCH] Fix SystemTime that change visibility and compilation issue
 of KafkaGroupLeaderElector (#3155)

* Fix SystemTime that change visibility

* Use MetadataRecoveryStrategy.NONE for NetworkClient
---
 .../leaderelector/kafka/KafkaGroupLeaderElector.java          | 4 +++-
 .../kafka/schemaregistry/metrics/MetricsContainer.java        | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/io/confluent/kafka/schemaregistry/leaderelector/kafka/KafkaGroupLeaderElector.java b/core/src/main/java/io/confluent/kafka/schemaregistry/leaderelector/kafka/KafkaGroupLeaderElector.java
index fd807620f80..14929ff3521 100644
--- a/core/src/main/java/io/confluent/kafka/schemaregistry/leaderelector/kafka/KafkaGroupLeaderElector.java
+++ b/core/src/main/java/io/confluent/kafka/schemaregistry/leaderelector/kafka/KafkaGroupLeaderElector.java
@@ -27,6 +27,7 @@
 import org.apache.kafka.clients.ClientUtils;
 import org.apache.kafka.clients.CommonClientConfigs;
 import org.apache.kafka.clients.Metadata;
+import org.apache.kafka.clients.MetadataRecoveryStrategy;
 import org.apache.kafka.clients.NetworkClient;
 import org.apache.kafka.clients.consumer.internals.ConsumerNetworkClient;
 import org.apache.kafka.common.KafkaException;
@@ -151,7 +152,8 @@ public KafkaGroupLeaderElector(SchemaRegistryConfig config,
           time,
           true,
           new ApiVersions(),
-          logContext);
+          logContext,
+          MetadataRecoveryStrategy.NONE);
 
       this.client = new ConsumerNetworkClient(
           logContext,
diff --git a/core/src/main/java/io/confluent/kafka/schemaregistry/metrics/MetricsContainer.java b/core/src/main/java/io/confluent/kafka/schemaregistry/metrics/MetricsContainer.java
index c0ba6808cd4..6dcc4ae88ab 100644
--- a/core/src/main/java/io/confluent/kafka/schemaregistry/metrics/MetricsContainer.java
+++ b/core/src/main/java/io/confluent/kafka/schemaregistry/metrics/MetricsContainer.java
@@ -34,7 +34,7 @@
 import org.apache.kafka.common.metrics.MetricsReporter;
 import org.apache.kafka.common.metrics.stats.CumulativeCount;
 import org.apache.kafka.common.metrics.stats.Value;
-import org.apache.kafka.common.utils.SystemTime;
+import org.apache.kafka.common.utils.Time;
 
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -115,7 +115,7 @@ public MetricsContainer(SchemaRegistryConfig config, String kafkaClusterId) {
             new MetricConfig().samples(config.getInt(ProducerConfig.METRICS_NUM_SAMPLES_CONFIG))
                     .timeWindow(config.getLong(ProducerConfig.METRICS_SAMPLE_WINDOW_MS_CONFIG),
                             TimeUnit.MILLISECONDS);
-    this.metrics = new Metrics(metricConfig, reporters, new SystemTime(), metricsContext);
+    this.metrics = new Metrics(metricConfig, reporters, Time.SYSTEM, metricsContext);
 
     this.isLeaderNode = createMetric(METRIC_NAME_MASTER_SLAVE_ROLE,
             "1.0 indicates the node is the active leader in the cluster and is the"