commit 057d6a09cf842756af6093a24e914318028bf1be
parent 5aae8af6707536a6f51d33abded768c95c26ce00
Author: agoloman <agoloman@mozilla.com>
Date: Sat, 4 Oct 2025 16:53:35 +0300
Revert "Bug 1992239 - Update to Glean v65.2.2 r=TravisLong,supply-chain-reviewers" for causing mochitest failures.
This reverts commit 5aae8af6707536a6f51d33abded768c95c26ce00.
Diffstat:
16 files changed, 72 insertions(+), 77 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -2712,9 +2712,9 @@ dependencies = [
[[package]]
name = "glean"
-version = "65.2.2"
+version = "65.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "895946f5a54f9d54c24175af3a064c9ecf8b4f9374afb26132b583f179fc6be2"
+checksum = "76747982847c4c232762c8a9e41d9929563f7403a096237aba2b39d9e5b375d0"
dependencies = [
"crossbeam-channel",
"glean-core",
@@ -2727,9 +2727,9 @@ dependencies = [
[[package]]
name = "glean-core"
-version = "65.2.2"
+version = "65.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22a5ae2c3fd542fb8388da0de68542748f466c8df9a815c8b9cc274894ab919"
+checksum = "c94f929d70199042dc13c3fd6b55538e11dfb16774c717f88456a5992c349ec1"
dependencies = [
"android_logger",
"bincode",
diff --git a/Cargo.toml b/Cargo.toml
@@ -71,7 +71,7 @@ uniffi_pipeline = "0.29.3"
# Shared across multiple application-services consumers.
rusqlite = "0.37"
# Shared across multiple glean consumers.
-glean = "=65.2.2"
+glean = "=65.2.1"
# 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
diff --git a/gfx/wr/Cargo.lock b/gfx/wr/Cargo.lock
@@ -1175,9 +1175,9 @@ dependencies = [
[[package]]
name = "glean"
-version = "65.2.2"
+version = "65.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "895946f5a54f9d54c24175af3a064c9ecf8b4f9374afb26132b583f179fc6be2"
+checksum = "76747982847c4c232762c8a9e41d9929563f7403a096237aba2b39d9e5b375d0"
dependencies = [
"crossbeam-channel",
"glean-core",
@@ -1190,9 +1190,9 @@ dependencies = [
[[package]]
name = "glean-core"
-version = "65.2.2"
+version = "65.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22a5ae2c3fd542fb8388da0de68542748f466c8df9a815c8b9cc274894ab919"
+checksum = "c94f929d70199042dc13c3fd6b55538e11dfb16774c717f88456a5992c349ec1"
dependencies = [
"android_logger",
"bincode",
diff --git a/gfx/wr/Cargo.toml b/gfx/wr/Cargo.toml
@@ -10,7 +10,7 @@ resolver = "2"
[workspace.dependencies]
gleam = "0.15.1"
-glean = "=65.2.2"
+glean = "=65.2.1"
[profile.release]
debug = true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -76,7 +76,7 @@ ktlint = "1.7.1"
spotless = "8.0.0"
# Mozilla
-glean = "65.2.2"
+glean = "65.2.1"
# Testing libraries
androidx-test = "1.7.0"
diff --git a/python/sites/mach.txt b/python/sites/mach.txt
@@ -57,7 +57,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==65.2.2:telemetry will not be collected
+pypi-optional:glean-sdk==65.2.1:telemetry will not be collected
pypi-optional:orjson>=3.10.15:json operations will be slower in various tools
# Mach gracefully handles the case where `psutil` is unavailable.
# We aren't (yet) able to pin packages in automation, so we have to
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
@@ -268,15 +268,15 @@ user-login = "jrmuizel"
user-name = "Jeff Muizelaar"
[[publisher.glean]]
-version = "65.2.2"
-when = "2025-10-02"
+version = "65.2.1"
+when = "2025-09-26"
user-id = 48
user-login = "badboy"
user-name = "Jan-Erik Rediger"
[[publisher.glean-core]]
-version = "65.2.2"
-when = "2025-10-02"
+version = "65.2.1"
+when = "2025-09-26"
user-id = 48
user-login = "badboy"
user-name = "Jan-Erik Rediger"
@@ -2745,6 +2745,51 @@ who = "Ameer Ghani <inahga@divviup.org>"
criteria = "safe-to-deploy"
version = "1.12.1"
+[[audits.isrg.audits.serde]]
+who = "J.C. Jones <jc@divviup.org>"
+criteria = "safe-to-deploy"
+delta = "1.0.219 -> 1.0.224"
+
+[[audits.isrg.audits.serde]]
+who = "J.C. Jones <jc@divviup.org>"
+criteria = "safe-to-deploy"
+delta = "1.0.224 -> 1.0.225"
+
+[[audits.isrg.audits.serde]]
+who = "Tim Geoghegan <timg@divviup.org>"
+criteria = "safe-to-deploy"
+delta = "1.0.225 -> 1.0.226"
+
+[[audits.isrg.audits.serde_core]]
+who = "J.C. Jones <jc@divviup.org>"
+criteria = "safe-to-deploy"
+version = "1.0.224"
+
+[[audits.isrg.audits.serde_core]]
+who = "J.C. Jones <jc@divviup.org>"
+criteria = "safe-to-deploy"
+delta = "1.0.224 -> 1.0.225"
+
+[[audits.isrg.audits.serde_core]]
+who = "Tim Geoghegan <timg@divviup.org>"
+criteria = "safe-to-deploy"
+delta = "1.0.225 -> 1.0.226"
+
+[[audits.isrg.audits.serde_derive]]
+who = "J.C. Jones <jc@divviup.org>"
+criteria = "safe-to-deploy"
+delta = "1.0.219 -> 1.0.224"
+
+[[audits.isrg.audits.serde_derive]]
+who = "J.C. Jones <jc@divviup.org>"
+criteria = "safe-to-deploy"
+delta = "1.0.224 -> 1.0.225"
+
+[[audits.isrg.audits.serde_derive]]
+who = "Tim Geoghegan <timg@divviup.org>"
+criteria = "safe-to-deploy"
+delta = "1.0.225 -> 1.0.226"
+
[[audits.isrg.audits.sha2]]
who = "David Cook <dcook@divviup.org>"
criteria = "safe-to-deploy"
diff --git a/third_party/rust/glean-core/.cargo-checksum.json b/third_party/rust/glean-core/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.lock":"cb4157ee7dbc00995c9b8fe1e762e7bf955cb3fdd6f826990494e340e0b21b57","Cargo.toml":"c806ecada5be56fd1c8e2578a5c8fe53e3526479a1fd94fe1ac6c11974c179ec","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"026495898699b54608eb4ec16074ffafc57920d80ccb59961c501a1ea28c9985","build.rs":"4857bea99c6b8c08db8818efa9d3738716f52d3acb68159323957ae52892a3eb","examples/rkv-open.rs":"0d0aaaa29b47338880ab444cece0dfa212ff114cbaf738c9a4cd6e7f10545854","src/common_metric_data.rs":"571075e47241a5f21799994033f852d0d70d0e486661287646ac61dadd11ac59","src/core/mod.rs":"14141b42926a91ec4924e7246f3b891508a63bd1750330c4ad2198674b4d7d7d","src/core_metrics.rs":"ddc750e9f4e11f88aee947360897031657aeef74fcf0f3293bd9033b78747354","src/coverage.rs":"49613fd310bd24d779472720975fbe6c97ec370a95eb55f10afa43f67539c942","src/database/mod.rs":"d7326c8820748f92d101c7978f77064010a7475dfea508b5817c201c6ec2b9a8","src/debug.rs":"663f77a3335256a562afad031496ea9215e315edd608398452df514dcff0b4af","src/dispatcher/global.rs":"17493b1a5e926ca1e9c1cda2ee031773402a19183911eb80048630d60266d89e","src/dispatcher/mod.rs":"30086e2aa8b34d7bdeef6ca93c115f3f22c438dc7a9896ce8251c9e6992420ea","src/error.rs":"b93c7d3e243b21bb9eafc95f17860aba1a942b2f2b0a7f43307690f05fece516","src/error_recording.rs":"32c1f58ff080cb22184bca37e356faadbfe846386880fb0898b773adb3a97d8c","src/event_database/mod.rs":"cfd584864a8300a2b441bd91558dcc64ab8130bcc9e19583edeb37a3d9622d2c","src/fd_logger.rs":"0c9def6fa53db1a2ab93c85795f8a7df57797bcfd3978146923e151752e291a6","src/glean.udl":"43d66c7ee56533bdac9f272f3281515ee1e2cc1d9db2c85811f37283acda2967","src/glean_metrics.rs":"eb8dcf95b7a1a5c53d880f0ff791300e6c4c5e21f0761fed7c004381bc43a230","src/histogram/exponential.rs":"63c81371f3c912f946dd39aea76f6f3f73f35f1526110b7def4c2badab48143d","src/histogram/functional.rs":"fffa12a5b2b376cf9337ee0fdd6ad7961841e441b556a4e9ef29c524f933ea2d","src/histogram/linear.rs":"7531e1515844fca96f7c9dad48f632012d9d2bc002f02c15c82501c74c324e70","src/histogram/mod.rs":"0dd7264a04da0bb69aed42bc99201ef0d4d7be8ea1503165fd2904440e805ad5","src/internal_metrics.rs":"ed17121170c203062a9a8f0debb1da8caef49056e1a54096f53ffc3be7571075","src/internal_pings.rs":"308a0437325686cdbc7b7ed2f444a972e76a06d3982c4d9551324f8e21e96a23","src/lib.rs":"490e8c7374e64684113bae1f1d1c0ddaf08bc53df9ac474d864f91d8adf2bd59","src/lib_unit_tests.rs":"cc0ca9d21ce75fc9e8b445240d770018459b8f71f44b08a988d4ac2d25ac3c4f","src/metrics/boolean.rs":"0d3b3ab535a30fe2de3709c21b0f56d294171aa748d7fca9b022f59504055f4c","src/metrics/counter.rs":"31e52181aed062b686ec0dc745ead3946ce685ca49c2f90733aa3054a46ee428","src/metrics/custom_distribution.rs":"c8e3843a618eda50d2702ec3438ba89cb8132503f288cc91765fb9eca410f3cf","src/metrics/datetime.rs":"f03b9c8c97c14d6d34e0a019730fb71a7d8dd1cd929c17817c40ee84f12a53f4","src/metrics/denominator.rs":"0cda6120020b5bec89804e8700b8eb4e22cc85550f64612a6dbf403aea5fa1fd","src/metrics/dual_labeled_counter.rs":"81c6b668cd75e6eb3383bfeff569b9aca98f7f0cf4d75a528162e2e0810ba16b","src/metrics/event.rs":"412b5ed7703b0a8edcf33c344a09c7277141d924898397b18891d02ccba7730d","src/metrics/experiment.rs":"5f9278cca4e133eb8df33bbfe36d1fe0ef3eade8c09f1b46db3c4d0790515412","src/metrics/labeled.rs":"5e1b4df1086f10013794db27d19050792e8929f97e61cd9bd738e1944df7b940","src/metrics/memory_distribution.rs":"2d8c79148585792477a4242132aa4d39f6ed384e533b9fc7b629df0cda21e0dc","src/metrics/memory_unit.rs":"ee32e020cb303dd631457374048a3ed53a2e7cbacc29c54d17d836fb15507538","src/metrics/mod.rs":"27b2f2931c942d8007cf0e4acbc8c875c2a08761b886c04b58c3d6b6b7d726d3","src/metrics/numerator.rs":"d9a8f1bfb846746eab9fca3cdbb58a679f1a16f7c192bacb46697766eb33c9ce","src/metrics/object.rs":"93a17838f0e845a2ffccef63adde28629aea25453dc5bfb742dde3dfd956d13b","src/metrics/ping.rs":"6eef8ca063adb1158a66bf283fa66c2349e1551366b1f027150a45f24025b364","src/metrics/quantity.rs":"0e722d6e2b5f215815b45de85697ca3513a0c22768e802acbacee2e09914de2e","src/metrics/rate.rs":"2c217d6b1b1094cdf72ffd55b90823e535094d422714cdc3c98339fa2a0509d8","src/metrics/recorded_experiment.rs":"6f089534bb4e1143abf0aa43e813c9fcc864fff128a825e83f09e61e96a1f6ee","src/metrics/remote_settings_config.rs":"3beea00afd2779f1e4d2d88ed43cbce1e5a62286ea74b52f0a62236f3b34c217","src/metrics/string.rs":"8d218d13508bac5d384caaccd1e83f16e31c470a7276ae14685767196892b008","src/metrics/string_list.rs":"a01360c198d9505158757b42bf3fa14cadbee825d2f261b96778eb70b89c5902","src/metrics/text.rs":"18c81d0c049d1c92c4d22ccb534cae944a0f190872b4dfc2788e9a7ed0eff2d0","src/metrics/time_unit.rs":"72325065e4ac0f3562f1983bda9fe3c0ab18272011dafe03d67900a3184a8eb6","src/metrics/timespan.rs":"5aa05a2540b551794aa64d7cdd253dfacd4f50b78878608adc909185b06f431a","src/metrics/timing_distribution.rs":"6e62c42c345385fd2c0e697603dbe947b41a3ba52beb6df6c604b29316c19e7b","src/metrics/url.rs":"02e7279f71f6ea0b54f6c9732fb4ff8422061963d134ed7f5091a24d0ba74d1b","src/metrics/uuid.rs":"d3fd20143c7fe7462c9ad819bb5e6ae370930a8b30e778d799cfe48a63b35e67","src/ping/mod.rs":"22c85bd40fd0dbf479d504c6b8671833d02fbe2da2d2778fcbb11aeeea5f65b6","src/scheduler.rs":"2463d406492b43e3b4544bc3b6cdeea99421b2bb04178a0cf38cd9cfcd00c5e4","src/storage/mod.rs":"4c7daf0a8252b027577104a553bc5eeaf5a8b008e6109b249ed081c20b5720ea","src/system.rs":"e3d1b54e1d39cafe6f4dc7ff5021b08c879733f909951b0e1332b3efa9ed97bd","src/thread.rs":"f8504fb6cfc7b43566f232930d5075d8a759fd7339d81ff01ba73568298492c7","src/traits/boolean.rs":"772acc7e42b16f1d5ca559009f33f3f2eedd71eec68211d651a41dcadda93267","src/traits/counter.rs":"b5ec577b46c6b78a503fc9f1712e4033c0a17d952c7eb619b5dbdd56cb65bc4f","src/traits/custom_distribution.rs":"17354bd7a9d5add9ffaf66a5d4f3bd7e3a42b33cad24138e30c8b08ecc8d5308","src/traits/datetime.rs":"a917cb631be66e0c42bfa49ca370f862c39497534e38ea9f42f7125a1fe7c280","src/traits/dual_labeled_counter.rs":"9f69fad25d7982f1d5d8195e2d218cebebb22db2c5f913202d25294d3462c254","src/traits/event.rs":"de542d6eb14648524f3ab5bd695767a30a2bb177fc2f297c9bbdc0340543e56d","src/traits/labeled.rs":"1b2f8eea8d59e1635f64993936d880084a5e3f65cfd7a26ddf6968366890187d","src/traits/memory_distribution.rs":"193b3c8aeb7dfd4b87337a9ba36ae9b2774b8f1a9bfe0a59632e0670ff242d8f","src/traits/mod.rs":"1ffab9c66d37a4759c369d805386792eb39f769d6a801e1737eb19cfdb40477f","src/traits/numerator.rs":"27946742ef94e0018de4bb690414ff187fe28e7e845431873bc4ad5981c2d3a9","src/traits/object.rs":"c03bad670ec7affbc578247f9e1904e898c1870b9bf25750c5094113f995623f","src/traits/ping.rs":"8831c106c03afeb458b0b028fa1ce61f056ebf8e82bc0a171a1bff255d920748","src/traits/quantity.rs":"02397ed9542aaca442d5eed3419b33744c5781fffc0d91e57474cb983370cdc1","src/traits/rate.rs":"34c6bf9d718b1f94ef56f03b3b41ecfaf36111a4bee114d3bf17231d8842e772","src/traits/string.rs":"f21cf48c23086c61b6620c65f2e3dea8b83728a25b466f69a194223c5a33f9e5","src/traits/string_list.rs":"2816a6eb8716e0f2fe2383954e9b8f81494bf4dfee4d35c55698795dc1f2be53","src/traits/text.rs":"ef4422b0027e1282d0a9adc5c6c7e852b70151e2619fba4956434a85f1a396f5","src/traits/timespan.rs":"74bfc63448d2cc9b184b4ffa6c9cce962fb5aeac045988face556c4eb58a2ca1","src/traits/timing_distribution.rs":"45c0eda19b799af94b03476edefe086bd870ef0a07fd09c835bf398786d2b605","src/traits/url.rs":"5540515d7ef0949fe17f8bf54fa8c6d2f45ee0579632d7100f35b04d51013c88","src/traits/uuid.rs":"9d4e48de7ccf3e862ec0adba559811885d5cbefe83ca7a962f82815da88233ec","src/upload/directory.rs":"b676a05ae19a937e81391d749048fd7f544c629999dd71c8198319b5534da956","src/upload/mod.rs":"b162abaa982c62fa8f803a5b2b28c9d2d700829212046446667f79f795601b5c","src/upload/policy.rs":"0f8e50db8942b75ca871764e3a250d3d382925f752b162c8ac160185c5f6a2d7","src/upload/request.rs":"6922ca8ca6944b414686234156b1d46bf9e6f4bf745b77ed7a767ad231970876","src/upload/result.rs":"c956266c54595d27d5e8b11abffe28fad5fea82995922618805b66cfdcc21d54","src/util.rs":"8fe16c1a1c89d9ca0fee425d81a5809c999092c0b7543d386a2b9a6d649ba130","tests/boolean.rs":"76d6014ff108cb6514d9bceb1b2b14749a55b09921f4595a5e30f1bd3546e9f0","tests/collection_enabled.rs":"05517ad50a05e97f73b658eb854561284db1588c7f1ec736055436a0b2b64d99","tests/common/mod.rs":"be651c204ea7fc8412959a29d03a5c6ed868e20f8c06733869063dcfb18d8405","tests/counter.rs":"4c59def10e64de0d7a0241dde0267fd02c828b38be8cc67fba90a76004ca6721","tests/custom_distribution.rs":"41c593a0b4561e21f29d1a5b948de964a866253c58ca76ffefebe370fca150e0","tests/datetime.rs":"51bf8ebea3f5b99d2e5cab1d0e2cd15d750a05c5002b9dbec614ce7dc9093cf4","tests/dual_labeled_counter.rs":"e95a5713ec3faa2cbd4bfdafa9b2f4051bb7c3d7e3fd09ca4d730d5ee7d30ffe","tests/event.rs":"2321b9b80460aeaeb3583da5d475de7c6e331e95033f38313a9018056850201b","tests/labeled.rs":"01ea8db75d774f6ca864f7cc772c98c21e570511cb034e0226127a2bae7b605f","tests/memory_distribution.rs":"3d9a5b8f99e03f783e3396e4320ee4dc974c895cfef2cec0b14d2a9a9f9b736f","tests/object.rs":"8c35676e04f6ccf54a28764700915e753fc0355bfa5d7804d72caba66fd564cd","tests/ping.rs":"eff68d3b47b04c58d8123214dd66e8d06d11f82ed3fd4f703224f84effb319bb","tests/ping_maker.rs":"e4b834336dc8114531746a3c47a8c28c7ae9831856c06d9c0ce26a1167e4fcfd","tests/quantity.rs":"55e7dca346fd1d27f0974b78ca3fb12427cb5da2ee637afc08a54f360f947361","tests/rate.rs":"3766230e31cc4ab960f916b4c2f9208cc8542ecea0749298197f547b745440e9","tests/storage.rs":"990dd1d13b9ffa8af0686977a6ac3502c6befb9eaa83649587e2660f51c596c9","tests/string.rs":"397fcfd27c25f0e81e2a40db3265b0d7dc0dd56b190319c1f86cb1c2c0ed4f9d","tests/string_list.rs":"34efa2afe3e89e6635f21ec9c80650d5816e35e9cb85163d894d600a5b3a4e3a","tests/test-rkv-cases.sh":"1df53d64ba03ff60b242afb79099fb1a5847a7d29b4b8f6e3fa8d75bdeff1d71","tests/text.rs":"c3449e0dd8d774a60f47e39752c16951b8723eeea11c6a01d7fa7d3536285773","tests/timespan.rs":"3d05739a93f3e0ea7264e8fdea876bd948714e5b44e82b8fd7c0218fdb597bb3","tests/timing_distribution.rs":"072ad950b2162e503150e411119b9a000573538bd2cff93c1c1a3616d1589ef4","tests/uuid.rs":"e0e58614319f5e973126f5b4e68d9289ccd6d65e428aca215bf7dcc8a0504889","uniffi.toml":"6ddc98b686b0925a81abd9d1c769e5c98ac29771b210a1c535931a46dec9a8e3"},"package":"b22a5ae2c3fd542fb8388da0de68542748f466c8df9a815c8b9cc274894ab919"}
-\ No newline at end of file
+{"files":{"Cargo.lock":"1091ffb928af70975d34ffb872f3b2ed4dcb5c9779bbf421bc50a2d606360307","Cargo.toml":"88e5e3deb546dae0e6a57b3fd5e191d13a64618c488512358d1a7f5ac49c2e67","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"026495898699b54608eb4ec16074ffafc57920d80ccb59961c501a1ea28c9985","build.rs":"4857bea99c6b8c08db8818efa9d3738716f52d3acb68159323957ae52892a3eb","examples/rkv-open.rs":"0d0aaaa29b47338880ab444cece0dfa212ff114cbaf738c9a4cd6e7f10545854","src/common_metric_data.rs":"571075e47241a5f21799994033f852d0d70d0e486661287646ac61dadd11ac59","src/core/mod.rs":"14141b42926a91ec4924e7246f3b891508a63bd1750330c4ad2198674b4d7d7d","src/core_metrics.rs":"ddc750e9f4e11f88aee947360897031657aeef74fcf0f3293bd9033b78747354","src/coverage.rs":"49613fd310bd24d779472720975fbe6c97ec370a95eb55f10afa43f67539c942","src/database/mod.rs":"553a41f960c3e3e3e23218bfe990beac513c44e94490d1c0199e73ad4a415262","src/debug.rs":"663f77a3335256a562afad031496ea9215e315edd608398452df514dcff0b4af","src/dispatcher/global.rs":"17493b1a5e926ca1e9c1cda2ee031773402a19183911eb80048630d60266d89e","src/dispatcher/mod.rs":"30086e2aa8b34d7bdeef6ca93c115f3f22c438dc7a9896ce8251c9e6992420ea","src/error.rs":"b93c7d3e243b21bb9eafc95f17860aba1a942b2f2b0a7f43307690f05fece516","src/error_recording.rs":"32c1f58ff080cb22184bca37e356faadbfe846386880fb0898b773adb3a97d8c","src/event_database/mod.rs":"cfd584864a8300a2b441bd91558dcc64ab8130bcc9e19583edeb37a3d9622d2c","src/fd_logger.rs":"0c9def6fa53db1a2ab93c85795f8a7df57797bcfd3978146923e151752e291a6","src/glean.udl":"43d66c7ee56533bdac9f272f3281515ee1e2cc1d9db2c85811f37283acda2967","src/glean_metrics.rs":"eb8dcf95b7a1a5c53d880f0ff791300e6c4c5e21f0761fed7c004381bc43a230","src/histogram/exponential.rs":"63c81371f3c912f946dd39aea76f6f3f73f35f1526110b7def4c2badab48143d","src/histogram/functional.rs":"fffa12a5b2b376cf9337ee0fdd6ad7961841e441b556a4e9ef29c524f933ea2d","src/histogram/linear.rs":"7531e1515844fca96f7c9dad48f632012d9d2bc002f02c15c82501c74c324e70","src/histogram/mod.rs":"0dd7264a04da0bb69aed42bc99201ef0d4d7be8ea1503165fd2904440e805ad5","src/internal_metrics.rs":"75f7db7476d89fca433c9c1880e4a0161ad02bad35604a6dd1845f6622d3928b","src/internal_pings.rs":"308a0437325686cdbc7b7ed2f444a972e76a06d3982c4d9551324f8e21e96a23","src/lib.rs":"490e8c7374e64684113bae1f1d1c0ddaf08bc53df9ac474d864f91d8adf2bd59","src/lib_unit_tests.rs":"cc0ca9d21ce75fc9e8b445240d770018459b8f71f44b08a988d4ac2d25ac3c4f","src/metrics/boolean.rs":"0d3b3ab535a30fe2de3709c21b0f56d294171aa748d7fca9b022f59504055f4c","src/metrics/counter.rs":"31e52181aed062b686ec0dc745ead3946ce685ca49c2f90733aa3054a46ee428","src/metrics/custom_distribution.rs":"c8e3843a618eda50d2702ec3438ba89cb8132503f288cc91765fb9eca410f3cf","src/metrics/datetime.rs":"f03b9c8c97c14d6d34e0a019730fb71a7d8dd1cd929c17817c40ee84f12a53f4","src/metrics/denominator.rs":"0cda6120020b5bec89804e8700b8eb4e22cc85550f64612a6dbf403aea5fa1fd","src/metrics/dual_labeled_counter.rs":"81c6b668cd75e6eb3383bfeff569b9aca98f7f0cf4d75a528162e2e0810ba16b","src/metrics/event.rs":"412b5ed7703b0a8edcf33c344a09c7277141d924898397b18891d02ccba7730d","src/metrics/experiment.rs":"5f9278cca4e133eb8df33bbfe36d1fe0ef3eade8c09f1b46db3c4d0790515412","src/metrics/labeled.rs":"5e1b4df1086f10013794db27d19050792e8929f97e61cd9bd738e1944df7b940","src/metrics/memory_distribution.rs":"2d8c79148585792477a4242132aa4d39f6ed384e533b9fc7b629df0cda21e0dc","src/metrics/memory_unit.rs":"ee32e020cb303dd631457374048a3ed53a2e7cbacc29c54d17d836fb15507538","src/metrics/mod.rs":"27b2f2931c942d8007cf0e4acbc8c875c2a08761b886c04b58c3d6b6b7d726d3","src/metrics/numerator.rs":"d9a8f1bfb846746eab9fca3cdbb58a679f1a16f7c192bacb46697766eb33c9ce","src/metrics/object.rs":"93a17838f0e845a2ffccef63adde28629aea25453dc5bfb742dde3dfd956d13b","src/metrics/ping.rs":"6eef8ca063adb1158a66bf283fa66c2349e1551366b1f027150a45f24025b364","src/metrics/quantity.rs":"0e722d6e2b5f215815b45de85697ca3513a0c22768e802acbacee2e09914de2e","src/metrics/rate.rs":"2c217d6b1b1094cdf72ffd55b90823e535094d422714cdc3c98339fa2a0509d8","src/metrics/recorded_experiment.rs":"6f089534bb4e1143abf0aa43e813c9fcc864fff128a825e83f09e61e96a1f6ee","src/metrics/remote_settings_config.rs":"3beea00afd2779f1e4d2d88ed43cbce1e5a62286ea74b52f0a62236f3b34c217","src/metrics/string.rs":"8d218d13508bac5d384caaccd1e83f16e31c470a7276ae14685767196892b008","src/metrics/string_list.rs":"a01360c198d9505158757b42bf3fa14cadbee825d2f261b96778eb70b89c5902","src/metrics/text.rs":"18c81d0c049d1c92c4d22ccb534cae944a0f190872b4dfc2788e9a7ed0eff2d0","src/metrics/time_unit.rs":"72325065e4ac0f3562f1983bda9fe3c0ab18272011dafe03d67900a3184a8eb6","src/metrics/timespan.rs":"5aa05a2540b551794aa64d7cdd253dfacd4f50b78878608adc909185b06f431a","src/metrics/timing_distribution.rs":"6e62c42c345385fd2c0e697603dbe947b41a3ba52beb6df6c604b29316c19e7b","src/metrics/url.rs":"02e7279f71f6ea0b54f6c9732fb4ff8422061963d134ed7f5091a24d0ba74d1b","src/metrics/uuid.rs":"d3fd20143c7fe7462c9ad819bb5e6ae370930a8b30e778d799cfe48a63b35e67","src/ping/mod.rs":"22c85bd40fd0dbf479d504c6b8671833d02fbe2da2d2778fcbb11aeeea5f65b6","src/scheduler.rs":"2463d406492b43e3b4544bc3b6cdeea99421b2bb04178a0cf38cd9cfcd00c5e4","src/storage/mod.rs":"4c7daf0a8252b027577104a553bc5eeaf5a8b008e6109b249ed081c20b5720ea","src/system.rs":"e3d1b54e1d39cafe6f4dc7ff5021b08c879733f909951b0e1332b3efa9ed97bd","src/thread.rs":"f8504fb6cfc7b43566f232930d5075d8a759fd7339d81ff01ba73568298492c7","src/traits/boolean.rs":"772acc7e42b16f1d5ca559009f33f3f2eedd71eec68211d651a41dcadda93267","src/traits/counter.rs":"b5ec577b46c6b78a503fc9f1712e4033c0a17d952c7eb619b5dbdd56cb65bc4f","src/traits/custom_distribution.rs":"17354bd7a9d5add9ffaf66a5d4f3bd7e3a42b33cad24138e30c8b08ecc8d5308","src/traits/datetime.rs":"a917cb631be66e0c42bfa49ca370f862c39497534e38ea9f42f7125a1fe7c280","src/traits/dual_labeled_counter.rs":"9f69fad25d7982f1d5d8195e2d218cebebb22db2c5f913202d25294d3462c254","src/traits/event.rs":"de542d6eb14648524f3ab5bd695767a30a2bb177fc2f297c9bbdc0340543e56d","src/traits/labeled.rs":"1b2f8eea8d59e1635f64993936d880084a5e3f65cfd7a26ddf6968366890187d","src/traits/memory_distribution.rs":"193b3c8aeb7dfd4b87337a9ba36ae9b2774b8f1a9bfe0a59632e0670ff242d8f","src/traits/mod.rs":"1ffab9c66d37a4759c369d805386792eb39f769d6a801e1737eb19cfdb40477f","src/traits/numerator.rs":"27946742ef94e0018de4bb690414ff187fe28e7e845431873bc4ad5981c2d3a9","src/traits/object.rs":"c03bad670ec7affbc578247f9e1904e898c1870b9bf25750c5094113f995623f","src/traits/ping.rs":"8831c106c03afeb458b0b028fa1ce61f056ebf8e82bc0a171a1bff255d920748","src/traits/quantity.rs":"02397ed9542aaca442d5eed3419b33744c5781fffc0d91e57474cb983370cdc1","src/traits/rate.rs":"34c6bf9d718b1f94ef56f03b3b41ecfaf36111a4bee114d3bf17231d8842e772","src/traits/string.rs":"f21cf48c23086c61b6620c65f2e3dea8b83728a25b466f69a194223c5a33f9e5","src/traits/string_list.rs":"2816a6eb8716e0f2fe2383954e9b8f81494bf4dfee4d35c55698795dc1f2be53","src/traits/text.rs":"ef4422b0027e1282d0a9adc5c6c7e852b70151e2619fba4956434a85f1a396f5","src/traits/timespan.rs":"74bfc63448d2cc9b184b4ffa6c9cce962fb5aeac045988face556c4eb58a2ca1","src/traits/timing_distribution.rs":"45c0eda19b799af94b03476edefe086bd870ef0a07fd09c835bf398786d2b605","src/traits/url.rs":"5540515d7ef0949fe17f8bf54fa8c6d2f45ee0579632d7100f35b04d51013c88","src/traits/uuid.rs":"9d4e48de7ccf3e862ec0adba559811885d5cbefe83ca7a962f82815da88233ec","src/upload/directory.rs":"b676a05ae19a937e81391d749048fd7f544c629999dd71c8198319b5534da956","src/upload/mod.rs":"b162abaa982c62fa8f803a5b2b28c9d2d700829212046446667f79f795601b5c","src/upload/policy.rs":"0f8e50db8942b75ca871764e3a250d3d382925f752b162c8ac160185c5f6a2d7","src/upload/request.rs":"6922ca8ca6944b414686234156b1d46bf9e6f4bf745b77ed7a767ad231970876","src/upload/result.rs":"c956266c54595d27d5e8b11abffe28fad5fea82995922618805b66cfdcc21d54","src/util.rs":"8fe16c1a1c89d9ca0fee425d81a5809c999092c0b7543d386a2b9a6d649ba130","tests/boolean.rs":"76d6014ff108cb6514d9bceb1b2b14749a55b09921f4595a5e30f1bd3546e9f0","tests/collection_enabled.rs":"05517ad50a05e97f73b658eb854561284db1588c7f1ec736055436a0b2b64d99","tests/common/mod.rs":"be651c204ea7fc8412959a29d03a5c6ed868e20f8c06733869063dcfb18d8405","tests/counter.rs":"4c59def10e64de0d7a0241dde0267fd02c828b38be8cc67fba90a76004ca6721","tests/custom_distribution.rs":"41c593a0b4561e21f29d1a5b948de964a866253c58ca76ffefebe370fca150e0","tests/datetime.rs":"51bf8ebea3f5b99d2e5cab1d0e2cd15d750a05c5002b9dbec614ce7dc9093cf4","tests/dual_labeled_counter.rs":"e95a5713ec3faa2cbd4bfdafa9b2f4051bb7c3d7e3fd09ca4d730d5ee7d30ffe","tests/event.rs":"2321b9b80460aeaeb3583da5d475de7c6e331e95033f38313a9018056850201b","tests/labeled.rs":"01ea8db75d774f6ca864f7cc772c98c21e570511cb034e0226127a2bae7b605f","tests/memory_distribution.rs":"3d9a5b8f99e03f783e3396e4320ee4dc974c895cfef2cec0b14d2a9a9f9b736f","tests/object.rs":"8c35676e04f6ccf54a28764700915e753fc0355bfa5d7804d72caba66fd564cd","tests/ping.rs":"eff68d3b47b04c58d8123214dd66e8d06d11f82ed3fd4f703224f84effb319bb","tests/ping_maker.rs":"e4b834336dc8114531746a3c47a8c28c7ae9831856c06d9c0ce26a1167e4fcfd","tests/quantity.rs":"55e7dca346fd1d27f0974b78ca3fb12427cb5da2ee637afc08a54f360f947361","tests/rate.rs":"3766230e31cc4ab960f916b4c2f9208cc8542ecea0749298197f547b745440e9","tests/storage.rs":"990dd1d13b9ffa8af0686977a6ac3502c6befb9eaa83649587e2660f51c596c9","tests/string.rs":"397fcfd27c25f0e81e2a40db3265b0d7dc0dd56b190319c1f86cb1c2c0ed4f9d","tests/string_list.rs":"34efa2afe3e89e6635f21ec9c80650d5816e35e9cb85163d894d600a5b3a4e3a","tests/test-rkv-cases.sh":"1df53d64ba03ff60b242afb79099fb1a5847a7d29b4b8f6e3fa8d75bdeff1d71","tests/text.rs":"c3449e0dd8d774a60f47e39752c16951b8723eeea11c6a01d7fa7d3536285773","tests/timespan.rs":"3d05739a93f3e0ea7264e8fdea876bd948714e5b44e82b8fd7c0218fdb597bb3","tests/timing_distribution.rs":"072ad950b2162e503150e411119b9a000573538bd2cff93c1c1a3616d1589ef4","tests/uuid.rs":"e0e58614319f5e973126f5b4e68d9289ccd6d65e428aca215bf7dcc8a0504889","uniffi.toml":"6ddc98b686b0925a81abd9d1c769e5c98ac29771b210a1c535931a46dec9a8e3"},"package":"c94f929d70199042dc13c3fd6b55538e11dfb16774c717f88456a5992c349ec1"}
+\ No newline at end of file
diff --git a/third_party/rust/glean-core/Cargo.lock b/third_party/rust/glean-core/Cargo.lock
@@ -316,7 +316,7 @@ dependencies = [
[[package]]
name = "glean-core"
-version = "65.2.2"
+version = "65.2.1"
dependencies = [
"android_logger",
"bincode",
diff --git a/third_party/rust/glean-core/Cargo.toml b/third_party/rust/glean-core/Cargo.toml
@@ -13,7 +13,7 @@
edition = "2021"
rust-version = "1.82"
name = "glean-core"
-version = "65.2.2"
+version = "65.2.1"
authors = [
"Jan-Erik Rediger <jrediger@mozilla.com>",
"The Glean Team <glean-team@mozilla.com>",
diff --git a/third_party/rust/glean-core/src/database/mod.rs b/third_party/rust/glean-core/src/database/mod.rs
@@ -217,12 +217,6 @@ fn database_size(dir: &Path) -> Option<NonZeroU64> {
NonZeroU64::new(total_size)
}
-fn store_size(rkv: &Rkv, store: &SingleStore) -> Result<i64> {
- let reader = rkv.read()?;
- let iter = store.iter_start(&reader)?;
- Ok(iter.count().try_into().unwrap_or(-1))
-}
-
impl Database {
/// Initializes the data store.
///
@@ -249,22 +243,10 @@ impl Database {
let (rkv, rkv_load_state) = Self::open_rkv(&path)?;
load_sizes.post_open = database_size(&path).map(|x| x.get() as i64);
let user_store = rkv.open_single(Lifetime::User.as_str(), StoreOptions::create())?;
- match store_size(&rkv, &user_store) {
- Ok(record_count) => load_sizes.user_records = Some(record_count),
- Err(e) => load_sizes.error = Some(e.to_string()),
- };
load_sizes.post_open_user = database_size(&path).map(|x| x.get() as i64);
let ping_store = rkv.open_single(Lifetime::Ping.as_str(), StoreOptions::create())?;
- match store_size(&rkv, &ping_store) {
- Ok(record_count) => load_sizes.ping_records = Some(record_count),
- Err(e) => load_sizes.error = Some(e.to_string()),
- };
let application_store =
rkv.open_single(Lifetime::Application.as_str(), StoreOptions::create())?;
- match store_size(&rkv, &application_store) {
- Ok(record_count) => load_sizes.application_records = Some(record_count),
- Err(e) => load_sizes.error = Some(e.to_string()),
- };
let ping_lifetime_data = if delay_ping_lifetime_io {
Some(RwLock::new(BTreeMap::new()))
} else {
@@ -297,12 +279,6 @@ impl Database {
// Safe unwrap: just set it to Some above.
db.load_sizes.as_mut().unwrap().post_load_ping_lifetime_data =
database_size(&path).map(|x| x.get() as i64);
- if let Some(ref ping_data) = db.ping_lifetime_data {
- // Safe unwrap: just set load_sizes to Some above.
- // Safe unwrap: Unless the read lock is poisoned (already?!).
- db.load_sizes.as_mut().unwrap().ping_memory_records =
- Some(ping_data.read().unwrap().len().try_into().unwrap_or(-1));
- }
Ok(db)
}
diff --git a/third_party/rust/glean-core/src/internal_metrics.rs b/third_party/rust/glean-core/src/internal_metrics.rs
@@ -470,14 +470,4 @@ pub struct LoadSizesObject {
pub post_open_user: Option<i64>,
#[serde(skip_serializing_if = "Option::is_none")]
pub post_load_ping_lifetime_data: Option<i64>,
- #[serde(skip_serializing_if = "Option::is_none")]
- pub user_records: Option<i64>,
- #[serde(skip_serializing_if = "Option::is_none")]
- pub ping_records: Option<i64>,
- #[serde(skip_serializing_if = "Option::is_none")]
- pub application_records: Option<i64>,
- #[serde(skip_serializing_if = "Option::is_none")]
- pub ping_memory_records: Option<i64>,
- #[serde(skip_serializing_if = "Option::is_none")]
- pub error: Option<String>,
}
diff --git a/third_party/rust/glean/.cargo-checksum.json b/third_party/rust/glean/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.lock":"c5fd7744f92d6dce3861884b8c185ea40ff0b891a3d61ef99e0d5bbf77b337bc","Cargo.toml":"359b72541149497067afeeeb625a822a05d3ebb4521d3b09ae051d8a36c5c11f","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"5627cc81e6187ab6c2b4dff061af16d559edcab64ba786bac39daa69c703c595","src/common_test.rs":"c86cccfb7da1506cfed29cb2ee13d839b7ac7cffdfd70793c9665bb44e0b684f","src/configuration.rs":"de65ab99a26b4547be20803bc195cb50a6ab40b1a3f49a2e6230fed5a9d7a8d8","src/core_metrics.rs":"fef8fb4e5fa57c179836c6eb2cf59278fe3b8b036dbe57b0ff02971b4acd822f","src/lib.rs":"3c73125967a4cb026bd4d7ca898edd3d2bee61c35abcfbcd875852552c540b52","src/net/http_uploader.rs":"0a94ac3cd87cb021529dee46d537765ab8d923e0f4ac7615225e878d3739e6dc","src/net/mod.rs":"95d2c0744caa9e336f4c4d0cef698202eb65d39b4c025a2da3902dffecdede73","src/private/event.rs":"58f2f4474261d7312370d6e8aeeca2f2a0b4124adbda596ee72b052c2ad585e9","src/private/mod.rs":"de67f272a20b9b5ead58a40073a82ba54f9dd1b7d0d14c7b916fc714c961ead4","src/private/object.rs":"6e58703fa760edb4cb6da4f68fdbfbae5b55a63194d681504883c11c8daac624","src/private/ping.rs":"8ec514e88c1fcba13560522c83e39643edf7d74a3dc733e273984c46c781b2d2","src/system.rs":"d602804a72258bfd65e51c571946631732ee27d81342d8aa406e47fdd241bbfa","src/test.rs":"3bd23be7c82864543d8c918fa3d61e821199799f0d276880b9339a20a303768f","tests/collection_enabled.rs":"3327a949dbdeec493d661261abda68ffa71acc50ab24cba4fde5302749e6f16b","tests/collection_enabled_bin.rs":"d3a6458b84012a447e5cb792f2292a06951ed252fad803b9166b437bacba542c","tests/common/mod.rs":"2fd391c5eb45f56fdfa3261dd631406c67ed36b10b0d5432febe2483da5c9d89","tests/custom_distribution_buffered.rs":"aa70bc2e2aca14c5c8a30dafd246d2657769fa7cdf4d09a6f10a03a356c696f6","tests/dual_labeled_counter_metric.rs":"91e9e206a4f331e067f55e5cde7eb0b893e41ea08eb125371e7b03fe44cb1445","tests/health_ping.rs":"1489995efa25fe1518003b048990fb405c90664e270802ec913cc8de737e4b74","tests/init_fails.rs":"ca7fa1b3dd6a21a9e005b7a4f0a18664c4bceb952dd463db8316500f72280d5b","tests/interruptible_shutdown.rs":"60f057bd495843a6d97cc9f875be1aa944b43c5f9a034c58d648b2d629195989","tests/labeled_metrics.rs":"d9b14025054a0ee9b89b60e720435828257eda7ec61f349389ab387923d3954c","tests/memory_distribution_buffered.rs":"e809a8de47ea4ac10c1181651d48b11aa11f57704d95f10ae194762e5d3d2982","tests/metric_metadata.rs":"e0188fcf8dc8f754f905a0662932d341646429589795bf10407645c0b3034ad2","tests/near-empty-c0ffee-db.safe.bin":"89afb3bb8fc94430fb0ed0fe55f85f3f8bcc8fd0fed69a9df13cc560294ec9f5","tests/never_init.rs":"51fff5618f6603bc0945d70131698d10a1c6275f43bbc22a2de5807f8a79229f","tests/no_time_to_init.rs":"2ede23df6618ff1cb5ae3b7bbf95900ad0fd92072afa2e0319bf147b4f75cefc","tests/overflowing_preinit.rs":"dc4d5eccb84c3c9ca25221bdc4a9bbf50ebc36d6d83d27f36d93f4562fb75d5d","tests/persist_ping_lifetime_nopanic.rs":"18379d3ffbf4a2c8c684c04ff7a0660b86dfbbb447db2d24dfed6073cb7ddf8f","tests/schema.rs":"23b49005402b914e55a0c5c155f30c2662c609f79be78d1385ec25b3600b3547","tests/simple.rs":"79d78a4cdc439c92b4efbbb2aa181ec1fd232c7a6264ad7832ab2a574ea74939","tests/test-delayed-ping-data.sh":"b6a86e07e47c301529e3bcca5265eba091c6626e38a495ad05f94f1654e6450e","tests/test-enabled-pings.sh":"f094f5735c1bb66da854de0eae84098527fff9b59854888da6f2865308847383","tests/test-mps-delay.sh":"207661a72bf8c05a8b44ad40f208826338069e2f7f4dc3f589aabc35606732e8","tests/test-pending-gets-removed.sh":"7099aaf770cfae070ee4427557cb33981734e18fe145890917d5e8ca324ea011","tests/test-ping-lifetime-flush.sh":"ed7dfc57ce71677e6b310286aed563ab4baa69aad9554cbd045fe5e49903b63a","tests/test-shutdown-blocking.sh":"77402ba408ffb69c19da01d9bffc8a1be8c735efdb84575512f778a07e8e77d1","tests/test-thread-crashing.sh":"e0e5ca6caa95e43d78369eb227cb523108486b31f8289b97bc012c37cdf8bc5c","tests/timing_distribution_buffered.rs":"b96cd123ff830175597d32667477eac9102e05aea6726382c83b35b6bc66176c","tests/timing_distribution_single_sample.rs":"bca54132d5fec225788f0292e8b6c11fa658405dc0586a2bbd84b86c1558f4bd","tests/upload_timing.rs":"e7271e7a71fc5df98c9695a01f89039f4011849c709c8dc99af23bb7e047f3e1","tests/uploader_capabilities.rs":"0c2d70ed51fba444a94aef522e7cb9253c939551694babe0045b2358e3e85b34"},"package":"895946f5a54f9d54c24175af3a064c9ecf8b4f9374afb26132b583f179fc6be2"}
-\ No newline at end of file
+{"files":{"Cargo.lock":"ee7b0b1f63cb0c1c727bab9b7081c96ab8f119e0a59bd7af7fa5b2f2c81f2af6","Cargo.toml":"f95a17fb6c23dc2e09a9ecf2fd95f06ebe991c1c009fc59ee9f98bc5172dcded","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"5627cc81e6187ab6c2b4dff061af16d559edcab64ba786bac39daa69c703c595","src/common_test.rs":"c86cccfb7da1506cfed29cb2ee13d839b7ac7cffdfd70793c9665bb44e0b684f","src/configuration.rs":"de65ab99a26b4547be20803bc195cb50a6ab40b1a3f49a2e6230fed5a9d7a8d8","src/core_metrics.rs":"fef8fb4e5fa57c179836c6eb2cf59278fe3b8b036dbe57b0ff02971b4acd822f","src/lib.rs":"3c73125967a4cb026bd4d7ca898edd3d2bee61c35abcfbcd875852552c540b52","src/net/http_uploader.rs":"0a94ac3cd87cb021529dee46d537765ab8d923e0f4ac7615225e878d3739e6dc","src/net/mod.rs":"95d2c0744caa9e336f4c4d0cef698202eb65d39b4c025a2da3902dffecdede73","src/private/event.rs":"58f2f4474261d7312370d6e8aeeca2f2a0b4124adbda596ee72b052c2ad585e9","src/private/mod.rs":"de67f272a20b9b5ead58a40073a82ba54f9dd1b7d0d14c7b916fc714c961ead4","src/private/object.rs":"6e58703fa760edb4cb6da4f68fdbfbae5b55a63194d681504883c11c8daac624","src/private/ping.rs":"8ec514e88c1fcba13560522c83e39643edf7d74a3dc733e273984c46c781b2d2","src/system.rs":"d602804a72258bfd65e51c571946631732ee27d81342d8aa406e47fdd241bbfa","src/test.rs":"3bd23be7c82864543d8c918fa3d61e821199799f0d276880b9339a20a303768f","tests/collection_enabled.rs":"3327a949dbdeec493d661261abda68ffa71acc50ab24cba4fde5302749e6f16b","tests/collection_enabled_bin.rs":"d3a6458b84012a447e5cb792f2292a06951ed252fad803b9166b437bacba542c","tests/common/mod.rs":"2fd391c5eb45f56fdfa3261dd631406c67ed36b10b0d5432febe2483da5c9d89","tests/custom_distribution_buffered.rs":"aa70bc2e2aca14c5c8a30dafd246d2657769fa7cdf4d09a6f10a03a356c696f6","tests/dual_labeled_counter_metric.rs":"91e9e206a4f331e067f55e5cde7eb0b893e41ea08eb125371e7b03fe44cb1445","tests/health_ping.rs":"977407ef9e2692d45a28c8a7b76ff5c83f0f83ebb3cba147062419932c29835a","tests/init_fails.rs":"ca7fa1b3dd6a21a9e005b7a4f0a18664c4bceb952dd463db8316500f72280d5b","tests/interruptible_shutdown.rs":"60f057bd495843a6d97cc9f875be1aa944b43c5f9a034c58d648b2d629195989","tests/labeled_metrics.rs":"d9b14025054a0ee9b89b60e720435828257eda7ec61f349389ab387923d3954c","tests/memory_distribution_buffered.rs":"e809a8de47ea4ac10c1181651d48b11aa11f57704d95f10ae194762e5d3d2982","tests/metric_metadata.rs":"e0188fcf8dc8f754f905a0662932d341646429589795bf10407645c0b3034ad2","tests/near-empty-c0ffee-db.safe.bin":"89afb3bb8fc94430fb0ed0fe55f85f3f8bcc8fd0fed69a9df13cc560294ec9f5","tests/never_init.rs":"51fff5618f6603bc0945d70131698d10a1c6275f43bbc22a2de5807f8a79229f","tests/no_time_to_init.rs":"2ede23df6618ff1cb5ae3b7bbf95900ad0fd92072afa2e0319bf147b4f75cefc","tests/overflowing_preinit.rs":"dc4d5eccb84c3c9ca25221bdc4a9bbf50ebc36d6d83d27f36d93f4562fb75d5d","tests/persist_ping_lifetime_nopanic.rs":"18379d3ffbf4a2c8c684c04ff7a0660b86dfbbb447db2d24dfed6073cb7ddf8f","tests/schema.rs":"23b49005402b914e55a0c5c155f30c2662c609f79be78d1385ec25b3600b3547","tests/simple.rs":"79d78a4cdc439c92b4efbbb2aa181ec1fd232c7a6264ad7832ab2a574ea74939","tests/test-delayed-ping-data.sh":"b6a86e07e47c301529e3bcca5265eba091c6626e38a495ad05f94f1654e6450e","tests/test-enabled-pings.sh":"f094f5735c1bb66da854de0eae84098527fff9b59854888da6f2865308847383","tests/test-mps-delay.sh":"207661a72bf8c05a8b44ad40f208826338069e2f7f4dc3f589aabc35606732e8","tests/test-pending-gets-removed.sh":"7099aaf770cfae070ee4427557cb33981734e18fe145890917d5e8ca324ea011","tests/test-ping-lifetime-flush.sh":"ed7dfc57ce71677e6b310286aed563ab4baa69aad9554cbd045fe5e49903b63a","tests/test-shutdown-blocking.sh":"77402ba408ffb69c19da01d9bffc8a1be8c735efdb84575512f778a07e8e77d1","tests/test-thread-crashing.sh":"e0e5ca6caa95e43d78369eb227cb523108486b31f8289b97bc012c37cdf8bc5c","tests/timing_distribution_buffered.rs":"b96cd123ff830175597d32667477eac9102e05aea6726382c83b35b6bc66176c","tests/timing_distribution_single_sample.rs":"bca54132d5fec225788f0292e8b6c11fa658405dc0586a2bbd84b86c1558f4bd","tests/upload_timing.rs":"e7271e7a71fc5df98c9695a01f89039f4011849c709c8dc99af23bb7e047f3e1","tests/uploader_capabilities.rs":"0c2d70ed51fba444a94aef522e7cb9253c939551694babe0045b2358e3e85b34"},"package":"76747982847c4c232762c8a9e41d9929563f7403a096237aba2b39d9e5b375d0"}
+\ No newline at end of file
diff --git a/third_party/rust/glean/Cargo.lock b/third_party/rust/glean/Cargo.lock
@@ -312,7 +312,7 @@ dependencies = [
[[package]]
name = "glean"
-version = "65.2.2"
+version = "65.2.1"
dependencies = [
"crossbeam-channel",
"env_logger",
@@ -331,9 +331,9 @@ dependencies = [
[[package]]
name = "glean-core"
-version = "65.2.2"
+version = "65.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22a5ae2c3fd542fb8388da0de68542748f466c8df9a815c8b9cc274894ab919"
+checksum = "c94f929d70199042dc13c3fd6b55538e11dfb16774c717f88456a5992c349ec1"
dependencies = [
"android_logger",
"bincode",
diff --git a/third_party/rust/glean/Cargo.toml b/third_party/rust/glean/Cargo.toml
@@ -13,7 +13,7 @@
edition = "2021"
rust-version = "1.82"
name = "glean"
-version = "65.2.2"
+version = "65.2.1"
authors = [
"Jan-Erik Rediger <jrediger@mozilla.com>",
"The Glean Team <glean-team@mozilla.com>",
@@ -127,7 +127,7 @@ path = "tests/uploader_capabilities.rs"
version = "0.5"
[dependencies.glean-core]
-version = "65.2.2"
+version = "65.2.1"
[dependencies.inherent]
version = "1"
diff --git a/third_party/rust/glean/tests/health_ping.rs b/third_party/rust/glean/tests/health_ping.rs
@@ -142,11 +142,6 @@ fn test_pre_post_init_health_pings_exist() {
assert_eq!(None, load_sizes.get("post_open"));
assert_eq!(None, load_sizes.get("post_open_user"));
assert_eq!(None, load_sizes.get("post_load_ping_lifetime_data"));
- assert_eq!(0, *load_sizes.get("user_records").unwrap());
- assert_eq!(0, *load_sizes.get("ping_records").unwrap());
- assert_eq!(0, *load_sizes.get("application_records").unwrap());
- assert_eq!(None, load_sizes.get("ping_memory_records"));
- assert_eq!(None, load_sizes.get("error"));
let cfg = ConfigurationBuilder::new(true, tmpname.clone(), "health-ping-test")
.with_server_endpoint("invalid-test-host")
@@ -199,15 +194,4 @@ fn test_pre_post_init_health_pings_exist() {
.unwrap()
.as_i64()
);
- assert!(0 < load_sizes.get("user_records").unwrap().as_i64().unwrap());
- assert!(0 < load_sizes.get("ping_records").unwrap().as_i64().unwrap());
- assert!(
- 0 < load_sizes
- .get("application_records")
- .unwrap()
- .as_i64()
- .unwrap()
- );
- assert_eq!(None, load_sizes.get("ping_memory_records"));
- assert_eq!(None, load_sizes.get("error"));
}
