Added reading stats.

Author: MihaelBercic

src/main/kotlin/docker/DockerContainer.kt

@@ -1,5 +1,6 @@
 package docker
 
+import com.google.gson.annotations.SerializedName
 import kotlinx.serialization.Serializable
 import utils.CircularList
 
@@ -27,4 +28,26 @@ data class DockerContainer(
 ) {
     val averageCpuUsage get(): Double = cpuUsage.elements().average().takeIf { !it.isNaN() } ?: 0.0
     val averageMemoryUsage get(): Double = memoryUsage.elements().average().takeIf { !it.isNaN() } ?: 0.0
-}
+}
+
+@Serializable
+data class DockerStatsModel(
+    @SerializedName("BlockIO")
+    val blockIo: String,
+    @SerializedName("CPUPerc")
+    val cpuperc: String,
+    @SerializedName("Container")
+    val container: String,
+    @SerializedName("ID")
+    val id: String,
+    @SerializedName("MemPerc")
+    val memPerc: String,
+    @SerializedName("MemUsage")
+    val memUsage: String,
+    @SerializedName("Name")
+    val name: String,
+    @SerializedName("NetIO")
+    val netIo: String,
+    @SerializedName("PIDs")
+    val pids: String,
+)

src/main/kotlin/docker/DockerProxy.kt

@@ -8,10 +8,7 @@ import logging.Logger
 import network.data.Endpoint
 import network.data.clusters.Cluster
 import network.data.messages.Message
-import utils.CircularList
 import utils.runAfter
-import java.nio.ByteBuffer
-import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.locks.ReentrantLock
 import kotlin.concurrent.withLock
@@ -94,50 +91,11 @@ abstract class DockerProxy(configuration: Configuration) : MigrationStrategy(con
         val numberOfElements = (configuration.slotDuration / 1000).toInt()
 
         val process = ProcessBuilder()
-            .command("docker", "stats", "--no-trunc", "--format", "{{.ID}} {{.CPUPerc}} {{.MemPerc}} {{.PIDs}}")
+            .command("docker", "stats", "--no-stream", "--no-trunc", "--format", "{{ json . }}")
             .redirectErrorStream(true)
             .start()
-
-        val buffer = ByteBuffer.allocate(100_000)
-        val escapeSequence = byteArrayOf(0x1B, 0x5B, 0x32, 0x4A, 0x1B, 0x5B, 0x48) // Escape sequence of CLI output.
-        var escapeIndex = 0
-        process.inputStream.use { inputStream ->
-            while (true) {
-                try {
-                    val byte = inputStream.read().toByte()
-                    if (byte < 0) break
-                    buffer.put(byte)
-                    if (byte == escapeSequence[escapeIndex]) escapeIndex++ else escapeIndex = 0
-                    if (escapeIndex != escapeSequence.size) continue // If escape sequence was not detected, continue reading data.
-                    val length = buffer.position() - escapeSequence.size
-                    if (length > 0) String(buffer.array(), 0, length).split("\n").map { line ->
-                        if (line.isNotEmpty()) {
-                            val fields = line.split(" ")
-                            val containerId = fields[0]
-                            if (fields.none { it.contains("-") || it.isEmpty() }) {
-                                val cpuPercentage = fields[1].trim('%').toDouble()
-                                val memoryPercentage = fields[2].trim('%').toDouble()
-                                val activeProcesses = fields[3].toInt()
-                                val container = localContainers.computeIfAbsent(containerId) {
-                                    DockerContainer(containerId, activeProcesses, CircularList(numberOfElements), CircularList(numberOfElements))
-                                }
-                                container.apply {
-                                    cpuUsage.add(cpuPercentage)
-                                    memoryUsage.add(memoryPercentage)
-                                    updated = System.currentTimeMillis()
-                                    processes = activeProcesses
-                                }
-                            } else localContainers[containerId]?.updated = System.currentTimeMillis()
-                        }
-                    }
-                    buffer.clear()
-                    escapeIndex = 0
-                } catch (e: Exception) {
-                    buffer.clear()
-                    escapeIndex = 0
-                    Dashboard.reportException(e)
-                }
-            }
+        process.inputReader().readLines().forEach { line ->
+            println("Read line from docker stats: $line")
         }
 
     }