Rewrote the FlowEngine (#256)

* Removed unused components. Updated tests.

Improved checkpointing model

Improved model, started with SimPowerSource

implemented FailureModels and Checkpointing

First working version

midway commit

first update

All simulation are now run with a single CPU and single MemoryUnit. multi CPUs are combined into one. This is for performance and explainability.

* fixed merge conflicts

* Updated M3SA paths.

* Fixed small typo

14 files changed, 0 insertions, 1677 deletions

diff --git a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/ComputeService.java b/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/ComputeService.java
deleted file mode 100644
index ad01ee57..00000000
--- a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/ComputeService.java
+++ /dev/null
@@ -1,637 +0,0 @@
-/*
- * Copyright (c) 2022 AtLarge Research
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package org.opendc.compute.service;
-
-import java.time.Duration;
-import java.time.Instant;
-import java.time.InstantSource;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.SplittableRandom;
-import java.util.UUID;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.opendc.common.Dispatcher;
-import org.opendc.common.util.Pacer;
-import org.opendc.compute.api.ComputeClient;
-import org.opendc.compute.api.Flavor;
-import org.opendc.compute.api.Image;
-import org.opendc.compute.api.Task;
-import org.opendc.compute.api.TaskState;
-import org.opendc.compute.service.driver.Host;
-import org.opendc.compute.service.driver.HostListener;
-import org.opendc.compute.service.driver.HostModel;
-import org.opendc.compute.service.driver.HostState;
-import org.opendc.compute.service.scheduler.ComputeScheduler;
-import org.opendc.compute.service.telemetry.SchedulerStats;
-import org.opendc.simulator.compute.workload.SimWorkload;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The {@link ComputeService} hosts the API implementation of the OpenDC Compute Engine.
- */
-public final class ComputeService implements AutoCloseable {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ComputeService.class);
-
-    /**
-     * The {@link InstantSource} representing the clock tracking the (simulation) time.
-     */
-    private final InstantSource clock;
-
-    /**
-     * The {@link ComputeScheduler} responsible for placing the tasks onto hosts.
-     */
-    private final ComputeScheduler scheduler;
-
-    /**
-     * The {@link Pacer} used to pace the scheduling requests.
-     */
-    private final Pacer pacer;
-
-    /**
-     * The {@link SplittableRandom} used to generate the unique identifiers for the service resources.
-     */
-    private final SplittableRandom random = new SplittableRandom(0);
-
-    private final int maxNumFailures;
-
-    /**
-     * A flag to indicate that the service is closed.
-     */
-    private boolean isClosed;
-
-    /**
-     * A mapping from host to host view.
-     */
-    private final Map<Host, HostView> hostToView = new HashMap<>();
-
-    /**
-     * The available hypervisors.
-     */
-    private final Set<HostView> availableHosts = new HashSet<>();
-
-    /**
-     * The tasks that should be launched by the service.
-     */
-    private final Deque<SchedulingRequest> taskQueue = new ArrayDeque<>();
-
-    /**
-     * The active tasks in the system.
-     */
-    private final Map<Task, Host> activeTasks = new HashMap<>();
-
-    /**
-     * The registered flavors for this compute service.
-     */
-    private final Map<UUID, ServiceFlavor> flavorById = new HashMap<>();
-
-    private final List<ServiceFlavor> flavors = new ArrayList<>();
-
-    /**
-     * The registered images for this compute service.
-     */
-    private final Map<UUID, ServiceImage> imageById = new HashMap<>();
-
-    private final List<ServiceImage> images = new ArrayList<>();
-
-    /**
-     * The registered tasks for this compute service.
-     */
-    private final Map<UUID, ServiceTask> taskById = new HashMap<>();
-
-    private final List<ServiceTask> tasks = new ArrayList<>();
-
-    /**
-     * A [HostListener] used to track the active tasks.
-     */
-    private final HostListener hostListener = new HostListener() {
-        @Override
-        public void onStateChanged(@NotNull Host host, @NotNull HostState newState) {
-            LOGGER.debug("Host {} state changed: {}", host, newState);
-
-            final HostView hv = hostToView.get(host);
-
-            if (hv != null) {
-                if (newState == HostState.UP) {
-                    availableHosts.add(hv);
-                } else {
-                    availableHosts.remove(hv);
-                }
-            }
-
-            // Re-schedule on the new machine
-            requestSchedulingCycle();
-        }
-
-        @Override
-        public void onStateChanged(@NotNull Host host, @NotNull Task task, @NotNull TaskState newState) {
-            final ServiceTask serviceTask = (ServiceTask) task;
-
-            if (serviceTask.getHost() != host) {
-                // This can happen when a task is rescheduled and started on another machine, while being deleted from
-                // the old machine.
-                return;
-            }
-
-            serviceTask.setState(newState);
-
-            // TODO: move the removal of tasks when max Failures are reached to here
-            if (newState == TaskState.TERMINATED || newState == TaskState.DELETED || newState == TaskState.ERROR) {
-                LOGGER.info("task {} {} {} finished", task.getUid(), task.getName(), task.getFlavor());
-
-                if (activeTasks.remove(task) != null) {
-                    tasksActive--;
-                }
-
-                HostView hv = hostToView.get(host);
-                final ServiceFlavor flavor = serviceTask.getFlavor();
-                if (hv != null) {
-                    hv.provisionedCores -= flavor.getCoreCount();
-                    hv.instanceCount--;
-                    hv.availableMemory += flavor.getMemorySize();
-                } else {
-                    LOGGER.error("Unknown host {}", host);
-                }
-
-                // Try to reschedule if needed
-                requestSchedulingCycle();
-            }
-        }
-    };
-
-    private int maxCores = 0;
-    private long maxMemory = 0L;
-    private long attemptsSuccess = 0L;
-    private long attemptsFailure = 0L;
-    private long attemptsError = 0L;
-    private int tasksPending = 0;
-    private int tasksActive = 0;
-
-    /**
-     * Construct a {@link ComputeService} instance.
-     */
-    ComputeService(Dispatcher dispatcher, ComputeScheduler scheduler, Duration quantum, int maxNumFailures) {
-        this.clock = dispatcher.getTimeSource();
-        this.scheduler = scheduler;
-        this.pacer = new Pacer(dispatcher, quantum.toMillis(), (time) -> doSchedule());
-        this.maxNumFailures = maxNumFailures;
-    }
-
-    /**
-     * Create a new {@link Builder} instance.
-     */
-    public static Builder builder(Dispatcher dispatcher, ComputeScheduler scheduler) {
-        return new Builder(dispatcher, scheduler);
-    }
-
-    /**
-     * Create a new {@link ComputeClient} to control the compute service.
-     */
-    public ComputeClient newClient() {
-        if (isClosed) {
-            throw new IllegalStateException("Service is closed");
-        }
-        return new Client(this);
-    }
-
-    /**
-     * Return the {@link Task}s hosted by this service.
-     */
-    public List<Task> getTasks() {
-        return Collections.unmodifiableList(tasks);
-    }
-
-    /**
-     * Add a {@link Host} to the scheduling pool of the compute service.
-     */
-    public void addHost(Host host) {
-        // Check if host is already known
-        if (hostToView.containsKey(host)) {
-            return;
-        }
-
-        HostView hv = new HostView(host);
-        HostModel model = host.getModel();
-
-        maxCores = Math.max(maxCores, model.coreCount());
-        maxMemory = Math.max(maxMemory, model.memoryCapacity());
-        hostToView.put(host, hv);
-
-        if (host.getState() == HostState.UP) {
-            availableHosts.add(hv);
-        }
-
-        scheduler.addHost(hv);
-        host.addListener(hostListener);
-    }
-
-    /**
-     * Remove a {@link Host} from the scheduling pool of the compute service.
-     */
-    public void removeHost(Host host) {
-        HostView view = hostToView.remove(host);
-        if (view != null) {
-            availableHosts.remove(view);
-            scheduler.removeHost(view);
-            host.removeListener(hostListener);
-        }
-    }
-
-    /**
-     * Lookup the {@link Host} that currently hosts the specified {@link Task}.
-     */
-    public Host lookupHost(Task task) {
-        if (task instanceof ServiceTask) {
-            return ((ServiceTask) task).getHost();
-        }
-
-        ServiceTask internal = Objects.requireNonNull(taskById.get(task.getUid()), "Invalid task passed to lookupHost");
-        return internal.getHost();
-    }
-
-    /**
-     * Return the {@link Host}s that are registered with this service.
-     */
-    public Set<Host> getHosts() {
-        return Collections.unmodifiableSet(hostToView.keySet());
-    }
-
-    /**
-     * Collect the statistics about the scheduler component of this service.
-     */
-    public SchedulerStats getSchedulerStats() {
-        return new SchedulerStats(
-                availableHosts.size(),
-                hostToView.size() - availableHosts.size(),
-                attemptsSuccess,
-                attemptsFailure,
-                attemptsError,
-                tasks.size(),
-                tasksPending,
-                tasksActive);
-    }
-
-    @Override
-    public void close() {
-        if (isClosed) {
-            return;
-        }
-
-        isClosed = true;
-        pacer.cancel();
-    }
-
-    /**
-     * Enqueue the specified [task] to be scheduled onto a host.
-     */
-    SchedulingRequest schedule(ServiceTask task) {
-        LOGGER.debug("Enqueueing task {} to be assigned to host", task.getUid());
-
-        long now = clock.millis();
-        SchedulingRequest request = new SchedulingRequest(task, now);
-
-        task.launchedAt = Instant.ofEpochMilli(now);
-        taskQueue.add(request);
-        tasksPending++;
-        requestSchedulingCycle();
-        return request;
-    }
-
-    void delete(ServiceFlavor flavor) {
-        flavorById.remove(flavor.getUid());
-        flavors.remove(flavor);
-    }
-
-    void delete(ServiceImage image) {
-        imageById.remove(image.getUid());
-        images.remove(image);
-    }
-
-    void delete(ServiceTask task) {
-        taskById.remove(task.getUid());
-        tasks.remove(task);
-    }
-
-    /**
-     * Indicate that a new scheduling cycle is needed due to a change to the service's state.
-     */
-    private void requestSchedulingCycle() {
-        // Bail out in case the queue is empty.
-        if (taskQueue.isEmpty()) {
-            return;
-        }
-
-        pacer.enqueue();
-    }
-
-    /**
-     * Run a single scheduling iteration.
-     */
-    private void doSchedule() {
-        // reorder tasks
-
-        while (!taskQueue.isEmpty()) {
-            SchedulingRequest request = taskQueue.peek();
-
-            if (request.isCancelled) {
-                taskQueue.poll();
-                tasksPending--;
-                continue;
-            }
-
-            final ServiceTask task = request.task;
-
-            // Remove task from scheduling if it has failed too many times
-            if (task.getNumFailures() > maxNumFailures) {
-                LOGGER.warn("Failed to spawn {}: Task has failed more than the allowed {} times", task, maxNumFailures);
-
-                taskQueue.poll();
-                tasksPending--;
-                task.setState(TaskState.TERMINATED);
-                continue;
-            }
-
-            final ServiceFlavor flavor = task.getFlavor();
-            final HostView hv = scheduler.select(request.task);
-
-            if (hv == null || !hv.getHost().canFit(task)) {
-                LOGGER.trace("Task {} selected for scheduling but no capacity available for it at the moment", task);
-
-                if (flavor.getMemorySize() > maxMemory || flavor.getCoreCount() > maxCores) {
-                    // Remove the incoming image
-                    taskQueue.poll();
-                    tasksPending--;
-                    attemptsFailure++;
-
-                    LOGGER.warn("Failed to spawn {}: does not fit", task);
-
-                    task.setState(TaskState.TERMINATED);
-                    continue;
-                } else {
-                    break;
-                }
-            }
-
-            Host host = hv.getHost();
-
-            // Remove request from queue
-            taskQueue.poll();
-            tasksPending--;
-
-            LOGGER.info("Assigned task {} to host {}", task, host);
-
-            try {
-                task.host = host;
-
-                host.spawn(task);
-                host.start(task);
-
-                tasksActive++;
-                attemptsSuccess++;
-
-                hv.instanceCount++;
-                hv.provisionedCores += flavor.getCoreCount();
-                hv.availableMemory -= flavor.getMemorySize();
-
-                activeTasks.put(task, host);
-            } catch (Exception cause) {
-                LOGGER.error("Failed to deploy VM", cause);
-                attemptsError++;
-            }
-        }
-    }
-
-    /**
-     * Builder class for a {@link ComputeService}.
-     */
-    public static class Builder {
-        private final Dispatcher dispatcher;
-        private final ComputeScheduler computeScheduler;
-        private Duration quantum = Duration.ofMinutes(5);
-        private int maxNumFailures = 10;
-
-        Builder(Dispatcher dispatcher, ComputeScheduler computeScheduler) {
-            this.dispatcher = dispatcher;
-            this.computeScheduler = computeScheduler;
-        }
-
-        /**
-         * Set the scheduling quantum of the service.
-         */
-        public Builder withQuantum(Duration quantum) {
-            this.quantum = quantum;
-            return this;
-        }
-
-        public Builder withMaxNumFailures(int maxNumFailures) {
-            this.maxNumFailures = maxNumFailures;
-            return this;
-        }
-
-        /**
-         * Build a {@link ComputeService}.
-         */
-        public ComputeService build() {
-            return new ComputeService(dispatcher, computeScheduler, quantum, maxNumFailures);
-        }
-    }
-
-    /**
-     * Implementation of {@link ComputeClient} using a {@link ComputeService}.
-     */
-    private static class Client implements ComputeClient {
-        private final ComputeService service;
-        private boolean isClosed;
-
-        Client(ComputeService service) {
-            this.service = service;
-        }
-
-        /**
-         * Method to check if the client is still open and throw an exception if it is not.
-         */
-        private void checkOpen() {
-            if (isClosed) {
-                throw new IllegalStateException("Client is already closed");
-            }
-        }
-
-        @NotNull
-        @Override
-        public List<Flavor> queryFlavors() {
-            checkOpen();
-            return new ArrayList<>(service.flavors);
-        }
-
-        @Override
-        public Flavor findFlavor(@NotNull UUID id) {
-            checkOpen();
-
-            return service.flavorById.get(id);
-        }
-
-        @NotNull
-        @Override
-        public Flavor newFlavor(
-                @NotNull String name,
-                int cpuCount,
-                long memorySize,
-                @NotNull Map<String, String> labels,
-                @NotNull Map<String, ?> meta) {
-            checkOpen();
-
-            final ComputeService service = this.service;
-            UUID uid = new UUID(service.clock.millis(), service.random.nextLong());
-            ServiceFlavor flavor = new ServiceFlavor(service, uid, name, cpuCount, memorySize, labels, meta);
-
-            service.flavorById.put(uid, flavor);
-            service.flavors.add(flavor);
-
-            return flavor;
-        }
-
-        @NotNull
-        @Override
-        public List<Image> queryImages() {
-            checkOpen();
-
-            return new ArrayList<>(service.images);
-        }
-
-        @Override
-        public Image findImage(@NotNull UUID id) {
-            checkOpen();
-
-            return service.imageById.get(id);
-        }
-
-        @NotNull
-        public Image newImage(@NotNull String name, @NotNull Map<String, String> labels, @NotNull Map<String, ?> meta) {
-            checkOpen();
-
-            final ComputeService service = this.service;
-            UUID uid = new UUID(service.clock.millis(), service.random.nextLong());
-
-            ServiceImage image = new ServiceImage(service, uid, name, labels, meta);
-
-            service.imageById.put(uid, image);
-            service.images.add(image);
-
-            return image;
-        }
-
-        @NotNull
-        @Override
-        public Task newTask(
-                @NotNull String name,
-                @NotNull Image image,
-                @NotNull Flavor flavor,
-                @NotNull Map<String, String> labels,
-                @NotNull Map<String, ?> meta,
-                boolean start) {
-            checkOpen();
-
-            final ComputeService service = this.service;
-            UUID uid = new UUID(service.clock.millis(), service.random.nextLong());
-
-            final ServiceFlavor internalFlavor =
-                    Objects.requireNonNull(service.flavorById.get(flavor.getUid()), "Unknown flavor");
-            final ServiceImage internalImage =
-                    Objects.requireNonNull(service.imageById.get(image.getUid()), "Unknown image");
-
-            ServiceTask task = new ServiceTask(service, uid, name, internalFlavor, internalImage, labels, meta);
-
-            service.taskById.put(uid, task);
-            service.tasks.add(task);
-
-            if (start) {
-                task.start();
-            }
-
-            return task;
-        }
-
-        @Nullable
-        @Override
-        public Task findTask(@NotNull UUID id) {
-            checkOpen();
-            return service.taskById.get(id);
-        }
-
-        @NotNull
-        @Override
-        public List<Task> queryTasks() {
-            checkOpen();
-
-            return new ArrayList<>(service.tasks);
-        }
-
-        @Override
-        public void close() {
-            isClosed = true;
-        }
-
-        @Override
-        public String toString() {
-            return "ComputeService.Client";
-        }
-
-        @Nullable
-        @Override
-        public void rescheduleTask(@NotNull Task task, @NotNull SimWorkload workload) {
-            ServiceTask internalTask = (ServiceTask) findTask(task.getUid());
-            Host from = service.lookupHost(internalTask);
-
-            from.delete(internalTask);
-
-            internalTask.host = null;
-
-            internalTask.setWorkload(workload);
-            internalTask.start();
-        }
-    }
-
-    /**
-     * A request to schedule a {@link ServiceTask} onto one of the {@link Host}s.
-     */
-    static class SchedulingRequest {
-        final ServiceTask task;
-        final long submitTime;
-
-        boolean isCancelled;
-
-        SchedulingRequest(ServiceTask task, long submitTime) {
-            this.task = task;
-            this.submitTime = submitTime;
-        }
-    }
-}
diff --git a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/HostView.java b/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/HostView.java
deleted file mode 100644
index 6e2cdcb4..00000000
--- a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/HostView.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2022 AtLarge Research
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package org.opendc.compute.service;
-
-import org.opendc.compute.service.driver.Host;
-
-/**
- * A view of a {@link Host} as seen from the {@link ComputeService}.
- */
-public class HostView {
-    private final Host host;
-    int instanceCount;
-    long availableMemory;
-    int provisionedCores;
-
-    /**
-     * Construct a {@link HostView} instance.
-     *
-     * @param host The host to create a view of.
-     */
-    public HostView(Host host) {
-        this.host = host;
-        this.availableMemory = host.getModel().memoryCapacity();
-    }
-
-    /**
-     * The {@link Host} this is a view of.
-     */
-    public Host getHost() {
-        return host;
-    }
-
-    /**
-     * Return the number of instances on this host.
-     */
-    public int getInstanceCount() {
-        return instanceCount;
-    }
-
-    /**
-     * Return the available memory of the host.
-     */
-    public long getAvailableMemory() {
-        return availableMemory;
-    }
-
-    /**
-     * Return the provisioned cores on the host.
-     */
-    public int getProvisionedCores() {
-        return provisionedCores;
-    }
-
-    @Override
-    public String toString() {
-        return "HostView[host=" + host + "]";
-    }
-}
diff --git a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/ServiceFlavor.java b/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/ServiceFlavor.java
deleted file mode 100644
index 0f434a6a..00000000
--- a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/ServiceFlavor.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2022 AtLarge Research
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package org.opendc.compute.service;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
-import org.jetbrains.annotations.NotNull;
-import org.opendc.compute.api.Flavor;
-
-/**
- * Implementation of {@link Flavor} provided by {@link ComputeService}.
- */
-public final class ServiceFlavor implements Flavor {
-    private final ComputeService service;
-    private final UUID uid;
-    private final String name;
-    private final int coreCount;
-    private final long memorySize;
-    private final Map<String, String> labels;
-    private final Map<String, ?> meta;
-
-    ServiceFlavor(
-            ComputeService service,
-            UUID uid,
-            String name,
-            int coreCount,
-            long memorySize,
-            Map<String, String> labels,
-            Map<String, ?> meta) {
-        this.service = service;
-        this.uid = uid;
-        this.name = name;
-        this.coreCount = coreCount;
-        this.memorySize = memorySize;
-        this.labels = labels;
-        this.meta = meta;
-    }
-
-    @Override
-    public int getCoreCount() {
-        return coreCount;
-    }
-
-    @Override
-    public long getMemorySize() {
-        return memorySize;
-    }
-
-    @NotNull
-    @Override
-    public UUID getUid() {
-        return uid;
-    }
-
-    @NotNull
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @NotNull
-    @Override
-    public Map<String, String> getLabels() {
-        return Collections.unmodifiableMap(labels);
-    }
-
-    @NotNull
-    @Override
-    public Map<String, Object> getMeta() {
-        return Collections.unmodifiableMap(meta);
-    }
-
-    @Override
-    public void reload() {
-        // No-op: this object is the source-of-truth
-    }
-
-    @Override
-    public void delete() {
-        service.delete(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        ServiceFlavor flavor = (ServiceFlavor) o;
-        return service.equals(flavor.service) && uid.equals(flavor.uid);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(service, uid);
-    }
-
-    @Override
-    public String toString() {
-        return "Flavor[uid=" + uid + ",name=" + name + "]";
-    }
-}
diff --git a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/ServiceImage.java b/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/ServiceImage.java
deleted file mode 100644
index 706be483..00000000
--- a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/ServiceImage.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2022 AtLarge Research
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package org.opendc.compute.service;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
-import org.jetbrains.annotations.NotNull;
-import org.opendc.compute.api.Image;
-
-/**
- * Implementation of {@link Image} provided by {@link ComputeService}.
- */
-public final class ServiceImage implements Image {
-    private final ComputeService service;
-    private final UUID uid;
-    private final String name;
-    private final Map<String, String> labels;
-    private final Map<String, ?> meta;
-
-    ServiceImage(ComputeService service, UUID uid, String name, Map<String, String> labels, Map<String, ?> meta) {
-        this.service = service;
-        this.uid = uid;
-        this.name = name;
-        this.labels = labels;
-        this.meta = meta;
-    }
-
-    @NotNull
-    @Override
-    public UUID getUid() {
-        return uid;
-    }
-
-    @NotNull
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @NotNull
-    @Override
-    public Map<String, String> getLabels() {
-        return Collections.unmodifiableMap(labels);
-    }
-
-    @NotNull
-    @Override
-    public Map<String, Object> getMeta() {
-        return Collections.unmodifiableMap(meta);
-    }
-
-    @Override
-    public void reload() {
-        // No-op: this object is the source-of-truth
-    }
-
-    @Override
-    public void delete() {
-        service.delete(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        ServiceImage image = (ServiceImage) o;
-        return service.equals(image.service) && uid.equals(image.uid);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(service, uid);
-    }
-
-    @Override
-    public String toString() {
-        return "Image[uid=" + uid + ",name=" + name + "]";
-    }
-}
diff --git a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/ServiceTask.java b/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/ServiceTask.java
deleted file mode 100644
index f0e2a82e..00000000
--- a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/ServiceTask.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright (c) 2022 AtLarge Research
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package org.opendc.compute.service;
-
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.opendc.compute.api.Task;
-import org.opendc.compute.api.TaskState;
-import org.opendc.compute.api.TaskWatcher;
-import org.opendc.compute.service.driver.Host;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Implementation of {@link Task} provided by {@link ComputeService}.
- */
-public final class ServiceTask implements Task {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ServiceTask.class);
-
-    private final ComputeService service;
-    private final UUID uid;
-
-    private final String name;
-    private final ServiceFlavor flavor;
-    private final ServiceImage image;
-    private final Map<String, String> labels;
-    private Map<String, ?> meta;
-
-    private final List<TaskWatcher> watchers = new ArrayList<>();
-    private TaskState state = TaskState.TERMINATED;
-    Instant launchedAt = null;
-    Host host = null;
-    private ComputeService.SchedulingRequest request = null;
-
-    private int numFailures = 0;
-
-    ServiceTask(
-            ComputeService service,
-            UUID uid,
-            String name,
-            ServiceFlavor flavor,
-            ServiceImage image,
-            Map<String, String> labels,
-            Map<String, ?> meta) {
-        this.service = service;
-        this.uid = uid;
-        this.name = name;
-        this.flavor = flavor;
-        this.image = image;
-        this.labels = labels;
-        this.meta = meta;
-    }
-
-    @NotNull
-    @Override
-    public UUID getUid() {
-        return uid;
-    }
-
-    @NotNull
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @NotNull
-    @Override
-    public ServiceFlavor getFlavor() {
-        return flavor;
-    }
-
-    @NotNull
-    @Override
-    public ServiceImage getImage() {
-        return image;
-    }
-
-    @NotNull
-    @Override
-    public Map<String, String> getLabels() {
-        return Collections.unmodifiableMap(labels);
-    }
-
-    @NotNull
-    @Override
-    public Map<String, Object> getMeta() {
-        return Collections.unmodifiableMap(meta);
-    }
-
-    public void setWorkload(Object _workload) {
-        Map<String, Object> new_meta = new HashMap<String, Object>();
-        new_meta.put("workload", _workload);
-
-        meta = new_meta;
-    }
-
-    @NotNull
-    @Override
-    public TaskState getState() {
-        return state;
-    }
-
-    @Nullable
-    @Override
-    public Instant getLaunchedAt() {
-        return launchedAt;
-    }
-
-    /**
-     * Return the {@link Host} on which the task is running or <code>null</code> if it is not running on a host.
-     */
-    public Host getHost() {
-        return host;
-    }
-
-    @Override
-    public void start() {
-        switch (state) {
-            case PROVISIONING:
-                LOGGER.debug("User tried to start task but request is already pending: doing nothing");
-            case RUNNING:
-                LOGGER.debug("User tried to start task but task is already running");
-                break;
-            case DELETED:
-                LOGGER.warn("User tried to start deleted task");
-                throw new IllegalStateException("Task is deleted");
-            default:
-                LOGGER.info("User requested to start task {}", uid);
-                setState(TaskState.PROVISIONING);
-                assert request == null : "Scheduling request already active";
-                request = service.schedule(this);
-                break;
-        }
-    }
-
-    @Override
-    public void stop() {
-        switch (state) {
-            case PROVISIONING:
-                cancelProvisioningRequest();
-                setState(TaskState.TERMINATED);
-                break;
-            case RUNNING:
-            case ERROR:
-                final Host host = this.host;
-                if (host == null) {
-                    throw new IllegalStateException("Task not running");
-                }
-                host.stop(this);
-                break;
-        }
-    }
-
-    @Override
-    public void watch(@NotNull TaskWatcher watcher) {
-        watchers.add(watcher);
-    }
-
-    @Override
-    public void unwatch(@NotNull TaskWatcher watcher) {
-        watchers.remove(watcher);
-    }
-
-    @Override
-    public void reload() {
-        // No-op: this object is the source-of-truth
-    }
-
-    @Override
-    public void delete() {
-        switch (state) {
-            case PROVISIONING:
-            case TERMINATED:
-                cancelProvisioningRequest();
-                service.delete(this);
-                setState(TaskState.DELETED);
-                break;
-            case RUNNING:
-            case ERROR:
-                final Host host = this.host;
-                if (host == null) {
-                    throw new IllegalStateException("Task not running");
-                }
-                host.delete(this);
-                service.delete(this);
-                setState(TaskState.DELETED);
-                break;
-        }
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        ServiceTask task = (ServiceTask) o;
-        return service.equals(task.service) && uid.equals(task.uid);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(service, uid);
-    }
-
-    @Override
-    public String toString() {
-        return "Task[uid=" + uid + ",name=" + name + ",state=" + state + "]";
-    }
-
-    void setState(TaskState newState) {
-        if (this.state == newState) {
-            return;
-        }
-
-        for (TaskWatcher watcher : watchers) {
-            watcher.onStateChanged(this, newState);
-        }
-        if (newState == TaskState.ERROR) {
-            this.numFailures++;
-        }
-
-        this.state = newState;
-    }
-
-    /**
-     * Cancel the provisioning request if active.
-     */
-    private void cancelProvisioningRequest() {
-        final ComputeService.SchedulingRequest request = this.request;
-        if (request != null) {
-            this.request = null;
-            request.isCancelled = true;
-        }
-    }
-
-    @Override
-    public int getNumFailures() {
-        return this.numFailures;
-    }
-}
diff --git a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/Host.java b/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/Host.java
deleted file mode 100644
index 546f774b..00000000
--- a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/Host.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2022 AtLarge Research
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package org.opendc.compute.service.driver;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import org.opendc.compute.api.Task;
-import org.opendc.compute.service.driver.telemetry.GuestCpuStats;
-import org.opendc.compute.service.driver.telemetry.GuestSystemStats;
-import org.opendc.compute.service.driver.telemetry.HostCpuStats;
-import org.opendc.compute.service.driver.telemetry.HostSystemStats;
-
-/**
- * Base interface for representing compute resources that host virtualized {@link Task} instances.
- */
-public interface Host {
-    /**
-     * Return a unique identifier representing the host.
-     */
-    UUID getUid();
-
-    /**
-     * Return the name of this host.
-     */
-    String getName();
-
-    /**
-     * Return the machine model of the host.
-     */
-    HostModel getModel();
-
-    /**
-     * Return the state of the host.
-     */
-    HostState getState();
-
-    /**
-     * Return the meta-data associated with the host.
-     */
-    Map<String, ?> getMeta();
-
-    /**
-     * Return the {@link Task} instances known to the host.
-     */
-    Set<Task> getInstances();
-
-    /**
-     * Determine whether the specified <code>task</code> can still fit on this host.
-     */
-    boolean canFit(Task task);
-
-    /**
-     * Register the specified <code>task</code> on the host.
-     */
-    void spawn(Task task);
-
-    /**
-     * Determine whether the specified <code>task</code> exists on the host.
-     */
-    boolean contains(Task task);
-
-    /**
-     * Start the task if it is currently not running on this host.
-     *
-     * @throws IllegalArgumentException if the task is not present on the host.
-     */
-    void start(Task task);
-
-    /**
-     * Stop the task if it is currently running on this host.
-     *
-     * @throws IllegalArgumentException if the task is not present on the host.
-     */
-    void stop(Task task);
-
-    /**
-     * Delete the specified <code>task</code> on this host and cleanup all resources associated with it.
-     */
-    void delete(Task task);
-
-    /**
-     * Add a [HostListener] to this host.
-     */
-    void addListener(HostListener listener);
-
-    /**
-     * Remove a [HostListener] from this host.
-     */
-    void removeListener(HostListener listener);
-
-    /**
-     * Query the system statistics of the host.
-     */
-    HostSystemStats getSystemStats();
-
-    /**
-     * Query the system statistics of a {@link Task} that is located on this host.
-     *
-     * @param task The {@link Task} to obtain the system statistics of.
-     * @throws IllegalArgumentException if the task is not present on the host.
-     */
-    GuestSystemStats getSystemStats(Task task);
-
-    /**
-     * Query the CPU statistics of the host.
-     */
-    HostCpuStats getCpuStats();
-
-    /**
-     * Query the CPU statistics of a {@link Task} that is located on this host.
-     *
-     * @param task The {@link Task} to obtain the CPU statistics of.
-     * @throws IllegalArgumentException if the task is not present on the host.
-     */
-    GuestCpuStats getCpuStats(Task task);
-}
diff --git a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/HostListener.java b/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/HostListener.java
deleted file mode 100644
index 079c6cff..00000000
--- a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/HostListener.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2022 AtLarge Research
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package org.opendc.compute.service.driver;
-
-import org.opendc.compute.api.Task;
-import org.opendc.compute.api.TaskState;
-
-/**
- * Listener interface for events originating from a {@link Host}.
- */
-public interface HostListener {
-    /**
-     * This method is invoked when the state of <code>task</code> on <code>host</code> changes.
-     */
-    default void onStateChanged(Host host, Task task, TaskState newState) {}
-
-    /**
-     * This method is invoked when the state of a {@link Host} has changed.
-     */
-    default void onStateChanged(Host host, HostState newState) {}
-}
diff --git a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/HostModel.java b/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/HostModel.java
deleted file mode 100644
index 87464fe1..00000000
--- a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/HostModel.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2022 AtLarge Research
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package org.opendc.compute.service.driver;
-
-/**
- * Record describing the static machine properties of the host.
- *
- * @param cpuCapacity The total CPU capacity of the host in MHz.
- * @param coreCount The number of logical processing cores available for this host.
- * @param memoryCapacity The amount of memory available for this host in MB.
- */
-public record HostModel(double cpuCapacity, int coreCount, long memoryCapacity) {}
diff --git a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/HostState.java b/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/HostState.java
deleted file mode 100644
index ce12a67e..00000000
--- a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/HostState.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2022 AtLarge Research
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package org.opendc.compute.service.driver;
-
-/**
- * The state of a host.
- */
-public enum HostState {
-    /**
-     * The host is up and able to host guests.
-     */
-    UP,
-
-    /**
-     * The host is in a (forced) down state and unable to host any guests.
-     */
-    DOWN,
-
-    /**
-     * The host is in an error state and unable to host any guests.
-     */
-    ERROR
-}
diff --git a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/telemetry/GuestCpuStats.java b/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/telemetry/GuestCpuStats.java
deleted file mode 100644
index 0b78c7ea..00000000
--- a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/telemetry/GuestCpuStats.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2022 AtLarge Research
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package org.opendc.compute.service.driver.telemetry;
-
-/**
- * Statistics about the CPUs of a guest.
- *
- * @param activeTime The cumulative time (in seconds) that the CPUs of the guest were actively running.
- * @param idleTime The cumulative time (in seconds) the CPUs of the guest were idle.
- * @param stealTime The cumulative CPU time (in seconds) that the guest was ready to run, but not granted time by the host.
- * @param lostTime The cumulative CPU time (in seconds) that was lost due to interference with other machines.
- * @param capacity The available CPU capacity of the guest (in MHz).
- * @param usage Amount of CPU resources (in MHz) actually used by the guest.
- * @param utilization The utilization of the CPU resources (in %) relative to the total CPU capacity.
- */
-public record GuestCpuStats(
-        long activeTime,
-        long idleTime,
-        long stealTime,
-        long lostTime,
-        double capacity,
-        double usage,
-        double utilization) {}
diff --git a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/telemetry/GuestSystemStats.java b/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/telemetry/GuestSystemStats.java
deleted file mode 100644
index dbf98dd5..00000000
--- a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/telemetry/GuestSystemStats.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2022 AtLarge Research
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package org.opendc.compute.service.driver.telemetry;
-
-import java.time.Duration;
-import java.time.Instant;
-
-/**
- * System-level statistics of a guest.
- *
- * @param uptime The cumulative uptime of the guest since last boot (in ms).
- * @param downtime The cumulative downtime of the guest since last boot (in ms).
- * @param bootTime The time at which the guest booted.
- */
-public record GuestSystemStats(Duration uptime, Duration downtime, Instant bootTime) {}
diff --git a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/telemetry/HostCpuStats.java b/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/telemetry/HostCpuStats.java
deleted file mode 100644
index d1c2328b..00000000
--- a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/telemetry/HostCpuStats.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2022 AtLarge Research
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package org.opendc.compute.service.driver.telemetry;
-
-/**
- * Statistics about the CPUs of a host.
- *
- * @param activeTime The cumulative time (in seconds) that the CPUs of the host were actively running.
- * @param idleTime The cumulative time (in seconds) the CPUs of the host were idle.
- * @param stealTime The cumulative CPU time (in seconds) that virtual machines were ready to run, but were not able to.
- * @param lostTime The cumulative CPU time (in seconds) that was lost due to interference between virtual machines.
- * @param capacity The available CPU capacity of the host (in MHz).
- * @param demand Amount of CPU resources (in MHz) the guests would use if there were no CPU contention or CPU
- *               limits.
- * @param usage Amount of CPU resources (in MHz) actually used by the host.
- * @param utilization The utilization of the CPU resources (in %) relative to the total CPU capacity.
- */
-public record HostCpuStats(
-        long activeTime,
-        long idleTime,
-        long stealTime,
-        long lostTime,
-        double capacity,
-        double demand,
-        double usage,
-        double utilization) {}
diff --git a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/telemetry/HostSystemStats.java b/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/telemetry/HostSystemStats.java
deleted file mode 100644
index c0713f3c..00000000
--- a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/driver/telemetry/HostSystemStats.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2022 AtLarge Research
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package org.opendc.compute.service.driver.telemetry;
-
-import java.time.Duration;
-import java.time.Instant;
-
-/**
- * System-level statistics of a host.
- *
- * @param uptime The cumulative uptime of the host since last boot (in ms).
- * @param downtime The cumulative downtime of the host since last boot (in ms).
- * @param bootTime The time at which the task started.
- * @param powerDraw Instantaneous power draw of the system (in W).
- * @param energyUsage The cumulative energy usage of the system (in J).
- * @param guestsTerminated The number of guests that are in a terminated state.
- * @param guestsRunning The number of guests that are in a running state.
- * @param guestsError The number of guests that are in an error state.
- * @param guestsInvalid The number of guests that are in an unknown state.
- */
-public record HostSystemStats(
-        Duration uptime,
-        Duration downtime,
-        Instant bootTime,
-        double powerDraw,
-        double energyUsage,
-        int guestsTerminated,
-        int guestsRunning,
-        int guestsError,
-        int guestsInvalid) {}
diff --git a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/telemetry/SchedulerStats.java b/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/telemetry/SchedulerStats.java
deleted file mode 100644
index fc044d8c..00000000
--- a/opendc-compute/opendc-compute-service/src/main/java/org/opendc/compute/service/telemetry/SchedulerStats.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2022 AtLarge Research
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package org.opendc.compute.service.telemetry;
-
-/**
- * Statistics about the scheduling component of the [ComputeService].
- *
- * @param hostsAvailable The number of hosts currently available for scheduling.
- * @param hostsUnavailable The number of hosts unavailable for scheduling.
- * @param attemptsSuccess Scheduling attempts that resulted into an allocation onto a host.
- * @param attemptsFailure The number of failed scheduling attempt due to insufficient capacity at the moment.
- * @param attemptsError The number of scheduling attempts that failed due to system error.
- * @param tasksTotal The number of tasks registered with the service.
- * @param tasksPending The number of tasks that are pending to be scheduled.
- * @param tasksActive The number of tasks that are currently managed by the service and running.
- */
-public record SchedulerStats(
-        int hostsAvailable,
-        int hostsUnavailable,
-        long attemptsSuccess,
-        long attemptsFailure,
-        long attemptsError,
-        int tasksTotal,
-        int tasksPending,
-        int tasksActive) {}