update jdk to 24 and misc refactoring

Signed-off-by: neo <[email protected]>

Author: neowu

.github/workflows/jre.yml

@@ -12,5 +12,5 @@ jobs:
     - uses: docker/build-push-action@v4
       with:
         context: "docker/jre"
-        tags: "neowu/jre:21.0.5"
+        tags: "neowu/jre:24"
         push: true

build.gradle.kts

@@ -12,9 +12,9 @@ subprojects {
 
 val elasticVersion = "8.15.0"
 val jacksonVersion = "2.17.2"
-val junitVersion = "5.11.3"
-val mockitoVersion = "5.14.2"
-val assertjVersion = "3.26.3"
+val junitVersion = "5.12.1"
+val mockitoVersion = "5.16.1"
+val assertjVersion = "3.27.3"
 
 project("core-ng-api") {
     apply(plugin = "lib")

core-ng/src/main/java/core/framework/internal/log/filter/LogFilter.java

@@ -42,9 +42,9 @@ private void appendArgument(StringBuilder builder, Object argument) {
         // for performance reason, truncation will be handled by each type of LogParam, to best fit each specific cases
         if (argument instanceof LogParam logParam) {
             logParam.append(builder, maskedFields, MAX_PARAM_LENGTH);
-            return;
+        } else {
+            appendRawArgument(builder, argument, MAX_PARAM_LENGTH);
         }
-        appendRawArgument(builder, argument, MAX_PARAM_LENGTH);
     }
 
     void appendRawArgument(StringBuilder builder, Object argument, int maxLength) {

core-ng/src/main/java/core/framework/web/sse/ChannelListener.java

@@ -2,8 +2,10 @@
 
 import core.framework.web.Request;
 
+import javax.annotation.Nullable;
+
 public interface ChannelListener<T> {
-    void onConnect(Request request, Channel<T> channel, String lastEventId);
+    void onConnect(Request request, Channel<T> channel, @Nullable String lastEventId);
 
     default void onClose(Channel<T> channel) {
     }

docker/jre/Dockerfile

@@ -1,4 +1,4 @@
-FROM        eclipse-temurin:21.0.5_11-jdk-alpine as build
+FROM        eclipse-temurin:24_36-jdk-alpine as build
 RUN         jlink --add-modules java.base,java.compiler,java.desktop,java.instrument,java.logging,java.management.rmi,java.naming,java.security.jgss,java.security.sasl,java.sql,java.xml \
                   --add-modules jdk.charsets,jdk.crypto.cryptoki,jdk.jdi,jdk.localedata,jdk.management.jfr,jdk.naming.dns,jdk.naming.rmi,jdk.net,jdk.unsupported \
                   --output /opt/jre --strip-java-debug-attributes --no-man-pages --no-header-files

ext/log-processor/src/main/resources/kibana.json

@@ -3,7 +3,7 @@
   {
     "id": "action-pattern", "type": "index-pattern",
     "attributes": {
-      "fieldFormatMap": "{\n  \"elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"stats.request_body_length\": {\"id\": \"bytes\", \"params\": {\"pattern\": \"0,0.[00]b\"}},\n  \"stats.response_body_length\": {\"id\": \"bytes\", \"params\": {\"pattern\": \"0,0.[00]b\"}},\n  \"stats.cpu_time\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"stats.http_delay\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"stats.consumer_delay\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"stats.task_delay\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"stats.sse_event_size\": {\"id\": \"bytes\", \"params\": {\"pattern\": \"0,0.[00]b\"}},\n  \"stats.sse_duration\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"stats.kafka_max_message_size\": {\"id\": \"bytes\", \"params\": {\"pattern\": \"0,0.[00]b\"}},\n  \"perf_stats.kafka.total_elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"perf_stats.db.total_elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"perf_stats.redis.total_elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"perf_stats.elasticsearch.total_elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"perf_stats.mongo.total_elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"perf_stats.http.read_entries\": {\"id\": \"bytes\", \"params\": {\"pattern\": \"0,0.[00]b\"}},\n  \"perf_stats.http.write_entries\": {\"id\": \"bytes\", \"params\": {\"pattern\": \"0,0.[00]b\"}},\n  \"perf_stats.http.total_elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"perf_stats.http_conn.total_elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"perf_stats.http_dns.total_elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"perf_stats.ws.read_entries\": {\"id\": \"bytes\", \"params\": {\"pattern\": \"0,0.[00]b\"}},\n  \"perf_stats.ws.write_entries\": {\"id\": \"bytes\", \"params\": {\"pattern\": \"0,0.[00]b\"}},\n  \"perf_stats.ws.total_elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"perf_stats.sse.read_entries\": {\"id\": \"bytes\", \"params\": {\"pattern\": \"0,0.[00]b\"}},\n  \"perf_stats.sse.write_entries\": {\"id\": \"bytes\", \"params\": {\"pattern\": \"0,0.[00]b\"}},\n  \"perf_stats.sse.total_elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}}\n}",
+      "fieldFormatMap": "{\n  \"elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"stats.request_body_length\": {\"id\": \"bytes\", \"params\": {\"pattern\": \"0,0.[00]b\"}},\n  \"stats.response_body_length\": {\"id\": \"bytes\", \"params\": {\"pattern\": \"0,0.[00]b\"}},\n  \"stats.cpu_time\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"stats.http_delay\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"stats.consumer_delay\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"stats.task_delay\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"stats.sse_event_size\": {\"id\": \"bytes\", \"params\": {\"pattern\": \"0,0.[00]b\"}},\n  \"stats.sse_duration\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"stats.kafka_max_message_size\": {\"id\": \"bytes\", \"params\": {\"pattern\": \"0,0.[00]b\"}},\n  \"perf_stats.kafka.total_elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"perf_stats.db.total_elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"perf_stats.redis.total_elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"perf_stats.elasticsearch.total_elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"perf_stats.mongo.total_elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"perf_stats.http.read_entries\": {\"id\": \"bytes\", \"params\": {\"pattern\": \"0,0.[00]b\"}},\n  \"perf_stats.http.write_entries\": {\"id\": \"bytes\", \"params\": {\"pattern\": \"0,0.[00]b\"}},\n  \"perf_stats.http.total_elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"perf_stats.http_conn.total_elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"perf_stats.http_dns.total_elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}},\n  \"perf_stats.sse.read_entries\": {\"id\": \"bytes\", \"params\": {\"pattern\": \"0,0.[00]b\"}},\n  \"perf_stats.sse.write_entries\": {\"id\": \"bytes\", \"params\": {\"pattern\": \"0,0.[00]b\"}},\n  \"perf_stats.sse.total_elapsed\": {\"id\": \"duration\", \"params\": {\"inputFormat\": \"nanoseconds\", \"outputFormat\": \"humanizePrecise\", \"useShortSuffix\": true, \"outputPrecision\": 3}}\n}",
       "fields": "[\n  {\"name\": \"@timestamp\", \"type\": \"date\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"_id\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": false},\n  {\"name\": \"action\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"app\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"client\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"correlation_id\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"ref_id\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"result\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"host\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"elapsed\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"error_code\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"error_message\", \"type\": \"string\", \"searchable\": false, \"aggregatable\": false, \"readFromDocValues\": false},\n  {\"name\": \"context.client_ip\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"context.controller\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"context.method\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"context.path_pattern\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"context.request_url\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"context.response_code\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"context.session_hash\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"context.user_agent\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"context.referer\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"context.topic\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"context.key\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"context.handler\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"context.trigger\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"context.job\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"context.job_class\", \"type\": \"string\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.db.count\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.db.total_elapsed\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.db.read_entries\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.db.write_entries\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.elasticsearch.count\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.elasticsearch.total_elapsed\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.elasticsearch.read_entries\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.elasticsearch.write_entries\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.http.count\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.http.total_elapsed\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.http.read_entries\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.http.write_entries\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.http_dns.count\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.http_dns.total_elapsed\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.http_conn.count\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.http_conn.total_elapsed\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.kafka.count\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.kafka.total_elapsed\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.kafka.read_entries\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.kafka.write_entries\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.redis.count\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.redis.total_elapsed\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.redis.read_entries\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.redis.write_entries\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.mongo.count\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.mongo.total_elapsed\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.mongo.read_entries\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"perf_stats.mongo.write_entries\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"stats.cpu_time\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"stats.request_body_length\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"stats.response_body_length\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"stats.http_delay\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"stats.http_retries\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"stats.consumer_delay\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"stats.task_delay\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"stats.cache_hits\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"stats.cache_misses\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"stats.db_queries\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"stats.customer_registered\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"stats.order_placed\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true},\n  {\"name\": \"stats.order_amount\", \"type\": \"number\", \"searchable\": true, \"aggregatable\": true, \"readFromDocValues\": true}\n]",
       "timeFieldName": "@timestamp",
       "title": "action-*"