Merge branch 'master' into issue/2545-small

NDKVERSION

@@ -1 +1 @@
-26.0.10792818
+26.1.10909125

cmd/ooniprobe/internal/nettests/run.go

@@ -78,7 +78,7 @@ func RunGroup(config RunGroupConfig) error {
 		return err
 	}
 	if err := sess.MaybeLookupBackends(); err != nil {
-		log.WithError(err).Warn("Failed to discover OONI backends")
+		log.WithError(err).Errorf("Failed to discover OONI backends")
 		return err
 	}
 
@@ -116,7 +116,9 @@ func RunGroup(config RunGroupConfig) error {
 		ctl.RunType = config.RunType
 		ctl.SetNettestIndex(i, len(group.Nettests))
 		if err = nt.Run(ctl); err != nil {
-			log.WithError(err).Errorf("Failed to run %s", group.Label)
+			// We used to emit an error here, now we emit a warning--the proper choice
+			// given that we continue running. See https://github.com/ooni/probe/issues/2576.
+			log.WithError(err).Warnf("Failed to run %s", group.Label)
 		}
 	}
 

internal/registry/factory_test.go

@@ -492,8 +492,10 @@ func TestNewFactory(t *testing.T) {
 			inputPolicy:      model.InputStrictlyRequired,
 		},
 		"vanilla_tor": {
-			enabledByDefault: true,
-			inputPolicy:      model.InputNone,
+			// The experiment crashes on Android and possibly also iOS. We want to
+			// control whether and when to run it using check-in.
+			//enabledByDefault: false,
+			inputPolicy: model.InputNone,
 		},
 		"web_connectivity": {
 			enabledByDefault: true,

internal/registry/vanillator.go

@@ -16,8 +16,11 @@ func init() {
 				*config.(*vanillator.Config),
 			)
 		},
-		config:           &vanillator.Config{},
-		enabledByDefault: true,
+		config: &vanillator.Config{},
+		// We discussed this topic with @aanorbel. On Android this experiment crashes
+		// frequently because of https://github.com/ooni/probe/issues/2406. So, it seems
+		// more cautious to disable it by default and let the check-in API decide.
+		enabledByDefault: false,
 		inputPolicy:      model.InputNone,
 	}
 }