diff --git a/Cargo.lock b/Cargo.lock index 61ba645336e7..c60c83ec2992 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2284,9 +2284,9 @@ dependencies = [ [[package]] name = "glean" -version = "50.1.3" +version = "50.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe54494f067655870956431d2a6942e56611da53d67101dd64847445b29367b0" +checksum = "813fa9059f1a7d9da4fcf6cff6c77e6226fc26f58797d1659d16a8279c4655f2" dependencies = [ "chrono", "crossbeam-channel", @@ -2304,9 +2304,9 @@ dependencies = [ [[package]] name = "glean-core" -version = "50.1.3" +version = "50.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f32fadcf37284fdaf70d1e9d0afd753b8a5c02348fd2e366e81e2b6f9ba84091" +checksum = "e5edb2b6cf2938242adda6ece26ac29b2238c693c423331c8a68ce980c348b28" dependencies = [ "android_logger", "bincode", diff --git a/build.gradle b/build.gradle index 525ee3d0218f..e141a26967f1 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ allprojects { topsrcdir = gradle.mozconfig.topsrcdir topobjdir = gradle.mozconfig.topobjdir - gleanVersion = "50.1.3" + gleanVersion = "50.1.2" if (gleanVersion != getRustVersionFor("glean")) { throw new StopExecutionException("Mismatched Glean version, expected: ${gleanVersion}," + " found ${getRustVersionFor("glean")}") diff --git a/gfx/wr/webrender/Cargo.toml b/gfx/wr/webrender/Cargo.toml index 421109639aaa..8acb8fff76fe 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 = "50.1.3" +glean = "50.1.2" 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 ebefc246ea19..d8eb608d7496 100644 --- a/python/sites/mach.txt +++ b/python/sites/mach.txt @@ -129,7 +129,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==50.1.3:telemetry will not be collected +pypi-optional:glean-sdk==50.1.2: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 3b54d6af2d6a..e4b1afcc356f 100644 --- a/supply-chain/audits.toml +++ b/supply-chain/audits.toml @@ -110,12 +110,6 @@ 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" -delta = "50.1.2 -> 50.1.3" -notes = "Unchanged from last version" - [[audits.glean-core]] who = "Jan-Erik Rediger " criteria = "safe-to-deploy" @@ -128,12 +122,6 @@ 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" -delta = "50.1.2 -> 50.1.3" -notes = "Bug fix release with minimal changes, changes done by myself" - [[audits.linked-hash-map]] who = "Aria Beingessner " criteria = "safe-to-deploy" diff --git a/third_party/rust/glean-core/.cargo-checksum.json b/third_party/rust/glean-core/.cargo-checksum.json index 9e1cbc9533cb..b12cb9eb1fab 100644 --- a/third_party/rust/glean-core/.cargo-checksum.json +++ b/third_party/rust/glean-core/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"91460b06c03fdcb30eb73ba23b1ddc38605f92cf1fd134f253eab5aaa3358590","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":"098b8270709349b81a9086f5a8c4fe8f3a6347700ea8a70c08c8d9889a0d5f62","src/debug.rs":"90158cc5d488ba67b60d06647e54e59a1d7bdeb906087e4fe4cfab4373c1cc6c","src/dispatcher/global.rs":"03ef09170d0b7c654ac0b8dc555e2f6aad0cc10a5c1a73720007896f4faf48cb","src/dispatcher/mod.rs":"f9d7f329f86b75b5af573a07271ff4daef22abd4d6ce1c7241fe5e92a3babfe5","src/error.rs":"97172a791efdf8b791a04ae7961085fbef4391b313ff3ffb24e9381f2901fccc","src/error_recording.rs":"443c8c0162cc03ea432ce08f3d66b9859a556191abcd2b3d2e3dac25c374dc72","src/event_database/mod.rs":"95d665a039236ede25dd479b19f0ddc32c0dd79cef2fbcc2ef3bab1540680276","src/fd_logger.rs":"0c9def6fa53db1a2ab93c85795f8a7df57797bcfd3978146923e151752e291a6","src/glean.udl":"3db04f22ec66284f20a927fa019c5941f20db370259a8993804893133d3078c0","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":"c0c351ba62dba081f05867402343cb71b23fd6462c6101e7bae460dbf7d2021c","src/metrics/counter.rs":"798bbb83551c2e8e7c22610816a0e6ecfd43173e2263acc33b6db950fb325244","src/metrics/custom_distribution.rs":"945bc8e4a94c14b0151dfbdd2c0d746848a9aceac03bccbc9efe3901385b2f70","src/metrics/datetime.rs":"fee869f6c338b4241b173946f2931e4035277e76991a429b7136baabfe4f9212","src/metrics/denominator.rs":"1bdb4c13b051824f9d04b589826d679e5e28c43a6fe5e95c9f984bec90a9dbc9","src/metrics/event.rs":"9cec5e64f431052c970ef079bd55f86fd031d071d7e9ee674ad5aac1f111b5c2","src/metrics/experiment.rs":"89d41f0e3e03f50838ed5a518babf0b54db3eccb1fbee391ec37a48fc018cc92","src/metrics/labeled.rs":"69536ae68dcd199e16b83c6c3ba1c150e7c373682334acd7b360151431ff8a34","src/metrics/memory_distribution.rs":"f92cc3855c20fe7b672fded06a8bcfe4fda1a6b16ebdca83755b335fdefeed82","src/metrics/memory_unit.rs":"d7a678e5242febd021283b30c0099a9e62729944816a3f17d2d91e2808bc0570","src/metrics/mod.rs":"cfd8d157b039bd124716c2c6a0fd7a023275536bee3300803f7de94203c32933","src/metrics/numerator.rs":"6866f36cb788922d32e1be5158ca7ccc0f0959a677b66910c2fc516d968011cd","src/metrics/ping.rs":"b491ec663f8b4528b600e80731f9ed292d0515375c70886e4f6440ee065ec549","src/metrics/quantity.rs":"c271c78b0560fbae2b775a0d59252556f0f9afaea0a7465420dbaa13f2e46a81","src/metrics/rate.rs":"8cde98d1433fb4ee38bffde47c5904711dde83ad6c5bae1417405e384eaca0dc","src/metrics/recorded_experiment.rs":"33958abee79d8b55dec4cb5d20742640423713010f76314075cefde18b5c118a","src/metrics/string.rs":"d09164c372f2fae46b1de18851db3de822a69a348969a24a146ed732c6d1c4a9","src/metrics/string_list.rs":"f82c59eb408fc7d5fb2e925568c7103fd203806e9c01210229c1fa592b8c1a6c","src/metrics/text.rs":"59295859a801fa09b724dae2fa4f9ba8de38a4b2cb05249c6c49980ef41565d6","src/metrics/time_unit.rs":"b7578010c6270a45b30342b59189a862b2ede9dd24e9afae3e90fa6b970b3d24","src/metrics/timespan.rs":"a4831b27ad43ed47afa3d6e03afd0c642cf3dc4621092e89539f6cce8a530fd4","src/metrics/timing_distribution.rs":"aad258dc8d7530461b478e92f0587bf03bab5ad723dca86df92095db4ad320e6","src/metrics/url.rs":"f4ddda46fb9a2560a1c074addc80a7087888c1a042fb600ee4279769d0c93db4","src/metrics/uuid.rs":"3e6e2bc69ed7e37a7784eeeda6606dba96f2e5a529cb94f40f5e352778a5e586","src/ping/mod.rs":"83cc8b555fb611ef8b60eff3cb3928a38191596c10e39ed69dfffc9e4139ff3f","src/scheduler.rs":"1a9c79570dc0945ed6017d20231a398199e84240c866ddc0da6d95edb3859cf8","src/storage/mod.rs":"3fd0fb9b743a1ec12b8b1fd07f1a99594db030ec47ab4afe255923e6d11a636a","src/system.rs":"a76ff0998840ab4ad00dfd52dbad6b1558bb4cdcf613fe3725969c9a90e1bfe8","src/traits/boolean.rs":"799804d6babb49066fb0047cc5302c9fe0b428cd16937763ed94a7a0f6a8c1d2","src/traits/counter.rs":"631208036059d498a4485c74c2a80c24a5f13bffeb1053bdf5cce06af0e9d361","src/traits/custom_distribution.rs":"1b3ffda6e857bfa8ad5be412e88f3d9706ededf5a86407364ae19a81f06ef798","src/traits/datetime.rs":"2f4b9e64161c15c912b6a915045dd9840f76229d144a4d1542c54eb4f3b3406b","src/traits/event.rs":"4d917327a2fcf0cb9a1bd7fc309cf01ba90b94afa2cb827d4708d7c276e4ba6d","src/traits/labeled.rs":"7f3281fc0a1a745238e7e260463f397dfa61717408fe9d260dc9767d9c659e52","src/traits/memory_distribution.rs":"0b72ffde68eb97f01a57afbc5c6109565ec9435561984d34696622bf5a57d559","src/traits/mod.rs":"d0aa19a7cd97326fd2e026635406a5a9403953ced4954443a2bcbca32d868554","src/traits/numerator.rs":"3c33c4070b208872ea2924adc0b7b399be22c37713e5a8434f740ec3e822e715","src/traits/ping.rs":"8831c106c03afeb458b0b028fa1ce61f056ebf8e82bc0a171a1bff255d920748","src/traits/quantity.rs":"087d7a4b58f0eb7c766a0202dcf38a52d172ce4edf626211ffe5d94ed02ae754","src/traits/rate.rs":"edd21b6528100d358d4241db793b53d478485563bfe4ac92cf78adf5917ecc55","src/traits/string.rs":"48e5623c7db59b8e6454fbc7fb6e2395f808c9a0fa721d7c07b72abb171eb1ad","src/traits/string_list.rs":"5d5773d5a130323dd82ca95f4ecdccdd6b237afe2eadf8655363bd6b7e8508c1","src/traits/text.rs":"0d7afc7ca0bc51b2f959b24cd4416e2fb153e43a95346efc78458d472b8cb251","src/traits/timespan.rs":"29251233847c5cdd200a61472132c62ded27fe2c13835b09424384bf144d82db","src/traits/timing_distribution.rs":"5e619d445e6ef3f19ca69bcdfe02d19b150c5a46855d195703b6d2f55e538636","src/traits/url.rs":"a01331623af4fa8af6e71becffff60060832bef5e48a15df6dc23b41225f689e","src/traits/uuid.rs":"bd78515611ba406d8b1bda35a9fe30c317512a9afcea7c5dece8fced7d410a92","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":"0146c560be554c56af9612409b8cbeae57e20f52cca6cc2f4c615572e4449c3a","tests/custom_distribution.rs":"32e78ae7ad60a1c583e93a7293788a17004b4d41aad7e358f72a85e51c0cbfd8","tests/datetime.rs":"a991dee34e21a20df518a57b49f4476060b991ec00d519aa4341341085e4d0b3","tests/event.rs":"9a09f701e1b4557bf253aff536a92768e1f6459b04e01ea5c49aeac301dc126e","tests/labeled.rs":"0160023ca3695e9f417cbf09219d45551030275ac236d7f3f7fbe3aaa96299ab","tests/memory_distribution.rs":"aebb81f928874b692775513bdd56cbd9a75459374c4315ce68df40c65b206a0f","tests/ping.rs":"a831cf5de86505c1f5c357898cca71a83cd8f10e68acf8e43f3b76a77fe4fefc","tests/ping_maker.rs":"61b49380f8865b626643879079867571377950aea4701da0665e63cbe88083e0","tests/quantity.rs":"f51e9081b6da0f9e83f7d37c15ae5549c7d56be237894be35709984f0641f366","tests/rate.rs":"4ab4ede8c20fabba82f51ab806e1f5a3ddce5c43b11acc2f3022b3c95882b5b2","tests/storage.rs":"ed65b92d37eed873738717d95f1e70e93adf4ecd8db55f2e52f383e1e71ab3f3","tests/string.rs":"afae8a46ea94639d199f9bf043c571013bba43fd6aef3a2b7316b58fa8563f36","tests/string_list.rs":"e9f1797d09fccd1c326fb145fe692c1197eb3b84ec8afea1face17a16f520d32","tests/text.rs":"2a8c21a3f7e056cff2ab954418f9cf826240be968db15736d4760608ce87ea3b","tests/timespan.rs":"c633c05698c81ea30ef9105c0f8a1149e17925de9d3b8bc370f7ded0674563c7","tests/timing_distribution.rs":"8a308785f6d9330ddbbabc2e7128c8c883de92b8542d37e78bd87c6ff78e319f","tests/uuid.rs":"84ae2378d586219a37b0ae70d3672b79d8f8baeccd5290194f27705f9ee28bdc","uniffi.toml":"6ddc98b686b0925a81abd9d1c769e5c98ac29771b210a1c535931a46dec9a8e3"},"package":"f32fadcf37284fdaf70d1e9d0afd753b8a5c02348fd2e366e81e2b6f9ba84091"} \ No newline at end of file +{"files":{"Cargo.toml":"04b3598d79949960cc862132f18de5b37c0b9f13bf5dd7954e55045e5a77dc34","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"026495898699b54608eb4ec16074ffafc57920d80ccb59961c501a1ea28c9985","build.rs":"7dc87a0329262e0954334d1c3959bf4c9937d82f95359fba0b318fd45dd18f1a","src/common_metric_data.rs":"e9f3cc2066487b1feeaae47b7dd130ed77462649871985935ac37491411725c8","src/core/mod.rs":"1126371ab0839c54068c8019af5096be777c3ed08d1e76e32888daed7ce6bc10","src/core_metrics.rs":"8962f9f32ccc0583bc8f635b2c9442712506f3f8912de52b272425d9c6d359ad","src/coverage.rs":"49613fd310bd24d779472720975fbe6c97ec370a95eb55f10afa43f67539c942","src/database/mod.rs":"098b8270709349b81a9086f5a8c4fe8f3a6347700ea8a70c08c8d9889a0d5f62","src/debug.rs":"90158cc5d488ba67b60d06647e54e59a1d7bdeb906087e4fe4cfab4373c1cc6c","src/dispatcher/global.rs":"03ef09170d0b7c654ac0b8dc555e2f6aad0cc10a5c1a73720007896f4faf48cb","src/dispatcher/mod.rs":"f9d7f329f86b75b5af573a07271ff4daef22abd4d6ce1c7241fe5e92a3babfe5","src/error.rs":"97172a791efdf8b791a04ae7961085fbef4391b313ff3ffb24e9381f2901fccc","src/error_recording.rs":"443c8c0162cc03ea432ce08f3d66b9859a556191abcd2b3d2e3dac25c374dc72","src/event_database/mod.rs":"95d665a039236ede25dd479b19f0ddc32c0dd79cef2fbcc2ef3bab1540680276","src/fd_logger.rs":"0c9def6fa53db1a2ab93c85795f8a7df57797bcfd3978146923e151752e291a6","src/glean.udl":"3db04f22ec66284f20a927fa019c5941f20db370259a8993804893133d3078c0","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":"0a8ed7c36264570efb80d0245efa99fb282923e19060757b4e0e6005a055c933","src/lib_unit_tests.rs":"975b59dca5751a548cc98c6b51e05f888c1275e1d4edd83061b5b60769e4fe0c","src/metrics/boolean.rs":"c0c351ba62dba081f05867402343cb71b23fd6462c6101e7bae460dbf7d2021c","src/metrics/counter.rs":"798bbb83551c2e8e7c22610816a0e6ecfd43173e2263acc33b6db950fb325244","src/metrics/custom_distribution.rs":"945bc8e4a94c14b0151dfbdd2c0d746848a9aceac03bccbc9efe3901385b2f70","src/metrics/datetime.rs":"fee869f6c338b4241b173946f2931e4035277e76991a429b7136baabfe4f9212","src/metrics/denominator.rs":"1bdb4c13b051824f9d04b589826d679e5e28c43a6fe5e95c9f984bec90a9dbc9","src/metrics/event.rs":"9cec5e64f431052c970ef079bd55f86fd031d071d7e9ee674ad5aac1f111b5c2","src/metrics/experiment.rs":"89d41f0e3e03f50838ed5a518babf0b54db3eccb1fbee391ec37a48fc018cc92","src/metrics/labeled.rs":"69536ae68dcd199e16b83c6c3ba1c150e7c373682334acd7b360151431ff8a34","src/metrics/memory_distribution.rs":"f92cc3855c20fe7b672fded06a8bcfe4fda1a6b16ebdca83755b335fdefeed82","src/metrics/memory_unit.rs":"d7a678e5242febd021283b30c0099a9e62729944816a3f17d2d91e2808bc0570","src/metrics/mod.rs":"cfd8d157b039bd124716c2c6a0fd7a023275536bee3300803f7de94203c32933","src/metrics/numerator.rs":"6866f36cb788922d32e1be5158ca7ccc0f0959a677b66910c2fc516d968011cd","src/metrics/ping.rs":"b491ec663f8b4528b600e80731f9ed292d0515375c70886e4f6440ee065ec549","src/metrics/quantity.rs":"c271c78b0560fbae2b775a0d59252556f0f9afaea0a7465420dbaa13f2e46a81","src/metrics/rate.rs":"8cde98d1433fb4ee38bffde47c5904711dde83ad6c5bae1417405e384eaca0dc","src/metrics/recorded_experiment.rs":"33958abee79d8b55dec4cb5d20742640423713010f76314075cefde18b5c118a","src/metrics/string.rs":"d09164c372f2fae46b1de18851db3de822a69a348969a24a146ed732c6d1c4a9","src/metrics/string_list.rs":"f82c59eb408fc7d5fb2e925568c7103fd203806e9c01210229c1fa592b8c1a6c","src/metrics/text.rs":"59295859a801fa09b724dae2fa4f9ba8de38a4b2cb05249c6c49980ef41565d6","src/metrics/time_unit.rs":"b7578010c6270a45b30342b59189a862b2ede9dd24e9afae3e90fa6b970b3d24","src/metrics/timespan.rs":"a4831b27ad43ed47afa3d6e03afd0c642cf3dc4621092e89539f6cce8a530fd4","src/metrics/timing_distribution.rs":"aad258dc8d7530461b478e92f0587bf03bab5ad723dca86df92095db4ad320e6","src/metrics/url.rs":"f4ddda46fb9a2560a1c074addc80a7087888c1a042fb600ee4279769d0c93db4","src/metrics/uuid.rs":"3e6e2bc69ed7e37a7784eeeda6606dba96f2e5a529cb94f40f5e352778a5e586","src/ping/mod.rs":"83cc8b555fb611ef8b60eff3cb3928a38191596c10e39ed69dfffc9e4139ff3f","src/scheduler.rs":"1a9c79570dc0945ed6017d20231a398199e84240c866ddc0da6d95edb3859cf8","src/storage/mod.rs":"3fd0fb9b743a1ec12b8b1fd07f1a99594db030ec47ab4afe255923e6d11a636a","src/system.rs":"a76ff0998840ab4ad00dfd52dbad6b1558bb4cdcf613fe3725969c9a90e1bfe8","src/traits/boolean.rs":"799804d6babb49066fb0047cc5302c9fe0b428cd16937763ed94a7a0f6a8c1d2","src/traits/counter.rs":"631208036059d498a4485c74c2a80c24a5f13bffeb1053bdf5cce06af0e9d361","src/traits/custom_distribution.rs":"1b3ffda6e857bfa8ad5be412e88f3d9706ededf5a86407364ae19a81f06ef798","src/traits/datetime.rs":"2f4b9e64161c15c912b6a915045dd9840f76229d144a4d1542c54eb4f3b3406b","src/traits/event.rs":"4d917327a2fcf0cb9a1bd7fc309cf01ba90b94afa2cb827d4708d7c276e4ba6d","src/traits/labeled.rs":"7f3281fc0a1a745238e7e260463f397dfa61717408fe9d260dc9767d9c659e52","src/traits/memory_distribution.rs":"0b72ffde68eb97f01a57afbc5c6109565ec9435561984d34696622bf5a57d559","src/traits/mod.rs":"d0aa19a7cd97326fd2e026635406a5a9403953ced4954443a2bcbca32d868554","src/traits/numerator.rs":"3c33c4070b208872ea2924adc0b7b399be22c37713e5a8434f740ec3e822e715","src/traits/ping.rs":"8831c106c03afeb458b0b028fa1ce61f056ebf8e82bc0a171a1bff255d920748","src/traits/quantity.rs":"087d7a4b58f0eb7c766a0202dcf38a52d172ce4edf626211ffe5d94ed02ae754","src/traits/rate.rs":"edd21b6528100d358d4241db793b53d478485563bfe4ac92cf78adf5917ecc55","src/traits/string.rs":"48e5623c7db59b8e6454fbc7fb6e2395f808c9a0fa721d7c07b72abb171eb1ad","src/traits/string_list.rs":"5d5773d5a130323dd82ca95f4ecdccdd6b237afe2eadf8655363bd6b7e8508c1","src/traits/text.rs":"0d7afc7ca0bc51b2f959b24cd4416e2fb153e43a95346efc78458d472b8cb251","src/traits/timespan.rs":"29251233847c5cdd200a61472132c62ded27fe2c13835b09424384bf144d82db","src/traits/timing_distribution.rs":"5e619d445e6ef3f19ca69bcdfe02d19b150c5a46855d195703b6d2f55e538636","src/traits/url.rs":"a01331623af4fa8af6e71becffff60060832bef5e48a15df6dc23b41225f689e","src/traits/uuid.rs":"bd78515611ba406d8b1bda35a9fe30c317512a9afcea7c5dece8fced7d410a92","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":"0146c560be554c56af9612409b8cbeae57e20f52cca6cc2f4c615572e4449c3a","tests/custom_distribution.rs":"32e78ae7ad60a1c583e93a7293788a17004b4d41aad7e358f72a85e51c0cbfd8","tests/datetime.rs":"a991dee34e21a20df518a57b49f4476060b991ec00d519aa4341341085e4d0b3","tests/event.rs":"9a09f701e1b4557bf253aff536a92768e1f6459b04e01ea5c49aeac301dc126e","tests/labeled.rs":"0160023ca3695e9f417cbf09219d45551030275ac236d7f3f7fbe3aaa96299ab","tests/memory_distribution.rs":"aebb81f928874b692775513bdd56cbd9a75459374c4315ce68df40c65b206a0f","tests/ping.rs":"a831cf5de86505c1f5c357898cca71a83cd8f10e68acf8e43f3b76a77fe4fefc","tests/ping_maker.rs":"61b49380f8865b626643879079867571377950aea4701da0665e63cbe88083e0","tests/quantity.rs":"f51e9081b6da0f9e83f7d37c15ae5549c7d56be237894be35709984f0641f366","tests/rate.rs":"4ab4ede8c20fabba82f51ab806e1f5a3ddce5c43b11acc2f3022b3c95882b5b2","tests/storage.rs":"ed65b92d37eed873738717d95f1e70e93adf4ecd8db55f2e52f383e1e71ab3f3","tests/string.rs":"afae8a46ea94639d199f9bf043c571013bba43fd6aef3a2b7316b58fa8563f36","tests/string_list.rs":"e9f1797d09fccd1c326fb145fe692c1197eb3b84ec8afea1face17a16f520d32","tests/text.rs":"2a8c21a3f7e056cff2ab954418f9cf826240be968db15736d4760608ce87ea3b","tests/timespan.rs":"c633c05698c81ea30ef9105c0f8a1149e17925de9d3b8bc370f7ded0674563c7","tests/timing_distribution.rs":"8a308785f6d9330ddbbabc2e7128c8c883de92b8542d37e78bd87c6ff78e319f","tests/uuid.rs":"84ae2378d586219a37b0ae70d3672b79d8f8baeccd5290194f27705f9ee28bdc","uniffi.toml":"6ddc98b686b0925a81abd9d1c769e5c98ac29771b210a1c535931a46dec9a8e3"},"package":"e5edb2b6cf2938242adda6ece26ac29b2238c693c423331c8a68ce980c348b28"} \ 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 f2a56eda7c97..3cd288544a7a 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 = "50.1.3" +version = "50.1.2" authors = [ "Jan-Erik Rediger ", "The Glean Team ", diff --git a/third_party/rust/glean-core/src/core_metrics.rs b/third_party/rust/glean-core/src/core_metrics.rs index aafa432bf7b9..d284290e753f 100644 --- a/third_party/rust/glean-core/src/core_metrics.rs +++ b/third_party/rust/glean-core/src/core_metrics.rs @@ -130,50 +130,6 @@ pub mod internal_metrics { }) }); - pub static android_sdk_version: Lazy = Lazy::new(|| { - StringMetric::new(CommonMetricData { - name: "android_sdk_version".into(), - category: "".into(), - send_in_pings: vec!["glean_client_info".into()], - lifetime: Lifetime::Application, - disabled: false, - ..Default::default() - }) - }); - - pub static device_manufacturer: Lazy = Lazy::new(|| { - StringMetric::new(CommonMetricData { - name: "device_manufacturer".into(), - category: "".into(), - send_in_pings: vec!["glean_client_info".into()], - lifetime: Lifetime::Application, - disabled: false, - ..Default::default() - }) - }); - - pub static device_model: Lazy = Lazy::new(|| { - StringMetric::new(CommonMetricData { - name: "device_model".into(), - category: "".into(), - send_in_pings: vec!["glean_client_info".into()], - lifetime: Lifetime::Application, - disabled: false, - ..Default::default() - }) - }); - - pub static locale: Lazy = Lazy::new(|| { - StringMetric::new(CommonMetricData { - name: "locale".into(), - category: "".into(), - send_in_pings: vec!["glean_client_info".into()], - lifetime: Lifetime::Application, - disabled: false, - ..Default::default() - }) - }); - pub static baseline_duration: Lazy = Lazy::new(|| { TimespanMetric::new( CommonMetricData { diff --git a/third_party/rust/glean-core/src/lib.rs b/third_party/rust/glean-core/src/lib.rs index 0178d92bb6ce..9c4016f6aaab 100644 --- a/third_party/rust/glean-core/src/lib.rs +++ b/third_party/rust/glean-core/src/lib.rs @@ -498,19 +498,6 @@ fn initialize_core_metrics(glean: &Glean, client_info: &ClientInfoMetrics) { } core_metrics::internal_metrics::os_version.set_sync(glean, system::get_os_version()); core_metrics::internal_metrics::architecture.set_sync(glean, system::ARCH.to_string()); - - if let Some(android_sdk_version) = client_info.android_sdk_version.as_ref() { - core_metrics::internal_metrics::android_sdk_version.set_sync(glean, android_sdk_version); - } - if let Some(device_manufacturer) = client_info.device_manufacturer.as_ref() { - core_metrics::internal_metrics::device_manufacturer.set_sync(glean, device_manufacturer); - } - if let Some(device_model) = client_info.device_model.as_ref() { - core_metrics::internal_metrics::device_model.set_sync(glean, device_model); - } - if let Some(locale) = client_info.locale.as_ref() { - core_metrics::internal_metrics::locale.set_sync(glean, locale); - } } /// Checks if [`initialize`] was ever called. diff --git a/third_party/rust/glean/.cargo-checksum.json b/third_party/rust/glean/.cargo-checksum.json index b0ae2ba4fada..90afa7d4c083 100644 --- a/third_party/rust/glean/.cargo-checksum.json +++ b/third_party/rust/glean/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"e118fe27a3ad1a7c2ec5127996ea93636b0b87567c2425f8bef98eaf917866e6","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":"f6cd799c7764c53510180a1cef6a5a9b435fae27b87270519d5b4e59201e8ecc","src/private/mod.rs":"0364ecf5f0439443a5b209583f4ff2c474b79f7c253c981ab0b7cdc528368698","src/private/ping.rs":"cbdc57f41fc9d46e56b4dfff91ac683753d1f8b3ecd0aa9bc3419e3595b8b81b","src/system.rs":"ff23a5b94f52dab484342dfed702412bc29ab1bbfd5af326033d8e07e7b9075f","src/test.rs":"30d62d967c56a7ca76c097e27bfb6d6d3779ccd5d374cf5a07a04216e4e0880b","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":"fe54494f067655870956431d2a6942e56611da53d67101dd64847445b29367b0"} \ No newline at end of file +{"files":{"Cargo.toml":"22631469f647eb393b83eccffadea1ff3124ba4e79e402b754aab30926d384c0","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":"f6cd799c7764c53510180a1cef6a5a9b435fae27b87270519d5b4e59201e8ecc","src/private/mod.rs":"0364ecf5f0439443a5b209583f4ff2c474b79f7c253c981ab0b7cdc528368698","src/private/ping.rs":"cbdc57f41fc9d46e56b4dfff91ac683753d1f8b3ecd0aa9bc3419e3595b8b81b","src/system.rs":"ff23a5b94f52dab484342dfed702412bc29ab1bbfd5af326033d8e07e7b9075f","src/test.rs":"30d62d967c56a7ca76c097e27bfb6d6d3779ccd5d374cf5a07a04216e4e0880b","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":"813fa9059f1a7d9da4fcf6cff6c77e6226fc26f58797d1659d16a8279c4655f2"} \ No newline at end of file diff --git a/third_party/rust/glean/Cargo.toml b/third_party/rust/glean/Cargo.toml index 4a01f3160ed3..1c9486e986ec 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 = "50.1.3" +version = "50.1.2" authors = [ "Jan-Erik Rediger ", "The Glean Team ", @@ -41,7 +41,7 @@ features = ["serde"] version = "0.5" [dependencies.glean-core] -version = "50.1.3" +version = "50.1.2" [dependencies.inherent] version = "1" diff --git a/toolkit/components/glean/api/Cargo.toml b/toolkit/components/glean/api/Cargo.toml index 60ab7d2c8713..3ecf0702ed0a 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 = "50.1.3" +glean = "50.1.2" inherent = "1.0.0" log = "0.4" nsstring = { path = "../../../../xpcom/rust/nsstring", optional = true }