version 3.0.18

Accenture · Oct 19, 2024 · a0db199 · a0db199
1 parent a3b49b7
commit a0db199
Show file tree

Hide file tree

Showing 25 changed files with 108 additions and 271 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ---
-## Version 3.0.16, 8/31/2024
+## Version 4.0.18, 10/18/2024
+
+### Added
+
+Added Kafka Raft for the Kafka-standalone app.
+
+### Removed
+
+Removed zookeeper from Kafka-standalone app.
+
+### Changed
+
+N/A
+
+---
+## Version 3.0.17, 10/9/2024
 
 ### Added
 

diff --git a/benchmark/benchmark-client/pom.xml b/benchmark/benchmark-client/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>benchmark-client</artifactId>
 
     <packaging>jar</packaging>
-    <version>3.0.17</version>
+    <version>3.0.18</version>
     <name>Benchmark client</name>
 
     <parent>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>platform-core</artifactId>
-            <version>3.0.17</version>
+            <version>3.0.18</version>
         </dependency>
 
         <!-- select your cloud connector (hazelcast-connector or kafka-connector).
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>kafka-connector</artifactId>
-            <version>3.0.17</version>
+            <version>3.0.18</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/junit/junit -->

diff --git a/benchmark/benchmark-server/pom.xml b/benchmark/benchmark-server/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>benchmark-server</artifactId>
 
     <packaging>jar</packaging>
-    <version>3.0.17</version>
+    <version>3.0.18</version>
     <name>Benchmark server</name>
 
     <parent>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>platform-core</artifactId>
-            <version>3.0.17</version>
+            <version>3.0.18</version>
         </dependency>
 
         <!-- select your cloud connector (hazelcast-connector or kafka-connector).
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>kafka-connector</artifactId>
-            <version>3.0.17</version>
+            <version>3.0.18</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/junit/junit -->

diff --git a/connectors/adapters/hazelcast/hazelcast-connector/pom.xml b/connectors/adapters/hazelcast/hazelcast-connector/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>hazelcast-connector</artifactId>
 
     <packaging>jar</packaging>
-    <version>3.0.17</version>
+    <version>3.0.18</version>
     <name>Cloud connector for Hazelcast cluster</name>
 
     <parent>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>cloud-connector</artifactId>
-            <version>3.0.17</version>
+            <version>3.0.18</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.hazelcast/hazelcast-client -->

diff --git a/connectors/adapters/hazelcast/hazelcast-presence/pom.xml b/connectors/adapters/hazelcast/hazelcast-presence/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.platformlambda</groupId>
     <artifactId>hazelcast-presence</artifactId>
     <packaging>jar</packaging>
-    <version>3.0.17</version>
+    <version>3.0.18</version>
     <name>Presence monitor for Hazelcast</name>
 
     <parent>
@@ -41,13 +41,13 @@
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>service-monitor</artifactId>
-            <version>3.0.17</version>
+            <version>3.0.18</version>
         </dependency>
 
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>hazelcast-connector</artifactId>
-            <version>3.0.17</version>
+            <version>3.0.18</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/junit/junit -->

diff --git a/connectors/adapters/kafka/kafka-connector/pom.xml b/connectors/adapters/kafka/kafka-connector/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>kafka-connector</artifactId>
 
     <packaging>jar</packaging>
-    <version>3.0.17</version>
+    <version>3.0.18</version>
     <name>Cloud connector for Kafka cluster</name>
 
     <parent>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>cloud-connector</artifactId>
-            <version>3.0.17</version>
+            <version>3.0.18</version>
         </dependency>
 
         <dependency>

diff --git a/connectors/adapters/kafka/kafka-presence/pom.xml b/connectors/adapters/kafka/kafka-presence/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.platformlambda</groupId>
     <artifactId>kafka-presence</artifactId>
     <packaging>jar</packaging>
-    <version>3.0.17</version>
+    <version>3.0.18</version>
     <name>Presence monitor for Kafka</name>
 
     <parent>
@@ -41,13 +41,13 @@
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>service-monitor</artifactId>
-            <version>3.0.17</version>
+            <version>3.0.18</version>
         </dependency>
 
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>kafka-connector</artifactId>
-            <version>3.0.17</version>
+            <version>3.0.18</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/junit/junit -->

diff --git a/connectors/adapters/kafka/kafka-standalone/Dockerfile b/connectors/adapters/kafka/kafka-standalone/Dockerfile
@@ -2,4 +2,4 @@ FROM mcr.microsoft.com/openjdk/jdk:11-ubuntu
 EXPOSE 9092
 WORKDIR /app
 COPY target/kafka-standalone-3.0.9.jar .
-ENTRYPOINT ["java","-jar","kafka-standalone-3.0.9.jar"]
+ENTRYPOINT ["java","-jar","kafka-standalone-3.0.17.jar"]
diff --git a/connectors/adapters/kafka/kafka-standalone/pom.xml b/connectors/adapters/kafka/kafka-standalone/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>kafka-standalone</artifactId>
 
     <packaging>jar</packaging>
-    <version>3.0.17</version>
+    <version>3.0.18</version>
     <name>Standalone kafka system for dev</name>
 
     <parent>
@@ -21,7 +21,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <snakeyaml.version>2.2</snakeyaml.version>
         <hazelcast.version>5.3.6</hazelcast.version>
-        <kafka.version>3.7.1</kafka.version>
+        <kafka.version>3.8.0</kafka.version>
         <gson.version>2.11.0</gson.version>
         <netty.version>4.1.111.Final</netty.version>
         <slf4j.version>2.0.11</slf4j.version>
@@ -43,31 +43,7 @@
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>platform-core</artifactId>
-            <version>3.0.17</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-            <version>3.9.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>ch.qos.logback</groupId>
-                    <artifactId>logback-classic</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>ch.qos.logback</groupId>
-                    <artifactId>logback-core</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>3.0.18</version>
         </dependency>
 
         <dependency>
@@ -112,15 +88,16 @@
             <version>2.16.1</version>
         </dependency>
 
-        <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-core</artifactId>
-        </dependency>
-
         <!-- https://mvnrepository.com/artifact/org.apache.kafka/kafka -->
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka_2.13</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/junit/junit -->

diff --git a/...ors/adapters/kafka/kafka-standalone/src/main/java/org/platformlambda/example/MainApp.java b/...ors/adapters/kafka/kafka-standalone/src/main/java/org/platformlambda/example/MainApp.java
@@ -21,52 +21,19 @@
 import org.platformlambda.core.annotations.MainApplication;
 import org.platformlambda.core.models.EntryPoint;
 import org.platformlambda.core.system.AutoStart;
-import org.platformlambda.core.util.Utility;
 import org.platformlambda.system.EmbeddedKafka;
-import org.platformlambda.system.EmbeddedZk;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 @MainApplication
 public class MainApp implements EntryPoint {
-    private static final Logger log = LoggerFactory.getLogger(MainApp.class);
 
     public static void main(String[] args) {
         AutoStart.main(args);
     }
 
     @Override
-    public void start(String[] args) throws InterruptedException {
-        if (zkRunning()) {
-            log.error("Application quits because another standalone instance is running");
-            System.exit(-1);
-        } else {
-            // start zookeeper
-            EmbeddedZk zk = new EmbeddedZk();
-            zk.start();
-            int timeout = 10;
-            if (!zkReady(timeout)) {
-                log.error("Application quits because standalone zookeeper does not start in {} seconds", timeout);
-                zk.shutdown();
-                System.exit(-1);
-            }
-            // start Kafka single node
-            EmbeddedKafka kafka = new EmbeddedKafka(zk);
-            kafka.start();
-        }
-    }
-
-    private boolean zkReady(int seconds) throws InterruptedException {
-        int seq = seconds;
-        while (seq > 0 && !zkRunning()) {
-            seq--;
-            Thread.sleep(1000);
-        }
-        return zkRunning();
-    }
-
-    private boolean zkRunning() {
-        return Utility.getInstance().portReady("127.0.0.1", 2181, 5000);
+    public void start(String[] args) {
+        EmbeddedKafka kafka = new EmbeddedKafka();
+        kafka.start();
     }
 
 }
diff --git a/...dapters/kafka/kafka-standalone/src/main/java/org/platformlambda/system/EmbeddedKafka.java b/...dapters/kafka/kafka-standalone/src/main/java/org/platformlambda/system/EmbeddedKafka.java
@@ -19,12 +19,11 @@
 package org.platformlambda.system;
 
 import kafka.server.KafkaConfig;
-import kafka.server.KafkaServer;
+import kafka.server.KafkaRaftServer;
 import org.apache.kafka.common.utils.Time;
 import org.platformlambda.core.util.Utility;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import scala.Option;
 
 import java.io.File;
 import java.io.IOException;
@@ -34,30 +33,36 @@
 public class EmbeddedKafka extends Thread {
     private static final Logger log = LoggerFactory.getLogger(EmbeddedKafka.class);
 
-    private KafkaServer kafka;
-    private final EmbeddedZk zookeeper;
-
-    public EmbeddedKafka(EmbeddedZk zookeeper) {
-        this.zookeeper = zookeeper;
-    }
+    private KafkaRaftServer kafka;
 
     @Override
     public void run() {
         try (InputStream stream = EmbeddedKafka.class.getResourceAsStream("/server.properties")) {
             if (stream == null) {
                 throw new IOException("server.properties is not available as resource");
             }
+            InputStream md = EmbeddedKafka.class.getResourceAsStream("/meta.properties");
+            if (md == null) {
+                throw new IOException("meta.properties is not available as resource");
+            }
+            Utility util = Utility.getInstance();
+            String metadata = util.stream2str(md);
+
             Properties p = new Properties();
             p.load(stream);
             String dir = p.getProperty("log.dirs");
             if (dir != null) {
-                File reset = new File(dir);
-                if (reset.exists() && reset.isDirectory()) {
-                    Utility.getInstance().cleanupDir(reset);
-                    log.info("Clean up transient Kafka working directory at {}", dir);
+                File kafkaLogs = new File(dir);
+                if (kafkaLogs.exists() && kafkaLogs.isDirectory()) {
+                    util.cleanupDir(kafkaLogs);
+                }
+                if (kafkaLogs.mkdirs()) {
+                    File mdFile = new File(kafkaLogs, "meta.properties");
+                    util.str2file(mdFile, metadata);
+                    log.info("Initialize {}", mdFile);
                 }
             }
-            kafka = new KafkaServer(new KafkaConfig(p), Time.SYSTEM, Option.apply("kafka"), false);
+            kafka = new KafkaRaftServer(new KafkaConfig(p), Time.SYSTEM);
             kafka.startup();
             Runtime.getRuntime().addShutdownHook(new Thread(this::shutdown));
 
@@ -68,12 +73,9 @@ public void run() {
     }
 
     private void shutdown() {
-        // orderly shutdown of kafka and zookeeper
+        // orderly shutdown kafka
         log.info("Shutting down");
         kafka.shutdown();
-        zookeeper.shutdown();
     }
 
-
-
 }