Skip to content

Ignore CannotSubmitMeasurement due to network issues #551

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

Merged
merged 1 commit into from
Mar 5, 2025
Merged

Ignore CannotSubmitMeasurement due to network issues #551

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
3 changes: 2 additions & 1 deletion composeApp/src/commonFullMain/kotlin/org/ooni/probe/shared/monitoring/CrashMonitoring.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class CrashMonitoring(

if (
(severity == Severity.Warn || severity == Severity.Error) &&
MESSAGES_TO_SKIP_REPORT.none { message.contains(it) }
(throwable != null || MESSAGES_TO_SKIP_REPORT.none { message.contains(it) })
) {
if (throwable != null) {
if (message.isNotBlank()) {
Expand Down Expand Up @@ -93,6 +93,7 @@ class CrashMonitoring(
private val MESSAGES_TO_SKIP_REPORT = listOf(
"Picking from default OpenVPN endpoints",
"sessionresolver: LookupHost failed",
"cannot submit measurement:",
)
}
}
9 changes: 7 additions & 2 deletions composeApp/src/commonMain/kotlin/org/ooni/probe/domain/RunNetTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package org.ooni.probe.domain
import co.touchlab.kermit.Logger
import co.touchlab.kermit.Severity
import kotlinx.coroutines.flow.Flow
import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json
import org.ooni.engine.models.TaskEvent
import org.ooni.engine.models.TaskEventResult
Expand Down Expand Up @@ -320,7 +319,13 @@ class RunNetTest(
* Here we group them under a single exception class for crash reporting.
*/
private fun TaskEvent.Log.getKnownException() =
if (message.startsWith("cannot submit measurement")) {
if (
message.startsWith("cannot submit measurement") &&
listOf(
"interrupted", "generic_timeout_error", "connection_aborted", "connection_reset",
"eof_error",
).none { message.contains(it) }
) {
CannotSubmitMeasurement()
} else if (message.startsWith("statsManager") && message.contains("not found:")) {
StatsManagerNotFoundError()
Expand Down
Loading