Merge pull request #551 from ooni/ignore-cannot-submit-network

Ignore CannotSubmitMeasurement due to network issues

Author: sdsantos

composeApp/src/commonFullMain/kotlin/org/ooni/probe/shared/monitoring/CrashMonitoring.kt

@@ -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()) {
@@ -93,6 +93,7 @@ class CrashMonitoring(
         private val MESSAGES_TO_SKIP_REPORT = listOf(
             "Picking from default OpenVPN endpoints",
             "sessionresolver: LookupHost failed",
+            "cannot submit measurement:",
         )
     }
 }

composeApp/src/commonMain/kotlin/org/ooni/probe/domain/RunNetTest.kt

@@ -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
@@ -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()