RUM-12047: Sending same properties that is being sent for the rest events

Author: satween

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumEventExt.kt

@@ -350,6 +350,43 @@ internal fun NetworkInfo.toActionConnectivity(): ActionEvent.Connectivity {
     )
 }
 
+internal fun NetworkInfo.toVitalConnectivity(): VitalEvent.Connectivity {
+    val status = if (isConnected()) {
+        VitalEvent.Status.CONNECTED
+    } else {
+        VitalEvent.Status.NOT_CONNECTED
+    }
+    val interfaces = when (connectivity) {
+        NetworkInfo.Connectivity.NETWORK_ETHERNET -> listOf(VitalEvent.Interface.ETHERNET)
+        NetworkInfo.Connectivity.NETWORK_WIFI -> listOf(VitalEvent.Interface.WIFI)
+        NetworkInfo.Connectivity.NETWORK_WIMAX -> listOf(VitalEvent.Interface.WIMAX)
+        NetworkInfo.Connectivity.NETWORK_BLUETOOTH -> listOf(VitalEvent.Interface.BLUETOOTH)
+        NetworkInfo.Connectivity.NETWORK_2G,
+        NetworkInfo.Connectivity.NETWORK_3G,
+        NetworkInfo.Connectivity.NETWORK_4G,
+        NetworkInfo.Connectivity.NETWORK_5G,
+        NetworkInfo.Connectivity.NETWORK_MOBILE_OTHER,
+        NetworkInfo.Connectivity.NETWORK_CELLULAR -> listOf(VitalEvent.Interface.CELLULAR)
+
+        NetworkInfo.Connectivity.NETWORK_OTHER -> listOf(VitalEvent.Interface.OTHER)
+        NetworkInfo.Connectivity.NETWORK_NOT_CONNECTED -> emptyList()
+    }
+
+    val cellular = if (cellularTechnology != null || carrierName != null) {
+        VitalEvent.Cellular(
+            technology = cellularTechnology,
+            carrierName = carrierName
+        )
+    } else {
+        null
+    }
+    return VitalEvent.Connectivity(
+        status,
+        interfaces,
+        cellular = cellular
+    )
+}
+
 internal fun NetworkInfo.isConnected(): Boolean {
     return connectivity != NetworkInfo.Connectivity.NETWORK_NOT_CONNECTED
 }
@@ -418,6 +455,18 @@ internal fun DeviceType.toErrorSchemaType(): ErrorEvent.DeviceType {
     }
 }
 
+internal fun DeviceType.toVitalSchemaType(): VitalEvent.DeviceType {
+    return when (this) {
+        DeviceType.MOBILE -> VitalEvent.DeviceType.MOBILE
+        DeviceType.TABLET -> VitalEvent.DeviceType.TABLET
+        DeviceType.TV -> VitalEvent.DeviceType.TV
+        DeviceType.DESKTOP -> VitalEvent.DeviceType.DESKTOP
+        DeviceType.GAMING_CONSOLE -> VitalEvent.DeviceType.GAMING_CONSOLE
+        DeviceType.BOT -> VitalEvent.DeviceType.BOT
+        DeviceType.OTHER -> VitalEvent.DeviceType.OTHER
+    }
+}
+
 // endregion
 
 // region Source
@@ -507,6 +556,23 @@ internal fun ResourceEvent.ResourceEventSource.Companion.tryFromSource(
     }
 }
 
+internal fun VitalEvent.VitalEventSource.Companion.tryFromSource(
+    source: String,
+    internalLogger: InternalLogger
+): VitalEvent.VitalEventSource? {
+    return try {
+        fromJson(source)
+    } catch (e: NoSuchElementException) {
+        internalLogger.log(
+            InternalLogger.Level.ERROR,
+            InternalLogger.Target.USER,
+            { UNKNOWN_SOURCE_WARNING_MESSAGE_FORMAT.format(Locale.US, source) },
+            e
+        )
+        null
+    }
+}
+
 internal const val UNKNOWN_SOURCE_WARNING_MESSAGE_FORMAT = "You are using an unknown " +
     "source %s for your events"
 

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScope.kt

@@ -326,6 +326,9 @@ internal open class RumViewScope(
             syntheticsAttribute == null -> VitalEvent.VitalEventSessionType.USER
             else -> VitalEvent.VitalEventSessionType.SYNTHETICS
         }
+        val batteryInfo = batteryInfoProvider.getState()
+        val displayInfo = displayInfoProvider.getState()
+        val user = datadogContext.userInfo
 
         return VitalEvent(
             date = event.eventTime.timestamp + serverTimeOffsetInMs,
@@ -355,6 +358,49 @@ internal open class RumViewScope(
                 name = rumContext.viewName,
                 url = rumContext.viewUrl.orEmpty()
             ),
+            source = VitalEvent.VitalEventSource.tryFromSource(
+                source = datadogContext.source,
+                internalLogger = sdkCore.internalLogger
+            ),
+            account = datadogContext.accountInfo?.let {
+                VitalEvent.Account(
+                    id = it.id,
+                    name = it.name,
+                    additionalProperties = it.extraInfo.toMutableMap()
+                )
+            },
+            usr = if (user.hasUserData()) {
+                VitalEvent.Usr(
+                    id = user.id,
+                    name = user.name,
+                    email = user.email,
+                    anonymousId = user.anonymousId,
+                    additionalProperties = user.additionalProperties.toMutableMap()
+                )
+            } else {
+                null
+            },
+            device = VitalEvent.Device(
+                type = datadogContext.deviceInfo.deviceType.toVitalSchemaType(),
+                name = datadogContext.deviceInfo.deviceName,
+                model = datadogContext.deviceInfo.deviceModel,
+                brand = datadogContext.deviceInfo.deviceBrand,
+                architecture = datadogContext.deviceInfo.architecture,
+                locales = datadogContext.deviceInfo.localeInfo.locales,
+                timeZone = datadogContext.deviceInfo.localeInfo.timeZone,
+                batteryLevel = batteryInfo.batteryLevel,
+                powerSavingMode = batteryInfo.lowPowerMode,
+                brightnessLevel = displayInfo.screenBrightness
+            ),
+            os = VitalEvent.Os(
+                name = datadogContext.deviceInfo.osName,
+                version = datadogContext.deviceInfo.osVersion,
+                versionMajor = datadogContext.deviceInfo.osMajorVersion
+            ),
+            connectivity = datadogContext.networkInfo.toVitalConnectivity(),
+            version = datadogContext.version,
+            service = datadogContext.service,
+            ddtags = buildDDTagsString(datadogContext),
             vital = VitalEvent.VitalEventVital(
                 id = UUID.randomUUID().toString(),
                 name = name,