uplift dependencies in clojure aleph (#10182)

* uplift dependencies in clojure aleph

Removed unneeded and unmaintained libs
also uplift jdk to 25 for clojure kit

* update donkey deps

---------

Co-authored-by: jj <[email protected]>

frameworks/Clojure/aleph/aleph.dockerfile

@@ -1,20 +1,14 @@
-FROM clojure:temurin-19-lein
+FROM clojure:lein as lein
 WORKDIR /aleph
 COPY src src
 COPY project.clj project.clj
 RUN lein uberjar
 
-# HTTP server
-EXPOSE 8080
-# async-profiler HTTP-server
-EXPOSE 8081
-# JMX port
-EXPOSE 9999
+FROM openjdk:25-jdk-slim
 
-RUN apt update -y
-RUN apt install perl -y
+WORKDIR /aleph
+COPY --from=lein /aleph/target/hello-aleph-standalone.jar app.jar
 
-CMD ["java", "-server", "-Xms2G", "-Xmx2G", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-Djava.net.preferIPv4Stack=true", "-Dio.netty.leakDetection.level=disabled", "-jar", "target/hello-aleph-standalone.jar"]
+EXPOSE 8080
 
-# To enable JMX and async-profiler
-#CMD ["java", "-XX:+UnlockDiagnosticVMOptions", "-XX:+DebugNonSafepoints", "-Djdk.attach.allowAttachSelf", "-Dcom.sun.management.jmxremote=true", "-Djava.rmi.server.hostname=0.0.0.0","-Dcom.sun.management.jmxremote.rmi.port=9999" ,"-Dcom.sun.management.jmxremote.port=9999", "-Dcom.sun.management.jmxremote.ssl=false", "-Dcom.sun.management.jmxremote.authenticate=false", "-server", "-Xms2G", "-Xmx2G", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-Djava.net.preferIPv4Stack=true", "-jar", "target/hello-aleph-standalone.jar"]
+CMD ["java", "-server", "--enable-native-access=ALL-UNNAMED", "-XX:+UseParallelGC", "-jar", "app.jar"]

frameworks/Clojure/aleph/project.clj

@@ -1,23 +1,12 @@
 (defproject hello "aleph"
   :description "Aleph benchmarks"
-  :dependencies [[org.clojure/clojure "1.11.1"]
-                 [aleph "0.6.1"]
-                 [metosin/jsonista "0.3.7"]
-                 [hiccup "1.0.5"]
-                 [com.github.arnaudgeiser/porsas "0.0.1-alpha14"
-                  :exclusions [io.netty/netty-codec-dns
-                               io.netty/netty-codec
-                               io.netty/netty-buffer
-                               io.netty/netty-common
-                               io.netty/netty-codec-http
-                               io.netty/netty-codec-http2
-                               io.netty/netty-codec-socks
-                               io.netty/netty-handler
-                               io.netty/netty-handler-proxy
-                               io.netty/netty-transport
-                               io.netty/netty-resolver-dns
-                               io.netty/netty-resolver]]
-                 [com.clojure-goes-fast/clj-async-profiler "1.0.3"]]
+  :dependencies [[org.clojure/clojure "1.12.3"]
+                 [aleph "0.9.3"]
+                 [metosin/jsonista "0.3.13"]
+                 [hiccup "2.0.0"]
+                 [seancorfield/next.jdbc "1.2.659"]
+                 [hikari-cp "3.3.0"]
+                 [org.postgresql/postgresql "42.7.8"]
+                 ]
   :main hello.handler
-  :jvm-opts ^:replace ["-Dclojure.compiler.direct-linking=true"]
   :aot :all)

frameworks/Clojure/aleph/src/hello/handler.clj

@@ -1,89 +1,73 @@
 (ns hello.handler
   (:require
-   [aleph.http              :as http]
-   [aleph.netty             :as netty]
-   [byte-streams            :as bs]
-   [clj-async-profiler.core :as prof]
-   [hiccup.page             :as hp]
-   [hiccup.util             :as hu]
-   [jsonista.core           :as json]
-   [manifold.deferred       :as d]
-   [porsas.async            :as async])
-  (:import (clojure.lang IDeref)
-           (io.netty.channel ChannelOption)
+    [aleph.http :as http]
+    [aleph.netty :as netty]
+    [hiccup.page :as hp]
+    [hiccup.util :as hu]
+    [jsonista.core :as json]
+    [manifold.deferred :as d]
+    [next.jdbc :as jdbc]
+    [next.jdbc.connection :as connection]
+    [next.jdbc.result-set :as rs])
+
+  (:import (com.zaxxer.hikari HikariDataSource)
            (io.netty.buffer PooledByteBufAllocator)
-           (java.util.function Supplier)
-           (java.util.concurrent ThreadLocalRandom)
-           (porsas.async Context))
+           (io.netty.channel ChannelOption)
+           (java.util.concurrent ThreadLocalRandom))
   (:gen-class))
 
+(def jdbc-opts {:builder-fn rs/as-unqualified-maps})
+
+(def db-spec
+  {:jdbcUrl "jdbc:postgresql://tfb-database/hello_world?user=benchmarkdbuser&password=benchmarkdbpass"})
+
+(def datasource
+  (connection/->pool HikariDataSource db-spec))
+
 (def plaintext-response
-  {:status 200
+  {:status  200
    :headers {"Content-Type" "text/plain"}
-   :body (bs/to-byte-array "Hello, World!")})
+   :body    (.getBytes "Hello, World!")})
 
 (def json-response
-  {:status 200
+  {:status  200
    :headers {"Content-Type" "application/json"}})
 
 (def html-response
-  {:status 200
+  {:status  200
    :headers {"Content-Type" "text/html; charset=utf-8"}})
 
-(def db-spec
-  {:uri "postgresql://tfb-database:5432/hello_world"
-   :user "benchmarkdbuser"
-   :password "benchmarkdbpass"
-   :size 1})
-
-(defmacro thread-local [& body]
-  `(let [tl# (ThreadLocal/withInitial (reify Supplier (get [_] ~@body)))]
-     (reify IDeref (deref [_] (.get tl#)))))
 
-(def pool
-  "PostgreSQL pool of connections (`PgPool`)."
-  (thread-local (async/pool db-spec)))
-
-(defn random
+(defn- random
   "Generate a random number between 1 and 10'000."
   []
   (unchecked-inc (.nextInt (ThreadLocalRandom/current) 10000)))
 
-(defn sanitize-queries-param
-  "Sanitizes the `queries` parameter. Clamps the value between 1 and 500.
-  Invalid (string) values become 1."
+(defn- sanitize-queries-param
   [request]
   (let [queries (-> request
                     :query-string
                     (subs 8))
         n (try (Integer/parseInt queries)
-               (catch Exception _ 1))] ; default to 1 on parse failure
+               (catch Exception _ 1))]                      ; default to 1 on parse failure
     (cond
       (< n 1) 1
       (> n 500) 500
       :else n)))
 
-(def ^Context
-  query-mapper
-  "Map each row into a record."
-  (async/context {:row (async/rs->compiled-record)}))
 
-(defn query-one-random-world
-  "Query a random world on the database.
-  Return a `CompletableFuture`."
-  []
-  (async/query-one query-mapper
-                   @pool
-                   ["SELECT id, randomnumber FROM world WHERE id=$1" (random)]))
-
-(defn update-world
-  "Update a world on the database.
-  Return a `CompletableFuture`."
-  [{:keys [randomNumber id]}]
-  (async/query @pool
-               ["UPDATE world SET randomnumber=$1 WHERE id=$2" randomNumber id]))
-
-(defn run-queries
+(defn- query-one-random-world []
+  (jdbc/execute-one! datasource
+                     ["select * from \"World\" where id = ?;" (random)]
+                     jdbc-opts))
+
+(defn- update-world
+  [{:keys [randomnumber  id]}]
+  (jdbc/execute-one! datasource
+                     ["update \"World\" set randomNumber = ? where id = ? returning *;" randomnumber id]
+                     jdbc-opts))
+
+(defn- run-queries
   "Run a number of `queries` on the database to fetch a random world.
   Return a `manifold.deferred`."
   [queries]
@@ -91,13 +75,13 @@
          (take queries
                (repeatedly query-one-random-world))))
 
-(defn query-fortunes
-  "Query the fortunes on database.
-  Return a `CompletableFuture`."
-  []
-  (async/query query-mapper @pool ["SELECT id, message from FORTUNE"]))
 
-(defn get-fortunes
+(defn query-fortunes []
+  (jdbc/execute! datasource
+                 ["select * from \"Fortune\";"]
+                 jdbc-opts))
+
+(defn- get-fortunes
   "Fetch the full list of Fortunes from the database, sort them by the fortune
   message text.
   Return a `CompletableFuture` with the results."
@@ -106,35 +90,31 @@
            (fn [fortunes]
              (sort-by :message
                       (conj fortunes
-                            {:id 0
+                            {:id      0
                              :message "Additional fortune added at request time."})))))
 
-(defn update-and-persist
-  "Fetch a number of `queries` random world from the database.
-  Compute a new `randomNumber` for each of them a return a `CompletableFuture`
-  with the updated worlds."
-  [queries]
+(defn- update-and-persist [queries]
   (d/chain' (run-queries queries)
             (fn [worlds]
-              (let [worlds' (mapv #(assoc % :randomNumber (random)) worlds)]
+              (let [worlds' (mapv #(assoc % :randomnumber (random)) worlds)]
                 (d/chain' (apply d/zip (mapv update-world worlds'))
                           (fn [_] worlds'))))))
 
-(defn fortunes-hiccup
+(defn- fortunes-hiccup
   "Render the given fortunes to simple HTML using Hiccup."
   [fortunes]
   (hp/html5
-   [:head
-    [:title "Fortunes"]]
-   [:body
-    [:table
-     [:tr
-      [:th "id"]
-      [:th "message"]]
-     (for [x fortunes]
-       [:tr
-        [:td (:id x)]
-        [:td (hu/escape-html (:message x))]])]]))
+    [:head
+     [:title "Fortunes"]]
+    [:body
+     [:table
+      [:tr
+       [:th "id"]
+       [:th "message"]]
+      (for [x fortunes]
+        [:tr
+         [:td (:id x)]
+         [:td (hu/escape-html (:message x))]])]]))
 
 (defn handler
   "Ring handler representing the different tests."
@@ -142,47 +122,38 @@
   (let [uri (:uri req)]
     (cond
       (.equals "/plaintext" uri) plaintext-response
-      (.equals "/json" uri)      (assoc json-response
-                                        :body (json/write-value-as-bytes {:message "Hello, World!"}))
-      (.equals "/db" uri)        (-> (query-one-random-world)
-                                     (d/chain (fn [world]
-                                                (assoc json-response
-                                                       :body (json/write-value-as-bytes world)))))
-      (.equals "/queries" uri)   (-> (sanitize-queries-param req)
-                                     (run-queries)
-                                     (d/chain (fn [worlds]
-                                                (assoc json-response
-                                                       :body (json/write-value-as-bytes worlds)))))
-      (.equals "/fortunes" uri)  (d/chain' (get-fortunes)
-                                           fortunes-hiccup
-                                           (fn [body]
-                                             (assoc html-response :body body)))
-      (.equals "/updates" uri)   (-> (sanitize-queries-param req)
-                                     (update-and-persist)
-                                     (d/chain (fn [worlds]
-                                                (assoc json-response
-                                                       :body (json/write-value-as-bytes worlds)))))
-      :else {:status 404})))
-
-;;;
+      (.equals "/json" uri) (assoc json-response
+                              :body (json/write-value-as-bytes {:message "Hello, World!"}))
+      (.equals "/db" uri) (-> (query-one-random-world)
+                              (d/chain (fn [world]
+                                         (assoc json-response
+                                           :body (json/write-value-as-bytes world)))))
+      (.equals "/queries" uri) (-> (sanitize-queries-param req)
+                                   (run-queries)
+                                   (d/chain (fn [worlds]
+                                              (assoc json-response
+                                                :body (json/write-value-as-bytes worlds)))))
+      (.equals "/fortunes" uri) (d/chain' (get-fortunes)
+                                          fortunes-hiccup
+                                          (fn [body]
+                                            (assoc html-response :body body)))
+      (.equals "/updates" uri) (-> (sanitize-queries-param req)
+                                   (update-and-persist)
+                                   (d/chain (fn [worlds]
+                                              (assoc json-response
+                                                :body (json/write-value-as-bytes worlds)))))
+      :else {:body   "Not found"
+             :status 404})))
+
 
 (defn -main [& _]
   (netty/leak-detector-level! :disabled)
-  (http/start-server handler {:port 8080
-                              :raw-stream? true
-                              :epoll? true
-                              :executor :none
+  (println "starting server on port 8080")
+  (http/start-server handler {:port                8080
+                              :raw-stream?         true
+                              :executor            :none
                               :bootstrap-transform (fn [bootstrap]
                                                      (.option bootstrap ChannelOption/ALLOCATOR PooledByteBufAllocator/DEFAULT)
                                                      (.childOption bootstrap ChannelOption/ALLOCATOR PooledByteBufAllocator/DEFAULT))
-                              :pipeline-transform (fn [pipeline]
-                                                    (.remove pipeline "continue-handler"))})
-  ;; Uncomment to enable async-profiler
-  #_
-  (do
-    (prof/profile-for 60
-                      #_
-                      {:transform (fn [s]
-                                    (when-not (re-find #"(writev|__libc|epoll_wait|write|__pthread)" s)
-                                      s))})
-    (prof/serve-files 8081)))
+                              :pipeline-transform  (fn [pipeline]
+                                                     (.remove pipeline "continue-handler"))}))

frameworks/Clojure/donkey/donkey.dockerfile

@@ -1,10 +1,10 @@
-FROM clojure:openjdk-11-lein-2.9.3 as lein
+FROM clojure:lein as lein
 WORKDIR /donkey
 COPY src src
 COPY project.clj project.clj
 RUN lein uberjar
 
-FROM openjdk:11.0.9.1-jdk-slim
+FROM openjdk:25-jdk-slim
 COPY --from=lein /donkey/target/hello-donkey-standalone.jar  app.jar
 
 EXPOSE 8080

frameworks/Clojure/donkey/project.clj

@@ -1,7 +1,7 @@
 (defproject hello "donkey"
   :description "Donkey Server"
-  :dependencies [[org.clojure/clojure "1.10.1"]
-                 [com.appsflyer/donkey "0.4.1"]]
+  :dependencies [[org.clojure/clojure "1.12.3"]
+                 [com.appsflyer/donkey "0.5.2"]]
   :jvm-opts ^:replace ["-Dclojure.compiler.direct-linking=true"]
   :main hello.handler
   :aot :all)

frameworks/Clojure/kit/kit-majavat.dockerfile

@@ -6,7 +6,7 @@ COPY . /
 
 RUN clj -Sforce -T:build all
 
-FROM azul/zulu-openjdk-alpine:17
+FROM openjdk:25-jdk-slim
 
 COPY --from=build /target/te-bench-standalone.jar /te-bench/te-bench-standalone.jar
 

frameworks/Clojure/kit/kit.dockerfile

@@ -6,7 +6,7 @@ COPY . /
 
 RUN clj -Sforce -T:build all
 
-FROM azul/zulu-openjdk-alpine:17
+FROM openjdk:25-jdk-slim
 
 COPY --from=build /target/te-bench-standalone.jar /te-bench/te-bench-standalone.jar