1 files changed, 16 insertions, 13 deletions

diff --git a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/Main.kt b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/Main.kt
index 5d6bc37f..8f4e9d6d 100644
--- a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/Main.kt
+++ b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/Main.kt
@@ -29,6 +29,7 @@ import com.github.ajalt.clikt.parameters.types.long
 import kotlinx.coroutines.*
 import mu.KotlinLogging
 import org.opendc.compute.workload.*
+import org.opendc.compute.workload.telemetry.SdkTelemetryManager
 import org.opendc.compute.workload.topology.HostSpec
 import org.opendc.compute.workload.topology.Topology
 import org.opendc.compute.workload.topology.apply
@@ -185,34 +186,36 @@ class RunnerCli : CliktCommand(name = "runner") {
                     else
                         null
 
+                val telemetry = SdkTelemetryManager(clock)
                 val simulator = ComputeServiceHelper(
                     coroutineContext,
                     clock,
+                    telemetry,
                     computeScheduler,
                     failureModel,
                     interferenceModel.takeIf { operational.performanceInterferenceEnabled }
                 )
 
-                val metricReader = CoroutineMetricReader(this, simulator.producers, exporter, exportInterval = Duration.ofHours(1))
+                telemetry.registerMetricReader(CoroutineMetricReader(this, exporter, exportInterval = Duration.ofHours(1)))
 
                 try {
                     // Instantiate the topology onto the simulator
                     simulator.apply(topology)
-                    // Converge workload trace
+                    // Run workload trace
                     simulator.run(workload.resolve(workloadLoader, seeder), seeder.nextLong())
+
+                    val serviceMetrics = collectServiceMetrics(telemetry.metricProducer)
+                    logger.debug {
+                        "Scheduler " +
+                            "Success=${serviceMetrics.attemptsSuccess} " +
+                            "Failure=${serviceMetrics.attemptsFailure} " +
+                            "Error=${serviceMetrics.attemptsError} " +
+                            "Pending=${serviceMetrics.serversPending} " +
+                            "Active=${serviceMetrics.serversActive}"
+                    }
                 } finally {
                     simulator.close()
-                    metricReader.close()
-                }
-
-                val serviceMetrics = collectServiceMetrics(simulator.producers[0])
-                logger.debug {
-                    "Scheduler " +
-                        "Success=${serviceMetrics.attemptsSuccess} " +
-                        "Failure=${serviceMetrics.attemptsFailure} " +
-                        "Error=${serviceMetrics.attemptsError} " +
-                        "Pending=${serviceMetrics.serversPending} " +
-                        "Active=${serviceMetrics.serversActive}"
+                    telemetry.close()
                 }
             }
         } catch (cause: Throwable) {