diff --git a/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/rum/BaseRumViewTest.kt b/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/rum/BaseRumViewTest.kt index e3b98bc5bd..c1fd12c724 100644 --- a/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/rum/BaseRumViewTest.kt +++ b/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/rum/BaseRumViewTest.kt @@ -60,7 +60,7 @@ abstract class BaseRumViewTest { variant = "debug", service = "test-service" ) - .useSite(DatadogSite.LOCAL) + .useSite(DatadogSite.STAGING) .setBatchSize(BatchSize.SMALL) .setUploadFrequency(UploadFrequency.FREQUENT) .build() @@ -100,7 +100,7 @@ abstract class BaseRumViewTest { .apply { _RumInternalProxy.setRumViewEventWriteConfig( builder = this@apply, - config = RumViewEventWriteConfig.AlwaysFullView + config = RumViewEventWriteConfig.FullViewOnlyAtStart ) } .build() diff --git a/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/rum/RumSearchResponse.kt b/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/rum/RumSearchResponse.kt index 5d25bb77ac..c72f6b707e 100644 --- a/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/rum/RumSearchResponse.kt +++ b/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/rum/RumSearchResponse.kt @@ -24,7 +24,7 @@ internal data class RumSearchResponse( @Serializable data class RumEventAttributes( - @SerialName("service") val service: String? = null, + @SerialName("service") val service: kotlinx.serialization.json.JsonElement? = null, @SerialName("attributes") val attributes: RumAttributes, @SerialName("timestamp") val timestamp: String, @SerialName("tags") val tags: List = emptyList() diff --git a/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/rum/RumSearchResponseViewEventAssert.kt b/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/rum/RumSearchResponseViewEventAssert.kt index b245a27419..e6093c895c 100644 --- a/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/rum/RumSearchResponseViewEventAssert.kt +++ b/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/rum/RumSearchResponseViewEventAssert.kt @@ -102,8 +102,8 @@ internal class RumSearchResponseViewEventAssert(actual: RumSearchResponse.ViewEv } fun hasService(service: String): RumSearchResponseViewEventAssert { - assertThat(actual.attributes.service) - .overridingErrorMessage("Expected service to be <%s> but was <%s>", service, actual.attributes.service) + assertThat(actual.attributes.attributes.service) + .overridingErrorMessage("Expected service to be <%s> but was <%s>", service, actual.attributes.attributes.service) .isEqualTo(service) return this } diff --git a/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/rum/RumViewUpdateTest.kt b/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/rum/RumViewUpdateTest.kt index 6993a5af0a..b1da94104b 100644 --- a/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/rum/RumViewUpdateTest.kt +++ b/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/rum/RumViewUpdateTest.kt @@ -103,7 +103,11 @@ class RumViewUpdateTest : BaseRumViewTest() { contextAttributes = mapOf("test_view_index" to 14) ) }, - predicate = { it.optionalResult?.data?.firstOrNull() != null }, + predicate = { + val found = it.optionalResult?.data?.firstOrNull() != null + android.util.Log.w("POLL_DEBUG", "predicate: found=$found") + found + }, interval = POLLING_INTERVAL_MS.milliseconds, timeout = POLLING_TIMEOUT_MS.milliseconds ) @@ -201,7 +205,7 @@ class RumViewUpdateTest : BaseRumViewTest() { companion object { private const val VIEW_NAME = "rum-view-update-test" - private const val POLLING_TIMEOUT_MS = 30_000L + private const val POLLING_TIMEOUT_MS = 60_000L private const val POLLING_INTERVAL_MS = 5_000L } } diff --git a/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/utils/KtorHttpResponse.kt b/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/utils/KtorHttpResponse.kt index ba4ae833ff..ac2b89d7a0 100644 --- a/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/utils/KtorHttpResponse.kt +++ b/reliability/with-backend/src/androidTest/kotlin/com/datadog/android/core/integration/tests/utils/KtorHttpResponse.kt @@ -39,13 +39,25 @@ internal suspend inline fun HttpClient.safePost(url: Url, body } val statusCode = response.status when (statusCode.value) { - in 500..599 -> KtorHttpResponse.ServerError(statusCode) - in 400..499 -> KtorHttpResponse.ClientError(statusCode) - else -> KtorHttpResponse.Success(response.body()) + in 500..599 -> { + android.util.Log.w("POLL_DEBUG", "safePost ServerError: $statusCode") + KtorHttpResponse.ServerError(statusCode) + } + in 400..499 -> { + val bodyText = response.bodyAsText() + android.util.Log.w("POLL_DEBUG", "safePost ClientError: $statusCode body=$bodyText") + KtorHttpResponse.ClientError(statusCode) + } + else -> { + android.util.Log.w("POLL_DEBUG", "safePost Success: $statusCode") + KtorHttpResponse.Success(response.body()) + } } } catch (e: IOException) { + android.util.Log.w("POLL_DEBUG", "safePost IOException: ${e.message}") KtorHttpResponse.IOError(e) } catch (e: Exception) { + android.util.Log.w("POLL_DEBUG", "safePost Exception: ${e.javaClass.simpleName}: ${e.message}") KtorHttpResponse.UnknownException(e) } }