harness: Perform several improvements

This commit performs several improvements to the OpenDC harness and modules utilizing the harness.

3 files changed, 19 insertions, 20 deletions

diff --git a/simulator/opendc-runner-web/build.gradle.kts b/simulator/opendc-runner-web/build.gradle.kts
index 7ae3c641..d0b80cc7 100644
--- a/simulator/opendc-runner-web/build.gradle.kts
+++ b/simulator/opendc-runner-web/build.gradle.kts
@@ -24,7 +24,7 @@ description = "Experiment runner for OpenDC"
 
 /* Build configuration */
 plugins {
-    `kotlin-library-convention`
+    `kotlin-library-conventions`
     application
 }
 
@@ -33,21 +33,20 @@ application {
 }
 
 dependencies {
+    api(platform(project(":opendc-platform")))
     api(project(":opendc-core"))
     implementation(project(":opendc-compute:opendc-compute-simulator"))
     implementation(project(":opendc-format"))
-    implementation(project(":opendc-experiments:opendc-experiments-sc20"))
+    implementation(project(":opendc-experiments:opendc-experiments-capelin"))
     implementation(project(":opendc-simulator:opendc-simulator-core"))
     implementation(project(":opendc-simulator:opendc-simulator-compute"))
 
-    implementation("com.github.ajalt:clikt:2.8.0")
-    implementation("io.github.microutils:kotlin-logging:1.7.10")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.9.8") {
-        exclude("org.jetbrains.kotlin", module = "kotlin-reflect")
-    }
-    implementation("io.sentry:sentry-log4j2:3.1.1")
-    implementation("org.mongodb:mongodb-driver-sync:4.0.5")
+    implementation("io.github.microutils:kotlin-logging")
+    implementation("com.github.ajalt.clikt:clikt:${versions["clikt"]}")
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:${versions["jackson-module-kotlin"]}")
+    implementation("io.sentry:sentry-log4j2:${versions["sentry-log4j2"]}")
+    implementation("org.mongodb:mongodb-driver-sync:${versions["mongodb-driver-sync"]}")
 
-    runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.13.1")
-    runtimeOnly("org.apache.logging.log4j:log4j-1.2-api:2.13.1")
+    runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}")
+    runtimeOnly("org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}")
 }
diff --git a/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/Main.kt b/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/Main.kt
index 7796019a..533bf321 100644
--- a/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/Main.kt
+++ b/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/Main.kt
@@ -41,13 +41,13 @@ import mu.KotlinLogging
 import org.bson.Document
 import org.bson.types.ObjectId
 import org.opendc.compute.simulator.allocation.*
-import org.opendc.experiments.sc20.experiment.attachMonitor
-import org.opendc.experiments.sc20.experiment.createFailureDomain
-import org.opendc.experiments.sc20.experiment.createProvisioner
-import org.opendc.experiments.sc20.experiment.model.Workload
-import org.opendc.experiments.sc20.experiment.processTrace
-import org.opendc.experiments.sc20.trace.Sc20ParquetTraceReader
-import org.opendc.experiments.sc20.trace.Sc20RawParquetTraceReader
+import org.opendc.experiments.capelin.experiment.attachMonitor
+import org.opendc.experiments.capelin.experiment.createFailureDomain
+import org.opendc.experiments.capelin.experiment.createProvisioner
+import org.opendc.experiments.capelin.experiment.processTrace
+import org.opendc.experiments.capelin.model.Workload
+import org.opendc.experiments.capelin.trace.Sc20ParquetTraceReader
+import org.opendc.experiments.capelin.trace.Sc20RawParquetTraceReader
 import org.opendc.format.trace.sc20.Sc20PerformanceInterferenceReader
 import org.opendc.simulator.utils.DelayControllerClockAdapter
 import org.opendc.trace.core.EventTracer
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 7ef25552..f16f9b90 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
@@ -27,8 +27,8 @@ import org.opendc.compute.core.Server
 import org.opendc.compute.core.ServerState
 import org.opendc.compute.core.virt.driver.VirtDriver
 import org.opendc.compute.core.virt.service.VirtProvisioningEvent
-import org.opendc.experiments.sc20.experiment.monitor.ExperimentMonitor
-import org.opendc.experiments.sc20.telemetry.HostEvent
+import org.opendc.experiments.capelin.monitor.ExperimentMonitor
+import org.opendc.experiments.capelin.telemetry.HostEvent
 import kotlin.math.max
 
 /**