Skip to content

Commit

Permalink
[backport] fix(registry): disable vanilla_tor by default
Browse files Browse the repository at this point in the history
This diff backports #1374 to release/3.19.

The reference issue is ooni/probe#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 ooni/probe#2406.
  • Loading branch information
bassosimone committed Oct 19, 2023
1 parent c8849b2 commit 6a40751
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
6 changes: 4 additions & 2 deletions internal/registry/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 5 additions & 2 deletions internal/registry/vanillator.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
}

0 comments on commit 6a40751

Please sign in to comment.