compute: Remove dependency on event tracer

This change removes the dependency on the event tracer in
`opendc-trace`, since we are in the process of migrating OpenDC to
use OpenTelemetry for distributed tracing and metrics.

3 files changed, 5 insertions, 15 deletions

diff --git a/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/ExperimentHelpers.kt b/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/ExperimentHelpers.kt
index 1fdd45ac..6f99a44e 100644
--- a/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/ExperimentHelpers.kt
+++ b/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/ExperimentHelpers.kt
@@ -45,7 +45,6 @@ import org.opendc.simulator.compute.interference.PerformanceInterferenceModel
 import org.opendc.simulator.compute.workload.SimWorkload
 import org.opendc.simulator.failures.CorrelatedFaultInjector
 import org.opendc.simulator.failures.FaultInjector
-import org.opendc.trace.core.EventTracer
 import java.io.File
 import java.time.Clock
 import kotlin.coroutines.resume
@@ -135,8 +134,7 @@ public fun createComputeService(
     coroutineScope: CoroutineScope,
     clock: Clock,
     environmentReader: EnvironmentReader,
-    allocationPolicy: AllocationPolicy,
-    eventTracer: EventTracer
+    allocationPolicy: AllocationPolicy
 ): ComputeService {
     val hosts = environmentReader
         .use { it.read() }
@@ -154,7 +152,7 @@ public fun createComputeService(
         }
 
     val scheduler =
-        ComputeService(coroutineScope.coroutineContext, clock, eventTracer, allocationPolicy)
+        ComputeService(coroutineScope.coroutineContext, clock, allocationPolicy)
 
     for (host in hosts) {
         scheduler.addHost(host)
diff --git a/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/Portfolio.kt b/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/Portfolio.kt
index 5a7eadad..46e0bcb9 100644
--- a/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/Portfolio.kt
+++ b/simulator/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/Portfolio.kt
@@ -41,7 +41,6 @@ import org.opendc.format.trace.PerformanceInterferenceModelReader
 import org.opendc.harness.dsl.Experiment
 import org.opendc.harness.dsl.anyOf
 import org.opendc.simulator.utils.DelayControllerClockAdapter
-import org.opendc.trace.core.EventTracer
 import java.io.File
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.random.Random
@@ -114,7 +113,6 @@ public abstract class Portfolio(name: String) : Experiment(name) {
     override fun doRun(repeat: Int) {
         val testScope = TestCoroutineScope()
         val clock = DelayControllerClockAdapter(testScope)
-        val tracer = EventTracer(clock)
         val seeder = Random(repeat)
         val environment = Sc20ClusterEnvironmentReader(File(environmentPath, "${topology.name}.txt"))
 
@@ -151,8 +149,7 @@ public abstract class Portfolio(name: String) : Experiment(name) {
                 this,
                 clock,
                 environment,
-                allocationPolicy,
-                tracer
+                allocationPolicy
             )
 
             val failureDomain = if (operationalPhenomena.failureFrequency > 0) {
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 c16f7003..a836b334 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
@@ -45,7 +45,6 @@ import org.opendc.format.environment.sc20.Sc20ClusterEnvironmentReader
 import org.opendc.format.trace.TraceReader
 import org.opendc.simulator.compute.workload.SimWorkload
 import org.opendc.simulator.utils.DelayControllerClockAdapter
-import org.opendc.trace.core.EventTracer
 import java.io.File
 import java.time.Clock
 
@@ -96,15 +95,13 @@ class CapelinIntegrationTest {
         val environmentReader = createTestEnvironmentReader()
         lateinit var scheduler: ComputeService
         lateinit var monitorResults: MonitorResults
-        val tracer = EventTracer(clock)
 
         testScope.launch {
             scheduler = createComputeService(
                 this,
                 clock,
                 environmentReader,
-                allocationPolicy,
-                tracer
+                allocationPolicy
             )
 
             val failureDomain = if (failures) {
@@ -157,15 +154,13 @@ class CapelinIntegrationTest {
         val allocationPolicy = AvailableCoreMemoryAllocationPolicy()
         val traceReader = createTestTraceReader(0.5, seed)
         val environmentReader = createTestEnvironmentReader("single")
-        val tracer = EventTracer(clock)
 
         testScope.launch {
             val scheduler = createComputeService(
                 this,
                 clock,
                 environmentReader,
-                allocationPolicy,
-                tracer
+                allocationPolicy
             )
             val monitorResults = attachMonitor(this, clock, scheduler, monitor)
             processTrace(