Add integration tests of set account information in reliability module

Author: ambushwork

dd-sdk-android-core/api/apiSurface

@@ -408,6 +408,9 @@ object com.datadog.android.log.LogAttributes
   const val USR_EMAIL: String
   const val USR_ID: String
   const val USR_NAME: String
+  const val ACCOUNT_ATTRIBUTES_GROUP: String
+  const val ACCOUNT_ID: String
+  const val ACCOUNT_NAME: String
   const val VARIANT: String
   const val SOURCE_TYPE: String
   const val ERROR_FINGERPRINT: String

dd-sdk-android-core/api/dd-sdk-android-core.api

@@ -956,6 +956,9 @@ public abstract interface annotation class com/datadog/android/lint/InternalApi
 }
 
 public final class com/datadog/android/log/LogAttributes {
+	public static final field ACCOUNT_ATTRIBUTES_GROUP Ljava/lang/String;
+	public static final field ACCOUNT_ID Ljava/lang/String;
+	public static final field ACCOUNT_NAME Ljava/lang/String;
 	public static final field APPLICATION_PACKAGE Ljava/lang/String;
 	public static final field APPLICATION_VERSION Ljava/lang/String;
 	public static final field DATE Ljava/lang/String;

dd-sdk-android-core/src/main/kotlin/com/datadog/android/log/LogAttributes.kt

@@ -7,6 +7,11 @@
 package com.datadog.android.log
 
 import com.datadog.android.api.SdkCore
+import com.datadog.android.log.LogAttributes.ACCOUNT_ID
+import com.datadog.android.log.LogAttributes.ACCOUNT_NAME
+import com.datadog.android.log.LogAttributes.USR_EMAIL
+import com.datadog.android.log.LogAttributes.USR_ID
+import com.datadog.android.log.LogAttributes.USR_NAME
 
 /**
  * This class holds constant log attribute keys.
@@ -318,6 +323,28 @@ object LogAttributes {
      */
     const val USR_NAME: String = "$USR_ATTRIBUTES_GROUP.name"
 
+    /**
+     * Group containing account properties.
+     *
+     * @see ACCOUNT_ID
+     * @see ACCOUNT_NAME
+     */
+    const val ACCOUNT_ATTRIBUTES_GROUP: String = "account"
+
+    /**
+     * The account identifier. (String)
+     * This value is filled automatically by the [Logger].
+     * @see [SdkCore.setAccountInfo]
+     */
+    const val ACCOUNT_ID: String = "$ACCOUNT_ATTRIBUTES_GROUP.id"
+
+    /**
+     * The account friendly name. (String)
+     * This value is filled automatically by the [Logger].
+     * @see [SdkCore.setAccountInfo]
+     */
+    const val ACCOUNT_NAME: String = "$ACCOUNT_ATTRIBUTES_GROUP.name"
+
     /**
      * The application variant. (String)
      * This value is filled automatically by the [Logger].

dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/DatadogCoreTest.kt

@@ -19,6 +19,7 @@ import com.datadog.android.core.internal.ContextProvider
 import com.datadog.android.core.internal.CoreFeature
 import com.datadog.android.core.internal.DatadogCore
 import com.datadog.android.core.internal.SdkFeature
+import com.datadog.android.core.internal.account.MutableAccountInfoProvider
 import com.datadog.android.core.internal.lifecycle.ProcessLifecycleCallback
 import com.datadog.android.core.internal.lifecycle.ProcessLifecycleMonitor
 import com.datadog.android.core.internal.net.DefaultFirstPartyHostHeaderTypeResolver
@@ -37,6 +38,7 @@ import com.datadog.android.utils.verifyLog
 import com.datadog.tools.unit.annotations.TestConfigurationsProvider
 import com.datadog.tools.unit.extensions.TestConfigurationExtension
 import com.datadog.tools.unit.extensions.config.TestConfiguration
+import com.datadog.tools.unit.forge.exhaustiveAttributes
 import com.google.gson.JsonObject
 import fr.xgouchet.elmyr.Forge
 import fr.xgouchet.elmyr.annotation.AdvancedForgery
@@ -289,6 +291,52 @@ internal class DatadogCoreTest {
         )
     }
 
+    @Test
+    fun `M update accountInfoProvider W setAccountInfo()`(
+        @StringForgery(type = StringForgeryType.HEXADECIMAL) id: String,
+        @StringForgery name: String,
+        @MapForgery(
+            key = AdvancedForgery(string = [StringForgery(StringForgeryType.ALPHA_NUMERICAL)]),
+            value = AdvancedForgery(string = [StringForgery(StringForgeryType.ALPHA_NUMERICAL)])
+        ) fakeAccountProperties: Map<String, String>
+    ) {
+        // Given
+        val mockAccountInfoProvider = mock<MutableAccountInfoProvider>()
+        testedCore.coreFeature.accountInfoProvider = mockAccountInfoProvider
+
+        // When
+        testedCore.setAccountInfo(id, name, fakeAccountProperties)
+
+        // Then
+        verify(mockAccountInfoProvider).setAccountInfo(id, name, fakeAccountProperties)
+    }
+
+    @Test
+    fun `M set additional account info W addAccountExtraInfo() is called`(
+        forge: Forge,
+        @StringForgery(type = StringForgeryType.HEXADECIMAL) id: String,
+        @StringForgery name: String
+    ) {
+        // Given
+        val fakeExtraProperties = forge.exhaustiveAttributes(excludedKeys = setOf("id", "name"))
+        testedCore.coreFeature = mock()
+        whenever(testedCore.coreFeature.initialized).thenReturn(AtomicBoolean())
+        val mockAccountInfoProvider = mock<MutableAccountInfoProvider>()
+        whenever(testedCore.coreFeature.accountInfoProvider) doReturn mockAccountInfoProvider
+
+        // When
+        testedCore.setAccountInfo(id, name, emptyMap())
+        testedCore.addAccountExtraInfo(fakeExtraProperties)
+
+        // Then
+        verify(mockAccountInfoProvider).setAccountInfo(
+            id,
+            name,
+            emptyMap()
+        )
+        verify(mockAccountInfoProvider).addExtraInfo(extraInfo = fakeExtraProperties)
+    }
+
     @Test
     fun `M update feature context W updateFeatureContext()`(
         @StringForgery feature: String,

reliability/core-it/src/androidTest/kotlin/com/datadog/android/core/integration/tests/InternalSdkCoreTest.kt

@@ -74,6 +74,15 @@ class InternalSdkCoreTest : MockServerTest() {
     @StringForgery(regex = "[a-z]+\\.[a-z]+@[a-z]+\\.[a-z]{3}")
     lateinit var fakeUserEmail: String
     private var fakeUserAdditionalProperties: Map<String, Any?> = emptyMap()
+
+    @StringForgery(type = StringForgeryType.ALPHABETICAL)
+    lateinit var fakeAccountId: String
+
+    @StringForgery(regex = "[A-Z][a-z]+ [A-Z]\\. [A-Z][a-z]+")
+    lateinit var fakeAccountName: String
+
+    private var fakeAccountExtraInfo: Map<String, Any?> = emptyMap()
+
     private lateinit var stubFeature: Feature
 
     @StringForgery(type = StringForgeryType.ALPHABETICAL)
@@ -97,12 +106,14 @@ class InternalSdkCoreTest : MockServerTest() {
         )
         fakeTrackingConsent = forge.aValueFrom(TrackingConsent::class.java)
         fakeUserAdditionalProperties = forge.exhaustiveAttributes(excludedKeys = setOf("id", "name", "email"))
+        fakeAccountExtraInfo = forge.exhaustiveAttributes(excludedKeys = setOf("id", "name"))
         testedInternalSdkCore = Datadog.initialize(
             ApplicationProvider.getApplicationContext(),
             fakeConfiguration,
             fakeTrackingConsent
         ) as InternalSdkCore
         Datadog.setUserInfo(fakeUserId, fakeUserName, fakeUserEmail, fakeUserAdditionalProperties)
+        Datadog.setAccountInfo(fakeAccountId, fakeAccountName, fakeAccountExtraInfo)
         testedInternalSdkCore.registerFeature(stubFeature)
     }
 
@@ -150,6 +161,10 @@ class InternalSdkCoreTest : MockServerTest() {
         assertThat(context.userInfo.email).isEqualTo(fakeUserEmail)
         assertThat(context.userInfo.additionalProperties)
             .containsExactlyInAnyOrderEntriesOf(fakeUserAdditionalProperties)
+        assertThat(context.accountInfo?.id).isEqualTo(fakeAccountId)
+        assertThat(context.accountInfo?.name).isEqualTo(fakeAccountName)
+        assertThat(context.accountInfo?.extraInfo)
+            .containsExactlyInAnyOrderEntriesOf(fakeAccountExtraInfo)
         assertThat(context.featuresContext).isEmpty()
     }