Bug 1967754 - Update to Glean v64.3.0 r=TravisLong,supply-chain-reviewers,mach-reviewers,ahochheiden

Differential Revision: https://phabricator.services.mozilla.com/D250445
This commit is contained in:
Jan-Erik Rediger
2025-05-22 08:15:29 +00:00
committed by jrediger@mozilla.com
parent e709a4d123
commit db75ef0ce8
22 changed files with 51 additions and 53 deletions

8
Cargo.lock generated
View File

@@ -2705,9 +2705,9 @@ dependencies = [
[[package]]
name = "glean"
version = "64.2.0"
version = "64.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3bbaa151992ac45799a3779a3ff9d9ce1412a91f982b54f95ac85124e96f870c"
checksum = "a3e74377404c1c77824ac2c99e40258e089042c3bfa5e828965c94a3f371ff85"
dependencies = [
"crossbeam-channel",
"glean-core",
@@ -2720,9 +2720,9 @@ dependencies = [
[[package]]
name = "glean-core"
version = "64.2.0"
version = "64.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec64dd5ecb37f04def90b179759c8906c95c895c392b444b5b67f868ffa4bedc"
checksum = "930c50acf96db6a6eb2608e378b58bd0fee85d42f0a0018f52a007074971da2b"
dependencies = [
"android_logger",
"bincode",

View File

@@ -68,7 +68,7 @@ uniffi_bindgen = "0.29.2"
# Shared across multiple application-services consumers.
rusqlite = "0.33.0"
# Shared across multiple glean consumers.
glean = "=64.2.0"
glean = "=64.3.0"
# Explicitly specify what our profiles use. The opt-level setting here is
# a total fiction; see the setup of MOZ_RUST_DEFAULT_FLAGS for what the

8
gfx/wr/Cargo.lock generated
View File

@@ -982,9 +982,9 @@ dependencies = [
[[package]]
name = "glean"
version = "64.2.0"
version = "64.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3bbaa151992ac45799a3779a3ff9d9ce1412a91f982b54f95ac85124e96f870c"
checksum = "a3e74377404c1c77824ac2c99e40258e089042c3bfa5e828965c94a3f371ff85"
dependencies = [
"crossbeam-channel",
"glean-core",
@@ -997,9 +997,9 @@ dependencies = [
[[package]]
name = "glean-core"
version = "64.2.0"
version = "64.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec64dd5ecb37f04def90b179759c8906c95c895c392b444b5b67f868ffa4bedc"
checksum = "930c50acf96db6a6eb2608e378b58bd0fee85d42f0a0018f52a007074971da2b"
dependencies = [
"android_logger",
"bincode",

View File

@@ -9,7 +9,7 @@ members = [
resolver = "2"
[workspace.dependencies]
glean = "=64.2.0"
glean = "=64.3.0"
[profile.release]
debug = true

View File

@@ -83,7 +83,7 @@ spotless = "7.0.2"
# Mozilla versions
apilint = "0.5.4"
mozilla-glean = "64.2.0"
mozilla-glean = "64.3.0"
# Testing versions
androidx-test = "1.6.1"

View File

@@ -104,7 +104,7 @@ vendored:third_party/python/wheel
vendored:third_party/python/zipp
# glean-sdk may not be installable if a wheel isn't available
# and it has to be built from source.
pypi-optional:glean-sdk==64.2.0:telemetry will not be collected
pypi-optional:glean-sdk==64.3.0: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).

View File

@@ -258,15 +258,15 @@ user-login = "jrmuizel"
user-name = "Jeff Muizelaar"
[[publisher.glean]]
version = "64.2.0"
when = "2025-04-28"
version = "64.3.0"
when = "2025-05-21"
user-id = 48
user-login = "badboy"
user-name = "Jan-Erik Rediger"
[[publisher.glean-core]]
version = "64.2.0"
when = "2025-04-28"
version = "64.3.0"
when = "2025-05-21"
user-id = 48
user-login = "badboy"
user-name = "Jan-Erik Rediger"

File diff suppressed because one or more lines are too long

View File

@@ -13,7 +13,7 @@
edition = "2021"
rust-version = "1.82"
name = "glean-core"
version = "64.2.0"
version = "64.3.0"
authors = [
"Jan-Erik Rediger <jrediger@mozilla.com>",
"The Glean Team <glean-team@mozilla.com>",
@@ -148,7 +148,7 @@ version = "1.0.19"
version = "0.4.8"
[dependencies.malloc_size_of]
version = "0.2.0"
version = "0.2.1"
features = ["once_cell"]
default-features = false
package = "wr_malloc_size_of"

View File

@@ -78,7 +78,6 @@ pub struct CommonMetricData {
#[derive(Default, Debug, MallocSizeOf)]
pub struct CommonMetricDataInternal {
pub inner: CommonMetricData,
#[ignore_malloc_size_of = "atomic integers never allocate (bug 1960589)"]
pub disabled: AtomicU8,
}

View File

@@ -168,7 +168,6 @@ pub struct Glean {
debug: DebugOptions,
pub(crate) app_build: String,
pub(crate) schedule_metrics_pings: bool,
#[ignore_malloc_size_of = "atomic integers never allocate (bug 1960589)"]
pub(crate) remote_settings_epoch: AtomicU8,
#[ignore_malloc_size_of = "TODO: Expose Glean's inner memory allocations (bug 1960592)"]
pub(crate) remote_settings_config: Arc<Mutex<RemoteSettingsConfig>>,
@@ -543,6 +542,7 @@ impl Glean {
}
let Some(ping) = self.ping_registry.get(ping) else {
log::trace!("Unknown ping {ping}. Assuming disabled.");
return false;
};

View File

@@ -476,6 +476,14 @@ interface LabeledString {
i32 test_get_num_recorded_errors(ErrorType error);
};
interface LabeledQuantity {
constructor(LabeledMetricData meta, sequence<CowString>? labels);
QuantityMetric get(string label);
i32 test_get_num_recorded_errors(ErrorType error);
};
interface StringListMetric {
constructor(CommonMetricData meta);

View File

@@ -208,19 +208,12 @@ impl DatetimeMetric {
time.second(),
time.nanosecond(),
),
TimeUnit::Microsecond => {
eprintln!(
"microseconds. nanoseconds={}, nanoseconds/1000={}",
time.nanosecond(),
time.nanosecond() / 1000
);
d.date().and_hms_nano_opt(
TimeUnit::Microsecond => d.date().and_hms_nano_opt(
time.hour(),
time.minute(),
time.second(),
time.nanosecond() / 1000,
)
}
),
TimeUnit::Millisecond => d.date().and_hms_nano_opt(
time.hour(),
time.minute(),

View File

@@ -124,7 +124,7 @@ fn nofollows_ping_can_ride_along() {
.unwrap();
if obj["ping_name"].as_str().unwrap() == "nofollows" {
assert_eq!(2, counter_val, "{:?}", json);
assert_eq!(2, counter_val, "{json:?}");
} else {
let seq = json["ping_info"]["seq"].as_i64().unwrap();
@@ -132,7 +132,7 @@ fn nofollows_ping_can_ride_along() {
0 => assert_eq!(1, counter_val),
1 => assert_eq!(3, counter_val),
2 => assert_eq!(8, counter_val),
_ => panic!("unexpected sequence number: {}", seq),
_ => panic!("unexpected sequence number: {seq}"),
}
}
}
@@ -162,7 +162,7 @@ fn nofollows_ping_can_ride_along() {
0 => assert_eq!(1, counter_val),
1 => assert_eq!(3, counter_val),
2 => assert_eq!(8, counter_val),
_ => panic!("unexpected sequence number: {}", seq),
_ => panic!("unexpected sequence number: {seq}"),
}
}
}

View File

@@ -144,7 +144,6 @@ fn snapshot_correctly_clears_the_stores() {
assert_eq!(1, s.as_array().unwrap().len());
assert_eq!("telemetry", s[0]["category"]);
assert_eq!("test_event_clear", s[0]["name"]);
println!("{:?}", s[0].get("extra"));
assert!(s[0].get("extra").is_none());
}
}

View File

@@ -117,7 +117,6 @@ fn test_metrics_must_report_experimentation_id() {
.collect(&glean, &ping_type, None, "", "")
.unwrap();
let metrics = ping.content["metrics"].as_object().unwrap();
println!("TLDEBUG Metrics:\n{:?}", metrics);
let strings = metrics["string"].as_object().unwrap();
assert_eq!(

View File

@@ -123,7 +123,7 @@ fn denominator_smoke() {
assert!(test_get_num_recorded_errors(&glean, num1.meta(), ErrorType::InvalidValue).is_err());
assert!(test_get_num_recorded_errors(&glean, num2.meta(), ErrorType::InvalidValue).is_err());
// Getting the value returns 0s if that's all we have.
// Getting the value returns what is stored
let data = num1.get_value(&glean, None).unwrap();
assert_eq!(3, data.numerator);
assert_eq!(7, data.denominator);

View File

@@ -98,12 +98,12 @@ fn long_text_values_are_truncated() {
..Default::default()
});
let test_sting = "01234567890".repeat(200 * 1024);
metric.set_sync(&glean, test_sting.clone());
let test_string = "01234567890".repeat(200 * 1024);
metric.set_sync(&glean, test_string.clone());
// Check that data was truncated
assert_eq!(
test_sting[..(200 * 1024)],
test_string[..(200 * 1024)],
metric.get_value(&glean, "store1").unwrap()
);

View File

@@ -1 +1 @@
{"files":{"Cargo.lock":"49b2fdc584b3bfa871d157e015ff8b476e39b470a6963e72e6a3528885e7214f","Cargo.toml":"c04f3098d1fafab6dd25d1556d68467e968c7eb4228d28922807e67f3d720076","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"5627cc81e6187ab6c2b4dff061af16d559edcab64ba786bac39daa69c703c595","src/common_test.rs":"c86cccfb7da1506cfed29cb2ee13d839b7ac7cffdfd70793c9665bb44e0b684f","src/configuration.rs":"de65ab99a26b4547be20803bc195cb50a6ab40b1a3f49a2e6230fed5a9d7a8d8","src/core_metrics.rs":"fef8fb4e5fa57c179836c6eb2cf59278fe3b8b036dbe57b0ff02971b4acd822f","src/lib.rs":"998359d04ba0f71aaa360b8999c716f22c9efaf1ff4e1fdce80f1d3af5e584b0","src/net/http_uploader.rs":"0a94ac3cd87cb021529dee46d537765ab8d923e0f4ac7615225e878d3739e6dc","src/net/mod.rs":"09ba010b03d045fd8a2ccbe4f205c5275bb622bceb34cb81a0aa8f7d33804e2e","src/private/event.rs":"9986dd55abc668533fe3a5c510155fde66446bf8829b323043e5b2b9c8864495","src/private/mod.rs":"66e90c41de74d1e80c5d3f49b8f1a86b8396be0b8c4a80f1a28903fe6d105ecf","src/private/object.rs":"5f3e5d065824ea82aa70156e875a82a079656e07753685d732f4d2aa1be1aedb","src/private/ping.rs":"8ec514e88c1fcba13560522c83e39643edf7d74a3dc733e273984c46c781b2d2","src/system.rs":"d602804a72258bfd65e51c571946631732ee27d81342d8aa406e47fdd241bbfa","src/test.rs":"8ff4d5072d23d9fbf5444e474d21b41a31e86a37e2a25fc2f2a92976e7642cbb","tests/collection_enabled.rs":"3327a949dbdeec493d661261abda68ffa71acc50ab24cba4fde5302749e6f16b","tests/collection_enabled_bin.rs":"d3a6458b84012a447e5cb792f2292a06951ed252fad803b9166b437bacba542c","tests/common/mod.rs":"2fd391c5eb45f56fdfa3261dd631406c67ed36b10b0d5432febe2483da5c9d89","tests/custom_distribution_buffered.rs":"47c13d1f39adf3881e10caa19e0c08235f08958809e234bf37a79d37d7322cd5","tests/init_fails.rs":"ca7fa1b3dd6a21a9e005b7a4f0a18664c4bceb952dd463db8316500f72280d5b","tests/interruptible_shutdown.rs":"3d954bbe47d4f5fd103c51a4ff99f151662143c25c826da9734a00cd215909b9","tests/memory_distribution_buffered.rs":"db487475a5cf17a0864ccf150984ebdd28bf616573772cf678246cc1bdbcbc0f","tests/metric_metadata.rs":"05c947d3decf0a3281378dbb108080a05319ad8f130af5b07f9b049b80e5f04f","tests/near-empty-c0ffee-db.safe.bin":"89afb3bb8fc94430fb0ed0fe55f85f3f8bcc8fd0fed69a9df13cc560294ec9f5","tests/never_init.rs":"51fff5618f6603bc0945d70131698d10a1c6275f43bbc22a2de5807f8a79229f","tests/no_time_to_init.rs":"2ede23df6618ff1cb5ae3b7bbf95900ad0fd92072afa2e0319bf147b4f75cefc","tests/overflowing_preinit.rs":"985e140460a100986fd051ce901b787a3a7a9747a856cd06066b740ac7d2381c","tests/persist_ping_lifetime_nopanic.rs":"18379d3ffbf4a2c8c684c04ff7a0660b86dfbbb447db2d24dfed6073cb7ddf8f","tests/schema.rs":"23b49005402b914e55a0c5c155f30c2662c609f79be78d1385ec25b3600b3547","tests/simple.rs":"15c76a1b5a336fd6abfbdebafc971f5c6a9b75107ddbca65f0031cde3e2886da","tests/test-delayed-ping-data.sh":"4a6db98b4df6b77898ace6a8b4e8b4c60d3e5c44873bbf38c62e83583e27a3ff","tests/test-enabled-pings.sh":"06656e38f63e65475006b107dd6bd179b0cbaa1fad1470de38e679e91a9315a3","tests/test-pending-gets-removed.sh":"e335f2f00fa97a61b6d94e0005fb3b9de8c8db8076111a67ca47d85392039ea9","tests/test-ping-lifetime-flush.sh":"e8f118ea2f6fd973809e38d5e828a03cfccfe0b0f497ccde5ec92d6d1380c071","tests/test-shutdown-blocking.sh":"a44d8d4bbe2ee3ede9e48121150ae7a5386025160c5cef2181ca142232c5fb27","tests/test-thread-crashing.sh":"f3cd0cc8a7b4fe82bef0fe6fbfbbe45fbad6da3afe0f82578bc5cfb2d6527ac6","tests/timing_distribution_buffered.rs":"501f7289c0c28f0ab83838c88b058999b19436d0f2b693be0787513d7b67e06d","tests/timing_distribution_single_sample.rs":"4f9498b6ef29913da0356027efe5f572c81d2f426e8538c068b54a1cfa33c1b8","tests/upload_timing.rs":"b3b9db197bc2ec41556388969a6bf289e7ef19e05b9019bc2bd98c823fcf6ea3","tests/uploader_capabilities.rs":"347f19e534a50a211ea179d6818631270d1b4ec468098e6b6abcde1e4a6a9bca"},"package":"3bbaa151992ac45799a3779a3ff9d9ce1412a91f982b54f95ac85124e96f870c"}
{"files":{"Cargo.lock":"ab8a68f93647fc03fb2b765e08fdddaeeec9c08eefd49158339084f89b6ca7fb","Cargo.toml":"91b8d2c0634e4ed4a83756536684eb4d0ff828bc965a21836d5e60135d992aae","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"5627cc81e6187ab6c2b4dff061af16d559edcab64ba786bac39daa69c703c595","src/common_test.rs":"c86cccfb7da1506cfed29cb2ee13d839b7ac7cffdfd70793c9665bb44e0b684f","src/configuration.rs":"de65ab99a26b4547be20803bc195cb50a6ab40b1a3f49a2e6230fed5a9d7a8d8","src/core_metrics.rs":"fef8fb4e5fa57c179836c6eb2cf59278fe3b8b036dbe57b0ff02971b4acd822f","src/lib.rs":"5cec0edb43099ddc0c7cf6e879526e34ac64ca808b971ce87b3b1b201d1f2f84","src/net/http_uploader.rs":"0a94ac3cd87cb021529dee46d537765ab8d923e0f4ac7615225e878d3739e6dc","src/net/mod.rs":"09ba010b03d045fd8a2ccbe4f205c5275bb622bceb34cb81a0aa8f7d33804e2e","src/private/event.rs":"9986dd55abc668533fe3a5c510155fde66446bf8829b323043e5b2b9c8864495","src/private/mod.rs":"66e90c41de74d1e80c5d3f49b8f1a86b8396be0b8c4a80f1a28903fe6d105ecf","src/private/object.rs":"5f3e5d065824ea82aa70156e875a82a079656e07753685d732f4d2aa1be1aedb","src/private/ping.rs":"8ec514e88c1fcba13560522c83e39643edf7d74a3dc733e273984c46c781b2d2","src/system.rs":"d602804a72258bfd65e51c571946631732ee27d81342d8aa406e47fdd241bbfa","src/test.rs":"8ff4d5072d23d9fbf5444e474d21b41a31e86a37e2a25fc2f2a92976e7642cbb","tests/collection_enabled.rs":"3327a949dbdeec493d661261abda68ffa71acc50ab24cba4fde5302749e6f16b","tests/collection_enabled_bin.rs":"d3a6458b84012a447e5cb792f2292a06951ed252fad803b9166b437bacba542c","tests/common/mod.rs":"2fd391c5eb45f56fdfa3261dd631406c67ed36b10b0d5432febe2483da5c9d89","tests/custom_distribution_buffered.rs":"47c13d1f39adf3881e10caa19e0c08235f08958809e234bf37a79d37d7322cd5","tests/init_fails.rs":"ca7fa1b3dd6a21a9e005b7a4f0a18664c4bceb952dd463db8316500f72280d5b","tests/interruptible_shutdown.rs":"3d954bbe47d4f5fd103c51a4ff99f151662143c25c826da9734a00cd215909b9","tests/memory_distribution_buffered.rs":"db487475a5cf17a0864ccf150984ebdd28bf616573772cf678246cc1bdbcbc0f","tests/metric_metadata.rs":"05c947d3decf0a3281378dbb108080a05319ad8f130af5b07f9b049b80e5f04f","tests/near-empty-c0ffee-db.safe.bin":"89afb3bb8fc94430fb0ed0fe55f85f3f8bcc8fd0fed69a9df13cc560294ec9f5","tests/never_init.rs":"51fff5618f6603bc0945d70131698d10a1c6275f43bbc22a2de5807f8a79229f","tests/no_time_to_init.rs":"2ede23df6618ff1cb5ae3b7bbf95900ad0fd92072afa2e0319bf147b4f75cefc","tests/overflowing_preinit.rs":"985e140460a100986fd051ce901b787a3a7a9747a856cd06066b740ac7d2381c","tests/persist_ping_lifetime_nopanic.rs":"18379d3ffbf4a2c8c684c04ff7a0660b86dfbbb447db2d24dfed6073cb7ddf8f","tests/schema.rs":"23b49005402b914e55a0c5c155f30c2662c609f79be78d1385ec25b3600b3547","tests/simple.rs":"15c76a1b5a336fd6abfbdebafc971f5c6a9b75107ddbca65f0031cde3e2886da","tests/test-delayed-ping-data.sh":"4a6db98b4df6b77898ace6a8b4e8b4c60d3e5c44873bbf38c62e83583e27a3ff","tests/test-enabled-pings.sh":"06656e38f63e65475006b107dd6bd179b0cbaa1fad1470de38e679e91a9315a3","tests/test-pending-gets-removed.sh":"e335f2f00fa97a61b6d94e0005fb3b9de8c8db8076111a67ca47d85392039ea9","tests/test-ping-lifetime-flush.sh":"e8f118ea2f6fd973809e38d5e828a03cfccfe0b0f497ccde5ec92d6d1380c071","tests/test-shutdown-blocking.sh":"a44d8d4bbe2ee3ede9e48121150ae7a5386025160c5cef2181ca142232c5fb27","tests/test-thread-crashing.sh":"f3cd0cc8a7b4fe82bef0fe6fbfbbe45fbad6da3afe0f82578bc5cfb2d6527ac6","tests/timing_distribution_buffered.rs":"501f7289c0c28f0ab83838c88b058999b19436d0f2b693be0787513d7b67e06d","tests/timing_distribution_single_sample.rs":"4f9498b6ef29913da0356027efe5f572c81d2f426e8538c068b54a1cfa33c1b8","tests/upload_timing.rs":"b3b9db197bc2ec41556388969a6bf289e7ef19e05b9019bc2bd98c823fcf6ea3","tests/uploader_capabilities.rs":"347f19e534a50a211ea179d6818631270d1b4ec468098e6b6abcde1e4a6a9bca"},"package":"a3e74377404c1c77824ac2c99e40258e089042c3bfa5e828965c94a3f371ff85"}

10
third_party/rust/glean/Cargo.lock generated vendored
View File

@@ -242,7 +242,7 @@ dependencies = [
[[package]]
name = "glean"
version = "64.2.0"
version = "64.3.0"
dependencies = [
"crossbeam-channel",
"env_logger",
@@ -261,9 +261,9 @@ dependencies = [
[[package]]
name = "glean-core"
version = "64.2.0"
version = "64.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec64dd5ecb37f04def90b179759c8906c95c895c392b444b5b67f868ffa4bedc"
checksum = "930c50acf96db6a6eb2608e378b58bd0fee85d42f0a0018f52a007074971da2b"
dependencies = [
"android_logger",
"bincode",
@@ -1127,9 +1127,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "wr_malloc_size_of"
version = "0.2.0"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c7c9a8bd19d73e907d610b14b3545475c98ad9581e36f1b67044fd209b66c69"
checksum = "afbb573017ba95ec7dcf91621ea30acc61f8c2599810c5f64b9b61b386528776"
dependencies = [
"once_cell",
]

View File

@@ -13,7 +13,7 @@
edition = "2021"
rust-version = "1.82"
name = "glean"
version = "64.2.0"
version = "64.3.0"
authors = [
"Jan-Erik Rediger <jrediger@mozilla.com>",
"The Glean Team <glean-team@mozilla.com>",
@@ -115,7 +115,7 @@ path = "tests/uploader_capabilities.rs"
version = "0.5"
[dependencies.glean-core]
version = "64.2.0"
version = "64.3.0"
[dependencies.inherent]
version = "1"
@@ -124,7 +124,7 @@ version = "1"
version = "0.4.8"
[dependencies.malloc_size_of]
version = "0.2.0"
version = "0.2.1"
features = ["once_cell"]
default-features = false
package = "wr_malloc_size_of"

View File

@@ -203,7 +203,7 @@ pub fn test_get_experimentation_id() -> Option<String> {
/// Set the remote configuration values for the metrics' disabled property
///
/// See [`glean_core::Glean::glean_apply_server_knobs_config`].
/// See [`glean_core::Glean::apply_server_knobs_config`].
pub fn glean_apply_server_knobs_config(json: String) {
glean_core::glean_apply_server_knobs_config(json)
}