Merge pull request #72 from ozangunalp/dependabot/maven/main/kafka.ve…

…rsion-3.5.0 Bump kafka.version from 3.4.0 to 3.5.0
ozangunalp · Sep 19, 2023 · b904d69 · b904d69
2 parents e5adc1d + 149d093
commit b904d69
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 18 deletions.
diff --git a/kafka-server/src/main/java/com/ozangunalp/kafka/server/EmbeddedKafkaBroker.java b/kafka-server/src/main/java/com/ozangunalp/kafka/server/EmbeddedKafkaBroker.java
@@ -186,7 +186,7 @@ public synchronized EmbeddedKafkaBroker start() {
             server = new KafkaServer(config, Time.SYSTEM, Option.apply(KAFKA_PREFIX), false);
         } else {
             Storage.formatStorageFromConfig(config, clusterId, true);
-            server = new KafkaRaftServer(config, Time.SYSTEM, Option.apply(KAFKA_PREFIX));
+            server = new KafkaRaftServer(config, Time.SYSTEM);
         }
         server.startup();
         this.kafkaServer = server;

diff --git a/pom.xml b/pom.xml
@@ -72,7 +72,7 @@
         <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
         <quarkus.platform.version>2.16.5.Final</quarkus.platform.version>
 
-        <kafka.version>3.4.0</kafka.version>
+        <kafka.version>3.5.0</kafka.version>
         <zookeeper.version>3.8.1</zookeeper.version>
         <scala.version>2.13.10</scala.version>
 
@@ -118,6 +118,11 @@
                 <artifactId>kafka-server-common</artifactId>
                 <version>${kafka.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.kafka</groupId>
+                <artifactId>kafka-storage</artifactId>
+                <version>${kafka.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.kafka</groupId>
                 <artifactId>kafka-clients</artifactId>

diff --git a/quarkus-kafka-server-extension/runtime/pom.xml b/quarkus-kafka-server-extension/runtime/pom.xml
@@ -24,6 +24,10 @@
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka-server-common</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>kafka-storage</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka_2.13</artifactId>

diff --git a/...src/main/java/com/ozangunalp/kafka/server/extension/runtime/KafkaServerSubstitutions.java b/...src/main/java/com/ozangunalp/kafka/server/extension/runtime/KafkaServerSubstitutions.java
@@ -22,9 +22,9 @@
 import com.oracle.svm.core.annotate.InjectAccessors;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
-import kafka.log.OffsetIndex;
-import kafka.log.TimeIndex;
-import kafka.log.TransactionIndex;
+import org.apache.kafka.storage.internals.log.OffsetIndex;
+import org.apache.kafka.storage.internals.log.TimeIndex;
+import org.apache.kafka.storage.internals.log.TransactionIndex;
 
 @TargetClass(value = AppInfoParser.class)
 final class RemoveJMXAccess {
@@ -85,28 +85,24 @@ static InetSocketAddress get() {
     }
 }
 
-@TargetClass(className = "kafka.log.LogConfig")
+@TargetClass(className = "org.apache.kafka.storage.internals.log.LogConfig")
 final class Target_LogConfig {
 
+    @Alias
+    public long segmentMs;
+
+    @Alias
+    public long segmentJitterMs;
+
     @Substitute
     public long randomSegmentJitter() {
-        if (segmentJitterMs() == 0) {
+        if (segmentJitterMs == 0) {
             return 0;
         } else {
-            return Utils.abs(new Random().nextInt()) % Math.min(segmentJitterMs(), segmentMs());
+            return Utils.abs(new Random().nextInt()) % Math.min(segmentJitterMs, segmentMs);
         }
     }
 
-    @Alias
-    public Long segmentJitterMs() {
-        return null;
-    }
-
-    @Alias
-    public Long segmentMs() {
-        return null;
-    }
-
 }
 
 @TargetClass(className = "kafka.log.LogFlushStats$")