From 22a91e59179a4f389d533faa8485c361c4c52f7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arturo=20Filast=C3=B2?= Date: Tue, 20 Feb 2024 15:17:12 +0100 Subject: [PATCH 1/3] Temporarily disable 0.5 since it's not collecting network_events --- api/ooniapi/probe_services.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/api/ooniapi/probe_services.py b/api/ooniapi/probe_services.py index 49f1a3be..a9ccf17e 100644 --- a/api/ooniapi/probe_services.py +++ b/api/ooniapi/probe_services.py @@ -276,9 +276,12 @@ def check_in() -> Response: ) # set webconnectivity_0.5 feature flag for some probes - octect = extract_probe_ipaddr_octect(1, 0) - if octect in (34, 239): - conf["features"]["webconnectivity_0.5"] = True + # Temporarily disabled while we work towards deploying this in prod: + # https://github.com/ooni/probe/issues/2674 + # + #octect = extract_probe_ipaddr_octect(1, 0) + #if octect in (34, 239): + # conf["features"]["webconnectivity_0.5"] = True conf["test_helpers"] = generate_test_helpers_conf() From d0fa5ee26d3fa04ab6ac9fafef07a8d830e2394c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arturo=20Filast=C3=B2?= Date: Tue, 20 Feb 2024 15:17:12 +0100 Subject: [PATCH 2/3] Temporarily disable 0.5 since it's not collecting network_events --- api/debian/changelog | 6 ++++++ api/ooniapi/probe_services.py | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/api/debian/changelog b/api/debian/changelog index a13f205a..c57c0b04 100644 --- a/api/debian/changelog +++ b/api/debian/changelog @@ -1,3 +1,9 @@ +ooni-api (1.0.89) unstable; urgency=medium + + * Disable wc 0.5 + + -- Arturo Wed, 21 Feb 2024 16:25:18 +0100 + ooni-api (1.0.88) unstable; urgency=medium * Add more logging diff --git a/api/ooniapi/probe_services.py b/api/ooniapi/probe_services.py index 49f1a3be..a9ccf17e 100644 --- a/api/ooniapi/probe_services.py +++ b/api/ooniapi/probe_services.py @@ -276,9 +276,12 @@ def check_in() -> Response: ) # set webconnectivity_0.5 feature flag for some probes - octect = extract_probe_ipaddr_octect(1, 0) - if octect in (34, 239): - conf["features"]["webconnectivity_0.5"] = True + # Temporarily disabled while we work towards deploying this in prod: + # https://github.com/ooni/probe/issues/2674 + # + #octect = extract_probe_ipaddr_octect(1, 0) + #if octect in (34, 239): + # conf["features"]["webconnectivity_0.5"] = True conf["test_helpers"] = generate_test_helpers_conf() From 78c3c7e5f8f4943b5149a511194f0e049ba7ba89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arturo=20Filast=C3=B2?= Date: Wed, 21 Feb 2024 16:26:44 +0100 Subject: [PATCH 3/3] Update changelog entry --- api/debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/debian/changelog b/api/debian/changelog index c57c0b04..06cda590 100644 --- a/api/debian/changelog +++ b/api/debian/changelog @@ -1,6 +1,6 @@ ooni-api (1.0.89) unstable; urgency=medium - * Disable wc 0.5 + * Disable web_connectivity 0.5 feature flag -- Arturo Wed, 21 Feb 2024 16:25:18 +0100