Bug 1983858 - Implement ObjectSerialize recursively

glean-core/android/src/main/java/mozilla/telemetry/glean/private/ObjectMetricType.kt

@@ -20,6 +20,12 @@ interface ObjectSerialize {
     fun intoSerializedObject(): String
 }
 
+fun Boolean.intoSerializedObject(): String = Json.encodeToString(this)
+
+fun Int.intoSerializedObject(): String = Json.encodeToString(this)
+
+fun String.intoSerializedObject(): String = Json.encodeToString(this)
+
 /**
  * This implements the developer facing API for the object metric type.
  *

glean-core/android/src/test/java/mozilla/telemetry/glean/private/ObjectMetricTypeTest.kt

@@ -19,7 +19,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@Serializable
 data class BalloonsObject(
     var items: MutableList<BalloonsObjectItem> = mutableListOf(),
 ) : ObjectSerialize {
@@ -40,14 +39,50 @@ data class BalloonsObject(
         element: BalloonsObjectItem,
     ) = items.set(index, element)
 
-    override fun intoSerializedObject(): String = Json.encodeToString(items)
+    override fun intoSerializedObject(): String {
+        var json = buildString {
+            append("[")
+            var first = true
+            for (item in items) {
+                if (!first) {
+                    append(",")
+                }
+                first = false
+                append(item.intoSerializedObject())
+            }
+            append("]")
+        }
+        return json
+    }
 }
 
-@Serializable
 data class BalloonsObjectItem(
     var colour: String? = null,
     var diameter: Int? = null,
-)
+) : ObjectSerialize {
+    override fun intoSerializedObject(): String {
+        var data: MutableList<String> = mutableListOf()
+        this.colour?.let { colour ->
+            val elem = buildString {
+                append("\"colour\":")
+                append(colour.intoSerializedObject())
+            }
+            data.add(elem)
+        }
+        this.diameter?.let { diameter ->
+            val elem = buildString {
+                append("\"diameter\":")
+                append(diameter.intoSerializedObject())
+            }
+            data.add(elem)
+        }
+        return buildString {
+            append("{")
+            append(data.joinToString(","))
+            append("}")
+        }
+    }
+}
 
 @RunWith(AndroidJUnit4::class)
 class ObjectMetricTypeTest {

glean-core/ios/Glean/Metrics/ObjectMetric.swift

@@ -5,11 +5,27 @@
 /// An object that can be serialized into JSON.
 ///
 /// Objects are defined by their structure in the metrics definition.
-public protocol ObjectSerialize: Codable, Decodable {
+public protocol ObjectSerialize: Decodable {
     func intoSerializedObject() -> String
 }
 
-extension Array: ObjectSerialize where Element: Codable {
+extension Array: ObjectSerialize where Element: ObjectSerialize {
+    public func intoSerializedObject() -> String {
+        var json = "["
+        var first = true
+        for elem in self {
+            if !first {
+                json.append(",")
+            }
+            first = false
+            json.append(elem.intoSerializedObject())
+        }
+        json.append("]")
+        return json
+    }
+}
+
+extension String: ObjectSerialize {
     public func intoSerializedObject() -> String {
         let jsonEncoder = JSONEncoder()
         let jsonData = try! jsonEncoder.encode(self)
@@ -18,6 +34,18 @@ extension Array: ObjectSerialize where Element: Codable {
     }
 }
 
+extension Bool: ObjectSerialize {
+    public func intoSerializedObject() -> String {
+        return self ? "true" : "false"
+    }
+}
+
+extension Int64: ObjectSerialize {
+    public func intoSerializedObject() -> String {
+        return String(self)
+    }
+}
+
 /// This implements the developer facing API for the object metric type.
 ///
 /// Instances of this class type are automatically generated by the parsers at built time,

glean-core/ios/GleanTests/Metrics/ObjectMetricTests.swift

@@ -5,9 +5,26 @@
 @testable import Glean
 import XCTest
 
-struct BalloonsObjectItem: Codable, Equatable {
+struct BalloonsObjectItem: Decodable, Equatable, ObjectSerialize {
     var colour: String?
-    var diameter: Int?
+    var diameter: Int64?
+
+    func intoSerializedObject() -> String {
+        var data: [String] = []
+        if let val = self.colour {
+            var elem = "\"colour\":"
+            elem.append(val.intoSerializedObject())
+            data.append(elem)
+        }
+        if let val = self.diameter {
+            var elem = "\"diameter\":"
+            elem.append(val.intoSerializedObject())
+            data.append(elem)
+        }
+        let obj = data.joined(separator: ",")
+        let json = "{" + obj + "}"
+        return json
+    }
 }
 
 typealias BalloonsObject = [BalloonsObjectItem]