Bug 1822325 - Vendor Glean 52.4.2 r=janerik,supply-chain-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D172797

gfx/wr/wr_glyph_rasterizer/Cargo.toml

@@ -25,7 +25,7 @@ tracy-rs = "0.1.2"
 log = "0.4"
 lazy_static = "1"
 fxhash = "0.2.1"
-glean = { version = "52.0.0", optional = true }
+glean = { version = "52.4.2", optional = true }
 firefox-on-glean = { version = "0.1.0", optional = true }
 serde = { optional = true, version = "1.0", features = ["serde_derive"] }
 

supply-chain/imports.lock

@@ -15,13 +15,27 @@ user-id = 48
 user-login = "badboy"
 user-name = "Jan-Erik Rediger"
 
+[[publisher.glean]]
+version = "52.4.2"
+when = "2023-03-15"
+user-id = 48
+user-login = "badboy"
+user-name = "Jan-Erik Rediger"
+
 [[publisher.glean-core]]
 version = "52.3.0"
 when = "2023-02-23"
 user-id = 48
 user-login = "badboy"
 user-name = "Jan-Erik Rediger"
 
+[[publisher.glean-core]]
+version = "52.4.2"
+when = "2023-03-15"
+user-id = 48
+user-login = "badboy"
+user-name = "Jan-Erik Rediger"
+
 [[publisher.ohttp]]
 version = "0.3.1"
 when = "2023-02-23"

third_party/rust/cssparser/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{".github/workflows/main.yml":"d66f2aac0764ebb09540737931fe2b9311e7033a2bf9a116c072cae6bec5e187","Cargo.toml":"50e9595b9b5243dab2200c2006ea9aed05e68118a9109e3320bda3d3bd82924b","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"53a6805edd80f642473514cb93f1f4197e17a911d66a2dfcefc3dc5e82bac206","build.rs":"b30f35bfbd713943822a19ce6ebe5c99017f603cb001ed37354020549aec71fc","build/match_byte.rs":"f57faf0597cb7b3e32999c5fb1215a43a5603121588c67d5031f720362171e1c","docs/.nojekyll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","docs/404.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","docs/index.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","src/color.rs":"788898ddc0dec90fc972091642f37ab769fc818199293b8dc1c59c21ad0d3d00","src/cow_rc_str.rs":"89b5dff5cf80eef3fcff0c11799e54a978d02d8b8963a621fbb999d35e7c03a3","src/from_bytes.rs":"b1cf15c4e975523fef46b575598737a39f3c63e5ce0b2bfd6ec627c69c6ea54a","src/lib.rs":"9a6b8657291eb142cd33972eaba1afd8fb2432b96b061687238278fecc3e0de1","src/macros.rs":"0d4c3d27a22677d9eb3616d7f7af604dc3de2932ca04fd1c036102884cd6f079","src/nth.rs":"2fc26915f0a36cb22ac45dd9a7ecbdc64c327b2ec135370258ec3db9f9985460","src/parser.rs":"f9985187ede4361a29b3bf22d248903343d58e5cf369a9b5e046961356a4faf9","src/rules_and_declarations.rs":"d826f82f8c179fc13756b92336556e3ee40a273314ef774f95af71e687745f2a","src/serializer.rs":"3a0155521676deea9a6327c2ed00af6d5dabb29a97e2341d0f565f8c2b66d0a3","src/size_of_tests.rs":"da0cbcaa304f7800e9122e2bce0a11d42a70b9012e646a723cb23ee74a6b858c","src/tests.rs":"9847bd8a60bda34259d2900e2b2d217e4c4a0e7dc6e410c61eee3b0e805b9a7e","src/tokenizer.rs":"71600903284f1d68a7da6b69c938b31f9d641f8d981c7adfd06a3c8b783541f2","src/unicode_range.rs":"20d96f06fbb73921e308cc340c9fe065e27f19843005689fb259007a6a372bcc"},"package":null}
+{"files":{".github/workflows/main.yml":"d66f2aac0764ebb09540737931fe2b9311e7033a2bf9a116c072cae6bec5e187","Cargo.toml":"03677b7dd7609f355cdeff66b2034647e2e553b282aa9fe7d0aca93a3ab04299","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"53a6805edd80f642473514cb93f1f4197e17a911d66a2dfcefc3dc5e82bac206","build.rs":"b30f35bfbd713943822a19ce6ebe5c99017f603cb001ed37354020549aec71fc","build/match_byte.rs":"f57faf0597cb7b3e32999c5fb1215a43a5603121588c67d5031f720362171e1c","docs/.nojekyll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","docs/404.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","docs/index.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","src/color.rs":"788898ddc0dec90fc972091642f37ab769fc818199293b8dc1c59c21ad0d3d00","src/cow_rc_str.rs":"89b5dff5cf80eef3fcff0c11799e54a978d02d8b8963a621fbb999d35e7c03a3","src/from_bytes.rs":"b1cf15c4e975523fef46b575598737a39f3c63e5ce0b2bfd6ec627c69c6ea54a","src/lib.rs":"9a6b8657291eb142cd33972eaba1afd8fb2432b96b061687238278fecc3e0de1","src/macros.rs":"0d4c3d27a22677d9eb3616d7f7af604dc3de2932ca04fd1c036102884cd6f079","src/nth.rs":"2fc26915f0a36cb22ac45dd9a7ecbdc64c327b2ec135370258ec3db9f9985460","src/parser.rs":"f9985187ede4361a29b3bf22d248903343d58e5cf369a9b5e046961356a4faf9","src/rules_and_declarations.rs":"d826f82f8c179fc13756b92336556e3ee40a273314ef774f95af71e687745f2a","src/serializer.rs":"3a0155521676deea9a6327c2ed00af6d5dabb29a97e2341d0f565f8c2b66d0a3","src/size_of_tests.rs":"da0cbcaa304f7800e9122e2bce0a11d42a70b9012e646a723cb23ee74a6b858c","src/tests.rs":"9847bd8a60bda34259d2900e2b2d217e4c4a0e7dc6e410c61eee3b0e805b9a7e","src/tokenizer.rs":"71600903284f1d68a7da6b69c938b31f9d641f8d981c7adfd06a3c8b783541f2","src/unicode_range.rs":"20d96f06fbb73921e308cc340c9fe065e27f19843005689fb259007a6a372bcc"},"package":null}

third_party/rust/cssparser/Cargo.toml

@@ -1,77 +1,41 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies.
-#
-# If you are reading this file be aware that the original Cargo.toml
-# will likely look very different (and much more reasonable).
-# See Cargo.toml.orig for the original contents.
-
 [package]
-edition = "2018"
-rust-version = "1.56"
 name = "cssparser"
 version = "0.30.0"
-authors = ["Simon Sapin <[email protected]>"]
-build = "build.rs"
-exclude = [
-    "src/css-parsing-tests/**",
-    "src/big-data-url.css",
-]
+authors = [ "Simon Sapin <[email protected]>" ]
+
 description = "Rust implementation of CSS Syntax Level 3"
 documentation = "https://docs.rs/cssparser/"
+repository = "https://github.com/servo/rust-cssparser"
 readme = "README.md"
-keywords = [
-    "css",
-    "syntax",
-    "parser",
-]
+keywords = ["css", "syntax", "parser"]
 license = "MPL-2.0"
-repository = "https://github.com/servo/rust-cssparser"
-
-[dependencies]
-dtoa-short = "0.3"
-itoa = "1.0"
-smallvec = "1.0"
-
-[dependencies.cssparser-macros]
-version = "0.6"
-path = "./macros"
-
-[dependencies.phf]
-version = ">=0.8,<=0.11"
-features = ["macros"]
+build = "build.rs"
+edition = "2018"
+rust-version = "1.56"
 
-[dependencies.serde]
-version = "1.0"
-optional = true
+exclude = ["src/css-parsing-tests/**", "src/big-data-url.css"]
 
 [dev-dependencies]
+serde_json = "1.0"
 difference = "2.0"
 encoding_rs = "0.8"
-serde_json = "1.0"
+
+[dependencies]
+cssparser-macros = {path = "./macros", version = "0.6"}
+dtoa-short = "0.3"
+itoa = "1.0"
+phf = {version = ">=0.8,<=0.11", features = ["macros"]}
+serde = {version = "1.0", optional = true}
+smallvec = "1.0"
 
 [build-dependencies]
-proc-macro2 = "1"
+syn = { version = "1", features = ["extra-traits", "fold", "full"] }
 quote = "1"
-
-[build-dependencies.syn]
-version = "1"
-features = [
-    "extra-traits",
-    "fold",
-    "full",
-]
+proc-macro2 = "1"
 
 [features]
 bench = []
 dummy_match_byte = []
 
 [workspace]
-members = [
-    ".",
-    "./macros",
-    "./procedural-masquerade",
-]
+members = [".", "./macros", "./procedural-masquerade"]

third_party/rust/glean-core/Cargo.toml

@@ -11,9 +11,9 @@
 
 [package]
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.62"
 name = "glean-core"
-version = "52.3.0"
+version = "52.4.2"
 authors = [
     "Jan-Erik Rediger <[email protected]>",
     "The Glean Team <[email protected]>",
@@ -36,7 +36,7 @@ repository = "https://github.com/mozilla/glean"
 resolver = "1"
 
 [package.metadata.glean]
-glean-parser = "7.0.0"
+glean-parser = "7.1.0"
 
 [dependencies.bincode]
 version = "1.2.1"
@@ -62,9 +62,6 @@ version = "0.4.8"
 [dependencies.once_cell]
 version = "1.4.1"
 
-[dependencies.remove_dir_all]
-version = "0.5.3"
-
 [dependencies.rkv]
 version = "0.18.4"
 features = ["lmdb"]

third_party/rust/glean-core/src/common_metric_data.rs

@@ -13,24 +13,19 @@ use serde::{Deserialize, Serialize};
 /// The supported metrics' lifetimes.
 ///
 /// A metric's lifetime determines when its stored data gets reset.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)]
 #[repr(i32)] // Use i32 to be compatible with our JNA definition
 #[serde(rename_all = "lowercase")]
 pub enum Lifetime {
     /// The metric is reset with each sent ping
+    #[default]
     Ping,
     /// The metric is reset on application restart
     Application,
     /// The metric is reset with each user profile
     User,
 }
 
-impl Default for Lifetime {
-    fn default() -> Self {
-        Lifetime::Ping
-    }
-}
-
 impl Lifetime {
     /// String representation of the lifetime.
     pub fn as_str(self) -> &'static str {

third_party/rust/glean-core/src/database/mod.rs

@@ -52,6 +52,15 @@ pub fn rkv_new(path: &Path) -> std::result::Result<Rkv, rkv::StoreError> {
             // Now try again, we only handle that error once.
             Rkv::new::<rkv::backend::SafeMode>(path)
         }
+        // This code is currently disabled but intended to be turned on in the
+        // near future. Please reference this bug for more details:
+        // https://bugzilla.mozilla.org/show_bug.cgi?id=1820792#c2
+        // Err(rkv::StoreError::DatabaseCorrupted) => {
+        //     let safebin = path.join("data.safe.bin");
+        //     fs::remove_file(safebin).map_err(|_| rkv::StoreError::DatabaseCorrupted)?;
+        //     // Try again, only allowing the error once.
+        //     Rkv::new::<rkv::backend::SafeMode>(path)
+        // }
         other => other,
     }
 }

third_party/rust/glean-core/src/event_database/mod.rs

@@ -584,7 +584,7 @@ impl EventDatabase {
 
         // safe unwrap, only error case is poisoning
         let _lock = self.file_lock.write().unwrap();
-        remove_dir_all::remove_dir_all(&self.path)?;
+        std::fs::remove_dir_all(&self.path)?;
         create_dir_all(&self.path)?;
 
         Ok(())

third_party/rust/glean-core/src/lib.rs

@@ -981,7 +981,7 @@ pub fn glean_test_destroy_glean(clear_stores: bool, data_path: Option<String>) {
         INITIALIZE_CALLED.store(false, Ordering::SeqCst);
     } else if clear_stores {
         if let Some(data_path) = data_path {
-            let _ = remove_dir_all::remove_dir_all(data_path).ok();
+            let _ = std::fs::remove_dir_all(data_path).ok();
         } else {
             log::warn!("Asked to clear stores before initialization, but no data path given.");
         }

third_party/rust/glean-core/src/ping/mod.rs

@@ -358,7 +358,7 @@ impl PingMaker {
     pub fn clear_pending_pings(&self, data_path: &Path) -> Result<()> {
         let pings_dir = self.get_pings_dir(data_path, None)?;
 
-        remove_dir_all::remove_dir_all(&pings_dir)?;
+        std::fs::remove_dir_all(&pings_dir)?;
         create_dir_all(&pings_dir)?;
 
         log::debug!("All pending pings deleted");

third_party/rust/glean/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"Cargo.toml":"0ec3bb60b6512567be647f2ba367bda935a68abf4fedcf0dc6d38f8bc43ddb3f","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"5627cc81e6187ab6c2b4dff061af16d559edcab64ba786bac39daa69c703c595","src/common_test.rs":"de47b53dcca37985c0a2b8c02daecbf32309aa54f5a4dd9290719c2c1fd0fa55","src/configuration.rs":"4ca9be0a49a9c50f4ebe868d4bfa04fe27619c871a436911f850b4dcf6e7a7b2","src/core_metrics.rs":"dd17b482613894af08b51a2cff6dc1e84a6dbd853c14a55566e6698348941ced","src/lib.rs":"2eb1b09f2f8a649729cd27222f0889eed7b50940fc7e2bb27de54abbdac439df","src/net/http_uploader.rs":"43812a70d19a38e8d7a093c8076c2b6345372c3c861b0f3511428762700a65e0","src/net/mod.rs":"e36e170a8e53530f8705988eea694ed7c55f50bb0ce403c0facbfb75ce03ac7f","src/private/event.rs":"02bbebf545695812e5055741cc0b5f3c99eda2039e684e26fcdd5f087ed15fe3","src/private/mod.rs":"0364ecf5f0439443a5b209583f4ff2c474b79f7c253c981ab0b7cdc528368698","src/private/ping.rs":"cbdc57f41fc9d46e56b4dfff91ac683753d1f8b3ecd0aa9bc3419e3595b8b81b","src/system.rs":"6eae5b41c15eba9cad6dbd116abe3519ee3e1fe034e79bdd692b029829a8c384","src/test.rs":"d367c85a106df58272b8a779da1769664ba8a39357fd650d9f21c21855b38906","tests/common/mod.rs":"37cd4c48e140c793b852ae09fb3e812da28a4412977295015bcbffd632fcf294","tests/init_fails.rs":"28fd7726e76ca1295eb0905eca0b2ec65b0accfa28432c9ff90ec8f92616fc79","tests/never_init.rs":"1f33b8ce7ca3514b57b48cc16d98408974c85cf8aa7d13257ffc2ad878ebb295","tests/no_time_to_init.rs":"e7df75b47897fbf2c860a2e1c1c225b57598b8d1a39125ca897fe8d825bf0338","tests/overflowing_preinit.rs":"7ad4b2274dd9240b53430859a4eb1d2597cf508a5a678333f3d3abbadd2ed4a7","tests/persist_ping_lifetime.rs":"81415dc1d74743f02269f0d0dfa524003147056853f080276972e64a0b761d3c","tests/persist_ping_lifetime_nopanic.rs":"18379d3ffbf4a2c8c684c04ff7a0660b86dfbbb447db2d24dfed6073cb7ddf8f","tests/schema.rs":"ea93fcf68e00ae803031dba9b93edac0713f17e375287c32c35512ba69d5f100","tests/simple.rs":"b099034b0599bdf4650e0fa09991a8413fc5fbf397755fc06c8963d4c7c8dfa6","tests/test-shutdown-blocking.sh":"9b16a01c190c7062474dd92182298a3d9a27928c8fa990340fdd798e6cdb7ab2","tests/upload_timing.rs":"d044fce7c783133e385671ea37d674e5a1b4120cae7b07708dcd825addfa0ee3"},"package":"aa4d34f9ae46bd3e68c5bb672762e7391843daedd609506a70b6b35ac6fea051"}
+{"files":{"Cargo.toml":"794cb4c811e030330df0a32cc2dcc5778e9749ae69857e90fef4061f61a973b5","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"5627cc81e6187ab6c2b4dff061af16d559edcab64ba786bac39daa69c703c595","src/common_test.rs":"de47b53dcca37985c0a2b8c02daecbf32309aa54f5a4dd9290719c2c1fd0fa55","src/configuration.rs":"4ca9be0a49a9c50f4ebe868d4bfa04fe27619c871a436911f850b4dcf6e7a7b2","src/core_metrics.rs":"dd17b482613894af08b51a2cff6dc1e84a6dbd853c14a55566e6698348941ced","src/lib.rs":"2eb1b09f2f8a649729cd27222f0889eed7b50940fc7e2bb27de54abbdac439df","src/net/http_uploader.rs":"43812a70d19a38e8d7a093c8076c2b6345372c3c861b0f3511428762700a65e0","src/net/mod.rs":"e36e170a8e53530f8705988eea694ed7c55f50bb0ce403c0facbfb75ce03ac7f","src/private/event.rs":"02bbebf545695812e5055741cc0b5f3c99eda2039e684e26fcdd5f087ed15fe3","src/private/mod.rs":"0364ecf5f0439443a5b209583f4ff2c474b79f7c253c981ab0b7cdc528368698","src/private/ping.rs":"cbdc57f41fc9d46e56b4dfff91ac683753d1f8b3ecd0aa9bc3419e3595b8b81b","src/system.rs":"6eae5b41c15eba9cad6dbd116abe3519ee3e1fe034e79bdd692b029829a8c384","src/test.rs":"d367c85a106df58272b8a779da1769664ba8a39357fd650d9f21c21855b38906","tests/common/mod.rs":"37cd4c48e140c793b852ae09fb3e812da28a4412977295015bcbffd632fcf294","tests/init_fails.rs":"28fd7726e76ca1295eb0905eca0b2ec65b0accfa28432c9ff90ec8f92616fc79","tests/never_init.rs":"1f33b8ce7ca3514b57b48cc16d98408974c85cf8aa7d13257ffc2ad878ebb295","tests/no_time_to_init.rs":"e7df75b47897fbf2c860a2e1c1c225b57598b8d1a39125ca897fe8d825bf0338","tests/overflowing_preinit.rs":"7ad4b2274dd9240b53430859a4eb1d2597cf508a5a678333f3d3abbadd2ed4a7","tests/persist_ping_lifetime.rs":"81415dc1d74743f02269f0d0dfa524003147056853f080276972e64a0b761d3c","tests/persist_ping_lifetime_nopanic.rs":"18379d3ffbf4a2c8c684c04ff7a0660b86dfbbb447db2d24dfed6073cb7ddf8f","tests/schema.rs":"ea93fcf68e00ae803031dba9b93edac0713f17e375287c32c35512ba69d5f100","tests/simple.rs":"b099034b0599bdf4650e0fa09991a8413fc5fbf397755fc06c8963d4c7c8dfa6","tests/test-shutdown-blocking.sh":"9b16a01c190c7062474dd92182298a3d9a27928c8fa990340fdd798e6cdb7ab2","tests/upload_timing.rs":"d044fce7c783133e385671ea37d674e5a1b4120cae7b07708dcd825addfa0ee3"},"package":"e1bd184ec51a21129cb58a1b7380250d5f71de01b3461ab3b81594e0a2322123"}

third_party/rust/glean/Cargo.toml

@@ -11,9 +11,9 @@
 
 [package]
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.62"
 name = "glean"
-version = "52.3.0"
+version = "52.4.2"
 authors = [
     "Jan-Erik Rediger <[email protected]>",
     "The Glean Team <[email protected]>",
@@ -43,7 +43,7 @@ features = ["serde"]
 version = "0.5"
 
 [dependencies.glean-core]
-version = "52.3.0"
+version = "52.4.2"
 
 [dependencies.inherent]
 version = "1"