mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 10:44:56 +00:00
Bug 1808586 - Upgrade to Glean v52.0.1 r=chutten,supply-chain-reviewers
Depends on D167245 Differential Revision: https://phabricator.services.mozilla.com/D167247
This commit is contained in:
parent
e3e9a85328
commit
2fab98bc22
8
Cargo.lock
generated
8
Cargo.lock
generated
@ -2303,9 +2303,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "glean"
|
||||
version = "52.0.0"
|
||||
version = "52.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f5f600281679e10615de8d2a250cee5ea24ba55d3b714c15833fc1951806ebb2"
|
||||
checksum = "b82332dcb52cd5abbcda9728131f105865c94cd68f5c2814c970b685f70547b4"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"crossbeam-channel",
|
||||
@ -2323,9 +2323,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "glean-core"
|
||||
version = "52.0.0"
|
||||
version = "52.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4357fa01f5b90c6e0fe0e39d434bf3b7394ed56f940bea4f221a2b355894fcfc"
|
||||
checksum = "122d2fe5b0d4cfa163cca9bdc349da07341765ec42a0fca1a5d245d54f80de55"
|
||||
dependencies = [
|
||||
"android_logger",
|
||||
"bincode",
|
||||
|
@ -36,7 +36,7 @@ allprojects {
|
||||
topsrcdir = gradle.mozconfig.topsrcdir
|
||||
topobjdir = gradle.mozconfig.topobjdir
|
||||
|
||||
gleanVersion = "52.0.0"
|
||||
gleanVersion = "52.0.1"
|
||||
if (gleanVersion != getRustVersionFor("glean")) {
|
||||
throw new StopExecutionException("Mismatched Glean version, expected: ${gleanVersion}," +
|
||||
" found ${getRustVersionFor("glean")}")
|
||||
|
@ -52,7 +52,7 @@ svg_fmt = "0.4"
|
||||
tracy-rs = "0.1.2"
|
||||
derive_more = { version = "0.99", default-features = false, features = ["add_assign"] }
|
||||
etagere = "0.2.6"
|
||||
glean = "52.0.0"
|
||||
glean = "52.0.1"
|
||||
fog = { version = "0.1.0", optional = true }
|
||||
swgl = { path = "../swgl", optional = true }
|
||||
topological-sort = "0.1"
|
||||
|
@ -136,7 +136,7 @@ pth:xpcom/geckoprocesstypes_generator
|
||||
pth:xpcom/idl-parser
|
||||
# glean-sdk may not be installable if a wheel isn't available
|
||||
# and it has to be built from source.
|
||||
pypi-optional:glean-sdk==52.0.0:telemetry will not be collected
|
||||
pypi-optional:glean-sdk==52.0.1:telemetry will not be collected
|
||||
# Mach gracefully handles the case where `psutil` is unavailable.
|
||||
# We aren't (yet) able to pin packages in automation, so we have to
|
||||
# support down to the oldest locally-installed version (5.4.2).
|
||||
|
@ -878,6 +878,12 @@ criteria = "safe-to-deploy"
|
||||
delta = "51.7.0 -> 51.8.0"
|
||||
notes = "Maintained by the Glean team at Mozilla"
|
||||
|
||||
[[audits.glean]]
|
||||
who = "Jan-Erik Rediger <jrediger@mozilla.com>"
|
||||
criteria = "safe-to-deploy"
|
||||
delta = "52.0.0 -> 52.0.1"
|
||||
notes = "Maintained by the Glean team at Mozilla"
|
||||
|
||||
[[audits.glean-core]]
|
||||
who = "Jan-Erik Rediger <jrediger@mozilla.com>"
|
||||
criteria = "safe-to-deploy"
|
||||
@ -955,6 +961,12 @@ criteria = "safe-to-deploy"
|
||||
delta = "51.7.0 -> 51.8.0"
|
||||
notes = "Maintained by the Glean team at Mozilla"
|
||||
|
||||
[[audits.glean-core]]
|
||||
who = "Jan-Erik Rediger <jrediger@mozilla.com>"
|
||||
criteria = "safe-to-deploy"
|
||||
delta = "52.0.0 -> 52.0.1"
|
||||
notes = "Maintained by the Glean team at Mozilla"
|
||||
|
||||
[[audits.goblin]]
|
||||
who = "Jan-Erik Rediger <jrediger@mozilla.com>"
|
||||
criteria = "safe-to-deploy"
|
||||
|
File diff suppressed because one or more lines are too long
2
third_party/rust/glean-core/Cargo.toml
vendored
2
third_party/rust/glean-core/Cargo.toml
vendored
@ -12,7 +12,7 @@
|
||||
[package]
|
||||
edition = "2018"
|
||||
name = "glean-core"
|
||||
version = "52.0.0"
|
||||
version = "52.0.1"
|
||||
authors = [
|
||||
"Jan-Erik Rediger <jrediger@mozilla.com>",
|
||||
"The Glean Team <glean-team@mozilla.com>",
|
||||
|
22
third_party/rust/glean-core/src/database/mod.rs
vendored
22
third_party/rust/glean-core/src/database/mod.rs
vendored
@ -5,13 +5,16 @@
|
||||
use std::collections::btree_map::Entry;
|
||||
use std::collections::BTreeMap;
|
||||
use std::fs;
|
||||
use std::io;
|
||||
use std::num::NonZeroU64;
|
||||
use std::path::Path;
|
||||
use std::str;
|
||||
use std::sync::RwLock;
|
||||
|
||||
use crate::ErrorKind;
|
||||
|
||||
use rkv::migrator::Migrator;
|
||||
use rkv::StoreOptions;
|
||||
use rkv::{MigrateError, StoreError, StoreOptions};
|
||||
|
||||
/// Unwrap a `Result`s `Ok` value or do the specified action.
|
||||
///
|
||||
@ -81,8 +84,6 @@ fn delete_lmdb_database(path: &Path) {
|
||||
/// without migrating data.
|
||||
/// This is a no-op if no LMDB database file exists.
|
||||
pub fn migrate(path: &Path, dst_env: &Rkv) {
|
||||
use rkv::{MigrateError, StoreError};
|
||||
|
||||
log::debug!("Migrating files in {}", path.display());
|
||||
|
||||
// Shortcut if no data to migrate is around.
|
||||
@ -708,7 +709,22 @@ impl Database {
|
||||
writer.commit()?;
|
||||
Ok(())
|
||||
});
|
||||
|
||||
if let Err(e) = res {
|
||||
// We try to clear everything.
|
||||
// If there was no data to begin with we encounter a `NotFound` error.
|
||||
// There's no point in logging that.
|
||||
if let ErrorKind::Rkv(StoreError::IoError(ioerr)) = e.kind() {
|
||||
if let io::ErrorKind::NotFound = ioerr.kind() {
|
||||
log::debug!(
|
||||
"Could not clear store for lifetime {:?}: {:?}",
|
||||
lifetime,
|
||||
ioerr
|
||||
);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
log::warn!("Could not clear store for lifetime {:?}: {:?}", lifetime, e);
|
||||
}
|
||||
}
|
||||
|
2
third_party/rust/glean/.cargo-checksum.json
vendored
2
third_party/rust/glean/.cargo-checksum.json
vendored
@ -1 +1 @@
|
||||
{"files":{"Cargo.toml":"8ff7c9904c31b1c8a997c5b961f3069fe59687beff6f5d00ced0b390ea96a23c","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"5bc5b1c46695f628e1023662752272e938a963b535d5686bd1ecc433f9e018c4","src/common_test.rs":"7d7d75ec7c3b3c9c79ada8ca8a31042aa1d7305091ae6f65af2d1ae8eb5ab3a6","src/configuration.rs":"5c460d3f512409f04a970a3180b3d81bdf18eec8ba115dc5cc434066b58b6b17","src/core_metrics.rs":"76ac5350cb6f82d9a193d519b085a08f138dceba77da3514bd0c636bcdefefca","src/lib.rs":"eaaa52789edbfbb1c8674c752ca3656212ac725eff2ec1b85381d023c784b965","src/net/http_uploader.rs":"43812a70d19a38e8d7a093c8076c2b6345372c3c861b0f3511428762700a65e0","src/net/mod.rs":"e05e61860f5828caa529c3ea75a2fff7371bfa3dce057077a74c09baf41a568a","src/private/event.rs":"02bbebf545695812e5055741cc0b5f3c99eda2039e684e26fcdd5f087ed15fe3","src/private/mod.rs":"0364ecf5f0439443a5b209583f4ff2c474b79f7c253c981ab0b7cdc528368698","src/private/ping.rs":"cbdc57f41fc9d46e56b4dfff91ac683753d1f8b3ecd0aa9bc3419e3595b8b81b","src/system.rs":"4e0ec743f6d06a9c83e46c95d0286d5745f4642398c942fce8ae7a1ea5202d37","src/test.rs":"167fad6dd350f8c63efaf0d2ba5b161e067203534a0e3a454881c1927fdd2899","tests/common/mod.rs":"37cd4c48e140c793b852ae09fb3e812da28a4412977295015bcbffd632fcf294","tests/init_fails.rs":"179788f0ead2e1fe1cbcd498b891cf9367b9dcb0b03b2961fbba084223682de7","tests/never_init.rs":"1f33b8ce7ca3514b57b48cc16d98408974c85cf8aa7d13257ffc2ad878ebb295","tests/no_time_to_init.rs":"91d789fc0b46a9015b6613aa80cd6b5106a7b012624a174130ea2c54b1b0574f","tests/overflowing_preinit.rs":"a7878a115bde1f291dc6fd71d5772bcffa2c172186b0fa49bb534c6d1f3a1307","tests/persist_ping_lifetime.rs":"251540b6b567d5867a408b81fac478c08aa5bdcb313c2ced5bdda97d806cc4cc","tests/persist_ping_lifetime_nopanic.rs":"c862d124f0e82ada02c87f13ff116d55f35687774a49da0971ab46a46c547b44","tests/schema.rs":"390b5533ac5c4d49bb049ea1311a71d7d5b911ce259e7a07baadb7f1fc755946","tests/simple.rs":"fb0c99773ffd25edae1431be14680c1051266cfff497b9225cabd2afd270ef04"},"package":"f5f600281679e10615de8d2a250cee5ea24ba55d3b714c15833fc1951806ebb2"}
|
||||
{"files":{"Cargo.toml":"25c5fac663fdf1019bfefc5303507f9e2d11a018f30eb98e6dded07a80002465","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"5bc5b1c46695f628e1023662752272e938a963b535d5686bd1ecc433f9e018c4","src/common_test.rs":"7d7d75ec7c3b3c9c79ada8ca8a31042aa1d7305091ae6f65af2d1ae8eb5ab3a6","src/configuration.rs":"5c460d3f512409f04a970a3180b3d81bdf18eec8ba115dc5cc434066b58b6b17","src/core_metrics.rs":"76ac5350cb6f82d9a193d519b085a08f138dceba77da3514bd0c636bcdefefca","src/lib.rs":"eaaa52789edbfbb1c8674c752ca3656212ac725eff2ec1b85381d023c784b965","src/net/http_uploader.rs":"43812a70d19a38e8d7a093c8076c2b6345372c3c861b0f3511428762700a65e0","src/net/mod.rs":"e05e61860f5828caa529c3ea75a2fff7371bfa3dce057077a74c09baf41a568a","src/private/event.rs":"02bbebf545695812e5055741cc0b5f3c99eda2039e684e26fcdd5f087ed15fe3","src/private/mod.rs":"0364ecf5f0439443a5b209583f4ff2c474b79f7c253c981ab0b7cdc528368698","src/private/ping.rs":"cbdc57f41fc9d46e56b4dfff91ac683753d1f8b3ecd0aa9bc3419e3595b8b81b","src/system.rs":"4e0ec743f6d06a9c83e46c95d0286d5745f4642398c942fce8ae7a1ea5202d37","src/test.rs":"167fad6dd350f8c63efaf0d2ba5b161e067203534a0e3a454881c1927fdd2899","tests/common/mod.rs":"37cd4c48e140c793b852ae09fb3e812da28a4412977295015bcbffd632fcf294","tests/init_fails.rs":"179788f0ead2e1fe1cbcd498b891cf9367b9dcb0b03b2961fbba084223682de7","tests/never_init.rs":"1f33b8ce7ca3514b57b48cc16d98408974c85cf8aa7d13257ffc2ad878ebb295","tests/no_time_to_init.rs":"91d789fc0b46a9015b6613aa80cd6b5106a7b012624a174130ea2c54b1b0574f","tests/overflowing_preinit.rs":"a7878a115bde1f291dc6fd71d5772bcffa2c172186b0fa49bb534c6d1f3a1307","tests/persist_ping_lifetime.rs":"251540b6b567d5867a408b81fac478c08aa5bdcb313c2ced5bdda97d806cc4cc","tests/persist_ping_lifetime_nopanic.rs":"c862d124f0e82ada02c87f13ff116d55f35687774a49da0971ab46a46c547b44","tests/schema.rs":"390b5533ac5c4d49bb049ea1311a71d7d5b911ce259e7a07baadb7f1fc755946","tests/simple.rs":"fb0c99773ffd25edae1431be14680c1051266cfff497b9225cabd2afd270ef04"},"package":"b82332dcb52cd5abbcda9728131f105865c94cd68f5c2814c970b685f70547b4"}
|
4
third_party/rust/glean/Cargo.toml
vendored
4
third_party/rust/glean/Cargo.toml
vendored
@ -12,7 +12,7 @@
|
||||
[package]
|
||||
edition = "2018"
|
||||
name = "glean"
|
||||
version = "52.0.0"
|
||||
version = "52.0.1"
|
||||
authors = [
|
||||
"Jan-Erik Rediger <jrediger@mozilla.com>",
|
||||
"The Glean Team <glean-team@mozilla.com>",
|
||||
@ -41,7 +41,7 @@ features = ["serde"]
|
||||
version = "0.5"
|
||||
|
||||
[dependencies.glean-core]
|
||||
version = "52.0.0"
|
||||
version = "52.0.1"
|
||||
|
||||
[dependencies.inherent]
|
||||
version = "1"
|
||||
|
@ -6,7 +6,7 @@ edition = "2018"
|
||||
license = "MPL-2.0"
|
||||
|
||||
[dependencies]
|
||||
glean = "52.0.0"
|
||||
glean = "52.0.1"
|
||||
log = "0.4"
|
||||
nserror = { path = "../../../xpcom/rust/nserror" }
|
||||
nsstring = { path = "../../../xpcom/rust/nsstring" }
|
||||
|
@ -9,7 +9,7 @@ license = "MPL-2.0"
|
||||
[dependencies]
|
||||
bincode = "1.0"
|
||||
chrono = "0.4.10"
|
||||
glean = "52.0.0"
|
||||
glean = "52.0.1"
|
||||
inherent = "1.0.0"
|
||||
log = "0.4"
|
||||
nsstring = { path = "../../../../xpcom/rust/nsstring", optional = true }
|
||||
|
Loading…
Reference in New Issue
Block a user