From 6a40751de2647a9dc37c4df4df278b2c1bea1755 Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Thu, 19 Oct 2023 13:20:06 +0200 Subject: [PATCH] [backport] fix(registry): disable vanilla_tor by default This diff backports #1374 to release/3.19. The reference issue is https://github.com/ooni/probe/issues/2553. When I implemented the disabled-by-default functionality, I missed that we should also disable-by-default vanilla_tor. The reason for doing that is that the experiment crashes on Android and possibly iOS due to https://github.com/ooni/probe/issues/2406. --- internal/registry/factory_test.go | 6 ++++-- internal/registry/vanillator.go | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/internal/registry/factory_test.go b/internal/registry/factory_test.go index b49ed21d56..49f11338a5 100644 --- a/internal/registry/factory_test.go +++ b/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, diff --git a/internal/registry/vanillator.go b/internal/registry/vanillator.go index cd8fae6583..fabf801662 100644 --- a/internal/registry/vanillator.go +++ b/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, } }