exp: Simplify metric reporting via monitor

This change simplifies the way metrics are reported to the monitor.
Previously, power draw was collected separately from the other metrics.
However, with the migration to OpenTelemetry, we collect all metrics
every 5 minutes, which drastically simplifies the metric gathering
logic.

6 files changed, 43 insertions, 228 deletions

diff --git a/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ExperimentMetricExporter.kt b/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ExperimentMetricExporter.kt
index 799de60f..39f18a1b 100644
--- a/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ExperimentMetricExporter.kt
+++ b/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ExperimentMetricExporter.kt
@@ -89,11 +89,10 @@ public class ExperimentMetricExporter(
                 hostMetric.interferedBurst,
                 hostMetric.cpuUsage,
                 hostMetric.cpuDemand,
+                hostMetric.powerDraw,
                 hostMetric.numberOfDeployedImages,
                 host
             )
-
-            monitor.reportPowerConsumption(host, hostMetric.powerDraw)
         }
     }
 
diff --git a/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ExperimentMonitor.kt b/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ExperimentMonitor.kt
index 5e75c890..68631dee 100644
--- a/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ExperimentMonitor.kt
+++ b/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ExperimentMonitor.kt
@@ -42,11 +42,6 @@ public interface ExperimentMonitor : AutoCloseable {
     public fun reportHostStateChange(time: Long, host: Host, newState: HostState) {}
 
     /**
-     * Report the power consumption of a host.
-     */
-    public fun reportPowerConsumption(host: Host, draw: Double) {}
-
-    /**
      * This method is invoked for a host for each slice that is finishes.
      */
     public fun reportHostSlice(
@@ -57,9 +52,9 @@ public interface ExperimentMonitor : AutoCloseable {
         interferedBurst: Long,
         cpuUsage: Double,
         cpuDemand: Double,
+        powerDraw: Double,
         numberOfDeployedImages: Int,
-        host: Host,
-        duration: Long = 5 * 60 * 1000L
+        host: Host
     ) {
     }
 
diff --git a/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ParquetExperimentMonitor.kt b/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ParquetExperimentMonitor.kt
index 0e675d87..983b4cff 100644
--- a/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ParquetExperimentMonitor.kt
+++ b/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ParquetExperimentMonitor.kt
@@ -50,52 +50,11 @@ public class ParquetExperimentMonitor(base: File, partition: String, bufferSize:
         File(base, "provisioner-metrics/$partition/data.parquet"),
         bufferSize
     )
-    private val currentHostEvent = mutableMapOf<Host, HostEvent>()
-    private var startTime = -1L
 
-    override fun reportVmStateChange(time: Long, server: Server, newState: ServerState) {
-        if (startTime < 0) {
-            startTime = time
-
-            // Update timestamp of initial event
-            currentHostEvent.replaceAll { _, v -> v.copy(timestamp = startTime) }
-        }
-    }
+    override fun reportVmStateChange(time: Long, server: Server, newState: ServerState) {}
 
     override fun reportHostStateChange(time: Long, host: Host, newState: HostState) {
         logger.debug { "Host ${host.uid} changed state $newState [$time]" }
-
-        val previousEvent = currentHostEvent[host]
-
-        val roundedTime = previousEvent?.let {
-            val duration = time - it.timestamp
-            val k = 5 * 60 * 1000L // 5 min in ms
-            val rem = duration % k
-
-            if (rem == 0L) {
-                time
-            } else {
-                it.timestamp + duration + k - rem
-            }
-        } ?: time
-
-        reportHostSlice(
-            roundedTime,
-            0,
-            0,
-            0,
-            0,
-            0.0,
-            0.0,
-            0,
-            host
-        )
-    }
-
-    private val lastPowerConsumption = mutableMapOf<Host, Double>()
-
-    override fun reportPowerConsumption(host: Host, draw: Double) {
-        lastPowerConsumption[host] = draw
     }
 
     override fun reportHostSlice(
@@ -106,69 +65,26 @@ public class ParquetExperimentMonitor(base: File, partition: String, bufferSize:
         interferedBurst: Long,
         cpuUsage: Double,
         cpuDemand: Double,
+        powerDraw: Double,
         numberOfDeployedImages: Int,
-        host: Host,
-        duration: Long
+        host: Host
     ) {
-        val previousEvent = currentHostEvent[host]
-        when {
-            previousEvent == null -> {
-                val event = HostEvent(
-                    time,
-                    5 * 60 * 1000L,
-                    host,
-                    numberOfDeployedImages,
-                    requestedBurst,
-                    grantedBurst,
-                    overcommissionedBurst,
-                    interferedBurst,
-                    cpuUsage,
-                    cpuDemand,
-                    lastPowerConsumption[host] ?: 200.0,
-                    host.model.cpuCount
-                )
-
-                currentHostEvent[host] = event
-            }
-            previousEvent.timestamp == time -> {
-                val event = HostEvent(
-                    time,
-                    previousEvent.duration,
-                    host,
-                    numberOfDeployedImages,
-                    requestedBurst,
-                    grantedBurst,
-                    overcommissionedBurst,
-                    interferedBurst,
-                    cpuUsage,
-                    cpuDemand,
-                    lastPowerConsumption[host] ?: 200.0,
-                    host.model.cpuCount
-                )
-
-                currentHostEvent[host] = event
-            }
-            else -> {
-                hostWriter.write(previousEvent)
-
-                val event = HostEvent(
-                    time,
-                    time - previousEvent.timestamp,
-                    host,
-                    numberOfDeployedImages,
-                    requestedBurst,
-                    grantedBurst,
-                    overcommissionedBurst,
-                    interferedBurst,
-                    cpuUsage,
-                    cpuDemand,
-                    lastPowerConsumption[host] ?: 200.0,
-                    host.model.cpuCount
-                )
-
-                currentHostEvent[host] = event
-            }
-        }
+        hostWriter.write(
+            HostEvent(
+                time,
+                5 * 60 * 1000L,
+                host,
+                numberOfDeployedImages,
+                requestedBurst,
+                grantedBurst,
+                overcommissionedBurst,
+                interferedBurst,
+                cpuUsage,
+                cpuDemand,
+                powerDraw,
+                host.model.cpuCount
+            )
+        )
     }
 
     override fun reportProvisionerMetrics(
@@ -196,12 +112,6 @@ public class ParquetExperimentMonitor(base: File, partition: String, bufferSize:
     }
 
     override fun close() {
-        // Flush remaining events
-        for ((_, event) in currentHostEvent) {
-            hostWriter.write(event)
-        }
-        currentHostEvent.clear()
-
         hostWriter.close()
         provisionerWriter.close()
     }
diff --git a/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/telemetry/parquet/ParquetHostEventWriter.kt b/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/telemetry/parquet/ParquetHostEventWriter.kt
index 4a3e7963..c8fe1cb2 100644
--- a/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/telemetry/parquet/ParquetHostEventWriter.kt
+++ b/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/telemetry/parquet/ParquetHostEventWriter.kt
@@ -52,7 +52,7 @@ public class ParquetHostEventWriter(path: File, bufferSize: Int) :
             record.put("interfered_burst", event.interferedBurst)
             record.put("cpu_usage", event.cpuUsage)
             record.put("cpu_demand", event.cpuDemand)
-            record.put("power_draw", event.powerDraw * (1.0 / 12))
+            record.put("power_draw", event.powerDraw)
             record.put("cores", event.cores)
         }
 
diff --git a/simulator/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt b/simulator/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt
index 0441cfed..bc639765 100644
--- a/simulator/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt
+++ b/simulator/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt
@@ -197,9 +197,9 @@ class CapelinIntegrationTest {
             interferedBurst: Long,
             cpuUsage: Double,
             cpuDemand: Double,
+            powerDraw: Double,
             numberOfDeployedImages: Int,
             host: Host,
-            duration: Long
         ) {
             totalRequestedBurst += requestedBurst
             totalGrantedBurst += grantedBurst
diff --git a/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/WebExperimentMonitor.kt b/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/WebExperimentMonitor.kt
index fcd43ea7..8f39b8ac 100644
--- a/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/WebExperimentMonitor.kt
+++ b/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/WebExperimentMonitor.kt
@@ -36,52 +36,11 @@ import kotlin.math.max
  */
 public class WebExperimentMonitor : ExperimentMonitor {
     private val logger = KotlinLogging.logger {}
-    private val currentHostEvent = mutableMapOf<Host, HostEvent>()
-    private var startTime = -1L
 
-    override fun reportVmStateChange(time: Long, server: Server, newState: ServerState) {
-        if (startTime < 0) {
-            startTime = time
-
-            // Update timestamp of initial event
-            currentHostEvent.replaceAll { _, v -> v.copy(timestamp = startTime) }
-        }
-    }
+    override fun reportVmStateChange(time: Long, server: Server, newState: ServerState) {}
 
     override fun reportHostStateChange(time: Long, host: Host, newState: HostState) {
         logger.debug { "Host ${host.uid} changed state $newState [$time]" }
-
-        val previousEvent = currentHostEvent[host]
-
-        val roundedTime = previousEvent?.let {
-            val duration = time - it.timestamp
-            val k = 5 * 60 * 1000L // 5 min in ms
-            val rem = duration % k
-
-            if (rem == 0L) {
-                time
-            } else {
-                it.timestamp + duration + k - rem
-            }
-        } ?: time
-
-        reportHostSlice(
-            roundedTime,
-            0,
-            0,
-            0,
-            0,
-            0.0,
-            0.0,
-            0,
-            host
-        )
-    }
-
-    private val lastPowerConsumption = mutableMapOf<Host, Double>()
-
-    override fun reportPowerConsumption(host: Host, draw: Double) {
-        lastPowerConsumption[host] = draw
     }
 
     override fun reportHostSlice(
@@ -92,69 +51,26 @@ public class WebExperimentMonitor : ExperimentMonitor {
         interferedBurst: Long,
         cpuUsage: Double,
         cpuDemand: Double,
+        powerDraw: Double,
         numberOfDeployedImages: Int,
         host: Host,
-        duration: Long
     ) {
-        val previousEvent = currentHostEvent[host]
-        when {
-            previousEvent == null -> {
-                val event = HostEvent(
-                    time,
-                    5 * 60 * 1000L,
-                    host,
-                    numberOfDeployedImages,
-                    requestedBurst,
-                    grantedBurst,
-                    overcommissionedBurst,
-                    interferedBurst,
-                    cpuUsage,
-                    cpuDemand,
-                    lastPowerConsumption[host] ?: 200.0,
-                    host.model.cpuCount
-                )
-
-                currentHostEvent[host] = event
-            }
-            previousEvent.timestamp == time -> {
-                val event = HostEvent(
-                    time,
-                    previousEvent.duration,
-                    host,
-                    numberOfDeployedImages,
-                    requestedBurst,
-                    grantedBurst,
-                    overcommissionedBurst,
-                    interferedBurst,
-                    cpuUsage,
-                    cpuDemand,
-                    lastPowerConsumption[host] ?: 200.0,
-                    host.model.cpuCount
-                )
-
-                currentHostEvent[host] = event
-            }
-            else -> {
-                processHostEvent(previousEvent)
-
-                val event = HostEvent(
-                    time,
-                    time - previousEvent.timestamp,
-                    host,
-                    numberOfDeployedImages,
-                    requestedBurst,
-                    grantedBurst,
-                    overcommissionedBurst,
-                    interferedBurst,
-                    cpuUsage,
-                    cpuDemand,
-                    lastPowerConsumption[host] ?: 200.0,
-                    host.model.cpuCount
-                )
-
-                currentHostEvent[host] = event
-            }
-        }
+        processHostEvent(
+            HostEvent(
+                time,
+                5 * 60 * 1000L,
+                host,
+                numberOfDeployedImages,
+                requestedBurst,
+                grantedBurst,
+                overcommissionedBurst,
+                interferedBurst,
+                cpuUsage,
+                cpuDemand,
+                powerDraw,
+                host.model.cpuCount
+            )
+        )
     }
 
     private var hostAggregateMetrics: AggregateHostMetrics = AggregateHostMetrics()
@@ -231,12 +147,7 @@ public class WebExperimentMonitor : ExperimentMonitor {
         val vmFailedCount: Int = 0
     )
 
-    override fun close() {
-        for ((_, event) in currentHostEvent) {
-            processHostEvent(event)
-        }
-        currentHostEvent.clear()
-    }
+    override fun close() {}
 
     public fun getResult(): Result {
         return Result(