From 72b2c1829ea7c3aa04caf907473497dec8ba074a Mon Sep 17 00:00:00 2001 From: Jan-Erik Rediger Date: Tue, 9 Aug 2022 15:58:51 +0000 Subject: [PATCH] Bug 1783754 - Update to Glean v51.1.0. r=TravisLong,supply-chain-reviewers Differential Revision: https://phabricator.services.mozilla.com/D154088 --- Cargo.lock | 8 ++++---- build.gradle | 2 +- gfx/wr/Cargo.lock | 8 ++++---- gfx/wr/webrender/Cargo.toml | 2 +- python/sites/mach.txt | 2 +- supply-chain/audits.toml | 12 ++++++++++++ supply-chain/config.toml | 4 ++++ .../AUTHORS.md | 0 .../LICENSE | 0 .../METADATA | 6 +++++- .../RECORD | 16 ++++++++-------- .../WHEEL | 0 .../entry_points.txt | 0 .../top_level.txt | 0 .../glean_parser/templates/swift.jinja2 | 4 ++++ third_party/python/poetry.lock | 8 ++++---- third_party/python/requirements.in | 2 +- third_party/python/requirements.txt | 6 +++--- .../rust/glean-core/.cargo-checksum.json | 2 +- third_party/rust/glean-core/Cargo.toml | 4 ++-- third_party/rust/glean-core/src/core/mod.rs | 19 +++++++++++++++++++ third_party/rust/glean-core/src/lib.rs | 2 +- third_party/rust/glean-core/src/upload/mod.rs | 2 +- third_party/rust/glean/.cargo-checksum.json | 2 +- third_party/rust/glean/Cargo.toml | 4 ++-- toolkit/components/glean/Cargo.toml | 2 +- toolkit/components/glean/api/Cargo.toml | 2 +- 27 files changed, 81 insertions(+), 38 deletions(-) rename third_party/python/glean_parser/{glean_parser-6.1.1.dist-info => glean_parser-6.1.2.dist-info}/AUTHORS.md (100%) rename third_party/python/glean_parser/{glean_parser-6.1.1.dist-info => glean_parser-6.1.2.dist-info}/LICENSE (100%) rename third_party/python/glean_parser/{glean_parser-6.1.1.dist-info => glean_parser-6.1.2.dist-info}/METADATA (99%) rename third_party/python/glean_parser/{glean_parser-6.1.1.dist-info => glean_parser-6.1.2.dist-info}/RECORD (84%) rename third_party/python/glean_parser/{glean_parser-6.1.1.dist-info => glean_parser-6.1.2.dist-info}/WHEEL (100%) rename third_party/python/glean_parser/{glean_parser-6.1.1.dist-info => glean_parser-6.1.2.dist-info}/entry_points.txt (100%) rename third_party/python/glean_parser/{glean_parser-6.1.1.dist-info => glean_parser-6.1.2.dist-info}/top_level.txt (100%) diff --git a/Cargo.lock b/Cargo.lock index 7cdbd4bc81d8..e7c66c154e81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2220,9 +2220,9 @@ dependencies = [ [[package]] name = "glean" -version = "51.0.1" +version = "51.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20e782acaa1771ea4de48aa8bcf3421ae1e77c36dbae7595428fc2e333d0df5" +checksum = "d187c24d9b68cf4604253a38a15c5490f8089fa0abbd5d3a75a7dab6496c452c" dependencies = [ "chrono", "crossbeam-channel", @@ -2240,9 +2240,9 @@ dependencies = [ [[package]] name = "glean-core" -version = "51.0.1" +version = "51.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "127156f8df21363a476e37b7adf3fe89995cf48fda281563fe7ae1bdb1160760" +checksum = "ff1c7b9f39201bd6983e178a6356597dce2ba2dd2ee1e9da41e36680cd4a99bf" dependencies = [ "android_logger", "bincode", diff --git a/build.gradle b/build.gradle index a46df8474748..22d413114b79 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ allprojects { topsrcdir = gradle.mozconfig.topsrcdir topobjdir = gradle.mozconfig.topobjdir - gleanVersion = "51.0.1" + gleanVersion = "51.1.0" if (gleanVersion != getRustVersionFor("glean")) { throw new StopExecutionException("Mismatched Glean version, expected: ${gleanVersion}," + " found ${getRustVersionFor("glean")}") diff --git a/gfx/wr/Cargo.lock b/gfx/wr/Cargo.lock index c1f8214a1b54..65f53207ea36 100644 --- a/gfx/wr/Cargo.lock +++ b/gfx/wr/Cargo.lock @@ -866,9 +866,9 @@ dependencies = [ [[package]] name = "glean" -version = "51.0.1" +version = "51.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20e782acaa1771ea4de48aa8bcf3421ae1e77c36dbae7595428fc2e333d0df5" +checksum = "d187c24d9b68cf4604253a38a15c5490f8089fa0abbd5d3a75a7dab6496c452c" dependencies = [ "chrono", "crossbeam-channel", @@ -886,9 +886,9 @@ dependencies = [ [[package]] name = "glean-core" -version = "51.0.1" +version = "51.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "127156f8df21363a476e37b7adf3fe89995cf48fda281563fe7ae1bdb1160760" +checksum = "ff1c7b9f39201bd6983e178a6356597dce2ba2dd2ee1e9da41e36680cd4a99bf" dependencies = [ "android_logger", "bincode", diff --git a/gfx/wr/webrender/Cargo.toml b/gfx/wr/webrender/Cargo.toml index 0b378c4705e9..30316e165e85 100644 --- a/gfx/wr/webrender/Cargo.toml +++ b/gfx/wr/webrender/Cargo.toml @@ -51,7 +51,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 = "51.0.1" +glean = "51.1.0" fog = { version = "0.1.0", optional = true } swgl = { path = "../swgl", optional = true } topological-sort = "0.1" diff --git a/python/sites/mach.txt b/python/sites/mach.txt index c6bfc3b58e43..7935f95930ba 100644 --- a/python/sites/mach.txt +++ b/python/sites/mach.txt @@ -130,7 +130,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==51.0.1:telemetry will not be collected +pypi-optional:glean-sdk==51.1.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). diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml index 539a8e299a24..c06ac7783752 100644 --- a/supply-chain/audits.toml +++ b/supply-chain/audits.toml @@ -128,6 +128,12 @@ criteria = "safe-to-deploy" version = "50.1.2" notes = "Maintained by the Glean team at Mozilla" +[[audits.glean]] +who = "Jan-Erik Rediger " +criteria = "safe-to-deploy" +version = "51.1.0" +notes = "Maintained by the Glean team at Mozilla" + [[audits.glean]] who = "Jan-Erik Rediger " criteria = "safe-to-deploy" @@ -152,6 +158,12 @@ criteria = "safe-to-deploy" version = "50.1.2" notes = "Maintained by the Glean team at Mozilla" +[[audits.glean-core]] +who = "Jan-Erik Rediger " +criteria = "safe-to-deploy" +version = "51.1.0" +notes = "Maintained by the Glean team at Mozilla" + [[audits.glean-core]] who = "Jan-Erik Rediger " criteria = "safe-to-deploy" diff --git a/supply-chain/config.toml b/supply-chain/config.toml index b8910702c4b9..6fe546873bf3 100644 --- a/supply-chain/config.toml +++ b/supply-chain/config.toml @@ -132,6 +132,10 @@ notes = "We're not shipping this and have no plans to ship it." audit-as-crates-io = false notes = "This is a first-party crate which is entirely unrelated to the crates.io package of the same name." +[policy.viaduct] +audit-as-crates-io = false +notes = "This is a first-party crate, maintained by the appservices team, which is entirely unrelated to the crates.io package of the same name." + [policy.webdriver] audit-as-crates-io = false criteria = "safe-to-run" diff --git a/third_party/python/glean_parser/glean_parser-6.1.1.dist-info/AUTHORS.md b/third_party/python/glean_parser/glean_parser-6.1.2.dist-info/AUTHORS.md similarity index 100% rename from third_party/python/glean_parser/glean_parser-6.1.1.dist-info/AUTHORS.md rename to third_party/python/glean_parser/glean_parser-6.1.2.dist-info/AUTHORS.md diff --git a/third_party/python/glean_parser/glean_parser-6.1.1.dist-info/LICENSE b/third_party/python/glean_parser/glean_parser-6.1.2.dist-info/LICENSE similarity index 100% rename from third_party/python/glean_parser/glean_parser-6.1.1.dist-info/LICENSE rename to third_party/python/glean_parser/glean_parser-6.1.2.dist-info/LICENSE diff --git a/third_party/python/glean_parser/glean_parser-6.1.1.dist-info/METADATA b/third_party/python/glean_parser/glean_parser-6.1.2.dist-info/METADATA similarity index 99% rename from third_party/python/glean_parser/glean_parser-6.1.1.dist-info/METADATA rename to third_party/python/glean_parser/glean_parser-6.1.2.dist-info/METADATA index 28687e9dcade..2731be0cad12 100644 --- a/third_party/python/glean_parser/glean_parser-6.1.1.dist-info/METADATA +++ b/third_party/python/glean_parser/glean_parser-6.1.2.dist-info/METADATA @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: glean-parser -Version: 6.1.1 +Version: 6.1.2 Summary: Parser tools for Mozilla's Glean telemetry Home-page: https://github.com/mozilla/glean_parser Author: The Glean Team @@ -86,6 +86,10 @@ $ glean_parser check < ping.json ## Unreleased +## 6.1.2 + +- Swift: Add a conditional `import Foundation` to support generating metrics when Glean is delivered via the AppServices iOS megazord + ## 6.1.1 - Rust: Use correct name for a ping in generated code. diff --git a/third_party/python/glean_parser/glean_parser-6.1.1.dist-info/RECORD b/third_party/python/glean_parser/glean_parser-6.1.2.dist-info/RECORD similarity index 84% rename from third_party/python/glean_parser/glean_parser-6.1.1.dist-info/RECORD rename to third_party/python/glean_parser/glean_parser-6.1.2.dist-info/RECORD index 5c257edb97f9..6689e84ed665 100644 --- a/third_party/python/glean_parser/glean_parser-6.1.1.dist-info/RECORD +++ b/third_party/python/glean_parser/glean_parser-6.1.2.dist-info/RECORD @@ -29,11 +29,11 @@ glean_parser/templates/kotlin.jinja2,sha256=h6RaxhGwh1G1NVqhGb4l2Jtl2orhyf8iFL-C glean_parser/templates/markdown.jinja2,sha256=vAHHGGm28HRDPd3zO_wQMAUZIuxE9uQ7hl3NpXxcKV4,3425 glean_parser/templates/qmldir.jinja2,sha256=m6IGsp-tgTiOfQ7VN8XW6GqX0gJqJkt3B6Pkaul6FVo,156 glean_parser/templates/rust.jinja2,sha256=rskbE0LMcCTO488faVXrGAP_e-l7rUpysbkNZXKk1Ck,11083 -glean_parser/templates/swift.jinja2,sha256=a8m1T3bLWieywYacpima16AwGBLjiEzCIzYGtYxm2D4,5214 -glean_parser-6.1.1.dist-info/AUTHORS.md,sha256=yxgj8MioO4wUnrh0gmfb8l3DJJrf-l4HmmEDbQsbbNI,455 -glean_parser-6.1.1.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725 -glean_parser-6.1.1.dist-info/METADATA,sha256=sQ9fjwllYlvTTt05MAk0UalTMJ7tjdEAhRk1GKSn2eE,25928 -glean_parser-6.1.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92 -glean_parser-6.1.1.dist-info/entry_points.txt,sha256=s-clJTIqp-PpJD-n3AnIQZFkTafIrzsTbAPX9vNY018,69 -glean_parser-6.1.1.dist-info/top_level.txt,sha256=q7T3duD-9tYZFyDry6Wv2LcdMsK2jGnzdDFhxWcT2Z8,13 -glean_parser-6.1.1.dist-info/RECORD,, +glean_parser/templates/swift.jinja2,sha256=yfv1qJLrfR2cc3t35fFPgveuuATBjg1Hge-3ka5rpFc,5270 +glean_parser-6.1.2.dist-info/AUTHORS.md,sha256=yxgj8MioO4wUnrh0gmfb8l3DJJrf-l4HmmEDbQsbbNI,455 +glean_parser-6.1.2.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725 +glean_parser-6.1.2.dist-info/METADATA,sha256=_paEotrxyZsT2pVvTmvF8EAattiUUkTK3RdZKL8OWes,26073 +glean_parser-6.1.2.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92 +glean_parser-6.1.2.dist-info/entry_points.txt,sha256=s-clJTIqp-PpJD-n3AnIQZFkTafIrzsTbAPX9vNY018,69 +glean_parser-6.1.2.dist-info/top_level.txt,sha256=q7T3duD-9tYZFyDry6Wv2LcdMsK2jGnzdDFhxWcT2Z8,13 +glean_parser-6.1.2.dist-info/RECORD,, diff --git a/third_party/python/glean_parser/glean_parser-6.1.1.dist-info/WHEEL b/third_party/python/glean_parser/glean_parser-6.1.2.dist-info/WHEEL similarity index 100% rename from third_party/python/glean_parser/glean_parser-6.1.1.dist-info/WHEEL rename to third_party/python/glean_parser/glean_parser-6.1.2.dist-info/WHEEL diff --git a/third_party/python/glean_parser/glean_parser-6.1.1.dist-info/entry_points.txt b/third_party/python/glean_parser/glean_parser-6.1.2.dist-info/entry_points.txt similarity index 100% rename from third_party/python/glean_parser/glean_parser-6.1.1.dist-info/entry_points.txt rename to third_party/python/glean_parser/glean_parser-6.1.2.dist-info/entry_points.txt diff --git a/third_party/python/glean_parser/glean_parser-6.1.1.dist-info/top_level.txt b/third_party/python/glean_parser/glean_parser-6.1.2.dist-info/top_level.txt similarity index 100% rename from third_party/python/glean_parser/glean_parser-6.1.1.dist-info/top_level.txt rename to third_party/python/glean_parser/glean_parser-6.1.2.dist-info/top_level.txt diff --git a/third_party/python/glean_parser/glean_parser/templates/swift.jinja2 b/third_party/python/glean_parser/glean_parser/templates/swift.jinja2 index 087677e94243..a37cae96017f 100644 --- a/third_party/python/glean_parser/glean_parser/templates/swift.jinja2 +++ b/third_party/python/glean_parser/glean_parser/templates/swift.jinja2 @@ -4,6 +4,10 @@ {# The rendered markdown is autogenerated, but this Jinja2 template is not. Please file bugs! #} +#if canImport(Foundation) + import Foundation +#endif + /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ diff --git a/third_party/python/poetry.lock b/third_party/python/poetry.lock index a4aa178683c3..932a153cba30 100644 --- a/third_party/python/poetry.lock +++ b/third_party/python/poetry.lock @@ -196,7 +196,7 @@ python-versions = "*" [[package]] name = "glean-parser" -version = "6.1.1" +version = "6.1.2" description = "Parser tools for Mozilla's Glean telemetry" category = "main" optional = false @@ -737,7 +737,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt [metadata] lock-version = "1.1" python-versions = "^3.6" -content-hash = "c2e0409d12cf05616e62dca8da5b1a5953cd0345d7e308f2162f21732da54e64" +content-hash = "7cc811bc4afabc7e8e9a4792305174b1fad1bc7bf899229f65dcef35526aab9e" [metadata.files] aiohttp = [ @@ -851,8 +851,8 @@ esprima = [ {file = "fluent.syntax-0.18.1.tar.gz", hash = "sha256:3a55f5e605d1b029a65cc8b6492c86ec4608e15447e73db1495de11fd46c104f"}, ] glean-parser = [ - {file = "glean_parser-6.1.1-py3-none-any.whl", hash = "sha256:225dc6d30d9c04459df2aebbd1950691fa32602a9be0228759a5bfaf2ece8581"}, - {file = "glean_parser-6.1.1.tar.gz", hash = "sha256:bc41a57aa432b4d632cbf0df1f0ab1ac720e3028f8b194dabdfbb1c837393b7d"}, + {file = "glean_parser-6.1.1-py3-none-any.whl", hash = "sha256:e801af6463b7e0ba79d97ddfc0a58d9d71121c93cea601417571e33fa8142270"}, + {file = "glean_parser-6.1.1.tar.gz", hash = "sha256:12a0fecedc1144d77fa571e0422ff3fea4dbadc381d631bea800a6b2f58f4f7f"}, ] idna = [ {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, diff --git a/third_party/python/requirements.in b/third_party/python/requirements.in index 73443dfef369..ad293a43edc9 100644 --- a/third_party/python/requirements.in +++ b/third_party/python/requirements.in @@ -10,7 +10,7 @@ ecdsa==0.15 esprima==4.0.1 fluent.migrate==0.11 fluent.syntax==0.18.1 -glean_parser==6.1.1 +glean_parser==6.1.2 # Pin importlib-metadata to a version compatible with poetry importlib-metadata==1.7.0 jsmin==2.1.0 diff --git a/third_party/python/requirements.txt b/third_party/python/requirements.txt index cb6d5620f182..7ef21c850560 100644 --- a/third_party/python/requirements.txt +++ b/third_party/python/requirements.txt @@ -89,9 +89,9 @@ fluent.migrate==0.11 \ fluent.syntax==0.18.1 \ --hash=sha256:0e63679fa4f1b3042565220a5127b4bab842424f07d6a13c12299e3b3835486a \ --hash=sha256:3a55f5e605d1b029a65cc8b6492c86ec4608e15447e73db1495de11fd46c104f -glean-parser==6.1.1 \ - --hash=sha256:225dc6d30d9c04459df2aebbd1950691fa32602a9be0228759a5bfaf2ece8581 \ - --hash=sha256:bc41a57aa432b4d632cbf0df1f0ab1ac720e3028f8b194dabdfbb1c837393b7d +glean-parser==6.1.2 \ + --hash=sha256:e801af6463b7e0ba79d97ddfc0a58d9d71121c93cea601417571e33fa8142270 \ + --hash=sha256:12a0fecedc1144d77fa571e0422ff3fea4dbadc381d631bea800a6b2f58f4f7f idna-ssl==1.1.0; python_version < "3.7" and python_version >= "3.6" \ --hash=sha256:a933e3bb13da54383f9e8f35dc4f9cb9eb9b3b78c6b36f311254d6d0d92c6c7c idna==2.10; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" or python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "3.7" or python_version < "3.7" and python_version >= "3.6" and python_full_version >= "3.4.0" or python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" \ diff --git a/third_party/rust/glean-core/.cargo-checksum.json b/third_party/rust/glean-core/.cargo-checksum.json index 90528daa6389..89f91a64cca3 100644 --- a/third_party/rust/glean-core/.cargo-checksum.json +++ b/third_party/rust/glean-core/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"d170b1c318ac2c72afb93d153f4895cfced1a6c5afefc8deef8edbae5fc1652a","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"026495898699b54608eb4ec16074ffafc57920d80ccb59961c501a1ea28c9985","build.rs":"7dc87a0329262e0954334d1c3959bf4c9937d82f95359fba0b318fd45dd18f1a","src/common_metric_data.rs":"e9f3cc2066487b1feeaae47b7dd130ed77462649871985935ac37491411725c8","src/core/mod.rs":"1126371ab0839c54068c8019af5096be777c3ed08d1e76e32888daed7ce6bc10","src/core_metrics.rs":"755bacc2680362c9ab7ab435f51f7ce42f6200e0aa3be9aed5a56f9397467051","src/coverage.rs":"49613fd310bd24d779472720975fbe6c97ec370a95eb55f10afa43f67539c942","src/database/mod.rs":"836f073180faec1b09d4fb08fc239db79dcbb73794e9119b8feb3ea005568b1d","src/debug.rs":"90158cc5d488ba67b60d06647e54e59a1d7bdeb906087e4fe4cfab4373c1cc6c","src/dispatcher/global.rs":"03ef09170d0b7c654ac0b8dc555e2f6aad0cc10a5c1a73720007896f4faf48cb","src/dispatcher/mod.rs":"f9d7f329f86b75b5af573a07271ff4daef22abd4d6ce1c7241fe5e92a3babfe5","src/error.rs":"177a110bdaa70d6b68d8d5bf87a274933efd27de7df1ba4458216ce110cfa754","src/error_recording.rs":"ea222616b739da78f2c7e252a9c6d2c78007027c1f83ec7b89578d16e1e5dc1c","src/event_database/mod.rs":"b88ced9831105d9c90f9385133793051015dfacde2ee61321e3a60d4df07a15a","src/fd_logger.rs":"0c9def6fa53db1a2ab93c85795f8a7df57797bcfd3978146923e151752e291a6","src/glean.udl":"9f868fc5b430f85fbd7db82a282c2da870b001226fc48542b768725b8c1d5151","src/glean_metrics.rs":"9414fb1453d19f6832df33e4c6ef7383d62203e47026bf5bc9552b083101ddd1","src/histogram/exponential.rs":"58bb1770bae45770d92995515d328eb50a7e78726224f779446ae7d1632a6a3e","src/histogram/functional.rs":"1a63a305b48bcef7bc38136b40d916df4bb8f098dc602514ada54a9b091f6951","src/histogram/linear.rs":"4342a1733175d7f97b2b41adb18100537c206100c9fccb5bd13bd782c9cb3c9a","src/histogram/mod.rs":"eeb7aff80806ab76cdce101dc08887b5552f8b4bdf64683f64f767e0f06a889d","src/internal_metrics.rs":"b3008db72c5358d0d7a5f5b6604a3d933ee4f1bf9e9855895ca205b82bd429c8","src/internal_pings.rs":"6468514acda555103f271b8ff80ce455019eb2989b2602d2a3a631516f281f3f","src/lib.rs":"7207dc495846df4ef99087ef8a1d7f142a89f772fe4b71c78a01c4b5b8f5cfdb","src/lib_unit_tests.rs":"975b59dca5751a548cc98c6b51e05f888c1275e1d4edd83061b5b60769e4fe0c","src/metrics/boolean.rs":"b3364bc71569ff0fc987e0f7fbd56086eca3fa51f9a90455f052ed3fbbfd372b","src/metrics/counter.rs":"673a7589da91d9ed44ef9d6ad3fce607b7ebf17938cb8453d0e4fccc7e99fb0f","src/metrics/custom_distribution.rs":"99eba9d170f8d26df08b03ae647904e47cb9d1b0212bf2bb3bb791eb348cc305","src/metrics/datetime.rs":"5d2fbb733cc9d45722123b59fb5657a7fd9657bbbede419742b3cd1c0c617ba5","src/metrics/denominator.rs":"4ab2c1f52e00e5d354305d3fd5e95235f5428d3effcf9cb993b1646dd7a1b320","src/metrics/event.rs":"6c979e22d1c08a17d04deb4bbf08f8d8b8cf08d262f226de5fee86da2ee3546e","src/metrics/experiment.rs":"89d41f0e3e03f50838ed5a518babf0b54db3eccb1fbee391ec37a48fc018cc92","src/metrics/labeled.rs":"d053c954c449e11f436e7fa3ed3c2c5612666cd65c0136156b6cbac4685840d6","src/metrics/memory_distribution.rs":"380f7543a755410b9108b3ec27ba461253feb4d8f16a3634afc3e9adad044701","src/metrics/memory_unit.rs":"d7a678e5242febd021283b30c0099a9e62729944816a3f17d2d91e2808bc0570","src/metrics/mod.rs":"cfd8d157b039bd124716c2c6a0fd7a023275536bee3300803f7de94203c32933","src/metrics/numerator.rs":"38e6218352377b3a6acad8d944a1e0e6bfdd0e3c267daf769051ec573ab1d4cf","src/metrics/ping.rs":"b491ec663f8b4528b600e80731f9ed292d0515375c70886e4f6440ee065ec549","src/metrics/quantity.rs":"7c9a661154b4374f7cff8afd5546f971a5b2ff547cccea492da39b205248905d","src/metrics/rate.rs":"46a66ba84534a829284e35966655887964d20d96e19780fe9bfd96599e0f1072","src/metrics/recorded_experiment.rs":"33958abee79d8b55dec4cb5d20742640423713010f76314075cefde18b5c118a","src/metrics/string.rs":"6f7b594463f6e1d7b07b0edad5486a8e07bfcbf0aac8e8297b9e91309dffaa76","src/metrics/string_list.rs":"700cbfb0a7d0addbffbc19f209769d1e38a73627741e1c2b95b109df60a3b106","src/metrics/text.rs":"73da1bbcdb80ec69a6bb0df22a50246c759840908e00486f7a23858dc97c8c37","src/metrics/time_unit.rs":"b7578010c6270a45b30342b59189a862b2ede9dd24e9afae3e90fa6b970b3d24","src/metrics/timespan.rs":"f5804f9dcc0336876d3bf0719d56565b1279b100134fa9d3bd6356a303fcc2ed","src/metrics/timing_distribution.rs":"73ad04160e557b41f9e00541e131131ff3506798d2eed8c5705bad70c2420e03","src/metrics/url.rs":"14751d1f1ecb8a884989e677e3bdaace02bb99fc0542f87751a4a3eb43ecf028","src/metrics/uuid.rs":"7180fa44ecc22f8b1da11e8610984ac28b0b2c919d77477981beb8fe7691299d","src/ping/mod.rs":"83cc8b555fb611ef8b60eff3cb3928a38191596c10e39ed69dfffc9e4139ff3f","src/scheduler.rs":"1a9c79570dc0945ed6017d20231a398199e84240c866ddc0da6d95edb3859cf8","src/storage/mod.rs":"3fd0fb9b743a1ec12b8b1fd07f1a99594db030ec47ab4afe255923e6d11a636a","src/system.rs":"a76ff0998840ab4ad00dfd52dbad6b1558bb4cdcf613fe3725969c9a90e1bfe8","src/traits/boolean.rs":"be0e130f8043215705becc956d45b126c340568f1b24a396c0af9b4334a41ced","src/traits/counter.rs":"c686d26e131d854cd7a7df83c900ca7c17a03c663a30cf58ab48c7259476ce85","src/traits/custom_distribution.rs":"159a5e26fb2326f5bcdc46979aa9c6481c5f0e93ecf957f668bb3f6988d8b00f","src/traits/datetime.rs":"636ac1456b1b042e38cf5ae6193c5b232ea0b80df62f583a2097891baef9641b","src/traits/event.rs":"3f48aa336854141784d121f7fa9e283f6ff708a9214f9c0aade3a68cc38dda99","src/traits/labeled.rs":"c633c68e70a44e73f8aff88aaab1029c0faded3cad08d822590ed8838f24b4fd","src/traits/memory_distribution.rs":"55bb8f45e948319fbba9d28a50d8742da134b066a42e480887db7c7e435f4096","src/traits/mod.rs":"d0aa19a7cd97326fd2e026635406a5a9403953ced4954443a2bcbca32d868554","src/traits/numerator.rs":"6e4f236bdc448f1bde7a8c249dcd086204c2c69990d3f444e746290929226ed3","src/traits/ping.rs":"8831c106c03afeb458b0b028fa1ce61f056ebf8e82bc0a171a1bff255d920748","src/traits/quantity.rs":"6ffe25c913bef4315573d747308c182de740b2a4e02ba22cd21d0c33ba521f31","src/traits/rate.rs":"f000790440e0f389f0b160526a9a9a266e58d1405915ae56ac550f482858222c","src/traits/string.rs":"0c3c88382ff2e8eba89c7cfe129c4b84e31140af717819533c14919541ad790c","src/traits/string_list.rs":"14e56b62c2c2be1dd8013f12001f235b084abd2a0d5aa2f7932843877af49ac0","src/traits/text.rs":"8af7d3a0c87cfd8c6d33d6ad47532b431055bbdd395f9110da5630222c23cf93","src/traits/timespan.rs":"52be325a9c061916f34c5b638a07a93b4a14aa89fe365783103d2e06b998f547","src/traits/timing_distribution.rs":"7cb59eb55e92516e6b076e2bb2d7fa120f491f01ba873918f93421079cc442ad","src/traits/url.rs":"c27f7add23214ff051078b65b88120b620560d2841a1056c7214d5237e86b9e4","src/traits/uuid.rs":"81322e71c7e847bacaf827a2cd58f6193bdc208355524207f7f38db039da6aa8","src/upload/directory.rs":"8b2fd5ea68e4d645891b70e095d0a4976d75d74e79fd84115e030b7a66141f87","src/upload/mod.rs":"8913e9e4eccbd8d0e075575992c1adcfc1217ae08cd642169791641e235b4a07","src/upload/policy.rs":"c250957a37783e74af8002cd80ba06ef9780a389fb0f61b8b665b79688f0a360","src/upload/request.rs":"a57fd6780c4d1411a64b0e2cb981310be87896f047db990f804fdb47d61c0a21","src/upload/result.rs":"7f0b5886716e7a6510fccec37e342d4702bc0aa6dc4f6d4b16a44b6e06998296","src/util.rs":"c1ecfc1037406d5b10aa185dac4ae28c6a8de603958a5b4969bb1bf130759985","tests/boolean.rs":"76d6014ff108cb6514d9bceb1b2b14749a55b09921f4595a5e30f1bd3546e9f0","tests/common/mod.rs":"a04c2cdf0b0af527a976b9f3def89b29c84f95d9c30a6538d0f297cb7c8c629e","tests/counter.rs":"46c82058cb1d7c60b340b6dbce998b4ea57333767ff52635d48a65235180e276","tests/custom_distribution.rs":"149a0e739fb36da3d4af85556566b907e4c43e2f27b66e1ebda3cd7e9c8c7196","tests/datetime.rs":"a991dee34e21a20df518a57b49f4476060b991ec00d519aa4341341085e4d0b3","tests/event.rs":"9a09f701e1b4557bf253aff536a92768e1f6459b04e01ea5c49aeac301dc126e","tests/labeled.rs":"2ca25d92aa13c1019acaa4085d512da3bddf322f92de7b2a3283795c94a471a5","tests/memory_distribution.rs":"18b0ba1eae6a3ae9a03d772cc45333644e930d0a8ae25503c9e9c887a9273536","tests/ping.rs":"a831cf5de86505c1f5c357898cca71a83cd8f10e68acf8e43f3b76a77fe4fefc","tests/ping_maker.rs":"61b49380f8865b626643879079867571377950aea4701da0665e63cbe88083e0","tests/quantity.rs":"e839d504af1c438f6ef98581066d807271900c52511f80e25488497885467fe8","tests/rate.rs":"1de571b9f0ee9a9006cbc8a31f91352d3ff1190b50840f0f668b470a7cd2a3a5","tests/storage.rs":"ed65b92d37eed873738717d95f1e70e93adf4ecd8db55f2e52f383e1e71ab3f3","tests/string.rs":"cbbd68a86275b86e5327c313071cbe210dfa325cece27735eaab381f8007cdf3","tests/string_list.rs":"73857baba228e1627430c500f4fa2456d81906718fed8ae6e8a61123dfcef98f","tests/text.rs":"d8ccf1841c92d2fc44e4e7ca35c14a177d835462d2c77e0b0d26fa2e685a5602","tests/timespan.rs":"ed71fd1e25c82f020917b1746c7d84ea23a207a03fe37b8dee3193366f2b28df","tests/timing_distribution.rs":"89124651d7b6563a4f27895375f4592f1bffa32f5d84d5fb3b9d1b6a82bd25f4","tests/uuid.rs":"84ae2378d586219a37b0ae70d3672b79d8f8baeccd5290194f27705f9ee28bdc","uniffi.toml":"6ddc98b686b0925a81abd9d1c769e5c98ac29771b210a1c535931a46dec9a8e3"},"package":"127156f8df21363a476e37b7adf3fe89995cf48fda281563fe7ae1bdb1160760"} \ No newline at end of file +{"files":{"Cargo.toml":"e7485cb8ae257100e9278f826748b8718e28faaca9b131fa43cebcf8da65c9fc","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"026495898699b54608eb4ec16074ffafc57920d80ccb59961c501a1ea28c9985","build.rs":"7dc87a0329262e0954334d1c3959bf4c9937d82f95359fba0b318fd45dd18f1a","src/common_metric_data.rs":"e9f3cc2066487b1feeaae47b7dd130ed77462649871985935ac37491411725c8","src/core/mod.rs":"a565392acf811d0051f4d07519369cd32b592fa7bf6dbc7c9f029453cea06b52","src/core_metrics.rs":"755bacc2680362c9ab7ab435f51f7ce42f6200e0aa3be9aed5a56f9397467051","src/coverage.rs":"49613fd310bd24d779472720975fbe6c97ec370a95eb55f10afa43f67539c942","src/database/mod.rs":"836f073180faec1b09d4fb08fc239db79dcbb73794e9119b8feb3ea005568b1d","src/debug.rs":"90158cc5d488ba67b60d06647e54e59a1d7bdeb906087e4fe4cfab4373c1cc6c","src/dispatcher/global.rs":"03ef09170d0b7c654ac0b8dc555e2f6aad0cc10a5c1a73720007896f4faf48cb","src/dispatcher/mod.rs":"f9d7f329f86b75b5af573a07271ff4daef22abd4d6ce1c7241fe5e92a3babfe5","src/error.rs":"177a110bdaa70d6b68d8d5bf87a274933efd27de7df1ba4458216ce110cfa754","src/error_recording.rs":"ea222616b739da78f2c7e252a9c6d2c78007027c1f83ec7b89578d16e1e5dc1c","src/event_database/mod.rs":"b88ced9831105d9c90f9385133793051015dfacde2ee61321e3a60d4df07a15a","src/fd_logger.rs":"0c9def6fa53db1a2ab93c85795f8a7df57797bcfd3978146923e151752e291a6","src/glean.udl":"9f868fc5b430f85fbd7db82a282c2da870b001226fc48542b768725b8c1d5151","src/glean_metrics.rs":"9414fb1453d19f6832df33e4c6ef7383d62203e47026bf5bc9552b083101ddd1","src/histogram/exponential.rs":"58bb1770bae45770d92995515d328eb50a7e78726224f779446ae7d1632a6a3e","src/histogram/functional.rs":"1a63a305b48bcef7bc38136b40d916df4bb8f098dc602514ada54a9b091f6951","src/histogram/linear.rs":"4342a1733175d7f97b2b41adb18100537c206100c9fccb5bd13bd782c9cb3c9a","src/histogram/mod.rs":"eeb7aff80806ab76cdce101dc08887b5552f8b4bdf64683f64f767e0f06a889d","src/internal_metrics.rs":"b3008db72c5358d0d7a5f5b6604a3d933ee4f1bf9e9855895ca205b82bd429c8","src/internal_pings.rs":"6468514acda555103f271b8ff80ce455019eb2989b2602d2a3a631516f281f3f","src/lib.rs":"b1528ec73dd7cd9f45f10b29006ec55beaa8b2852cac0685adbf11ad60d0dd6c","src/lib_unit_tests.rs":"975b59dca5751a548cc98c6b51e05f888c1275e1d4edd83061b5b60769e4fe0c","src/metrics/boolean.rs":"b3364bc71569ff0fc987e0f7fbd56086eca3fa51f9a90455f052ed3fbbfd372b","src/metrics/counter.rs":"673a7589da91d9ed44ef9d6ad3fce607b7ebf17938cb8453d0e4fccc7e99fb0f","src/metrics/custom_distribution.rs":"99eba9d170f8d26df08b03ae647904e47cb9d1b0212bf2bb3bb791eb348cc305","src/metrics/datetime.rs":"5d2fbb733cc9d45722123b59fb5657a7fd9657bbbede419742b3cd1c0c617ba5","src/metrics/denominator.rs":"4ab2c1f52e00e5d354305d3fd5e95235f5428d3effcf9cb993b1646dd7a1b320","src/metrics/event.rs":"6c979e22d1c08a17d04deb4bbf08f8d8b8cf08d262f226de5fee86da2ee3546e","src/metrics/experiment.rs":"89d41f0e3e03f50838ed5a518babf0b54db3eccb1fbee391ec37a48fc018cc92","src/metrics/labeled.rs":"d053c954c449e11f436e7fa3ed3c2c5612666cd65c0136156b6cbac4685840d6","src/metrics/memory_distribution.rs":"380f7543a755410b9108b3ec27ba461253feb4d8f16a3634afc3e9adad044701","src/metrics/memory_unit.rs":"d7a678e5242febd021283b30c0099a9e62729944816a3f17d2d91e2808bc0570","src/metrics/mod.rs":"cfd8d157b039bd124716c2c6a0fd7a023275536bee3300803f7de94203c32933","src/metrics/numerator.rs":"38e6218352377b3a6acad8d944a1e0e6bfdd0e3c267daf769051ec573ab1d4cf","src/metrics/ping.rs":"b491ec663f8b4528b600e80731f9ed292d0515375c70886e4f6440ee065ec549","src/metrics/quantity.rs":"7c9a661154b4374f7cff8afd5546f971a5b2ff547cccea492da39b205248905d","src/metrics/rate.rs":"46a66ba84534a829284e35966655887964d20d96e19780fe9bfd96599e0f1072","src/metrics/recorded_experiment.rs":"33958abee79d8b55dec4cb5d20742640423713010f76314075cefde18b5c118a","src/metrics/string.rs":"6f7b594463f6e1d7b07b0edad5486a8e07bfcbf0aac8e8297b9e91309dffaa76","src/metrics/string_list.rs":"700cbfb0a7d0addbffbc19f209769d1e38a73627741e1c2b95b109df60a3b106","src/metrics/text.rs":"73da1bbcdb80ec69a6bb0df22a50246c759840908e00486f7a23858dc97c8c37","src/metrics/time_unit.rs":"b7578010c6270a45b30342b59189a862b2ede9dd24e9afae3e90fa6b970b3d24","src/metrics/timespan.rs":"f5804f9dcc0336876d3bf0719d56565b1279b100134fa9d3bd6356a303fcc2ed","src/metrics/timing_distribution.rs":"73ad04160e557b41f9e00541e131131ff3506798d2eed8c5705bad70c2420e03","src/metrics/url.rs":"14751d1f1ecb8a884989e677e3bdaace02bb99fc0542f87751a4a3eb43ecf028","src/metrics/uuid.rs":"7180fa44ecc22f8b1da11e8610984ac28b0b2c919d77477981beb8fe7691299d","src/ping/mod.rs":"83cc8b555fb611ef8b60eff3cb3928a38191596c10e39ed69dfffc9e4139ff3f","src/scheduler.rs":"1a9c79570dc0945ed6017d20231a398199e84240c866ddc0da6d95edb3859cf8","src/storage/mod.rs":"3fd0fb9b743a1ec12b8b1fd07f1a99594db030ec47ab4afe255923e6d11a636a","src/system.rs":"a76ff0998840ab4ad00dfd52dbad6b1558bb4cdcf613fe3725969c9a90e1bfe8","src/traits/boolean.rs":"be0e130f8043215705becc956d45b126c340568f1b24a396c0af9b4334a41ced","src/traits/counter.rs":"c686d26e131d854cd7a7df83c900ca7c17a03c663a30cf58ab48c7259476ce85","src/traits/custom_distribution.rs":"159a5e26fb2326f5bcdc46979aa9c6481c5f0e93ecf957f668bb3f6988d8b00f","src/traits/datetime.rs":"636ac1456b1b042e38cf5ae6193c5b232ea0b80df62f583a2097891baef9641b","src/traits/event.rs":"3f48aa336854141784d121f7fa9e283f6ff708a9214f9c0aade3a68cc38dda99","src/traits/labeled.rs":"c633c68e70a44e73f8aff88aaab1029c0faded3cad08d822590ed8838f24b4fd","src/traits/memory_distribution.rs":"55bb8f45e948319fbba9d28a50d8742da134b066a42e480887db7c7e435f4096","src/traits/mod.rs":"d0aa19a7cd97326fd2e026635406a5a9403953ced4954443a2bcbca32d868554","src/traits/numerator.rs":"6e4f236bdc448f1bde7a8c249dcd086204c2c69990d3f444e746290929226ed3","src/traits/ping.rs":"8831c106c03afeb458b0b028fa1ce61f056ebf8e82bc0a171a1bff255d920748","src/traits/quantity.rs":"6ffe25c913bef4315573d747308c182de740b2a4e02ba22cd21d0c33ba521f31","src/traits/rate.rs":"f000790440e0f389f0b160526a9a9a266e58d1405915ae56ac550f482858222c","src/traits/string.rs":"0c3c88382ff2e8eba89c7cfe129c4b84e31140af717819533c14919541ad790c","src/traits/string_list.rs":"14e56b62c2c2be1dd8013f12001f235b084abd2a0d5aa2f7932843877af49ac0","src/traits/text.rs":"8af7d3a0c87cfd8c6d33d6ad47532b431055bbdd395f9110da5630222c23cf93","src/traits/timespan.rs":"52be325a9c061916f34c5b638a07a93b4a14aa89fe365783103d2e06b998f547","src/traits/timing_distribution.rs":"7cb59eb55e92516e6b076e2bb2d7fa120f491f01ba873918f93421079cc442ad","src/traits/url.rs":"c27f7add23214ff051078b65b88120b620560d2841a1056c7214d5237e86b9e4","src/traits/uuid.rs":"81322e71c7e847bacaf827a2cd58f6193bdc208355524207f7f38db039da6aa8","src/upload/directory.rs":"8b2fd5ea68e4d645891b70e095d0a4976d75d74e79fd84115e030b7a66141f87","src/upload/mod.rs":"0933210a117ba0ee051703c43115fa31ef97f06d0e0b3c1410306e4f7af4d8ae","src/upload/policy.rs":"c250957a37783e74af8002cd80ba06ef9780a389fb0f61b8b665b79688f0a360","src/upload/request.rs":"a57fd6780c4d1411a64b0e2cb981310be87896f047db990f804fdb47d61c0a21","src/upload/result.rs":"7f0b5886716e7a6510fccec37e342d4702bc0aa6dc4f6d4b16a44b6e06998296","src/util.rs":"c1ecfc1037406d5b10aa185dac4ae28c6a8de603958a5b4969bb1bf130759985","tests/boolean.rs":"76d6014ff108cb6514d9bceb1b2b14749a55b09921f4595a5e30f1bd3546e9f0","tests/common/mod.rs":"a04c2cdf0b0af527a976b9f3def89b29c84f95d9c30a6538d0f297cb7c8c629e","tests/counter.rs":"46c82058cb1d7c60b340b6dbce998b4ea57333767ff52635d48a65235180e276","tests/custom_distribution.rs":"149a0e739fb36da3d4af85556566b907e4c43e2f27b66e1ebda3cd7e9c8c7196","tests/datetime.rs":"a991dee34e21a20df518a57b49f4476060b991ec00d519aa4341341085e4d0b3","tests/event.rs":"9a09f701e1b4557bf253aff536a92768e1f6459b04e01ea5c49aeac301dc126e","tests/labeled.rs":"2ca25d92aa13c1019acaa4085d512da3bddf322f92de7b2a3283795c94a471a5","tests/memory_distribution.rs":"18b0ba1eae6a3ae9a03d772cc45333644e930d0a8ae25503c9e9c887a9273536","tests/ping.rs":"a831cf5de86505c1f5c357898cca71a83cd8f10e68acf8e43f3b76a77fe4fefc","tests/ping_maker.rs":"61b49380f8865b626643879079867571377950aea4701da0665e63cbe88083e0","tests/quantity.rs":"e839d504af1c438f6ef98581066d807271900c52511f80e25488497885467fe8","tests/rate.rs":"1de571b9f0ee9a9006cbc8a31f91352d3ff1190b50840f0f668b470a7cd2a3a5","tests/storage.rs":"ed65b92d37eed873738717d95f1e70e93adf4ecd8db55f2e52f383e1e71ab3f3","tests/string.rs":"cbbd68a86275b86e5327c313071cbe210dfa325cece27735eaab381f8007cdf3","tests/string_list.rs":"73857baba228e1627430c500f4fa2456d81906718fed8ae6e8a61123dfcef98f","tests/text.rs":"d8ccf1841c92d2fc44e4e7ca35c14a177d835462d2c77e0b0d26fa2e685a5602","tests/timespan.rs":"ed71fd1e25c82f020917b1746c7d84ea23a207a03fe37b8dee3193366f2b28df","tests/timing_distribution.rs":"89124651d7b6563a4f27895375f4592f1bffa32f5d84d5fb3b9d1b6a82bd25f4","tests/uuid.rs":"84ae2378d586219a37b0ae70d3672b79d8f8baeccd5290194f27705f9ee28bdc","uniffi.toml":"6ddc98b686b0925a81abd9d1c769e5c98ac29771b210a1c535931a46dec9a8e3"},"package":"ff1c7b9f39201bd6983e178a6356597dce2ba2dd2ee1e9da41e36680cd4a99bf"} \ No newline at end of file diff --git a/third_party/rust/glean-core/Cargo.toml b/third_party/rust/glean-core/Cargo.toml index 54317ca9bd8d..7e2feae10359 100644 --- a/third_party/rust/glean-core/Cargo.toml +++ b/third_party/rust/glean-core/Cargo.toml @@ -12,7 +12,7 @@ [package] edition = "2018" name = "glean-core" -version = "51.0.1" +version = "51.1.0" authors = [ "Jan-Erik Rediger ", "The Glean Team ", @@ -34,7 +34,7 @@ license = "MPL-2.0" repository = "https://github.com/mozilla/glean" [package.metadata.glean] -glean-parser = "6.1.1" +glean-parser = "6.1.2" [dependencies.bincode] version = "1.2.1" diff --git a/third_party/rust/glean-core/src/core/mod.rs b/third_party/rust/glean-core/src/core/mod.rs index be6450ce7ae9..f98fe959b228 100644 --- a/third_party/rust/glean-core/src/core/mod.rs +++ b/third_party/rust/glean-core/src/core/mod.rs @@ -53,6 +53,9 @@ pub fn setup_glean(glean: Glean) -> Result<()> { Ok(()) } +/// Execute `f` passing the global Glean object. +/// +/// Panics if the global Glean object has not been set. pub fn with_glean(f: F) -> R where F: FnOnce(&Glean) -> R, @@ -62,6 +65,9 @@ where f(&lock) } +/// Execute `f` passing the global Glean object mutable. +/// +/// Panics if the global Glean object has not been set. pub fn with_glean_mut(f: F) -> R where F: FnOnce(&mut Glean) -> R, @@ -71,6 +77,19 @@ where f(&mut lock) } +/// Execute `f` passing the global Glean object if it has been set. +/// +/// Returns `None` if the global Glean object has not been set. +/// Returns `Some(T)` otherwise. +pub fn with_opt_glean(f: F) -> Option +where + F: FnOnce(&Glean) -> R, +{ + let glean = global_glean()?; + let lock = glean.lock().unwrap(); + Some(f(&lock)) +} + /// The object holding meta information about a Glean instance. /// /// ## Example diff --git a/third_party/rust/glean-core/src/lib.rs b/third_party/rust/glean-core/src/lib.rs index 0178d92bb6ce..3e955148a588 100644 --- a/third_party/rust/glean-core/src/lib.rs +++ b/third_party/rust/glean-core/src/lib.rs @@ -847,7 +847,7 @@ pub fn glean_test_destroy_glean(clear_stores: bool) { /// Get the next upload task pub fn glean_get_upload_task() -> PingUploadTask { - core::with_glean(|glean| glean.get_upload_task()) + core::with_opt_glean(|glean| glean.get_upload_task()).unwrap_or_else(PingUploadTask::done) } /// Processes the response from an attempt to upload a ping. diff --git a/third_party/rust/glean-core/src/upload/mod.rs b/third_party/rust/glean-core/src/upload/mod.rs index dad396bfaf17..2e8ff01483bd 100644 --- a/third_party/rust/glean-core/src/upload/mod.rs +++ b/third_party/rust/glean-core/src/upload/mod.rs @@ -174,7 +174,7 @@ impl PingUploadTask { matches!(self, PingUploadTask::Wait { .. }) } - fn done() -> Self { + pub(crate) fn done() -> Self { PingUploadTask::Done { unused: 0 } } } diff --git a/third_party/rust/glean/.cargo-checksum.json b/third_party/rust/glean/.cargo-checksum.json index abae0ca1a6f3..e34b8460d81d 100644 --- a/third_party/rust/glean/.cargo-checksum.json +++ b/third_party/rust/glean/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"cca6235962158e52716cffef30031b7bd6d9c6ace3f06267d2e3da34d24f7c15","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"5bc5b1c46695f628e1023662752272e938a963b535d5686bd1ecc433f9e018c4","src/common_test.rs":"68f6d408cb7b683fa32c8b38a4df1e6c45bfd77c0c90ca35976ea7548bbc4b2f","src/configuration.rs":"37ad5b3e7d4e31dd04a7d6690179168b5f2768d87dd36056dee5d08bdbe20fb2","src/core_metrics.rs":"76ac5350cb6f82d9a193d519b085a08f138dceba77da3514bd0c636bcdefefca","src/lib.rs":"e342d497d60abceca3c84d35523a54d187b0282220a112da53e4ab1cf76da205","src/net/http_uploader.rs":"43812a70d19a38e8d7a093c8076c2b6345372c3c861b0f3511428762700a65e0","src/net/mod.rs":"86cbcb0b46f9d13923a20db9e482b65da49d7daa4e335a3f3092f1d760f572b0","src/private/event.rs":"02bbebf545695812e5055741cc0b5f3c99eda2039e684e26fcdd5f087ed15fe3","src/private/mod.rs":"0364ecf5f0439443a5b209583f4ff2c474b79f7c253c981ab0b7cdc528368698","src/private/ping.rs":"cbdc57f41fc9d46e56b4dfff91ac683753d1f8b3ecd0aa9bc3419e3595b8b81b","src/system.rs":"ff23a5b94f52dab484342dfed702412bc29ab1bbfd5af326033d8e07e7b9075f","src/test.rs":"d70c6aaadd529bec2fa3029c4138193865e598ad054ec636a4b5baae48177f99","tests/common/mod.rs":"37cd4c48e140c793b852ae09fb3e812da28a4412977295015bcbffd632fcf294","tests/init_fails.rs":"9b78226a4e3220de5b64a205a97b8d5778d1700391b5b71c7819b6cdd120747e","tests/never_init.rs":"1f33b8ce7ca3514b57b48cc16d98408974c85cf8aa7d13257ffc2ad878ebb295","tests/no_time_to_init.rs":"494dcddce49f279c6508f484ee59cf8bb83e7324de07bdbc1142f2a066b7f6a1","tests/overflowing_preinit.rs":"396206d5078b7e6c148bbf2aecb0f963cfaa4d7eff3fc7bf6590125076ee6113","tests/persist_ping_lifetime.rs":"2297d4b208e14188e6dcca2d4806b805cfc7dd824d21bd143a7803b95e0709f4","tests/persist_ping_lifetime_nopanic.rs":"06f1f3ca3b8a6c8b7fc4d6fc48d0e1d2ccffd32139f080db0a95003e9edd507d","tests/schema.rs":"a96089f828928b6be1fad7815e3269f5693af1b773e570312b357a29af28122a","tests/simple.rs":"a1d72af899293390bb955ca379baafb89c29bb746630409f8c51f453d222dbad"},"package":"a20e782acaa1771ea4de48aa8bcf3421ae1e77c36dbae7595428fc2e333d0df5"} \ No newline at end of file +{"files":{"Cargo.toml":"ec66c8a001c3fc6282887bace97d01db96ca04115b64c94b580e17ae4fe06ff5","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"5bc5b1c46695f628e1023662752272e938a963b535d5686bd1ecc433f9e018c4","src/common_test.rs":"68f6d408cb7b683fa32c8b38a4df1e6c45bfd77c0c90ca35976ea7548bbc4b2f","src/configuration.rs":"37ad5b3e7d4e31dd04a7d6690179168b5f2768d87dd36056dee5d08bdbe20fb2","src/core_metrics.rs":"76ac5350cb6f82d9a193d519b085a08f138dceba77da3514bd0c636bcdefefca","src/lib.rs":"e342d497d60abceca3c84d35523a54d187b0282220a112da53e4ab1cf76da205","src/net/http_uploader.rs":"43812a70d19a38e8d7a093c8076c2b6345372c3c861b0f3511428762700a65e0","src/net/mod.rs":"86cbcb0b46f9d13923a20db9e482b65da49d7daa4e335a3f3092f1d760f572b0","src/private/event.rs":"02bbebf545695812e5055741cc0b5f3c99eda2039e684e26fcdd5f087ed15fe3","src/private/mod.rs":"0364ecf5f0439443a5b209583f4ff2c474b79f7c253c981ab0b7cdc528368698","src/private/ping.rs":"cbdc57f41fc9d46e56b4dfff91ac683753d1f8b3ecd0aa9bc3419e3595b8b81b","src/system.rs":"ff23a5b94f52dab484342dfed702412bc29ab1bbfd5af326033d8e07e7b9075f","src/test.rs":"d70c6aaadd529bec2fa3029c4138193865e598ad054ec636a4b5baae48177f99","tests/common/mod.rs":"37cd4c48e140c793b852ae09fb3e812da28a4412977295015bcbffd632fcf294","tests/init_fails.rs":"9b78226a4e3220de5b64a205a97b8d5778d1700391b5b71c7819b6cdd120747e","tests/never_init.rs":"1f33b8ce7ca3514b57b48cc16d98408974c85cf8aa7d13257ffc2ad878ebb295","tests/no_time_to_init.rs":"494dcddce49f279c6508f484ee59cf8bb83e7324de07bdbc1142f2a066b7f6a1","tests/overflowing_preinit.rs":"396206d5078b7e6c148bbf2aecb0f963cfaa4d7eff3fc7bf6590125076ee6113","tests/persist_ping_lifetime.rs":"2297d4b208e14188e6dcca2d4806b805cfc7dd824d21bd143a7803b95e0709f4","tests/persist_ping_lifetime_nopanic.rs":"06f1f3ca3b8a6c8b7fc4d6fc48d0e1d2ccffd32139f080db0a95003e9edd507d","tests/schema.rs":"a96089f828928b6be1fad7815e3269f5693af1b773e570312b357a29af28122a","tests/simple.rs":"a1d72af899293390bb955ca379baafb89c29bb746630409f8c51f453d222dbad"},"package":"d187c24d9b68cf4604253a38a15c5490f8089fa0abbd5d3a75a7dab6496c452c"} \ No newline at end of file diff --git a/third_party/rust/glean/Cargo.toml b/third_party/rust/glean/Cargo.toml index c6ceb8eaddb1..b5651aae5399 100644 --- a/third_party/rust/glean/Cargo.toml +++ b/third_party/rust/glean/Cargo.toml @@ -12,7 +12,7 @@ [package] edition = "2018" name = "glean" -version = "51.0.1" +version = "51.1.0" authors = [ "Jan-Erik Rediger ", "The Glean Team ", @@ -41,7 +41,7 @@ features = ["serde"] version = "0.5" [dependencies.glean-core] -version = "51.0.1" +version = "51.1.0" [dependencies.inherent] version = "1" diff --git a/toolkit/components/glean/Cargo.toml b/toolkit/components/glean/Cargo.toml index f32a5230d58a..e30649a1b6d8 100644 --- a/toolkit/components/glean/Cargo.toml +++ b/toolkit/components/glean/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" license = "MPL-2.0" [dependencies] -glean = "51.0.1" +glean = "51.1.0" log = "0.4" nserror = { path = "../../../xpcom/rust/nserror" } nsstring = { path = "../../../xpcom/rust/nsstring" } diff --git a/toolkit/components/glean/api/Cargo.toml b/toolkit/components/glean/api/Cargo.toml index 84d749cf006d..ac997e651d88 100644 --- a/toolkit/components/glean/api/Cargo.toml +++ b/toolkit/components/glean/api/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] bincode = "1.0" chrono = "0.4.10" -glean = "51.0.1" +glean = "51.1.0" inherent = "1.0.0" log = "0.4" nsstring = { path = "../../../../xpcom/rust/nsstring", optional = true }