diff --git a/CHANGELOG.md b/CHANGELOG.md index 962690b950..977fb9797f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 1.14.1 / 2022-09-27 + +* [IMPROVEMENT] Global: Add CPU architecture to the collected device information. See [#1000](https://github.com/DataDog/dd-sdk-android/pull/1000) + # 1.14.0 / 2022-09-20 * [FEATURE] Global: Collect OS and device information instead of relying on User-Agent header. See [#945](https://github.com/DataDog/dd-sdk-android/pull/945) diff --git a/buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt b/buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt index ddf94e48b3..a81c9b72b8 100644 --- a/buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt +++ b/buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt @@ -17,7 +17,7 @@ object AndroidConfig { const val MIN_SDK_FOR_COMPOSE = 21 const val BUILD_TOOLS_VERSION = "31.0.0" - val VERSION = Version(1, 14, 0, Version.Type.Release) + val VERSION = Version(1, 14, 1, Version.Type.Release) } @Suppress("UnstableApiUsage") diff --git a/dd-sdk-android/apiSurface b/dd-sdk-android/apiSurface index 347a1e1b13..84b3415a77 100644 --- a/dd-sdk-android/apiSurface +++ b/dd-sdk-android/apiSurface @@ -452,7 +452,7 @@ data class com.datadog.android.rum.model.ActionEvent companion object fun fromJson(kotlin.String): Os data class Device - constructor(DeviceType, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null) + constructor(DeviceType, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null) fun toJson(): com.google.gson.JsonElement companion object fun fromJson(kotlin.String): Device @@ -625,7 +625,7 @@ data class com.datadog.android.rum.model.ErrorEvent companion object fun fromJson(kotlin.String): Os data class Device - constructor(DeviceType, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null) + constructor(DeviceType, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null) fun toJson(): com.google.gson.JsonElement companion object fun fromJson(kotlin.String): Device @@ -836,7 +836,7 @@ data class com.datadog.android.rum.model.LongTaskEvent companion object fun fromJson(kotlin.String): Os data class Device - constructor(DeviceType, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null) + constructor(DeviceType, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null) fun toJson(): com.google.gson.JsonElement companion object fun fromJson(kotlin.String): Device @@ -977,7 +977,7 @@ data class com.datadog.android.rum.model.ResourceEvent companion object fun fromJson(kotlin.String): Os data class Device - constructor(DeviceType, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null) + constructor(DeviceType, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null) fun toJson(): com.google.gson.JsonElement companion object fun fromJson(kotlin.String): Device @@ -1199,7 +1199,7 @@ data class com.datadog.android.rum.model.ViewEvent companion object fun fromJson(kotlin.String): Os data class Device - constructor(DeviceType, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null) + constructor(DeviceType, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null) fun toJson(): com.google.gson.JsonElement companion object fun fromJson(kotlin.String): Device diff --git a/dd-sdk-android/src/main/json/rum/_common-schema.json b/dd-sdk-android/src/main/json/rum/_common-schema.json index bc163b2379..ea6c5ac955 100644 --- a/dd-sdk-android/src/main/json/rum/_common-schema.json +++ b/dd-sdk-android/src/main/json/rum/_common-schema.json @@ -260,6 +260,11 @@ "type": "string", "description": "Device marketing brand, e.g. Apple, OPPO, Xiaomi, etc.", "readOnly": true + }, + "architecture": { + "type": "string", + "description": "The CPU architecture of the device that is reporting the error", + "readOnly": true } } }, diff --git a/dd-sdk-android/src/main/kotlin/com/datadog/android/core/internal/system/AndroidInfoProvider.kt b/dd-sdk-android/src/main/kotlin/com/datadog/android/core/internal/system/AndroidInfoProvider.kt index d4b10a62ca..7ddbb4eb4a 100644 --- a/dd-sdk-android/src/main/kotlin/com/datadog/android/core/internal/system/AndroidInfoProvider.kt +++ b/dd-sdk-android/src/main/kotlin/com/datadog/android/core/internal/system/AndroidInfoProvider.kt @@ -23,4 +23,6 @@ internal interface AndroidInfoProvider { val osMajorVersion: String val osVersion: String + + val architecture: String } diff --git a/dd-sdk-android/src/main/kotlin/com/datadog/android/core/internal/system/DefaultAndroidInfoProvider.kt b/dd-sdk-android/src/main/kotlin/com/datadog/android/core/internal/system/DefaultAndroidInfoProvider.kt index 6dca671f9b..08ee7cebbf 100644 --- a/dd-sdk-android/src/main/kotlin/com/datadog/android/core/internal/system/DefaultAndroidInfoProvider.kt +++ b/dd-sdk-android/src/main/kotlin/com/datadog/android/core/internal/system/DefaultAndroidInfoProvider.kt @@ -71,6 +71,11 @@ internal class DefaultAndroidInfoProvider( return osVersion.split('.').first() } + override val architecture: String + get() { + return System.getProperty("os.arch") ?: "unknown" + } + companion object { const val FEATURE_GOOGLE_ANDROID_TV = "com.google.android.tv" diff --git a/dd-sdk-android/src/main/kotlin/com/datadog/android/core/internal/system/NoOpAndroidInfoProvider.kt b/dd-sdk-android/src/main/kotlin/com/datadog/android/core/internal/system/NoOpAndroidInfoProvider.kt index b2100c1acc..dcff8e585e 100644 --- a/dd-sdk-android/src/main/kotlin/com/datadog/android/core/internal/system/NoOpAndroidInfoProvider.kt +++ b/dd-sdk-android/src/main/kotlin/com/datadog/android/core/internal/system/NoOpAndroidInfoProvider.kt @@ -15,4 +15,5 @@ internal class NoOpAndroidInfoProvider : AndroidInfoProvider { override val osName: String = "" override val osMajorVersion: String = "" override val osVersion: String = "" + override val architecture: String = "" } diff --git a/dd-sdk-android/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumActionScope.kt b/dd-sdk-android/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumActionScope.kt index 3fd057f620..e721fd675c 100644 --- a/dd-sdk-android/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumActionScope.kt +++ b/dd-sdk-android/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumActionScope.kt @@ -226,7 +226,8 @@ internal class RumActionScope( type = androidInfoProvider.deviceType.toActionSchemaType(), name = androidInfoProvider.deviceName, model = androidInfoProvider.deviceModel, - brand = androidInfoProvider.deviceBrand + brand = androidInfoProvider.deviceBrand, + architecture = androidInfoProvider.architecture ), context = ActionEvent.Context(additionalProperties = attributes), dd = ActionEvent.Dd(session = ActionEvent.DdSession(plan = ActionEvent.Plan.PLAN_1)) diff --git a/dd-sdk-android/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumResourceScope.kt b/dd-sdk-android/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumResourceScope.kt index d3d2097a71..3480613e06 100644 --- a/dd-sdk-android/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumResourceScope.kt +++ b/dd-sdk-android/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumResourceScope.kt @@ -217,7 +217,8 @@ internal class RumResourceScope( type = androidInfoProvider.deviceType.toResourceSchemaType(), name = androidInfoProvider.deviceName, model = androidInfoProvider.deviceModel, - brand = androidInfoProvider.deviceBrand + brand = androidInfoProvider.deviceBrand, + architecture = androidInfoProvider.architecture ), context = ResourceEvent.Context(additionalProperties = attributes), dd = ResourceEvent.Dd( @@ -308,7 +309,8 @@ internal class RumResourceScope( type = androidInfoProvider.deviceType.toErrorSchemaType(), name = androidInfoProvider.deviceName, model = androidInfoProvider.deviceModel, - brand = androidInfoProvider.deviceBrand + brand = androidInfoProvider.deviceBrand, + architecture = androidInfoProvider.architecture ), context = ErrorEvent.Context(additionalProperties = attributes), dd = ErrorEvent.Dd(session = ErrorEvent.DdSession(plan = ErrorEvent.Plan.PLAN_1)) diff --git a/dd-sdk-android/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScope.kt b/dd-sdk-android/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScope.kt index 0677677de2..1a2d652c91 100644 --- a/dd-sdk-android/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScope.kt +++ b/dd-sdk-android/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScope.kt @@ -380,7 +380,8 @@ internal open class RumViewScope( type = androidInfoProvider.deviceType.toErrorSchemaType(), name = androidInfoProvider.deviceName, model = androidInfoProvider.deviceModel, - brand = androidInfoProvider.deviceBrand + brand = androidInfoProvider.deviceBrand, + architecture = androidInfoProvider.architecture ), context = ErrorEvent.Context(additionalProperties = updatedAttributes), dd = ErrorEvent.Dd(session = ErrorEvent.DdSession(plan = ErrorEvent.Plan.PLAN_1)) @@ -607,7 +608,8 @@ internal open class RumViewScope( type = androidInfoProvider.deviceType.toViewSchemaType(), name = androidInfoProvider.deviceName, model = androidInfoProvider.deviceModel, - brand = androidInfoProvider.deviceBrand + brand = androidInfoProvider.deviceBrand, + architecture = androidInfoProvider.architecture ), context = ViewEvent.Context(additionalProperties = attributes), dd = ViewEvent.Dd( @@ -703,7 +705,8 @@ internal open class RumViewScope( type = androidInfoProvider.deviceType.toActionSchemaType(), name = androidInfoProvider.deviceName, model = androidInfoProvider.deviceModel, - brand = androidInfoProvider.deviceBrand + brand = androidInfoProvider.deviceBrand, + architecture = androidInfoProvider.architecture ), context = ActionEvent.Context(additionalProperties = GlobalRum.globalAttributes), dd = ActionEvent.Dd(session = ActionEvent.DdSession(ActionEvent.Plan.PLAN_1)) @@ -763,7 +766,8 @@ internal open class RumViewScope( type = androidInfoProvider.deviceType.toLongTaskSchemaType(), name = androidInfoProvider.deviceName, model = androidInfoProvider.deviceModel, - brand = androidInfoProvider.deviceBrand + brand = androidInfoProvider.deviceBrand, + architecture = androidInfoProvider.architecture ), context = LongTaskEvent.Context(additionalProperties = updatedAttributes), dd = LongTaskEvent.Dd(session = LongTaskEvent.DdSession(LongTaskEvent.Plan.PLAN_1)) diff --git a/dd-sdk-android/src/main/kotlin/com/datadog/android/rum/internal/ndk/DatadogNdkCrashHandler.kt b/dd-sdk-android/src/main/kotlin/com/datadog/android/rum/internal/ndk/DatadogNdkCrashHandler.kt index d081800576..bea48d61a9 100644 --- a/dd-sdk-android/src/main/kotlin/com/datadog/android/rum/internal/ndk/DatadogNdkCrashHandler.kt +++ b/dd-sdk-android/src/main/kotlin/com/datadog/android/rum/internal/ndk/DatadogNdkCrashHandler.kt @@ -312,7 +312,8 @@ internal class DatadogNdkCrashHandler( type = androidInfoProvider.deviceType.toErrorSchemaType(), name = androidInfoProvider.deviceName, model = androidInfoProvider.deviceModel, - brand = androidInfoProvider.deviceBrand + brand = androidInfoProvider.deviceBrand, + architecture = androidInfoProvider.architecture ), dd = ErrorEvent.Dd(session = ErrorEvent.DdSession(plan = ErrorEvent.Plan.PLAN_1)), context = ErrorEvent.Context(additionalProperties = additionalProperties), diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/ActionEventAssert.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/ActionEventAssert.kt index 6b75181161..474b9d0f68 100644 --- a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/ActionEventAssert.kt +++ b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/ActionEventAssert.kt @@ -292,7 +292,8 @@ internal class ActionEventAssert(actual: ActionEvent) : name: String, model: String, brand: String, - type: ActionEvent.DeviceType + type: ActionEvent.DeviceType, + architecture: String ): ActionEventAssert { assertThat(actual.device?.name) .overridingErrorMessage( @@ -314,6 +315,12 @@ internal class ActionEventAssert(actual: ActionEvent) : "Expected event data to have device.type $type but was ${actual.device?.type}" ) .isEqualTo(type) + assertThat(actual.device?.architecture) + .overridingErrorMessage( + "Expected event data to have device.architecture $architecture" + + " but was ${actual.device?.architecture}" + ) + .isEqualTo(architecture) return this } diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/ErrorEventAssert.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/ErrorEventAssert.kt index 56f935b50b..025433482a 100644 --- a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/ErrorEventAssert.kt +++ b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/ErrorEventAssert.kt @@ -367,7 +367,8 @@ internal class ErrorEventAssert(actual: ErrorEvent) : name: String, model: String, brand: String, - type: ErrorEvent.DeviceType + type: ErrorEvent.DeviceType, + architecture: String ): ErrorEventAssert { assertThat(actual.device?.name) .overridingErrorMessage( @@ -389,6 +390,12 @@ internal class ErrorEventAssert(actual: ErrorEvent) : "Expected event data to have device.type $type but was ${actual.device?.type}" ) .isEqualTo(type) + assertThat(actual.device?.architecture) + .overridingErrorMessage( + "Expected event data to have device.architecture $architecture" + + " but was ${actual.device?.architecture}" + ) + .isEqualTo(architecture) return this } diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/LongTaskEventAssert.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/LongTaskEventAssert.kt index 6e291b116b..894c50cacd 100644 --- a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/LongTaskEventAssert.kt +++ b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/LongTaskEventAssert.kt @@ -212,7 +212,8 @@ internal class LongTaskEventAssert(actual: LongTaskEvent) : name: String, model: String, brand: String, - type: LongTaskEvent.DeviceType + type: LongTaskEvent.DeviceType, + architecture: String ): LongTaskEventAssert { assertThat(actual.device?.name) .overridingErrorMessage( @@ -234,6 +235,12 @@ internal class LongTaskEventAssert(actual: LongTaskEvent) : "Expected event data to have device.type $type but was ${actual.device?.type}" ) .isEqualTo(type) + assertThat(actual.device?.architecture) + .overridingErrorMessage( + "Expected event data to have device.architecture $architecture" + + " but was ${actual.device?.architecture}" + ) + .isEqualTo(architecture) return this } diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/ResourceEventAssert.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/ResourceEventAssert.kt index 08e875490c..476b8b4d2a 100644 --- a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/ResourceEventAssert.kt +++ b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/ResourceEventAssert.kt @@ -465,7 +465,8 @@ internal class ResourceEventAssert(actual: ResourceEvent) : name: String, model: String, brand: String, - type: ResourceEvent.DeviceType + type: ResourceEvent.DeviceType, + architecture: String ): ResourceEventAssert { assertThat(actual.device?.name) .overridingErrorMessage( @@ -487,6 +488,12 @@ internal class ResourceEventAssert(actual: ResourceEvent) : "Expected event data to have device.type $type but was ${actual.device?.type}" ) .isEqualTo(type) + assertThat(actual.device?.architecture) + .overridingErrorMessage( + "Expected event data to have device.architecture $architecture" + + " but was ${actual.device?.architecture}" + ) + .isEqualTo(architecture) return this } diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/ViewEventAssert.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/ViewEventAssert.kt index 828399b0e9..d237f5eb33 100644 --- a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/ViewEventAssert.kt +++ b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/assertj/ViewEventAssert.kt @@ -412,7 +412,8 @@ internal class ViewEventAssert(actual: ViewEvent) : name: String, model: String, brand: String, - type: ViewEvent.DeviceType + type: ViewEvent.DeviceType, + architecture: String ): ViewEventAssert { assertThat(actual.device?.name) .overridingErrorMessage( @@ -434,6 +435,12 @@ internal class ViewEventAssert(actual: ViewEvent) : "Expected event data to have device.type $type but was ${actual.device?.type}" ) .isEqualTo(type) + assertThat(actual.device?.architecture) + .overridingErrorMessage( + "Expected event data to have device.architecture $architecture" + + " but was ${actual.device?.architecture}" + ) + .isEqualTo(architecture) return this } diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumActionScopeTest.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumActionScopeTest.kt index f01af3a0c9..03778b2f80 100644 --- a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumActionScopeTest.kt +++ b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumActionScopeTest.kt @@ -202,7 +202,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -296,7 +297,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -367,7 +369,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -497,7 +500,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -556,7 +560,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -606,7 +611,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -662,7 +668,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -712,7 +719,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -763,7 +771,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -813,7 +822,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -864,7 +874,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -917,7 +928,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -966,7 +978,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1015,7 +1028,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1065,7 +1079,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1117,7 +1132,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1187,7 +1203,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1243,7 +1260,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1290,7 +1308,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1340,7 +1359,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1390,7 +1410,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1441,7 +1462,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1487,7 +1509,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1540,7 +1563,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1591,7 +1615,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1640,7 +1665,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1689,7 +1715,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1740,7 +1767,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1821,7 +1849,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1867,7 +1896,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1913,7 +1943,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1959,7 +1990,8 @@ internal class RumActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumContinuousActionScopeTest.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumContinuousActionScopeTest.kt index dc9e39d755..b942dd5f90 100644 --- a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumContinuousActionScopeTest.kt +++ b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumContinuousActionScopeTest.kt @@ -216,7 +216,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -274,7 +275,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -331,7 +333,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -391,7 +394,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -461,7 +465,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -535,7 +540,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -595,7 +601,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -659,7 +666,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -716,7 +724,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -780,7 +789,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -825,7 +835,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -874,7 +885,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -923,7 +935,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -973,7 +986,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1025,7 +1039,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1072,7 +1087,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1145,7 +1161,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1204,7 +1221,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1257,7 +1275,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1310,7 +1329,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1364,7 +1384,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1415,7 +1436,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1470,7 +1492,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1521,7 +1544,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1639,7 +1663,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1694,7 +1719,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1743,7 +1769,8 @@ internal class RumContinuousActionScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumResourceScopeTest.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumResourceScopeTest.kt index e4e0ec73ab..8ed4b3a4f4 100644 --- a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumResourceScopeTest.kt +++ b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumResourceScopeTest.kt @@ -227,7 +227,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toResourceSchemaType() + fakeAndroidInfoProvider.deviceType.toResourceSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -289,7 +290,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toResourceSchemaType() + fakeAndroidInfoProvider.deviceType.toResourceSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -364,7 +366,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toResourceSchemaType() + fakeAndroidInfoProvider.deviceType.toResourceSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -429,7 +432,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toResourceSchemaType() + fakeAndroidInfoProvider.deviceType.toResourceSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -491,7 +495,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toResourceSchemaType() + fakeAndroidInfoProvider.deviceType.toResourceSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -544,7 +549,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toResourceSchemaType() + fakeAndroidInfoProvider.deviceType.toResourceSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -589,7 +595,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toResourceSchemaType() + fakeAndroidInfoProvider.deviceType.toResourceSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -706,7 +713,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toResourceSchemaType() + fakeAndroidInfoProvider.deviceType.toResourceSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -769,7 +777,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toResourceSchemaType() + fakeAndroidInfoProvider.deviceType.toResourceSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -833,7 +842,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toResourceSchemaType() + fakeAndroidInfoProvider.deviceType.toResourceSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -898,7 +908,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toResourceSchemaType() + fakeAndroidInfoProvider.deviceType.toResourceSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -964,7 +975,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1030,7 +1042,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1111,7 +1124,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1193,7 +1207,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1262,7 +1277,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1331,7 +1347,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1399,7 +1416,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1468,7 +1486,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1542,7 +1561,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1617,7 +1637,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1769,7 +1790,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toResourceSchemaType() + fakeAndroidInfoProvider.deviceType.toResourceSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1829,7 +1851,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toResourceSchemaType() + fakeAndroidInfoProvider.deviceType.toResourceSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1891,7 +1914,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toResourceSchemaType() + fakeAndroidInfoProvider.deviceType.toResourceSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -2001,7 +2025,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toResourceSchemaType() + fakeAndroidInfoProvider.deviceType.toResourceSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -2060,7 +2085,8 @@ internal class RumResourceScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toResourceSchemaType() + fakeAndroidInfoProvider.deviceType.toResourceSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScopeTest.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScopeTest.kt index e438ecf1ef..8078ea2f24 100644 --- a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScopeTest.kt +++ b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScopeTest.kt @@ -680,7 +680,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -743,7 +744,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -806,7 +808,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -875,7 +878,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -941,7 +945,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1007,7 +1012,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1060,7 +1066,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1144,7 +1151,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1209,7 +1217,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1294,7 +1303,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1381,7 +1391,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1447,7 +1458,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1512,7 +1524,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1570,7 +1583,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1671,7 +1685,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1749,7 +1764,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1827,7 +1843,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1907,7 +1924,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -1968,7 +1986,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -2041,7 +2060,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -2097,7 +2117,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -2175,7 +2196,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -2253,7 +2275,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -2331,7 +2354,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -2404,7 +2428,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -2455,7 +2480,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -2525,7 +2551,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -2784,7 +2811,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -3230,7 +3258,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -3290,7 +3319,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -3351,7 +3381,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -3414,7 +3445,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -3522,7 +3554,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -3584,7 +3617,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -3645,7 +3679,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -3685,7 +3720,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -3750,7 +3786,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -3813,7 +3850,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -3853,7 +3891,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -3917,7 +3956,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -3982,7 +4022,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -4048,7 +4089,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -4112,7 +4154,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -4152,7 +4195,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -4340,7 +4384,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toLongTaskSchemaType() + fakeAndroidInfoProvider.deviceType.toLongTaskSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -4386,7 +4431,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toLongTaskSchemaType() + fakeAndroidInfoProvider.deviceType.toLongTaskSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -4442,7 +4488,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toLongTaskSchemaType() + fakeAndroidInfoProvider.deviceType.toLongTaskSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -4498,7 +4545,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toLongTaskSchemaType() + fakeAndroidInfoProvider.deviceType.toLongTaskSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -4726,7 +4774,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -4789,7 +4838,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -4870,7 +4920,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -4936,7 +4987,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -4980,7 +5032,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -5056,7 +5109,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -5120,7 +5174,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -5194,7 +5249,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -5268,7 +5324,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -5357,7 +5414,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -5446,7 +5504,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -5537,7 +5596,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -5628,7 +5688,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -5720,7 +5781,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -5812,7 +5874,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toViewSchemaType() + fakeAndroidInfoProvider.deviceType.toViewSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -5931,7 +5994,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toActionSchemaType() + fakeAndroidInfoProvider.deviceType.toActionSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -5978,7 +6042,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toLongTaskSchemaType() + fakeAndroidInfoProvider.deviceType.toLongTaskSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, @@ -6040,7 +6105,8 @@ internal class RumViewScopeTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) hasOsInfo( fakeAndroidInfoProvider.osName, diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/ndk/DatadogNdkCrashHandlerTest.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/ndk/DatadogNdkCrashHandlerTest.kt index 947c40991b..02b0ebf81b 100644 --- a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/ndk/DatadogNdkCrashHandlerTest.kt +++ b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/ndk/DatadogNdkCrashHandlerTest.kt @@ -433,7 +433,8 @@ internal class DatadogNdkCrashHandlerTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) .hasOsInfo( fakeAndroidInfoProvider.osName, @@ -517,7 +518,8 @@ internal class DatadogNdkCrashHandlerTest { fakeAndroidInfoProvider.deviceName, fakeAndroidInfoProvider.deviceModel, fakeAndroidInfoProvider.deviceBrand, - fakeAndroidInfoProvider.deviceType.toErrorSchemaType() + fakeAndroidInfoProvider.deviceType.toErrorSchemaType(), + fakeAndroidInfoProvider.architecture ) .hasOsInfo( fakeAndroidInfoProvider.osName, diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/ActionEventForgeryFactory.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/ActionEventForgeryFactory.kt index 1b221761dc..636e97fecd 100644 --- a/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/ActionEventForgeryFactory.kt +++ b/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/ActionEventForgeryFactory.kt @@ -88,7 +88,8 @@ internal class ActionEventForgeryFactory : name = androidInfoProvider.deviceName, model = androidInfoProvider.deviceModel, brand = androidInfoProvider.deviceBrand, - type = androidInfoProvider.deviceType.toActionSchemaType() + type = androidInfoProvider.deviceType.toActionSchemaType(), + architecture = androidInfoProvider.architecture ) }, context = forge.aNullable { diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/AndroidInfoProviderForgeryFactory.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/AndroidInfoProviderForgeryFactory.kt index 4c6628f1ac..fef6d1f70a 100644 --- a/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/AndroidInfoProviderForgeryFactory.kt +++ b/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/AndroidInfoProviderForgeryFactory.kt @@ -22,6 +22,7 @@ internal class AndroidInfoProviderForgeryFactory : ForgeryFactory { name = androidInfoProvider.deviceName, model = androidInfoProvider.deviceModel, brand = androidInfoProvider.deviceBrand, - type = androidInfoProvider.deviceType.toErrorSchemaType() + type = androidInfoProvider.deviceType.toErrorSchemaType(), + architecture = androidInfoProvider.architecture ) }, context = forge.aNullable { diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/LongTaskEventForgeryFactory.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/LongTaskEventForgeryFactory.kt index 9853934908..a462316ffc 100644 --- a/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/LongTaskEventForgeryFactory.kt +++ b/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/LongTaskEventForgeryFactory.kt @@ -83,7 +83,8 @@ internal class LongTaskEventForgeryFactory : name = androidInfoProvider.deviceName, model = androidInfoProvider.deviceModel, brand = androidInfoProvider.deviceBrand, - type = androidInfoProvider.deviceType.toLongTaskSchemaType() + type = androidInfoProvider.deviceType.toLongTaskSchemaType(), + architecture = androidInfoProvider.architecture ) }, context = forge.aNullable { diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/ResourceEventForgeryFactory.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/ResourceEventForgeryFactory.kt index 1f8fbed64f..cd9dd3c5cf 100644 --- a/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/ResourceEventForgeryFactory.kt +++ b/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/ResourceEventForgeryFactory.kt @@ -112,7 +112,8 @@ internal class ResourceEventForgeryFactory : name = androidInfoProvider.deviceName, model = androidInfoProvider.deviceModel, brand = androidInfoProvider.deviceBrand, - type = androidInfoProvider.deviceType.toResourceSchemaType() + type = androidInfoProvider.deviceType.toResourceSchemaType(), + architecture = androidInfoProvider.architecture ) }, context = forge.aNullable { diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/ViewEventForgeryFactory.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/ViewEventForgeryFactory.kt index 0b954b54cc..318cd520ad 100644 --- a/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/ViewEventForgeryFactory.kt +++ b/dd-sdk-android/src/test/kotlin/com/datadog/android/utils/forge/ViewEventForgeryFactory.kt @@ -116,7 +116,8 @@ internal class ViewEventForgeryFactory : ForgeryFactory { name = androidInfoProvider.deviceName, model = androidInfoProvider.deviceModel, brand = androidInfoProvider.deviceBrand, - type = androidInfoProvider.deviceType.toViewSchemaType() + type = androidInfoProvider.deviceType.toViewSchemaType(), + architecture = androidInfoProvider.architecture ) }, context = forge.aNullable { diff --git a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/about/AboutFragment.kt b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/about/AboutFragment.kt index e3db86b9ac..867b3d6906 100644 --- a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/about/AboutFragment.kt +++ b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/about/AboutFragment.kt @@ -29,7 +29,6 @@ class AboutFragment : container: ViewGroup?, savedInstanceState: Bundle? ): View? { - val rootView = inflater.inflate(R.layout.fragment_about, container, false) aboutText = rootView.findViewById(R.id.about_text) diff --git a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/compose/InteractionSample.kt b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/compose/InteractionSample.kt index 303bb70836..67ca42b700 100644 --- a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/compose/InteractionSample.kt +++ b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/compose/InteractionSample.kt @@ -44,7 +44,6 @@ import kotlin.math.roundToInt @Preview @Composable fun InteractionSampleView() { - val collection = remember { mutableStateListOf().apply { addAll(1..100) } } val scrollState = rememberLazyListState().apply { @@ -65,7 +64,6 @@ fun InteractionSampleView() { @OptIn(ExperimentalTrackingApi::class) @Composable fun ItemRow(index: Int, onDismissed: () -> Unit) { - val swipeableState = rememberSwipeableState(DragStates.VISIBLE) val startState = DragStates.VISIBLE diff --git a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/crash/CrashFragment.kt b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/crash/CrashFragment.kt index 0495cda1b7..825d4525c3 100644 --- a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/crash/CrashFragment.kt +++ b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/crash/CrashFragment.kt @@ -100,7 +100,6 @@ class CrashFragment : } private fun triggerOOM() { - Thread { for (i in 0..128) { bitmapList.add(Bitmap.createBitmap(3840, 2160, Bitmap.Config.ARGB_8888)) diff --git a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/data/db/realm/LogRealm.kt b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/data/db/realm/LogRealm.kt index d65e0e937e..99b103f8c9 100644 --- a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/data/db/realm/LogRealm.kt +++ b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/data/db/realm/LogRealm.kt @@ -15,7 +15,8 @@ import java.util.UUID open class LogRealm( @RealmField(name = BaseColumns._ID) - @PrimaryKey var id: String = UUID.randomUUID().toString(), + @PrimaryKey + var id: String = UUID.randomUUID().toString(), @RealmField(name = DatadogDbContract.Logs.COLUMN_NAME_MESSAGE) var message: String, @RealmField(name = DatadogDbContract.Logs.COLUMN_NAME_TIMESTAMP) diff --git a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/data/db/sqldelight/SqlDelightDataSource.kt b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/data/db/sqldelight/SqlDelightDataSource.kt index b1b32688d8..6a5bc77b04 100644 --- a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/data/db/sqldelight/SqlDelightDataSource.kt +++ b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/data/db/sqldelight/SqlDelightDataSource.kt @@ -45,7 +45,6 @@ class SqlDelightDataSource(val context: Context) : DataSource { logsDatabase.logsQueries.purgeLogs(minTtlRequired) // add new data logsDatabase.logsQueries.transactionTraced("Adding data to Logs DB") { - setTag("logs_count", logs.size) logs.forEach { logsDatabase.logsQueries.insertLog( diff --git a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/data/db/sqlite/DatadogSqliteHelper.kt b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/data/db/sqlite/DatadogSqliteHelper.kt index 9ad72e0798..41869a8880 100644 --- a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/data/db/sqlite/DatadogSqliteHelper.kt +++ b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/data/db/sqlite/DatadogSqliteHelper.kt @@ -40,10 +40,10 @@ class DatadogSqliteHelper(context: Context) : ${DatadogDbContract.Logs.COLUMN_NAME_TIMESTAMP} TEXT, ${DatadogDbContract.Logs.COLUMN_NAME_TTL} INTEGER ) - """ + """ const val DELETE_DB_QUERY = """ DROP TABLE IF EXISTS ${DatadogDbContract.Logs.TABLE_NAME} - """ + """ } } diff --git a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/picture/SampleGlideModule.kt b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/picture/SampleGlideModule.kt index 509015af7b..fe32ad4e2a 100644 --- a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/picture/SampleGlideModule.kt +++ b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/picture/SampleGlideModule.kt @@ -10,7 +10,6 @@ import android.content.Context import android.util.Log import com.bumptech.glide.GlideBuilder import com.bumptech.glide.annotation.GlideModule -import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory import com.bumptech.glide.load.engine.cache.LruResourceCache import com.datadog.android.glide.DatadogGlideModule diff --git a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/traces/TracesViewModel.kt b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/traces/TracesViewModel.kt index 7f512197e7..95fecefb61 100644 --- a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/traces/TracesViewModel.kt +++ b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/traces/TracesViewModel.kt @@ -65,7 +65,6 @@ class TracesViewModel(private val okHttpClient: OkHttpClient) : ViewModel() { onDone: () -> Unit = {} ) { scope.launchTraced("startCoroutineOperation", Dispatchers.Main) { - setTag("flavor", BuildConfig.FLAVOR) performTask(this) performFlowTask() @@ -144,7 +143,6 @@ class TracesViewModel(private val okHttpClient: OkHttpClient) : ViewModel() { @SuppressLint("DefaultLocale") private suspend fun performFlowTask() { - delay(100) withContextTraced("coroutine flow collect", Dispatchers.Default) { try { diff --git a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/user/UserFragment.kt b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/user/UserFragment.kt index 0611600f53..09a64163a6 100644 --- a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/user/UserFragment.kt +++ b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/user/UserFragment.kt @@ -70,7 +70,7 @@ class UserFragment : Fragment(), View.OnClickListener { setUserInfo( id, name, - email, + email ) addUserExtraInfo( mapOf( diff --git a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/vitals/PiDigitComputerBBP.kt b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/vitals/PiDigitComputerBBP.kt index 18668fc472..45df79f7c9 100644 --- a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/vitals/PiDigitComputerBBP.kt +++ b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/vitals/PiDigitComputerBBP.kt @@ -43,7 +43,6 @@ internal class PiDigitComputerBBP { * Computes the n-th hexadecimal digits of pi using the BBP formula. */ fun computePiDigits(n: Int): String { - val s1 = piIntermediateSum(1, n) val s4 = piIntermediateSum(4, n) val s5 = piIntermediateSum(5, n) diff --git a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/widget/WidgetIntentService.kt b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/widget/WidgetIntentService.kt index afaff2d035..2950766004 100644 --- a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/widget/WidgetIntentService.kt +++ b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/widget/WidgetIntentService.kt @@ -25,7 +25,6 @@ class WidgetIntentService : IntentService("WidgetIntentService") { override fun onHandleIntent(intent: Intent?) { when (intent?.action) { LOAD_RANDOM_RESOURCE_ACTION -> { - val widgetName = intent.getStringExtra(WIDGET_NAME_ARG) val widgetId = intent.getIntExtra(WIDGET_ID_ARG, 0) val hasRumContext = widgetId != 0 && widgetName != null diff --git a/tools/noopfactory/src/main/kotlin/com/datadog/tools/noopfactory/NoOpFactoryProvider.kt b/tools/noopfactory/src/main/kotlin/com/datadog/tools/noopfactory/NoOpFactoryProvider.kt index 84f1a58c38..3229341931 100644 --- a/tools/noopfactory/src/main/kotlin/com/datadog/tools/noopfactory/NoOpFactoryProvider.kt +++ b/tools/noopfactory/src/main/kotlin/com/datadog/tools/noopfactory/NoOpFactoryProvider.kt @@ -21,4 +21,4 @@ class NoOpFactoryProvider : SymbolProcessorProvider { environment.logger ) } -} \ No newline at end of file +} diff --git a/tools/noopfactory/src/main/kotlin/com/datadog/tools/noopfactory/NoOpFactorySymbolProcessor.kt b/tools/noopfactory/src/main/kotlin/com/datadog/tools/noopfactory/NoOpFactorySymbolProcessor.kt index cff91e30f2..906bc0ed94 100644 --- a/tools/noopfactory/src/main/kotlin/com/datadog/tools/noopfactory/NoOpFactorySymbolProcessor.kt +++ b/tools/noopfactory/src/main/kotlin/com/datadog/tools/noopfactory/NoOpFactorySymbolProcessor.kt @@ -41,7 +41,6 @@ import com.squareup.kotlinpoet.TypeVariableName import com.squareup.kotlinpoet.UNIT import com.squareup.kotlinpoet.ksp.KotlinPoetKspPreview import com.squareup.kotlinpoet.ksp.TypeParameterResolver -import com.squareup.kotlinpoet.ksp.toClassName import com.squareup.kotlinpoet.ksp.toTypeName import com.squareup.kotlinpoet.ksp.toTypeParameterResolver import java.io.IOException @@ -167,7 +166,6 @@ class NoOpFactorySymbolProcessor( packageName: String, interfaceName: String ) { - val params = declaration.typeParameters if (params.isEmpty()) { typeSpecBuilder.addSuperinterface(ClassName(packageName, interfaceName)) @@ -214,7 +212,7 @@ class NoOpFactorySymbolProcessor( */ private fun generateParentInterfacesImplementation( typeSpecBuilder: TypeSpec.Builder, - declaration: KSClassDeclaration, + declaration: KSClassDeclaration ) { val interfaces = mutableListOf(declaration) val functions: MutableMap = mutableMapOf() @@ -394,4 +392,4 @@ class NoOpFactorySymbolProcessor( private val ignoredFunctions = arrayOf("equals(other)", "hashCode()", "toString()") const val KOTLIN_COLLECTIONS_PACKAGE = "kotlin.collections" } -} \ No newline at end of file +} diff --git a/tools/noopfactory/src/test/kotlin/com/datadog/tools/noopfactory/NoOpFactoryProviderTest.kt b/tools/noopfactory/src/test/kotlin/com/datadog/tools/noopfactory/NoOpFactoryProviderTest.kt index 7312cc4dc1..6e69eb6630 100644 --- a/tools/noopfactory/src/test/kotlin/com/datadog/tools/noopfactory/NoOpFactoryProviderTest.kt +++ b/tools/noopfactory/src/test/kotlin/com/datadog/tools/noopfactory/NoOpFactoryProviderTest.kt @@ -97,4 +97,4 @@ internal class NoOpFactoryProviderTest { } // endregion -} \ No newline at end of file +}