refactor: consolidate perf logging to single fun

Author: ovitrif

app/src/main/java/to/bitkit/fcm/WakeNodeWorker.kt

@@ -37,7 +37,7 @@ import to.bitkit.repositories.LightningRepo
 import to.bitkit.services.CoreService
 import to.bitkit.ui.pushNotification
 import to.bitkit.utils.Logger
-import to.bitkit.utils.withPerformanceLogging
+import to.bitkit.utils.measured
 import kotlin.time.Duration.Companion.minutes
 
 @Suppress("LongParameterList")
@@ -74,7 +74,7 @@ class WakeNodeWorker @AssistedInject constructor(
         Logger.debug("${this::class.simpleName} notification payload: $notificationPayload")
 
         try {
-            withPerformanceLogging {
+            measured(TAG) {
                 lightningRepo.start(
                     walletIndex = 0,
                     timeout = timeout,
@@ -252,4 +252,8 @@ class WakeNodeWorker @AssistedInject constructor(
 
         deliverSignal.complete(Unit)
     }
+
+    companion object {
+        private const val TAG = "WakeNodeWorker"
+    }
 }

app/src/main/java/to/bitkit/utils/Logger.kt

@@ -102,13 +102,13 @@ class AppLogger(
         delegate?.verbose(msg, e, context, file, line)
     }
 
-    fun performance(
+    fun perf(
         msg: String?,
         context: String = "",
         file: String = getCallerPath(),
         line: Int = getCallerLine(),
     ) {
-        delegate?.performance(msg, context, file, line)
+        delegate?.perf(msg, context, file, line)
     }
 }
 
@@ -179,7 +179,7 @@ class LoggerImpl(
         saver.save(message)
     }
 
-    fun performance(
+    fun perf(
         msg: String?,
         context: String = "",
         path: String = getCallerPath(),

app/src/main/java/to/bitkit/utils/Perf.kt

@@ -1,34 +1,26 @@
 package to.bitkit.utils
 
-import java.time.Instant
-import kotlin.system.measureTimeMillis
+import kotlin.time.Duration
+import kotlin.time.measureTime
+
+fun Duration.formatted(): String = toComponents { hours, minutes, seconds, nanoseconds ->
+    val ms = nanoseconds / 1_000_000
+    buildString {
+        if (hours > 0) append("${hours}h ")
+        if (minutes > 0) append("${minutes}m ")
+        if (seconds > 0) append("${seconds}s ")
+        if (ms > 0 || isEmpty()) append("${ms}ms")
+    }.trim()
+}
 
 internal inline fun <T> measured(
     label: String,
     block: () -> T,
 ): T {
     var result: T
-
-    val elapsedMs = measureTimeMillis {
+    val elapsed = measureTime {
         result = block()
     }
-
-    Logger.debug("$label took ${elapsedMs}ms")
-
-    return result
-}
-
-internal inline fun <T> withPerformanceLogging(block: () -> T): T {
-    val startTime = System.currentTimeMillis()
-    val startTimestamp = Instant.ofEpochMilli(startTime)
-    Logger.performance("Start Time: $startTimestamp")
-
-    val result: T = block()
-
-    val endTime = System.currentTimeMillis()
-    val endTimestamp = Instant.ofEpochMilli(endTime)
-    val duration = (endTime - startTime) / 1000.0
-    Logger.performance("End Time: $endTimestamp, Duration: $duration seconds")
-
+    Logger.perf("$label took ${elapsed.formatted()}")
     return result
 }