refactor(trace): Simplify TraceFormat SPI interface

This change simplifies the TraceFormat SPI interface by reducing the
number of interfaces that implementors need to implement to only
TraceFormat.

1 files changed, 1 insertions, 7 deletions

diff --git a/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadLoader.kt b/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadLoader.kt
index ab7f051f..6dba41e6 100644
--- a/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadLoader.kt
+++ b/opendc-compute/opendc-compute-workload/src/main/kotlin/org/opendc/compute/workload/ComputeWorkloadLoader.kt
@@ -25,7 +25,6 @@ package org.opendc.compute.workload
 import mu.KotlinLogging
 import org.opendc.simulator.compute.workload.SimTraceWorkload
 import org.opendc.trace.*
-import org.opendc.trace.opendc.OdcVmTraceFormat
 import java.io.File
 import java.time.Duration
 import java.time.Instant
@@ -45,11 +44,6 @@ public class ComputeWorkloadLoader(private val baseDir: File) {
     private val logger = KotlinLogging.logger {}
 
     /**
-     * The [OdcVmTraceFormat] instance to load the traces
-     */
-    private val format = OdcVmTraceFormat()
-
-    /**
      * The cache of workloads.
      */
     private val cache = ConcurrentHashMap<String, List<VirtualMachine>>()
@@ -159,7 +153,7 @@ public class ComputeWorkloadLoader(private val baseDir: File) {
 
             logger.info { "Loading trace $it at $path" }
 
-            val trace = format.open(path.toURI().toURL())
+            val trace = Trace.open(path, format = "opendc-vm")
             val fragments = parseFragments(trace)
             parseMeta(trace, fragments)
         }