merge: Add support for new trace formats

This pull request updates the trace API with the addition of several new trace formats.

- Add support for Materna traces from GWA
- Keep reader state in own class
- Parse last column in Solvinity trace format 
- Add support Azure VM traces
- Add support for WfCommons (WorkflowHub) traces 
- Add API for accessing available table columns
- Add synthetic resource table for Bitbrains format
- Support dynamic resolving of trace formats 

**Breaking API Changes**

- Replace `isSupported` by a list of `TableColumns`

6 files changed, 338 insertions, 92 deletions

diff --git a/opendc-trace/opendc-trace-bitbrains/src/main/kotlin/org/opendc/trace/bitbrains/BitbrainsResourceStateTable.kt b/opendc-trace/opendc-trace-bitbrains/src/main/kotlin/org/opendc/trace/bitbrains/BitbrainsResourceStateTable.kt
index 767ef919..c9e5954d 100644
--- a/opendc-trace/opendc-trace-bitbrains/src/main/kotlin/org/opendc/trace/bitbrains/BitbrainsResourceStateTable.kt
+++ b/opendc-trace/opendc-trace-bitbrains/src/main/kotlin/org/opendc/trace/bitbrains/BitbrainsResourceStateTable.kt
@@ -33,7 +33,7 @@ import kotlin.io.path.nameWithoutExtension
 /**
  * The resource state [Table] in the Bitbrains format.
  */
-internal class BitbrainsResourceStateTable(private val factory: CsvFactory, private val path: Path) : Table {
+internal class BitbrainsResourceStateTable(private val factory: CsvFactory, path: Path) : Table {
     /**
      * The partitions that belong to the table.
      */
@@ -41,28 +41,26 @@ internal class BitbrainsResourceStateTable(private val factory: CsvFactory, priv
         Files.walk(path, 1)
             .filter { !Files.isDirectory(it) && it.extension == "csv" }
             .collect(Collectors.toMap({ it.nameWithoutExtension }, { it }))
+            .toSortedMap()
 
     override val name: String = TABLE_RESOURCE_STATES
 
     override val isSynthetic: Boolean = false
 
-    override fun isSupported(column: TableColumn<*>): Boolean {
-        return when (column) {
-            RESOURCE_STATE_ID -> true
-            RESOURCE_STATE_TIMESTAMP -> true
-            RESOURCE_STATE_NCPUS -> true
-            RESOURCE_STATE_CPU_CAPACITY -> true
-            RESOURCE_STATE_CPU_USAGE -> true
-            RESOURCE_STATE_CPU_USAGE_PCT -> true
-            RESOURCE_STATE_MEM_CAPACITY -> true
-            RESOURCE_STATE_MEM_USAGE -> true
-            RESOURCE_STATE_DISK_READ -> true
-            RESOURCE_STATE_DISK_WRITE -> true
-            RESOURCE_STATE_NET_RX -> true
-            RESOURCE_STATE_NET_TX -> true
-            else -> false
-        }
-    }
+    override val columns: List<TableColumn<*>> = listOf(
+        RESOURCE_STATE_ID,
+        RESOURCE_STATE_TIMESTAMP,
+        RESOURCE_STATE_NCPUS,
+        RESOURCE_STATE_CPU_CAPACITY,
+        RESOURCE_STATE_CPU_USAGE,
+        RESOURCE_STATE_CPU_USAGE_PCT,
+        RESOURCE_STATE_MEM_CAPACITY,
+        RESOURCE_STATE_MEM_USAGE,
+        RESOURCE_STATE_DISK_READ,
+        RESOURCE_STATE_DISK_WRITE,
+        RESOURCE_STATE_NET_RX,
+        RESOURCE_STATE_NET_TX,
+    )
 
     override fun newReader(): TableReader {
         val it = partitions.iterator()
diff --git a/opendc-trace/opendc-trace-bitbrains/src/main/kotlin/org/opendc/trace/bitbrains/BitbrainsResourceStateTableReader.kt b/opendc-trace/opendc-trace-bitbrains/src/main/kotlin/org/opendc/trace/bitbrains/BitbrainsResourceStateTableReader.kt
index 5687ac7f..dab784c2 100644
--- a/opendc-trace/opendc-trace-bitbrains/src/main/kotlin/org/opendc/trace/bitbrains/BitbrainsResourceStateTableReader.kt
+++ b/opendc-trace/opendc-trace-bitbrains/src/main/kotlin/org/opendc/trace/bitbrains/BitbrainsResourceStateTableReader.kt
@@ -22,20 +22,42 @@
 
 package org.opendc.trace.bitbrains
 
+import com.fasterxml.jackson.core.JsonParseException
 import com.fasterxml.jackson.core.JsonToken
 import com.fasterxml.jackson.dataformat.csv.CsvParser
 import com.fasterxml.jackson.dataformat.csv.CsvSchema
 import org.opendc.trace.*
+import java.text.NumberFormat
 import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneOffset
+import java.time.format.DateTimeFormatter
+import java.time.format.DateTimeParseException
+import java.util.*
 
 /**
  * A [TableReader] for the Bitbrains resource state table.
  */
 internal class BitbrainsResourceStateTableReader(private val partition: String, private val parser: CsvParser) : TableReader {
     /**
-     * The current parser state.
+     * The [DateTimeFormatter] used to parse the timestamps in case of the Materna trace.
      */
-    private val state = RowState()
+    private val formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm:ss")
+
+    /**
+     * The type of timestamps in the trace.
+     */
+    private var timestampType: TimestampType = TimestampType.UNDECIDED
+
+    /**
+     * The [NumberFormat] used to parse doubles containing a comma.
+     */
+    private val nf = NumberFormat.getInstance(Locale.GERMAN)
+
+    /**
+     * A flag to indicate that the trace contains decimals with a comma separator.
+     */
+    private var usesCommaDecimalSeparator = false
 
     init {
         parser.schema = schema
@@ -43,7 +65,7 @@ internal class BitbrainsResourceStateTableReader(private val partition: String,
 
     override fun nextRow(): Boolean {
         // Reset the row state
-        state.reset()
+        reset()
 
         if (!nextStart()) {
             return false
@@ -57,17 +79,32 @@ internal class BitbrainsResourceStateTableReader(private val partition: String,
             }
 
             when (parser.currentName) {
-                "Timestamp [ms]" -> state.timestamp = Instant.ofEpochSecond(parser.longValue)
-                "CPU cores" -> state.cpuCores = parser.intValue
-                "CPU capacity provisioned [MHZ]" -> state.cpuCapacity = parser.doubleValue
-                "CPU usage [MHZ]" -> state.cpuUsage = parser.doubleValue
-                "CPU usage [%]" -> state.cpuUsagePct = parser.doubleValue
-                "Memory capacity provisioned [KB]" -> state.memCapacity = parser.doubleValue
-                "Memory usage [KB]" -> state.memUsage = parser.doubleValue
-                "Disk read throughput [KB/s]" -> state.diskRead = parser.doubleValue
-                "Disk write throughput [KB/s]" -> state.diskWrite = parser.doubleValue
-                "Network received throughput [KB/s]" -> state.netReceived = parser.doubleValue
-                "Network transmitted throughput [KB/s]" -> state.netTransmitted = parser.doubleValue
+                "Timestamp [ms]" -> {
+                    timestamp = when (timestampType) {
+                        TimestampType.UNDECIDED -> {
+                            try {
+                                val res = LocalDateTime.parse(parser.text, formatter).toInstant(ZoneOffset.UTC)
+                                timestampType = TimestampType.DATE_TIME
+                                res
+                            } catch (e: DateTimeParseException) {
+                                timestampType = TimestampType.EPOCH_MILLIS
+                                Instant.ofEpochSecond(parser.longValue)
+                            }
+                        }
+                        TimestampType.DATE_TIME -> LocalDateTime.parse(parser.text, formatter).toInstant(ZoneOffset.UTC)
+                        TimestampType.EPOCH_MILLIS -> Instant.ofEpochSecond(parser.longValue)
+                    }
+                }
+                "CPU cores" -> cpuCores = parser.intValue
+                "CPU capacity provisioned [MHZ]" -> cpuCapacity = parseSafeDouble()
+                "CPU usage [MHZ]" -> cpuUsage = parseSafeDouble()
+                "CPU usage [%]" -> cpuUsagePct = parseSafeDouble() / 100.0 // Convert to range [0, 1]
+                "Memory capacity provisioned [KB]" -> memCapacity = parseSafeDouble()
+                "Memory usage [KB]" -> memUsage = parseSafeDouble()
+                "Disk read throughput [KB/s]" -> diskRead = parseSafeDouble()
+                "Disk write throughput [KB/s]" -> diskWrite = parseSafeDouble()
+                "Network received throughput [KB/s]" -> netReceived = parseSafeDouble()
+                "Network transmitted throughput [KB/s]" -> netTransmitted = parseSafeDouble()
             }
         }
 
@@ -95,17 +132,17 @@ internal class BitbrainsResourceStateTableReader(private val partition: String,
     override fun <T> get(column: TableColumn<T>): T {
         val res: Any? = when (column) {
             RESOURCE_STATE_ID -> partition
-            RESOURCE_STATE_TIMESTAMP -> state.timestamp
-            RESOURCE_STATE_NCPUS -> state.cpuCores
-            RESOURCE_STATE_CPU_CAPACITY -> state.cpuCapacity
-            RESOURCE_STATE_CPU_USAGE -> state.cpuUsage
-            RESOURCE_STATE_CPU_USAGE_PCT -> state.cpuUsagePct
-            RESOURCE_STATE_MEM_CAPACITY -> state.memCapacity
-            RESOURCE_STATE_MEM_USAGE -> state.memUsage
-            RESOURCE_STATE_DISK_READ -> state.diskRead
-            RESOURCE_STATE_DISK_WRITE -> state.diskWrite
-            RESOURCE_STATE_NET_RX -> state.netReceived
-            RESOURCE_STATE_NET_TX -> state.netTransmitted
+            RESOURCE_STATE_TIMESTAMP -> timestamp
+            RESOURCE_STATE_NCPUS -> cpuCores
+            RESOURCE_STATE_CPU_CAPACITY -> cpuCapacity
+            RESOURCE_STATE_CPU_USAGE -> cpuUsage
+            RESOURCE_STATE_CPU_USAGE_PCT -> cpuUsagePct
+            RESOURCE_STATE_MEM_CAPACITY -> memCapacity
+            RESOURCE_STATE_MEM_USAGE -> memUsage
+            RESOURCE_STATE_DISK_READ -> diskRead
+            RESOURCE_STATE_DISK_WRITE -> diskWrite
+            RESOURCE_STATE_NET_RX -> netReceived
+            RESOURCE_STATE_NET_TX -> netTransmitted
             else -> throw IllegalArgumentException("Invalid column")
         }
 
@@ -119,7 +156,7 @@ internal class BitbrainsResourceStateTableReader(private val partition: String,
 
     override fun getInt(column: TableColumn<Int>): Int {
         return when (column) {
-            RESOURCE_STATE_NCPUS -> state.cpuCores
+            RESOURCE_STATE_NCPUS -> cpuCores
             else -> throw IllegalArgumentException("Invalid column")
         }
     }
@@ -130,15 +167,15 @@ internal class BitbrainsResourceStateTableReader(private val partition: String,
 
     override fun getDouble(column: TableColumn<Double>): Double {
         return when (column) {
-            RESOURCE_STATE_CPU_CAPACITY -> state.cpuCapacity
-            RESOURCE_STATE_CPU_USAGE -> state.cpuUsage
-            RESOURCE_STATE_CPU_USAGE_PCT -> state.cpuUsagePct
-            RESOURCE_STATE_MEM_CAPACITY -> state.memCapacity
-            RESOURCE_STATE_MEM_USAGE -> state.memUsage
-            RESOURCE_STATE_DISK_READ -> state.diskRead
-            RESOURCE_STATE_DISK_WRITE -> state.diskWrite
-            RESOURCE_STATE_NET_RX -> state.netReceived
-            RESOURCE_STATE_NET_TX -> state.netTransmitted
+            RESOURCE_STATE_CPU_CAPACITY -> cpuCapacity
+            RESOURCE_STATE_CPU_USAGE -> cpuUsage
+            RESOURCE_STATE_CPU_USAGE_PCT -> cpuUsagePct
+            RESOURCE_STATE_MEM_CAPACITY -> memCapacity
+            RESOURCE_STATE_MEM_USAGE -> memUsage
+            RESOURCE_STATE_DISK_READ -> diskRead
+            RESOURCE_STATE_DISK_WRITE -> diskWrite
+            RESOURCE_STATE_NET_RX -> netReceived
+            RESOURCE_STATE_NET_TX -> netTransmitted
             else -> throw IllegalArgumentException("Invalid column")
         }
     }
@@ -161,37 +198,62 @@ internal class BitbrainsResourceStateTableReader(private val partition: String,
     }
 
     /**
-     * The current row state.
+     * Try to parse the current value safely as double.
      */
-    private class RowState {
-        var timestamp: Instant? = null
-        var cpuCores = -1
-        var cpuCapacity = Double.NaN
-        var cpuUsage = Double.NaN
-        var cpuUsagePct = Double.NaN
-        var memCapacity = Double.NaN
-        var memUsage = Double.NaN
-        var diskRead = Double.NaN
-        var diskWrite = Double.NaN
-        var netReceived = Double.NaN
-        var netTransmitted = Double.NaN
+    private fun parseSafeDouble(): Double {
+        if (!usesCommaDecimalSeparator) {
+            try {
+                return parser.doubleValue
+            } catch (e: JsonParseException) {
+                usesCommaDecimalSeparator = true
+            }
+        }
 
-        /**
-         * Reset the state.
-         */
-        fun reset() {
-            timestamp = null
-            cpuCores = -1
-            cpuCapacity = Double.NaN
-            cpuUsage = Double.NaN
-            cpuUsagePct = Double.NaN
-            memCapacity = Double.NaN
-            memUsage = Double.NaN
-            diskRead = Double.NaN
-            diskWrite = Double.NaN
-            netReceived = Double.NaN
-            netTransmitted = Double.NaN
+        val text = parser.text
+        if (text.isBlank()) {
+            return 0.0
         }
+
+        return nf.parse(text).toDouble()
+    }
+
+    /**
+     * State fields of the reader.
+     */
+    private var timestamp: Instant? = null
+    private var cpuCores = -1
+    private var cpuCapacity = Double.NaN
+    private var cpuUsage = Double.NaN
+    private var cpuUsagePct = Double.NaN
+    private var memCapacity = Double.NaN
+    private var memUsage = Double.NaN
+    private var diskRead = Double.NaN
+    private var diskWrite = Double.NaN
+    private var netReceived = Double.NaN
+    private var netTransmitted = Double.NaN
+
+    /**
+     * Reset the state.
+     */
+    private fun reset() {
+        timestamp = null
+        cpuCores = -1
+        cpuCapacity = Double.NaN
+        cpuUsage = Double.NaN
+        cpuUsagePct = Double.NaN
+        memCapacity = Double.NaN
+        memUsage = Double.NaN
+        diskRead = Double.NaN
+        diskWrite = Double.NaN
+        netReceived = Double.NaN
+        netTransmitted = Double.NaN
+    }
+
+    /**
+     * The type of the timestamp in the trace.
+     */
+    private enum class TimestampType {
+        UNDECIDED, DATE_TIME, EPOCH_MILLIS
     }
 
     companion object {
@@ -199,15 +261,17 @@ internal class BitbrainsResourceStateTableReader(private val partition: String,
          * The [CsvSchema] that is used to parse the trace.
          */
         private val schema = CsvSchema.builder()
-            .addColumn("Timestamp [ms]", CsvSchema.ColumnType.NUMBER)
+            .addColumn("Timestamp [ms]", CsvSchema.ColumnType.NUMBER_OR_STRING)
             .addColumn("CPU cores", CsvSchema.ColumnType.NUMBER)
             .addColumn("CPU capacity provisioned [MHZ]", CsvSchema.ColumnType.NUMBER)
             .addColumn("CPU usage [MHZ]", CsvSchema.ColumnType.NUMBER)
             .addColumn("CPU usage [%]", CsvSchema.ColumnType.NUMBER)
             .addColumn("Memory capacity provisioned [KB]", CsvSchema.ColumnType.NUMBER)
             .addColumn("Memory usage [KB]", CsvSchema.ColumnType.NUMBER)
+            .addColumn("Memory usage [%]", CsvSchema.ColumnType.NUMBER)
             .addColumn("Disk read throughput [KB/s]", CsvSchema.ColumnType.NUMBER)
             .addColumn("Disk write throughput [KB/s]", CsvSchema.ColumnType.NUMBER)
+            .addColumn("Disk size [GB]", CsvSchema.ColumnType.NUMBER)
             .addColumn("Network received throughput [KB/s]", CsvSchema.ColumnType.NUMBER)
             .addColumn("Network transmitted throughput [KB/s]", CsvSchema.ColumnType.NUMBER)
             .setAllowComments(true)
diff --git a/opendc-trace/opendc-trace-bitbrains/src/main/kotlin/org/opendc/trace/bitbrains/BitbrainsResourceTable.kt b/opendc-trace/opendc-trace-bitbrains/src/main/kotlin/org/opendc/trace/bitbrains/BitbrainsResourceTable.kt
new file mode 100644
index 00000000..bc4f0b7d
--- /dev/null
+++ b/opendc-trace/opendc-trace-bitbrains/src/main/kotlin/org/opendc/trace/bitbrains/BitbrainsResourceTable.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2021 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.trace.bitbrains
+
+import com.fasterxml.jackson.dataformat.csv.CsvFactory
+import org.opendc.trace.*
+import java.nio.file.Files
+import java.nio.file.Path
+import java.util.stream.Collectors
+import kotlin.io.path.extension
+import kotlin.io.path.nameWithoutExtension
+
+/**
+ * The resources [Table] in the Bitbrains format.
+ */
+internal class BitbrainsResourceTable(private val factory: CsvFactory, path: Path) : Table {
+    /**
+     * The VMs that belong to the table.
+     */
+    private val vms =
+        Files.walk(path, 1)
+            .filter { !Files.isDirectory(it) && it.extension == "csv" }
+            .collect(Collectors.toMap({ it.nameWithoutExtension }, { it }))
+            .toSortedMap()
+
+    override val name: String = TABLE_RESOURCES
+
+    override val isSynthetic: Boolean = true
+
+    override val columns: List<TableColumn<*>> = listOf(RESOURCE_ID)
+
+    override fun newReader(): TableReader {
+        return BitbrainsResourceTableReader(factory, vms)
+    }
+
+    override fun newReader(partition: String): TableReader {
+        throw IllegalArgumentException("Unknown partition $partition")
+    }
+
+    override fun toString(): String = "BitbrainsResourceTable"
+}
diff --git a/opendc-trace/opendc-trace-bitbrains/src/main/kotlin/org/opendc/trace/bitbrains/BitbrainsResourceTableReader.kt b/opendc-trace/opendc-trace-bitbrains/src/main/kotlin/org/opendc/trace/bitbrains/BitbrainsResourceTableReader.kt
new file mode 100644
index 00000000..c02dc5ae
--- /dev/null
+++ b/opendc-trace/opendc-trace-bitbrains/src/main/kotlin/org/opendc/trace/bitbrains/BitbrainsResourceTableReader.kt
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2021 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.trace.bitbrains
+
+import com.fasterxml.jackson.dataformat.csv.CsvFactory
+import org.opendc.trace.*
+import java.nio.file.Path
+
+/**
+ * A [TableReader] for the Bitbrains resource table.
+ */
+internal class BitbrainsResourceTableReader(private val factory: CsvFactory, vms: Map<String, Path>) : TableReader {
+    /**
+     * An iterator to iterate over the resource entries.
+     */
+    private val it = vms.iterator()
+
+    override fun nextRow(): Boolean {
+        reset()
+
+        while (it.hasNext()) {
+            val (name, path) = it.next()
+
+            val parser = factory.createParser(path.toFile())
+            val reader = BitbrainsResourceStateTableReader(name, parser)
+
+            try {
+                if (!reader.nextRow()) {
+                    continue
+                }
+
+                id = reader.get(RESOURCE_STATE_ID)
+                return true
+            } finally {
+                reader.close()
+            }
+        }
+
+        return false
+    }
+
+    override fun hasColumn(column: TableColumn<*>): Boolean {
+        return when (column) {
+            RESOURCE_ID -> true
+            else -> false
+        }
+    }
+
+    override fun <T> get(column: TableColumn<T>): T {
+        val res: Any? = when (column) {
+            RESOURCE_ID -> id
+            else -> throw IllegalArgumentException("Invalid column")
+        }
+
+        @Suppress("UNCHECKED_CAST")
+        return res as T
+    }
+
+    override fun getBoolean(column: TableColumn<Boolean>): Boolean {
+        throw IllegalArgumentException("Invalid column")
+    }
+
+    override fun getInt(column: TableColumn<Int>): Int {
+        throw IllegalArgumentException("Invalid column")
+    }
+
+    override fun getLong(column: TableColumn<Long>): Long {
+        throw IllegalArgumentException("Invalid column")
+    }
+
+    override fun getDouble(column: TableColumn<Double>): Double {
+        throw IllegalArgumentException("Invalid column")
+    }
+
+    override fun close() {}
+
+    /**
+     * State fields of the reader.
+     */
+    private var id: String? = null
+
+    /**
+     * Reset the state of the reader.
+     */
+    private fun reset() {
+        id = null
+    }
+}
diff --git a/opendc-trace/opendc-trace-bitbrains/src/main/kotlin/org/opendc/trace/bitbrains/BitbrainsTrace.kt b/opendc-trace/opendc-trace-bitbrains/src/main/kotlin/org/opendc/trace/bitbrains/BitbrainsTrace.kt
index 5a2d4243..bcd8dd52 100644
--- a/opendc-trace/opendc-trace-bitbrains/src/main/kotlin/org/opendc/trace/bitbrains/BitbrainsTrace.kt
+++ b/opendc-trace/opendc-trace-bitbrains/src/main/kotlin/org/opendc/trace/bitbrains/BitbrainsTrace.kt
@@ -30,16 +30,16 @@ import java.nio.file.Path
  * [Trace] implementation for the Bitbrains format.
  */
 public class BitbrainsTrace internal constructor(private val factory: CsvFactory, private val path: Path) : Trace {
-    override val tables: List<String> = listOf(TABLE_RESOURCE_STATES)
+    override val tables: List<String> = listOf(TABLE_RESOURCES, TABLE_RESOURCE_STATES)
 
-    override fun containsTable(name: String): Boolean = TABLE_RESOURCE_STATES == name
+    override fun containsTable(name: String): Boolean = tables.contains(name)
 
     override fun getTable(name: String): Table? {
-        if (!containsTable(name)) {
-            return null
+        return when (name) {
+            TABLE_RESOURCES -> BitbrainsResourceTable(factory, path)
+            TABLE_RESOURCE_STATES -> BitbrainsResourceStateTable(factory, path)
+            else -> null
         }
-
-        return BitbrainsResourceStateTable(factory, path)
     }
 
     override fun toString(): String = "BitbrainsTrace[$path]"
diff --git a/opendc-trace/opendc-trace-bitbrains/src/test/kotlin/org/opendc/trace/bitbrains/BitbrainsTraceFormatTest.kt b/opendc-trace/opendc-trace-bitbrains/src/test/kotlin/org/opendc/trace/bitbrains/BitbrainsTraceFormatTest.kt
index 550805d3..ff4a33f8 100644
--- a/opendc-trace/opendc-trace-bitbrains/src/test/kotlin/org/opendc/trace/bitbrains/BitbrainsTraceFormatTest.kt
+++ b/opendc-trace/opendc-trace-bitbrains/src/test/kotlin/org/opendc/trace/bitbrains/BitbrainsTraceFormatTest.kt
@@ -25,9 +25,7 @@ package org.opendc.trace.bitbrains
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
-import org.opendc.trace.RESOURCE_STATE_CPU_USAGE
-import org.opendc.trace.RESOURCE_STATE_TIMESTAMP
-import org.opendc.trace.TABLE_RESOURCE_STATES
+import org.opendc.trace.*
 import java.net.URL
 
 /**
@@ -58,7 +56,7 @@ class BitbrainsTraceFormatTest {
         val url = checkNotNull(BitbrainsTraceFormatTest::class.java.getResource("/bitbrains.csv"))
         val trace = format.open(url)
 
-        assertEquals(listOf(TABLE_RESOURCE_STATES), trace.tables)
+        assertEquals(listOf(TABLE_RESOURCES, TABLE_RESOURCE_STATES), trace.tables)
     }
 
     @Test
@@ -82,6 +80,23 @@ class BitbrainsTraceFormatTest {
     }
 
     @Test
+    fun testResources() {
+        val format = BitbrainsTraceFormat()
+        val url = checkNotNull(BitbrainsTraceFormatTest::class.java.getResource("/bitbrains.csv"))
+        val trace = format.open(url)
+
+        val reader = trace.getTable(TABLE_RESOURCES)!!.newReader()
+
+        assertAll(
+            { assertTrue(reader.nextRow()) },
+            { assertEquals("bitbrains", reader.get(RESOURCE_ID)) },
+            { assertFalse(reader.nextRow()) }
+        )
+
+        reader.close()
+    }
+
+    @Test
     fun testSmoke() {
         val format = BitbrainsTraceFormat()
         val url = checkNotNull(BitbrainsTraceFormatTest::class.java.getResource("/bitbrains.csv"))