diff --git a/.gitmodules b/.gitmodules index 7f7fe49afc..f3ad832e17 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,4 +28,4 @@ [submodule "3rdparty/glean"] path = 3rdparty/glean url = https://github.com/mozilla/glean.git - branch = main + branch = release diff --git a/3rdparty/glean b/3rdparty/glean index f3987dbbce..017c95a64c 160000 --- a/3rdparty/glean +++ b/3rdparty/glean @@ -1 +1 @@ -Subproject commit f3987dbbce7f0f308e3554a1c19d0b6442686374 +Subproject commit 017c95a64cf8bae676365367eff29c9209406e20 diff --git a/scripts/linux/script.sh b/scripts/linux/script.sh index cd17aabf52..4bf38d2763 100755 --- a/scripts/linux/script.sh +++ b/scripts/linux/script.sh @@ -132,7 +132,7 @@ print Y "Update the submodules..." git submodule init || die "Failed" git submodule update --remote --depth 1 i18n || die "Failed" git submodule update --remote --depth 1 3rdparty/wireguard-tools || die "Failed" -git submodule update --remote --depth 1 3rdparty/glean || die "Failed" +git submodule update --depth 1 3rdparty/glean || die "Failed" print G "done." print G "Creating the orig tarball" diff --git a/vpnglean/src/lib.rs b/vpnglean/src/lib.rs index 265996e581..13ff7d569e 100644 --- a/vpnglean/src/lib.rs +++ b/vpnglean/src/lib.rs @@ -34,6 +34,7 @@ pub extern "C" fn glean_initialize(is_telemetry_enabled: bool, data_path: FfiStr uploader: Some(Box::new(VPNPingUploader::new())), // Whether Glean should schedule “metrics” pings for you use_core_mps: true, + trim_data_to_registered_pings: false, }; let client_info = ClientInfoMetrics {