Skip to content

fix: E2E test fixes for VIEW_UPDATE pipeline validation #3294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
andreicoj wants to merge 1 commit into
base: aleksandr-gringauz/view-update-4
Choose a base branch
from
Draft

fix: E2E test fixes for VIEW_UPDATE pipeline validation #3294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../src/androidTest/kotlin/com/datadog/android/core/integration/tests/rum/BaseRumViewTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -100,7 +100,7 @@ abstract class BaseRumViewTest {
.apply {
_RumInternalProxy.setRumViewEventWriteConfig(
builder = this@apply,
config = RumViewEventWriteConfig.AlwaysFullView
config = RumViewEventWriteConfig.FullViewOnlyAtStart
)
}
.build()
Expand Down
2 changes: 1 addition & 1 deletion ...rc/androidTest/kotlin/com/datadog/android/core/integration/tests/rum/RumSearchResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> = emptyList()
Expand Down
4 changes: 2 additions & 2 deletions ...kotlin/com/datadog/android/core/integration/tests/rum/RumSearchResponseViewEventAssert.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
8 changes: 6 additions & 2 deletions ...rc/androidTest/kotlin/com/datadog/android/core/integration/tests/rum/RumViewUpdateTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down Expand Up @@ -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
}
}
18 changes: 15 additions & 3 deletions ...c/androidTest/kotlin/com/datadog/android/core/integration/tests/utils/KtorHttpResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,25 @@ internal suspend inline fun <reified T : Any> 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)
}
}
Expand Down
Loading