From 48e08142b945316bcf78d9117aac403d35a215b8 Mon Sep 17 00:00:00 2001 From: Kunal Shroff Date: Wed, 21 Feb 2024 14:01:48 -0500 Subject: [PATCH 1/4] upgrade Kafka client and stream dep to 3.6.x --- app/alarm/Readme.md | 6 +++--- app/alarm/model/pom.xml | 4 ++-- dependencies/phoebus-target/pom.xml | 4 ++-- pom.xml | 1 + services/alarm-config-logger/pom.xml | 4 ++-- services/alarm-logger/pom.xml | 4 ++-- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/alarm/Readme.md b/app/alarm/Readme.md index 95e91fedc2..407259877f 100644 --- a/app/alarm/Readme.md +++ b/app/alarm/Readme.md @@ -25,9 +25,9 @@ kafka in `/opt/kafka`. cd examples # Use wget, 'curl -O', or web browser to fetch a recent version of kafka - wget https://downloads.apache.org/kafka/3.3.1/kafka_2.13-3.3.1.tgz - tar vzxf kafka_2.13-3.3.1.tgz - ln -s kafka_2.13-3.3.1 kafka + wget https://downloads.apache.org/kafka/3.3.1/kafka_2.13-3.6.1.tgz + tar vzxf kafka_2.13-3.6.1.tgz + ln -s kafka_2.13-3.6.1 kafka Check `config/zookeeper.properties` and `config/server.properties`. By default these contain settings for keeping data in `/tmp/`, which works for initial tests, diff --git a/app/alarm/model/pom.xml b/app/alarm/model/pom.xml index d117bd7883..f11efb84c3 100644 --- a/app/alarm/model/pom.xml +++ b/app/alarm/model/pom.xml @@ -37,12 +37,12 @@ org.apache.kafka kafka-clients - 2.0.0 + ${kafka.version} org.apache.kafka kafka-streams - 2.0.0 + ${kafka.version} org.phoebus diff --git a/dependencies/phoebus-target/pom.xml b/dependencies/phoebus-target/pom.xml index b7df3148d1..66dd4a1afd 100644 --- a/dependencies/phoebus-target/pom.xml +++ b/dependencies/phoebus-target/pom.xml @@ -282,12 +282,12 @@ org.apache.kafka kafka-streams - 2.0.0 + ${kafka.version} org.apache.kafka kafka-clients - 2.0.0 + ${kafka.version} diff --git a/pom.xml b/pom.xml index b118f42d76..3812c70f51 100644 --- a/pom.xml +++ b/pom.xml @@ -78,6 +78,7 @@ 3.6.1 5.8.2 8.2.0 + 3.6.1 UTF-8 UTF-8 diff --git a/services/alarm-config-logger/pom.xml b/services/alarm-config-logger/pom.xml index e921b0fec3..a999cfaef0 100644 --- a/services/alarm-config-logger/pom.xml +++ b/services/alarm-config-logger/pom.xml @@ -49,12 +49,12 @@ org.apache.kafka kafka-streams - 2.0.0 + ${kafka.version} org.apache.kafka kafka-clients - 2.0.0 + ${kafka.version} org.eclipse.jgit diff --git a/services/alarm-logger/pom.xml b/services/alarm-logger/pom.xml index 7f014d6b3f..7007ddef65 100644 --- a/services/alarm-logger/pom.xml +++ b/services/alarm-logger/pom.xml @@ -50,12 +50,12 @@ org.apache.kafka kafka-streams - 2.0.0 + ${kafka.version} org.apache.kafka kafka-clients - 2.0.0 + ${kafka.version} org.elasticsearch.client From df627b641dc627b3d55060a90e9d41f75981e2c8 Mon Sep 17 00:00:00 2001 From: Kunal Shroff Date: Wed, 21 Feb 2024 16:27:11 -0500 Subject: [PATCH 2/4] Add missing dependency 4 MultivaluedHashMap (different solution sought) --- app/alarm/logging-ui/pom.xml | 5 +++++ .../applications/alarm/logging/ui/AlarmLogSearchJob.java | 1 - dependencies/phoebus-target/pom.xml | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/alarm/logging-ui/pom.xml b/app/alarm/logging-ui/pom.xml index 8b503e9519..31c26eae33 100644 --- a/app/alarm/logging-ui/pom.xml +++ b/app/alarm/logging-ui/pom.xml @@ -63,5 +63,10 @@ jackson-datatype-jsr310 ${jackson.version} + + javax.ws.rs + javax.ws.rs-api + 2.1 + diff --git a/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogSearchJob.java b/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogSearchJob.java index 0367b3f36d..b6d4849bbe 100644 --- a/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogSearchJob.java +++ b/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogSearchJob.java @@ -1,6 +1,5 @@ package org.phoebus.applications.alarm.logging.ui; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/dependencies/phoebus-target/pom.xml b/dependencies/phoebus-target/pom.xml index 2ddb2bdc18..0bc47543a7 100644 --- a/dependencies/phoebus-target/pom.xml +++ b/dependencies/phoebus-target/pom.xml @@ -581,6 +581,12 @@ 1.1.4 + + javax.ws.rs + javax.ws.rs-api + 2.1 + + org.apache.activemq From 3539ba9f5ab1c181ceb94bed43e75071194d0136 Mon Sep 17 00:00:00 2001 From: Kunal Shroff Date: Thu, 22 Feb 2024 09:30:07 -0500 Subject: [PATCH 3/4] Update stream close to new kafka 3.6 API --- .../main/java/org/phoebus/alarm/logging/AlarmCmdLogger.java | 5 ++++- .../java/org/phoebus/alarm/logging/AlarmMessageLogger.java | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmCmdLogger.java b/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmCmdLogger.java index 9b7807d574..9878516e7f 100644 --- a/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmCmdLogger.java +++ b/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmCmdLogger.java @@ -2,7 +2,10 @@ import static org.phoebus.alarm.logging.AlarmLoggingService.logger; +import java.time.Duration; import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.time.temporal.TemporalUnit; import java.util.Properties; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -136,7 +139,7 @@ public void close() { Runtime.getRuntime().addShutdownHook(new Thread("streams-" + topic + "-alarm-cmd-shutdown-hook") { @Override public void run() { - streams.close(10, TimeUnit.SECONDS); + streams.close(Duration.of(10, ChronoUnit.SECONDS)); System.out.println("\nShutting cmd streams Done."); latch.countDown(); } diff --git a/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmMessageLogger.java b/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmMessageLogger.java index b83a7b99a2..73ab6a7cdb 100644 --- a/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmMessageLogger.java +++ b/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmMessageLogger.java @@ -2,7 +2,9 @@ import static org.phoebus.alarm.logging.AlarmLoggingService.logger; +import java.time.Duration; import java.time.Instant; +import java.time.temporal.ChronoUnit; import java.util.Properties; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -126,7 +128,7 @@ public long extract(ConsumerRecord record, long previousTimestam Runtime.getRuntime().addShutdownHook(new Thread("streams-"+topic+"-alarm-messages-shutdown-hook") { @Override public void run() { - streams.close(10, TimeUnit.SECONDS); + streams.close(Duration.of(10, ChronoUnit.SECONDS)); System.out.println("\nShutting streams Done."); latch.countDown(); } From c40eb633c9ff26259c9d1e12bc6e3536325463d6 Mon Sep 17 00:00:00 2001 From: Kunal Shroff Date: Tue, 27 Feb 2024 13:46:32 -0500 Subject: [PATCH 4/4] fix the kafka download link for 3.6.x --- app/alarm/Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/alarm/Readme.md b/app/alarm/Readme.md index 407259877f..1d61dc27bd 100644 --- a/app/alarm/Readme.md +++ b/app/alarm/Readme.md @@ -25,7 +25,7 @@ kafka in `/opt/kafka`. cd examples # Use wget, 'curl -O', or web browser to fetch a recent version of kafka - wget https://downloads.apache.org/kafka/3.3.1/kafka_2.13-3.6.1.tgz + wget https://downloads.apache.org/kafka/3.6.1/kafka_2.13-3.6.1.tgz tar vzxf kafka_2.13-3.6.1.tgz ln -s kafka_2.13-3.6.1 kafka