fix: support full live meter config

Author: BFergerson

src/main/kotlin/spp/protocol/instrument/LiveBreakpoint.kt

@@ -18,6 +18,7 @@ package spp.protocol.instrument
 
 import io.vertx.codegen.annotations.DataObject
 import io.vertx.core.Vertx
+import io.vertx.core.json.JsonArray
 import io.vertx.core.json.JsonObject
 import spp.protocol.instrument.event.LiveBreakpointHit
 import spp.protocol.instrument.event.LiveInstrumentEvent
@@ -60,7 +61,13 @@ data class LiveBreakpoint(
         applied = json.getBoolean("applied") ?: false,
         pending = json.getBoolean("pending") ?: false,
         throttle = json.getJsonObject("throttle")?.let { InstrumentThrottle(it) } ?: InstrumentThrottle.DEFAULT,
-        meta = json.getJsonObject("meta")?.associate { it.key to it.value } ?: emptyMap()
+        meta = json.getValue("meta")?.let {
+            if (it is JsonObject) {
+                it.associate { it.key to it.value }
+            } else {
+                toJsonMap(it as JsonArray)
+            }
+        } ?: emptyMap()
     )
 
     override fun toJson(): JsonObject {

src/main/kotlin/spp/protocol/instrument/LiveInstrument.kt

@@ -17,6 +17,7 @@
 package spp.protocol.instrument
 
 import io.vertx.core.Vertx
+import io.vertx.core.json.JsonArray
 import io.vertx.core.json.JsonObject
 import spp.protocol.instrument.event.LiveInstrumentEvent
 import spp.protocol.instrument.location.LiveSourceLocation
@@ -39,7 +40,7 @@ sealed class LiveInstrument {
     abstract val applyImmediately: Boolean
     abstract val applied: Boolean
     abstract val pending: Boolean
-    abstract val throttle: InstrumentThrottle?
+    abstract val throttle: InstrumentThrottle
     abstract val meta: Map<String, Any>
 
     override fun equals(other: Any?): Boolean {
@@ -88,5 +89,15 @@ sealed class LiveInstrument {
                 LiveInstrumentType.METER -> LiveMeter(json)
             }
         }
+
+        internal fun toJsonMap(metaArray: JsonArray?): Map<String, Any> {
+            val meta = mutableMapOf<String, String>()
+            val metaOb = metaArray ?: JsonArray()
+            for (i in 0 until metaOb.size()) {
+                val metaInfoOb = metaOb.getJsonObject(i)
+                meta[metaInfoOb.getString("name")] = metaInfoOb.getString("value")
+            }
+            return meta
+        }
     }
 }

src/main/kotlin/spp/protocol/instrument/LiveLog.kt

@@ -57,7 +57,13 @@ data class LiveLog(
         applied = json.getBoolean("applied") ?: false,
         pending = json.getBoolean("pending") ?: false,
         throttle = json.getJsonObject("throttle")?.let { InstrumentThrottle(it) } ?: InstrumentThrottle.DEFAULT,
-        meta = json.getJsonObject("meta")?.associate { it.key to it.value } ?: emptyMap()
+        meta = json.getValue("meta")?.let {
+            if (it is JsonObject) {
+                it.associate { it.key to it.value }
+            } else {
+                toJsonMap(it as JsonArray)
+            }
+        } ?: emptyMap()
     )
 
     override fun toJson(): JsonObject {

src/main/kotlin/spp/protocol/instrument/LiveMeter.kt

@@ -35,8 +35,8 @@ import spp.protocol.instrument.throttle.InstrumentThrottle
 data class LiveMeter(
     val meterType: MeterType,
     val metricValue: MetricValue? = null,
-    val meterTags: List<MeterTag> = emptyList(),
-    val meterPartitions: List<MeterPartition> = emptyList(),
+    val meterTags: List<MeterTag> = emptyList(), //todo: rename to tags
+    val meterPartitions: List<MeterPartition> = emptyList(), //todo: rename to partitions
     override val location: LiveSourceLocation,
     override val condition: String? = null,
     override val expiresAt: Long? = null,
@@ -45,7 +45,7 @@ data class LiveMeter(
     override val applyImmediately: Boolean = false,
     override val applied: Boolean = false,
     override val pending: Boolean = false,
-    override val throttle: InstrumentThrottle? = null,
+    override val throttle: InstrumentThrottle = InstrumentThrottle.NONE,
     override val meta: Map<String, Any> = emptyMap()
 ) : LiveInstrument() {
     override val type: LiveInstrumentType = LiveInstrumentType.METER
@@ -77,8 +77,14 @@ data class LiveMeter(
         applyImmediately = json.getBoolean("applyImmediately") ?: false,
         applied = json.getBoolean("applied") ?: false,
         pending = json.getBoolean("pending") ?: false,
-        throttle = json.getJsonObject("throttle")?.let { InstrumentThrottle(it) },
-        meta = json.getJsonObject("meta")?.associate { it.key to it.value } ?: emptyMap()
+        throttle = json.getJsonObject("throttle")?.let { InstrumentThrottle(it) } ?: InstrumentThrottle.NONE,
+        meta = json.getValue("meta")?.let {
+            if (it is JsonObject) {
+                it.associate { it.key to it.value }
+            } else {
+                toJsonMap(it as JsonArray)
+            }
+        } ?: emptyMap()
     )
 
     override fun toJson(): JsonObject {
@@ -96,7 +102,7 @@ data class LiveMeter(
         json.put("applyImmediately", applyImmediately)
         json.put("applied", applied)
         json.put("pending", pending)
-        json.put("throttle", throttle?.toJson())
+        json.put("throttle", throttle.toJson())
         json.put("meta", JsonObject(meta))
         return json
     }

src/main/kotlin/spp/protocol/instrument/LiveSpan.kt

@@ -17,6 +17,7 @@
 package spp.protocol.instrument
 
 import io.vertx.codegen.annotations.DataObject
+import io.vertx.core.json.JsonArray
 import io.vertx.core.json.JsonObject
 import spp.protocol.instrument.location.LiveSourceLocation
 import spp.protocol.instrument.throttle.InstrumentThrottle
@@ -37,7 +38,7 @@ data class LiveSpan(
     override val applyImmediately: Boolean = false,
     override val applied: Boolean = false,
     override val pending: Boolean = false,
-    override val throttle: InstrumentThrottle? = null,
+    override val throttle: InstrumentThrottle = InstrumentThrottle.DEFAULT,
     override val meta: Map<String, Any> = emptyMap()
 ) : LiveInstrument() {
     override val type: LiveInstrumentType = LiveInstrumentType.SPAN
@@ -52,8 +53,14 @@ data class LiveSpan(
         applyImmediately = json.getBoolean("applyImmediately") ?: false,
         applied = json.getBoolean("applied") ?: false,
         pending = json.getBoolean("pending") ?: false,
-        throttle = json.getJsonObject("throttle")?.let { InstrumentThrottle(it) },
-        meta = json.getJsonObject("meta")?.associate { it.key to it.value } ?: emptyMap()
+        throttle = json.getJsonObject("throttle")?.let { InstrumentThrottle(it) } ?: InstrumentThrottle.DEFAULT,
+        meta = json.getValue("meta")?.let {
+            if (it is JsonObject) {
+                it.associate { it.key to it.value }
+            } else {
+                toJsonMap(it as JsonArray)
+            }
+        } ?: emptyMap()
     )
 
     override fun toJson(): JsonObject {
@@ -68,7 +75,7 @@ data class LiveSpan(
         json.put("applyImmediately", applyImmediately)
         json.put("applied", applied)
         json.put("pending", pending)
-        json.put("throttle", throttle?.toJson())
+        json.put("throttle", throttle.toJson())
         json.put("meta", JsonObject(meta))
         return json
     }