chore: java 23 and gradle 8.5 support

Author: sureshg

.gitignore

@@ -25,3 +25,4 @@ jre/
 
 # Gradle release
 cx.json
+/.profileconfig.json

README.md

@@ -18,8 +18,8 @@ and [Compose Web (wasm)][Compose-Multiplatform] applications.
 ```bash
 # Mac OS
 $ curl -s "https://get.sdkman.io" | bash
-$ sdk i java 22.ea-open
-$ sdk u java 22.ea-open
+$ sdk i java 23.ea-open
+$ sdk u java 23.ea-open
 ```
 
 ### Build & Run
@@ -44,7 +44,7 @@ $ docker run \
         --publish 8081:8081 \
         --name kotlin-mpp-playground \
         --mount type=bind,source=$(pwd),destination=/app,readonly \
-        openjdk:22-slim /bin/bash -c "printenv && nohup jwebserver -b 0.0.0.0 -p 8081 -d / & backend/jvm/build/libs/jvm-app"
+        openjdk:23-slim /bin/bash -c "printenv && nohup jwebserver -b 0.0.0.0 -p 8081 -d / & backend/jvm/build/libs/jvm-app"
 
 $ ./gradlew :backend:jvm:jibDockerBuild
 $ docker run -it --rm --name jvm-app -p 8080:8080 -p 9898:9898 sureshg/jvm
@@ -106,9 +106,9 @@ $ actionlint
 
 <!-- Badges -->
 
-[java_url]: https://jdk.java.net/22/
+[java_url]: https://jdk.java.net/23/
 
-[java_img]: https://img.shields.io/badge/OpenJDK-22-e76f00?logo=openjdk&logoColor=e76f00
+[java_img]: https://img.shields.io/badge/OpenJDK-23-e76f00?logo=openjdk&logoColor=e76f00
 
 [kt_url]: https://github.com/JetBrains/kotlin/releases/latest
 

backend/jvm/build.gradle.kts

@@ -1,4 +1,4 @@
-import com.google.devtools.ksp.gradle.KspTask
+import com.google.devtools.ksp.gradle.KspAATask
 import common.*
 
 plugins {
@@ -71,10 +71,13 @@ tasks {
       }
 
   // Copy webapp to resources
-  processResources { dependsOn(copyWebApp) }
+  processResources {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    dependsOn(copyWebApp)
+  }
 
   // Makes sure jte is generated before compilation
-  withType<KspTask>().configureEach { dependsOn(generateJte) }
+  withType<KspAATask>().configureEach { dependsOn(generateJte) }
 
   // publish { finalizedBy(jibDockerBuild) }
 }
@@ -124,8 +127,8 @@ dependencies {
   implementation(libs.jte.runtime)
   // compileOnly(libs.jte.kotlin)
   implementation(libs.kotlinx.html) {
-    version { strictly(libs.kotlinx.html.get().version.toString()) }
-    because("Ktor Issue!")
+    // version { strictly(libs.kotlinx.html.get().version.toString()) }
+    // because("Ktor Issue!")
   }
   implementation(kotlinw("css"))
   implementation(libs.ktor.server.html)
@@ -140,7 +143,8 @@ dependencies {
   implementation(libs.ktor.cohort.core)
   implementation(libs.ktor.cohort.hikari)
   implementation(libs.micrometer.prometheus)
-  implementation(libs.ap.loader.all)
+  implementation(libs.ap.converter)
+  // implementation(libs.ap.loader.all)
 
   // Logging
   implementation(libs.logback.classic)

backend/jvm/src/main/java/one/converter/Arguments.java renamed to backend/jvm/src/main/java/Arguments.java

@@ -1,4 +1,3 @@
-package one.converter;
 /*
  * Copyright 2022 Andrei Pangin
  *
@@ -25,21 +24,23 @@
 public class Arguments {
     String title = "Flame Graph";
     String highlight;
+    String state;
     Pattern include;
     Pattern exclude;
     double minwidth;
     int skip;
     boolean reverse;
-    boolean cpu;
     boolean alloc;
     boolean live;
     boolean lock;
     boolean threads;
+    boolean classify;
     boolean total;
     boolean lines;
     boolean bci;
     boolean simple;
     boolean dot;
+    boolean norm;
     boolean collapsed;
     long from;
     long to;

backend/jvm/src/main/kotlin/dev/suresh/routes/Admin.kt

@@ -9,6 +9,7 @@ import io.ktor.server.routing.*
 fun Route.adminRoutes() {
   swaggerUI(path = "swagger", swaggerFile = "openapi/documentation.yaml") {
     version = BuildConfig.swaggerUi
+    customStyle("https://unpkg.com/[email protected]/themes/3.x/theme-flattop.css")
   }
 
   get("/") { call.respondRedirect("/swagger") }

backend/jvm/src/main/kotlin/dev/suresh/routes/Mgmt.kt

@@ -1,43 +1,39 @@
 package dev.suresh.routes
 
+import Arguments
+import FlameGraph
 import com.sun.management.HotSpotDiagnosticMXBean
 import dev.suresh.jvmRuntimeInfo
 import dev.suresh.plugins.debug
-import dev.suresh.runOnVirtualThread
 import io.ktor.http.*
-import io.ktor.server.application.*
 import io.ktor.server.http.content.*
-import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import java.io.File
 import java.io.PrintStream
 import java.lang.management.ManagementFactory
 import jdk.jfr.Configuration
+import jdk.jfr.FlightRecorder
 import jdk.jfr.consumer.RecordingStream
+import jfr2flame
 import kotlin.io.path.*
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
 import kotlin.time.toJavaDuration
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import one.converter.Arguments
-import one.converter.FlameGraph
-import one.converter.jfr2flame
 import one.jfr.JfrReader
-import one.profiler.AsyncProfiler
-import one.profiler.AsyncProfilerLoader
-import one.profiler.Events
 
 private val DEBUG = ScopedValue.newInstance<Boolean>()
 
 val mutex = Mutex()
 
-val profiler: AsyncProfiler? by lazy {
-  val ap = AsyncProfilerLoader.loadOrNull()
-  ap.start(Events.CPU, 1000)
-  ap
-}
+// val profiler: AsyncProfiler? by lazy {
+//  val ap = AsyncProfilerLoader.loadOrNull()
+//  ap.start(Events.CPU, 1000)
+//  ap
+// }
 
 val docRoot = Path(System.getProperty("java.io.tmpdir"))
 
@@ -158,44 +154,57 @@ fun Route.mgmtRoutes() {
   }
 
   get("/profile") {
-    // Run the blocking operation on virtual thread and make sure
-    // only one profile operation is running at a time.
+    // Make sure only one profile operation is running at a time.
     when {
       mutex.isLocked -> call.respondText("Profile operation is already running")
       else ->
           mutex.withLock {
-            runOnVirtualThread {
-              val jfrPath = createTempFile("profile", ".jfr")
-              RecordingStream(Configuration.getConfiguration("profile")).use {
-                it.setMaxSize(100 * 1024 * 1024)
-                it.setMaxAge(2.minutes.toJavaDuration())
-                it.enable("jdk.CPULoad").withPeriod(100.milliseconds.toJavaDuration())
-                it.enable("jdk.JavaMonitorEnter").withStackTrace()
-                it.startAsync()
-                Thread.sleep(5_000)
-                it.dump(jfrPath)
-                println("JFR file written to ${jfrPath.toAbsolutePath()}")
+            val jfrPath = createTempFile("profile", ".jfr")
+            val flightRecorder = FlightRecorder.getFlightRecorder()
+            when (flightRecorder.recordings.isEmpty()) {
+              true -> {
+                println("Starting new JFR recording...")
+                RecordingStream(Configuration.getConfiguration("profile")).use {
+                  it.setMaxSize(100 * 1000 * 1000)
+                  it.setMaxAge(2.minutes.toJavaDuration())
+                  it.enable("jdk.CPULoad").withPeriod(100.milliseconds.toJavaDuration())
+                  it.enable("jdk.JavaMonitorEnter").withStackTrace()
+                  it.startAsync()
+                  Thread.sleep(5.seconds.inWholeMilliseconds)
+                  it.dump(jfrPath)
+                }
               }
-
-              when (call.request.queryParameters.contains("download")) {
-                true -> {
-                  call.response.header(
-                      HttpHeaders.ContentDisposition,
-                      ContentDisposition.Attachment.withParameter(
-                              ContentDisposition.Parameters.FileName, jfrPath.fileName.name)
-                          .toString())
-                  call.respondFile(jfrPath.toFile())
+              else -> {
+                println("Using existing JFR recording...")
+                flightRecorder.takeSnapshot().use {
+                  if (it.size > 0) {
+                    it.maxSize = 50_000_000
+                    it.maxAge = 2.minutes.toJavaDuration()
+                    it.dump(jfrPath)
+                  }
                 }
-                else -> {
-                  val jfr2flame = jfr2flame(JfrReader(jfrPath.pathString), Arguments())
-                  val flameGraph = FlameGraph()
-                  jfr2flame.convert(flameGraph)
+              }
+            }
+            println("JFR file written to ${jfrPath.toAbsolutePath()}")
+
+            when (call.request.queryParameters.contains("download")) {
+              true -> {
+                call.response.header(
+                    HttpHeaders.ContentDisposition,
+                    ContentDisposition.Attachment.withParameter(
+                            ContentDisposition.Parameters.FileName, jfrPath.fileName.name)
+                        .toString())
+                call.respondFile(jfrPath.toFile())
+              }
+              else -> {
+                val jfr2flame = jfr2flame(JfrReader(jfrPath.pathString), Arguments())
+                val flameGraph = FlameGraph()
+                jfr2flame.convert(flameGraph)
 
-                  call.respondOutputStream(contentType = ContentType.Text.Html) {
-                    flameGraph.dump(PrintStream(this))
-                  }
-                  jfrPath.deleteIfExists()
+                call.respondOutputStream(contentType = ContentType.Text.Html) {
+                  flameGraph.dump(PrintStream(this))
                 }
+                jfrPath.deleteIfExists()
               }
             }
           }

backend/jvm/src/main/resources/openapi/documentation.yaml

@@ -19,6 +19,45 @@ paths:
               examples:
                 Example#1:
                   value: "/swagger"
+  /browse/{param}:
+    get:
+      description: ""
+      parameters:
+      - name: "param"
+        in: "path"
+        required: true
+        schema:
+          type: "array"
+          items:
+            type: "string"
+      responses:
+        "200":
+          description: "OK <br> A file response"
+          content:
+            application/*:
+              schema:
+                type: "object"
+                format: "binary"
+        "404":
+          description: "Not Found"
+          content:
+            text/html:
+              schema:
+                type: "string"
+  /ffm:
+    get:
+      description: ""
+  /heapdump:
+    get:
+      description: ""
+      responses:
+        "200":
+          description: "OK <br> A file response"
+          content:
+            application/*:
+              schema:
+                type: "object"
+                format: "binary"
   /info:
     get:
       description: ""
@@ -28,4 +67,18 @@ paths:
           content:
             '*/*':
               schema:
-                type: "string"
+                type: "string"
+  /profile:
+    get:
+      description: ""
+      responses:
+        "200":
+          description: "OK <br> A file response"
+          content:
+            application/*:
+              schema:
+                type: "object"
+                format: "binary"
+  /vthreads:
+    get:
+      description: ""

common/src/jvmMain/resources/logback.xml

@@ -1,4 +1,4 @@
-<configuration>
+<configuration scan="true" scanPeriod="30 seconds">
 
     <property name="pattern"
               value="%d{YYYY-MM-dd HH:mm:ss.SSS z, America/Los_Angeles} %-5level %X{remoteHost} [%thread] %logger{16} - %msg%n%rEx"/>

compose/desktop/build.gradle.kts

@@ -16,9 +16,7 @@ dependencies {
 }
 
 compose {
-  // Workaround until compose has support for Kotlin 2.0
-  kotlinCompilerPlugin = libs.versions.jetbrains.compose.compiler
-  // kotlinCompilerPlugin = dependencies.compiler.forKotlin(kotlinVersion.get())
+  kotlinCompilerPlugin = dependencies.compiler.forKotlin(kotlinVersion.get())
   kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${kotlinVersion.get()}")
 
   platformTypes = platformTypes.get() - KotlinPlatformType.native

compose/desktop/src/jvmMain/kotlin/Components.kt

@@ -0,0 +1,32 @@
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.PathEffect
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.unit.dp
+
+val stroke = Stroke(width = 2f, pathEffect = PathEffect.dashPathEffect(floatArrayOf(10f, 10f), 0f))
+
+fun Modifier.debug(color: Color = Color.Red) =
+    then(
+        if (debug)
+            drawBehind {
+              drawRoundRect(color = color, style = stroke, cornerRadius = CornerRadius(8.dp.toPx()))
+            }
+        else Modifier)
+
+@Composable
+fun scrollingBox(modifier: Modifier = Modifier, content: @Composable () -> Unit) =
+    BoxWithConstraints {
+      val vscrollState = rememberScrollState()
+      Box(
+          modifier =
+              modifier.fillMaxSize().padding(10.dp).debug().verticalScroll(state = vscrollState)) {
+            content()
+          }
+    }