Move log device.architecture member under dd

DataDog · Nov 15, 2022 · 2de7fa4 · 2de7fa4
1 parent 106c418
commit 2de7fa4
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 18 deletions.
diff --git a/dd-sdk-android/apiSurface b/dd-sdk-android/apiSurface
@@ -239,7 +239,7 @@ class com.datadog.android.log.Logger
   fun removeTag(String)
   fun removeTagsWithKey(String)
 data class com.datadog.android.log.model.LogEvent
-  constructor(Status, kotlin.String, kotlin.String, kotlin.String, Logger, Device, Usr? = null, Network? = null, Error? = null, kotlin.String, kotlin.collections.MutableMap<kotlin.String, kotlin.Any?> = mutableMapOf())
+  constructor(Status, kotlin.String, kotlin.String, kotlin.String, Logger, Dd, Usr? = null, Network? = null, Error? = null, kotlin.String, kotlin.collections.MutableMap<kotlin.String, kotlin.Any?> = mutableMapOf())
   fun toJson(): com.google.gson.JsonElement
   companion object 
     fun fromJson(kotlin.String): LogEvent
@@ -248,11 +248,11 @@ data class com.datadog.android.log.model.LogEvent
     fun toJson(): com.google.gson.JsonElement
     companion object 
       fun fromJson(kotlin.String): Logger
-  data class Device
-    constructor(kotlin.String)
+  data class Dd
+    constructor(Device)
     fun toJson(): com.google.gson.JsonElement
     companion object 
-      fun fromJson(kotlin.String): Device
+      fun fromJson(kotlin.String): Dd
   data class Usr
     constructor(kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.collections.MutableMap<kotlin.String, kotlin.Any?> = mutableMapOf())
     fun toJson(): com.google.gson.JsonElement
@@ -268,6 +268,11 @@ data class com.datadog.android.log.model.LogEvent
     fun toJson(): com.google.gson.JsonElement
     companion object 
       fun fromJson(kotlin.String): Error
+  data class Device
+    constructor(kotlin.String)
+    fun toJson(): com.google.gson.JsonElement
+    companion object 
+      fun fromJson(kotlin.String): Device
   data class Client
     constructor(SimCarrier? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String)
     fun toJson(): com.google.gson.JsonElement

diff --git a/dd-sdk-android/src/main/json/log/log-schema.json b/dd-sdk-android/src/main/json/log/log-schema.json
@@ -60,18 +60,28 @@
       ],
       "readOnly": true
     },
-    "device": {
+    "_dd": {
       "type": "object",
-      "description": "Information about the device that produced this log.",
+      "description": "Datadog internal information",
       "properties": {
-        "architecture": {
-          "type": "string",
-          "description": "The CPU architecture of the device",
+        "device": {
+          "type": "object",
+          "description": "Information about the device that produced this log.",
+          "properties": {
+            "architecture": {
+              "type": "string",
+              "description": "The CPU architecture of the device",
+              "readOnly": true
+            }
+          },
+          "required": [
+            "architecture"
+          ],
           "readOnly": true
         }
       },
       "required": [
-        "architecture"
+        "device"
       ],
       "readOnly": true
     },
@@ -182,7 +192,7 @@
     "date",
     "service",
     "logger",
-    "device",
+    "_dd",
     "ddtags"
   ],
   "additionalProperties": {

diff --git a/dd-sdk-android/src/main/kotlin/com/datadog/android/log/internal/domain/LogGenerator.kt b/dd-sdk-android/src/main/kotlin/com/datadog/android/log/internal/domain/LogGenerator.kt
@@ -97,8 +97,10 @@ internal class LogGenerator(
             date = formattedDate,
             error = error,
             logger = loggerInfo,
-            device = LogEvent.Device(
-                architecture = architecture
+            dd = LogEvent.Dd(
+                device = LogEvent.Device(
+                    architecture = architecture
+                )
             ),
             usr = usr,
             network = network,

diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/log/assertj/LogEventAssert.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/log/assertj/LogEventAssert.kt
@@ -102,9 +102,9 @@ internal class LogEventAssert(actual: LogEvent) :
     }
 
     fun hasDeviceArchitecture(expected: String): LogEventAssert {
-        assertThat(actual.device.architecture)
+        assertThat(actual.dd.device.architecture)
             .overridingErrorMessage(
-                "Expected device to have architecture $expected but was ${actual.device.architecture}"
+                "Expected device to have architecture $expected but was ${actual.dd.device.architecture}"
             )
             .isEqualTo(expected)
         return this

diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/LogEventForgeryFactory.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/LogEventForgeryFactory.kt
@@ -72,8 +72,10 @@ internal class LogEventForgeryFactory : ForgeryFactory<LogEvent> {
                 version = forge.aStringMatching("[0-9]\\.[0-9]\\.[0-9]"),
                 threadName = forge.aNullable { forge.anAlphabeticalString() }
             ),
-            device = LogEvent.Device(
-                architecture = forge.anAlphaNumericalString()
+            dd = LogEvent.Dd(
+                device = LogEvent.Device(
+                    architecture = forge.anAlphaNumericalString()
+                )
             )
         )
     }

diff --git a/...rumented/integration/src/main/kotlin/com/datadog/android/sdk/integration/RuntimeConfig.kt b/...rumented/integration/src/main/kotlin/com/datadog/android/sdk/integration/RuntimeConfig.kt
@@ -92,7 +92,7 @@ internal object RuntimeConfig {
 
     val stringAttributes = mapOf(
         "version_name" to BuildConfig.VERSION_NAME,
-        "device" to Build.DEVICE,
+        "build_device" to Build.DEVICE,
         "null_string" to null
     )