mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 10:44:56 +00:00
Bug 1693486 - Update to Glean 39.0.0. r=chutten
Differential Revision: https://phabricator.services.mozilla.com/D116376
This commit is contained in:
Jan-Erik Rediger
parent
e4e0623f1d
commit
b94eb35006
8
Cargo.lock
generated
8
Cargo.lock
generated
@ -2072,9 +2072,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "glean"
|
||||
version = "38.0.1"
|
||||
version = "39.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e19f2098b5cd381c6ba54836131befa7f0733b2a25fbb42f562c24bb817fa0f6"
|
||||
checksum = "c8e24825d3123194a212e3daf8ddac150713cec4f1e126dc3c12ba207f0b5d77"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"crossbeam-channel 0.5.0",
|
||||
@ -2092,9 +2092,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "glean-core"
|
||||
version = "38.0.1"
|
||||
version = "39.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4d672b7cc992c10c7ce78af182e9298d6a1e75f477ac5f1e9a03e89cfad027c9"
|
||||
checksum = "d1a31d189a28ffde9bfcc7ab26586ee2b81705f0b95bf7a090b67fab1f378782"
|
||||
dependencies = [
|
||||
"bincode",
|
||||
"chrono",
|
||||
|
||||
File diff suppressed because one or more lines are too long
34
third_party/rust/glean-core/Cargo.lock
generated
vendored
34
third_party/rust/glean-core/Cargo.lock
generated
vendored
@ -52,9 +52,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.67"
|
||||
version = "1.0.68"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
|
||||
checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
@ -109,9 +109,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ffi-support"
|
||||
version = "0.4.2"
|
||||
version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f85d4d1be103c0b2d86968f0b0690dc09ac0ba205b90adb0389b552869e5000e"
|
||||
checksum = "6f476e3c4fa6d9a3e0eeabd4f7555a382025ec05194675d72fa1db347e53ae6c"
|
||||
dependencies = [
|
||||
"lazy_static",
|
||||
"log",
|
||||
@ -141,9 +141,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.2"
|
||||
version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
|
||||
checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
@ -152,7 +152,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "glean-core"
|
||||
version = "38.0.1"
|
||||
version = "39.0.0"
|
||||
dependencies = [
|
||||
"bincode",
|
||||
"chrono",
|
||||
@ -230,9 +230,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.94"
|
||||
version = "0.2.95"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
|
||||
checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
|
||||
|
||||
[[package]]
|
||||
name = "lmdb-rkv"
|
||||
@ -377,9 +377,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.26"
|
||||
version = "1.0.27"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
|
||||
checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
|
||||
dependencies = [
|
||||
"unicode-xid",
|
||||
]
|
||||
@ -553,18 +553,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.24"
|
||||
version = "1.0.25"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
|
||||
checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.24"
|
||||
version = "1.0.25"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
|
||||
checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -607,9 +607,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "unicode-normalization"
|
||||
version = "0.1.17"
|
||||
version = "0.1.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef"
|
||||
checksum = "33717dca7ac877f497014e10d73f3acf948c342bee31b5ca7892faf94ccc6b49"
|
||||
dependencies = [
|
||||
"tinyvec",
|
||||
]
|
||||
|
||||
4
third_party/rust/glean-core/Cargo.toml
vendored
4
third_party/rust/glean-core/Cargo.toml
vendored
@ -13,7 +13,7 @@
|
||||
[package]
|
||||
edition = "2018"
|
||||
name = "glean-core"
|
||||
version = "38.0.1"
|
||||
version = "39.0.0"
|
||||
authors = ["Jan-Erik Rediger <jrediger@mozilla.com>", "The Glean Team <glean-team@mozilla.com>"]
|
||||
include = ["/README.md", "/LICENSE", "/src", "/examples", "/tests", "/Cargo.toml"]
|
||||
description = "A modern Telemetry library"
|
||||
@ -22,7 +22,7 @@ keywords = ["telemetry"]
|
||||
license = "MPL-2.0"
|
||||
repository = "https://github.com/mozilla/glean"
|
||||
[package.metadata.glean]
|
||||
glean-parser = "3.2.0"
|
||||
glean-parser = "3.4.0"
|
||||
[dependencies.bincode]
|
||||
version = "1.2.1"
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@ use crate::Lifetime;
|
||||
/// Note: the cases in this enum must be kept in sync with the ones
|
||||
/// in the platform-specific code (e.g. `ErrorType.kt`) and with the
|
||||
/// metrics in the registry files.
|
||||
#[derive(Debug, PartialEq)]
|
||||
#[derive(Copy, Clone, Debug, PartialEq)]
|
||||
pub enum ErrorType {
|
||||
/// For when the value to be recorded does not match the metric-specific restrictions
|
||||
InvalidValue,
|
||||
|
||||
31
third_party/rust/glean-core/src/traits/event.rs
vendored
31
third_party/rust/glean-core/src/traits/event.rs
vendored
@ -13,23 +13,22 @@ use crate::ErrorType;
|
||||
///
|
||||
/// Extra keys need to be pre-defined and map to a string representation.
|
||||
///
|
||||
/// For user-defined `EventMetric`s these will be defined as `enums`.
|
||||
/// Each variant will correspond to an entry in the `ALLOWED_KEYS` list.
|
||||
/// For user-defined `EventMetric`s these will be defined as `struct`s.
|
||||
/// Each extra key will be a field in that struct.
|
||||
/// Each field will correspond to an entry in the `ALLOWED_KEYS` list.
|
||||
/// The Glean SDK requires the keys as strings for submission in pings,
|
||||
/// whereas in code we want to provide users a type to work with
|
||||
/// (e.g. to avoid typos or misuse of the API).
|
||||
pub trait ExtraKeys: Hash + Eq + PartialEq + Copy {
|
||||
pub trait ExtraKeys {
|
||||
/// List of allowed extra keys as strings.
|
||||
const ALLOWED_KEYS: &'static [&'static str];
|
||||
|
||||
/// The index of the extra key.
|
||||
/// Convert the event extras into 2 lists:
|
||||
///
|
||||
/// It corresponds to its position in the associated `ALLOWED_KEYS` list.
|
||||
///
|
||||
/// *Note*: An index of `-1` indicates an invalid / non-existing extra key.
|
||||
/// Invalid / non-existing extra keys will be recorded as an error.
|
||||
/// This cannot happen for generated code.
|
||||
fn index(self) -> i32;
|
||||
/// 1. The list of extra key indices.
|
||||
/// Unset keys will be skipped.
|
||||
/// 2. The list of extra values.
|
||||
fn into_ffi_extra(self) -> HashMap<i32, String>;
|
||||
}
|
||||
|
||||
/// Default of no extra keys for events.
|
||||
@ -45,9 +44,8 @@ pub enum NoExtraKeys {}
|
||||
impl ExtraKeys for NoExtraKeys {
|
||||
const ALLOWED_KEYS: &'static [&'static str] = &[];
|
||||
|
||||
fn index(self) -> i32 {
|
||||
// This index will never be used.
|
||||
-1
|
||||
fn into_ffi_extra(self) -> HashMap<i32, String> {
|
||||
unimplemented!("non-existing extra keys can't be turned into a list")
|
||||
}
|
||||
}
|
||||
|
||||
@ -87,11 +85,8 @@ pub trait Event {
|
||||
///
|
||||
/// # Arguments
|
||||
///
|
||||
/// * `extra` - A [`HashMap`] of (key, value) pairs. The key is one of the allowed extra keys as
|
||||
/// set in the metric defintion.
|
||||
/// If a wrong key is used or a value is larger than allowed, an error is reported
|
||||
/// and no event is recorded.
|
||||
fn record<M: Into<Option<HashMap<Self::Extra, String>>>>(&self, extra: M);
|
||||
/// * `extra` - (optional) An object for the extra keys.
|
||||
fn record<M: Into<Option<Self::Extra>>>(&self, extra: M);
|
||||
|
||||
/// **Exported for test purposes.**
|
||||
///
|
||||
|
||||
2
third_party/rust/glean/.cargo-checksum.json
vendored
2
third_party/rust/glean/.cargo-checksum.json
vendored
@ -1 +1 @@
|
||||
{"files":{"Cargo.toml":"2b14ec0b180fc11a82fc2818448c0ed356b4fb5dcacdeda909d53436e82d4f67","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"fd9e0ca6907917ea6bec5de05e15dd21d20fae1cb7f3250467bb20231a8e1065","src/common_test.rs":"bd7ab2f6384bea8971f97ba68b11c946899303891bc534898f7aabbf27f9008a","src/configuration.rs":"4acbedba16d45f6404ccedde86e8aa33eea8c1b9554210cb69c79ff2ec9040c9","src/core_metrics.rs":"0ecf9ec7de9032f45e6c0feaebf17c614f9be88c1a28043e397eaf7d3b18ba37","src/dispatcher/global.rs":"6dae43ceb6bb8f5c6f20311ce610e4173eb880b4314aafd5791be03240a72096","src/dispatcher/mod.rs":"3254ad8f33439c1c0159e3e5b63f028f9e1a4a6c069c6d73dd82bd9cfe3e6086","src/glean_metrics.rs":"151b6e5acc12436c33c75e2e0a18f9769179d3c7fdc60a22fa02afb76feaf00f","src/lib.rs":"25b9e3dd21ff49579d31f07b1ce858f14dbb61ded3aa5623e0370d4af9f22810","src/net/http_uploader.rs":"9e8c1837ca0d3f6ea165ec936ab054173c4fe95a958710176c33b4d4d1d98beb","src/net/mod.rs":"284bcf182156c52ea25fa33bcc48d80b4970ee3c187a4ea3a06602cc34c710bf","src/pings.rs":"2dfccd84848e1933aa4f6a7a707c58ec794c8f73ef2d93ea4d4df71d4e6abc31","src/private/boolean.rs":"eeadc0529e2c69a930479f208746799b064b27facab8306c1c10c650e83fb63c","src/private/counter.rs":"75ad96cd5f53d024230357223244c0a8f58f8b32a9a4d0dbc7cc6ecd74db13b5","src/private/custom_distribution.rs":"0de9cd030a555d93352a7fd251febf4de3a2ca4eeb7666abe5baa884d59168b8","src/private/datetime.rs":"f7e68491b267452fc7d0bb50a2e2f73337d2580435b0518e4cb375a5a30d3017","src/private/denominator.rs":"746c5dfd81fe4027061d799421e35c2cf47b14b98e18e15f2e0d21379604f3f0","src/private/event.rs":"7839ded635f979c7e3a97227530c5843783b8cb2e4487aedbdce7ae16c611e76","src/private/labeled.rs":"ab9a89aa964d23c4b909cb222996cbd3073afaa348acfd8dac527d84d1ee9695","src/private/memory_distribution.rs":"201ce833900fca33f2e4bdd65d9055927627c5e97c9df001351ca40e8e11efae","src/private/mod.rs":"413a41942a48de3d39e9346c2a0803a3ce184978173f8a79b13a116be4abaffe","src/private/numerator.rs":"4133f4a1f2a20931176ecaa7e85a96a4d639ba1b3737441a5713c18909892a42","src/private/ping.rs":"915fc42994e0929656daee5511946ac1f56fe0d4d704e97e13795771d9890180","src/private/quantity.rs":"0fa3c6fb00a4c4d659284a87a4cfbfc5153a73e65ed802f27d74c1bd7fc06273","src/private/rate.rs":"bb7f1a1c9aa2413eb4c606f04aa58199a18d9d12a97fb6548d410f939b01ed09","src/private/recorded_experiment_data.rs":"66b2601902a2dc2b7a283717c21ce754de94fcca30d12e0398195c8ad49c90af","src/private/string.rs":"cab1b0a3a5368a1650dc253bcb5a4622f0d016913bf323c7d74c4130ab22f886","src/private/string_list.rs":"2f4df2aefdf9130a9913cd06dbf91747953ac79648af1c1b924053af18944bac","src/private/timespan.rs":"4094a6020269324e84d52a921c580ce156ea45e5af70a46540a64d23dfb2002e","src/private/timing_distribution.rs":"e6f45e4d57b1dde12b047f7f402787d69f0702fede88af1f0691663aeddaa161","src/private/uuid.rs":"7b76b815f08ac70522c65785f765c59d397f54ee257d47f8290029b456dce0ed","src/system.rs":"98aae0e0c9bf53f92fce4ca3d6040439f540023b63aab022c8c26381f04a4185","src/test.rs":"0cbe4f51fa01b1ca04e4b726e8eb729c3504086bc6b0d644e2114a5a4473165a","tests/common/mod.rs":"4837df2e771929cc077e6fb9a9239645e8e0f7bc6c9f409b71c4d147edf334fc","tests/init_fails.rs":"1e832fe454962ddb1155d546bb71b6395aa9936f848ff0fbe88affaaab7dfae3","tests/never_init.rs":"1f33b8ce7ca3514b57b48cc16d98408974c85cf8aa7d13257ffc2ad878ebb295","tests/no_time_to_init.rs":"4d61e4196d8eef23f3bcb24b59bd0b0379c1f2cb50f03434a53996ab097bfb17","tests/overflowing_preinit.rs":"81ff97745789fd5f58f86364488c011b4503648f1366b12e26755edc54323150","tests/schema.rs":"621caef0cc7f98c79740422835485fea2343ca105d0d9a7eec6ded9cfad6232c","tests/simple.rs":"2f58d3ff90005231f2febd21f66ee41d06302618408ea990b446510449c3444f"},"package":"e19f2098b5cd381c6ba54836131befa7f0733b2a25fbb42f562c24bb817fa0f6"}
|
||||
{"files":{"Cargo.toml":"33c4a9d73a7bb7561d70522ecf4be9530d52eb6e021d07c6b09f4578f6878dad","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"fd9e0ca6907917ea6bec5de05e15dd21d20fae1cb7f3250467bb20231a8e1065","src/common_test.rs":"bd7ab2f6384bea8971f97ba68b11c946899303891bc534898f7aabbf27f9008a","src/configuration.rs":"4acbedba16d45f6404ccedde86e8aa33eea8c1b9554210cb69c79ff2ec9040c9","src/core_metrics.rs":"0ecf9ec7de9032f45e6c0feaebf17c614f9be88c1a28043e397eaf7d3b18ba37","src/dispatcher/global.rs":"6dae43ceb6bb8f5c6f20311ce610e4173eb880b4314aafd5791be03240a72096","src/dispatcher/mod.rs":"3254ad8f33439c1c0159e3e5b63f028f9e1a4a6c069c6d73dd82bd9cfe3e6086","src/glean_metrics.rs":"151b6e5acc12436c33c75e2e0a18f9769179d3c7fdc60a22fa02afb76feaf00f","src/lib.rs":"25b9e3dd21ff49579d31f07b1ce858f14dbb61ded3aa5623e0370d4af9f22810","src/net/http_uploader.rs":"9e8c1837ca0d3f6ea165ec936ab054173c4fe95a958710176c33b4d4d1d98beb","src/net/mod.rs":"284bcf182156c52ea25fa33bcc48d80b4970ee3c187a4ea3a06602cc34c710bf","src/pings.rs":"2dfccd84848e1933aa4f6a7a707c58ec794c8f73ef2d93ea4d4df71d4e6abc31","src/private/boolean.rs":"eeadc0529e2c69a930479f208746799b064b27facab8306c1c10c650e83fb63c","src/private/counter.rs":"75ad96cd5f53d024230357223244c0a8f58f8b32a9a4d0dbc7cc6ecd74db13b5","src/private/custom_distribution.rs":"0de9cd030a555d93352a7fd251febf4de3a2ca4eeb7666abe5baa884d59168b8","src/private/datetime.rs":"f7e68491b267452fc7d0bb50a2e2f73337d2580435b0518e4cb375a5a30d3017","src/private/denominator.rs":"746c5dfd81fe4027061d799421e35c2cf47b14b98e18e15f2e0d21379604f3f0","src/private/event.rs":"d7d7473fa4de0bcc53179aedc1dac1b5affb3f59e8595260304c06de0a40019e","src/private/labeled.rs":"ab9a89aa964d23c4b909cb222996cbd3073afaa348acfd8dac527d84d1ee9695","src/private/memory_distribution.rs":"201ce833900fca33f2e4bdd65d9055927627c5e97c9df001351ca40e8e11efae","src/private/mod.rs":"413a41942a48de3d39e9346c2a0803a3ce184978173f8a79b13a116be4abaffe","src/private/numerator.rs":"4133f4a1f2a20931176ecaa7e85a96a4d639ba1b3737441a5713c18909892a42","src/private/ping.rs":"915fc42994e0929656daee5511946ac1f56fe0d4d704e97e13795771d9890180","src/private/quantity.rs":"0fa3c6fb00a4c4d659284a87a4cfbfc5153a73e65ed802f27d74c1bd7fc06273","src/private/rate.rs":"bb7f1a1c9aa2413eb4c606f04aa58199a18d9d12a97fb6548d410f939b01ed09","src/private/recorded_experiment_data.rs":"66b2601902a2dc2b7a283717c21ce754de94fcca30d12e0398195c8ad49c90af","src/private/string.rs":"cab1b0a3a5368a1650dc253bcb5a4622f0d016913bf323c7d74c4130ab22f886","src/private/string_list.rs":"2f4df2aefdf9130a9913cd06dbf91747953ac79648af1c1b924053af18944bac","src/private/timespan.rs":"4094a6020269324e84d52a921c580ce156ea45e5af70a46540a64d23dfb2002e","src/private/timing_distribution.rs":"e6f45e4d57b1dde12b047f7f402787d69f0702fede88af1f0691663aeddaa161","src/private/uuid.rs":"7b76b815f08ac70522c65785f765c59d397f54ee257d47f8290029b456dce0ed","src/system.rs":"98aae0e0c9bf53f92fce4ca3d6040439f540023b63aab022c8c26381f04a4185","src/test.rs":"0cbe4f51fa01b1ca04e4b726e8eb729c3504086bc6b0d644e2114a5a4473165a","tests/common/mod.rs":"4837df2e771929cc077e6fb9a9239645e8e0f7bc6c9f409b71c4d147edf334fc","tests/init_fails.rs":"1e832fe454962ddb1155d546bb71b6395aa9936f848ff0fbe88affaaab7dfae3","tests/never_init.rs":"1f33b8ce7ca3514b57b48cc16d98408974c85cf8aa7d13257ffc2ad878ebb295","tests/no_time_to_init.rs":"4d61e4196d8eef23f3bcb24b59bd0b0379c1f2cb50f03434a53996ab097bfb17","tests/overflowing_preinit.rs":"81ff97745789fd5f58f86364488c011b4503648f1366b12e26755edc54323150","tests/schema.rs":"621caef0cc7f98c79740422835485fea2343ca105d0d9a7eec6ded9cfad6232c","tests/simple.rs":"2f58d3ff90005231f2febd21f66ee41d06302618408ea990b446510449c3444f"},"package":"c8e24825d3123194a212e3daf8ddac150713cec4f1e126dc3c12ba207f0b5d77"}
|
||||
4
third_party/rust/glean/Cargo.toml
vendored
4
third_party/rust/glean/Cargo.toml
vendored
@ -13,7 +13,7 @@
|
||||
[package]
|
||||
edition = "2018"
|
||||
name = "glean"
|
||||
version = "38.0.1"
|
||||
version = "39.0.0"
|
||||
authors = ["Jan-Erik Rediger <jrediger@mozilla.com>", "The Glean Team <glean-team@mozilla.com>"]
|
||||
include = ["/README.md", "/LICENSE", "/src", "/tests", "/Cargo.toml"]
|
||||
description = "Glean SDK Rust language bindings"
|
||||
@ -29,7 +29,7 @@ features = ["serde"]
|
||||
version = "0.5"
|
||||
|
||||
[dependencies.glean-core]
|
||||
version = "38.0.1"
|
||||
version = "39.0.0"
|
||||
|
||||
[dependencies.inherent]
|
||||
version = "0.1.4"
|
||||
|
||||
36
third_party/rust/glean/src/private/event.rs
vendored
36
third_party/rust/glean/src/private/event.rs
vendored
@ -56,13 +56,11 @@ impl<K: traits::ExtraKeys> EventMetric<K> {
|
||||
impl<K: traits::ExtraKeys> traits::Event for EventMetric<K> {
|
||||
type Extra = K;
|
||||
|
||||
fn record<M: Into<Option<HashMap<<Self as traits::Event>::Extra, String>>>>(&self, extra: M) {
|
||||
fn record<M: Into<Option<<Self as traits::Event>::Extra>>>(&self, extra: M) {
|
||||
let now = crate::get_timestamp_ms();
|
||||
|
||||
// Translate from [ExtraKey -> String] to a [Int -> String] map
|
||||
let extra = extra
|
||||
.into()
|
||||
.map(|h| h.into_iter().map(|(k, v)| (k.index(), v)).collect());
|
||||
// Translate from {ExtraKey -> String} to a [Int -> String] map
|
||||
let extra = extra.into().map(|e| e.into_ffi_extra());
|
||||
let metric = Arc::clone(&self.inner);
|
||||
crate::launch_with_glean(move |glean| metric.record(glean, now, extra));
|
||||
}
|
||||
@ -130,17 +128,20 @@ mod test {
|
||||
let _lock = lock_test();
|
||||
let _t = new_glean(None, true);
|
||||
|
||||
#[derive(Debug, Clone, Copy, Hash, Eq, PartialEq)]
|
||||
enum SomeExtra {
|
||||
Key1,
|
||||
Key2,
|
||||
#[derive(Default, Debug, Clone, Hash, Eq, PartialEq)]
|
||||
struct SomeExtra {
|
||||
key1: Option<String>,
|
||||
key2: Option<String>,
|
||||
}
|
||||
|
||||
impl glean_core::traits::ExtraKeys for SomeExtra {
|
||||
const ALLOWED_KEYS: &'static [&'static str] = &["key1", "key2"];
|
||||
|
||||
fn index(self) -> i32 {
|
||||
self as i32
|
||||
fn into_ffi_extra(self) -> HashMap<i32, String> {
|
||||
let mut map = HashMap::new();
|
||||
self.key1.and_then(|key1| map.insert(0, key1));
|
||||
self.key2.and_then(|key2| map.insert(1, key2));
|
||||
map
|
||||
}
|
||||
}
|
||||
|
||||
@ -151,13 +152,16 @@ mod test {
|
||||
..Default::default()
|
||||
});
|
||||
|
||||
let mut map1 = HashMap::new();
|
||||
map1.insert(SomeExtra::Key1, "1".into());
|
||||
let map1 = SomeExtra {
|
||||
key1: Some("1".into()),
|
||||
..Default::default()
|
||||
};
|
||||
metric.record(map1);
|
||||
|
||||
let mut map2 = HashMap::new();
|
||||
map2.insert(SomeExtra::Key1, "1".into());
|
||||
map2.insert(SomeExtra::Key2, "2".into());
|
||||
let map2 = SomeExtra {
|
||||
key1: Some("1".into()),
|
||||
key2: Some("2".into()),
|
||||
};
|
||||
metric.record(map2);
|
||||
|
||||
metric.record(None);
|
||||
|
||||
@ -6,8 +6,8 @@ edition = "2018"
|
||||
license = "MPL-2.0"
|
||||
|
||||
[dependencies]
|
||||
glean = "38.0.1"
|
||||
glean-core = { version = "38.0.1", features = ["rkv-safe-mode"] }
|
||||
glean = "39.0.0"
|
||||
glean-core = { version = "39.0.0", features = ["rkv-safe-mode"] }
|
||||
log = "0.4"
|
||||
nserror = { path = "../../../xpcom/rust/nserror" }
|
||||
nsstring = { path = "../../../xpcom/rust/nsstring" }
|
||||
|
||||
@ -8,7 +8,7 @@ publish = false
|
||||
[dependencies]
|
||||
bincode = "1.0"
|
||||
chrono = "0.4.10"
|
||||
glean = "38.0.1"
|
||||
glean = "39.0.0"
|
||||
inherent = "0.1.4"
|
||||
log = "0.4"
|
||||
nsstring = { path = "../../../../xpcom/rust/nsstring", optional = true }
|
||||
|
||||
Loading…
Reference in New Issue
Block a user