From f8ff855784dc099de30b4388e24fca5236174321 Mon Sep 17 00:00:00 2001 From: gabrik Date: Wed, 3 Apr 2024 12:58:44 +0200 Subject: [PATCH] feat(tracing): using tracing and zenoh-util log init Signed-off-by: gabrik --- Cargo.lock | 1838 +++++++++++++------ Cargo.toml | 16 +- zenoh-bridge-mqtt/Cargo.toml | 4 +- zenoh-bridge-mqtt/src/main.rs | 5 +- zenoh-plugin-mqtt/Cargo.toml | 4 +- zenoh-plugin-mqtt/src/lib.rs | 68 +- zenoh-plugin-mqtt/src/mqtt_session_state.rs | 18 +- 7 files changed, 1347 insertions(+), 606 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5e25892..1adc8bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,27 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "CoreFoundation-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0e9889e6db118d49d88d84728d0e964d973a5680befb5f85f55141beea5c20b" +dependencies = [ + "libc", + "mach", +] + +[[package]] +name = "IOKit-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99696c398cbaf669d2368076bdb3d627fb0ce51a26899d7c61228c5c0af3bf4a" +dependencies = [ + "CoreFoundation-sys", + "libc", + "mach", +] + [[package]] name = "addr2line" version = "0.21.0" @@ -17,6 +38,16 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "advisory-lock" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6caee7d48f930f9ad3fc9546f8cbf843365da0c5b0ca4eee1d1ac3dd12d8f93" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "aead" version = "0.3.2" @@ -126,6 +157,60 @@ dependencies = [ "libc", ] +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstream" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + [[package]] name = "anyhow" version = "1.0.75" @@ -171,19 +256,6 @@ dependencies = [ "futures-core", ] -[[package]] -name = "async-channel" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" -dependencies = [ - "concurrent-queue", - "event-listener 5.2.0", - "event-listener-strategy", - "futures-core", - "pin-project-lite 0.2.13", -] - [[package]] name = "async-dup" version = "1.2.2" @@ -203,7 +275,7 @@ dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand", + "fastrand 1.9.0", "futures-lite", "slab", ] @@ -214,7 +286,7 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" dependencies = [ - "async-channel 1.9.0", + "async-channel", "async-executor", "async-io", "async-lock", @@ -230,7 +302,7 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8101020758a4fc3a7c326cb42aa99e9fa77cbfb76987c128ad956406fe1f70a7" dependencies = [ - "async-channel 1.9.0", + "async-channel", "async-dup", "async-std", "futures-core", @@ -253,7 +325,7 @@ dependencies = [ "futures-lite", "log", "parking", - "polling 2.8.0", + "polling", "rustix 0.37.25", "slab", "socket2 0.4.9", @@ -314,7 +386,7 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53bba003996b8fd22245cd0c59b869ba764188ed435392cf2796d03b805ade10" dependencies = [ - "async-channel 1.9.0", + "async-channel", "async-std", "http-types", "log", @@ -329,7 +401,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ "async-attributes", - "async-channel 1.9.0", + "async-channel", "async-global-executor", "async-io", "async-lock", @@ -373,17 +445,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -510,11 +571,11 @@ version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" dependencies = [ - "async-channel 1.9.0", + "async-channel", "async-lock", "async-task", "atomic-waker", - "fastrand", + "fastrand 1.9.0", "futures-lite", "log", ] @@ -549,6 +610,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21" +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + [[package]] name = "cc" version = "1.0.83" @@ -585,6 +652,33 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "ciborium" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" + +[[package]] +name = "ciborium-ll" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +dependencies = [ + "ciborium-io", + "half", +] + [[package]] name = "cipher" version = "0.2.5" @@ -606,28 +700,56 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.25" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ - "atty", - "bitflags 1.3.2", + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +dependencies = [ + "anstream", + "anstyle", "clap_lex", - "indexmap 1.9.3", "strsim", - "termcolor", - "textwrap", ] [[package]] -name = "clap_lex" -version = "0.2.4" +name = "clap_derive" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ - "os_str_bytes", + "heck", + "proc-macro2", + "quote", + "syn 2.0.33", ] +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "cobs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "concurrent-queue" version = "2.2.0" @@ -675,6 +797,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + [[package]] name = "cookie" version = "0.14.4" @@ -723,6 +851,91 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" + +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "is-terminal", + "itertools", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if 1.0.0", + "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", +] + [[package]] name = "crossbeam-utils" version = "0.8.16" @@ -795,13 +1008,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" [[package]] -name = "derivative" -version = "2.2.0" +name = "derive-new" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.33", +] + +[[package]] +name = "derive_more" +version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ + "convert_case", "proc-macro2", "quote", + "rustc_version 0.4.0", "syn 1.0.109", ] @@ -859,6 +1085,12 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + [[package]] name = "encoding_rs" version = "0.8.33" @@ -868,19 +1100,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "env_logger" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - [[package]] name = "equivalent" version = "1.0.1" @@ -896,6 +1115,17 @@ dependencies = [ "serde", ] +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + [[package]] name = "errno" version = "0.3.8" @@ -906,6 +1136,16 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "event-listener" version = "2.5.3" @@ -923,27 +1163,6 @@ dependencies = [ "pin-project-lite 0.2.13", ] -[[package]] -name = "event-listener" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite 0.2.13", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" -dependencies = [ - "event-listener 5.2.0", - "pin-project-lite 0.2.13", -] - [[package]] name = "fancy-regex" version = "0.11.0" @@ -963,6 +1182,12 @@ dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" + [[package]] name = "femme" version = "2.2.1" @@ -980,23 +1205,20 @@ dependencies = [ ] [[package]] -name = "fixedbitset" -version = "0.4.2" +name = "filepath" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +checksum = "f7faa16fcec147281a1719947edb44af4f9124964bf7476bd5f5356a48e44dcc" +dependencies = [ + "libc", + "winapi", +] [[package]] -name = "flume" -version = "0.10.14" +name = "fixedbitset" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", - "spin 0.9.8", -] +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flume" @@ -1017,10 +1239,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "form_urlencoded" -version = "1.2.0" +name = "foreign-types" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -1089,7 +1326,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -1121,12 +1358,6 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" -[[package]] -name = "futures-timer" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" - [[package]] name = "futures-util" version = "0.3.28" @@ -1145,28 +1376,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -1252,10 +1461,29 @@ dependencies = [ ] [[package]] -name = "hashbrown" -version = "0.12.3" +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hashbrown" @@ -1277,25 +1505,16 @@ dependencies = [ ] [[package]] -name = "hermit-abi" -version = "0.1.19" +name = "heck" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hex" -version = "0.4.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hkdf" @@ -1345,6 +1564,17 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http" version = "1.0.0" @@ -1356,6 +1586,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite 0.2.13", +] + [[package]] name = "http-client" version = "6.5.3" @@ -1375,7 +1616,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" dependencies = [ "anyhow", - "async-channel 1.9.0", + "async-channel", "async-std", "base64 0.13.1", "cookie", @@ -1408,6 +1649,43 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "hyper" +version = "0.14.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http 0.2.12", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite 0.2.13", + "socket2 0.5.6", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + [[package]] name = "iana-time-zone" version = "0.1.57" @@ -1419,7 +1697,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows 0.48.0", ] [[package]] @@ -1441,16 +1719,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - [[package]] name = "indexmap" version = "2.0.0" @@ -1491,11 +1759,17 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi", "libc", "windows-sys 0.48.0", ] +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + [[package]] name = "ipnetwork" version = "0.20.0" @@ -1511,7 +1785,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi", "rustix 0.38.32", "windows-sys 0.48.0", ] @@ -1525,6 +1799,15 @@ dependencies = [ "nom", ] +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.9" @@ -1670,17 +1953,13 @@ dependencies = [ ] [[package]] -name = "loom" -version = "0.5.6" +name = "loki-api" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +checksum = "f56d36f573486ba7f462b62cbae597fef7d5d93665e7047956b457531b8a1ced" dependencies = [ - "cfg-if 1.0.0", - "generator", - "pin-utils", - "scoped-tls", - "tracing", - "tracing-subscriber", + "prost", + "prost-types", ] [[package]] @@ -1693,331 +1972,190 @@ dependencies = [ ] [[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "memchr" -version = "2.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.11" +name = "mach" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "2fd13ee2dd61cc82833ba05ade5a30bb3d63f7ced605ef827063c63078302de9" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", ] [[package]] -name = "nanorand" -version = "0.7.0" +name = "mach2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" dependencies = [ - "getrandom 0.2.10", + "libc", ] [[package]] -name = "nix" -version = "0.27.1" +name = "matchers" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "bitflags 2.4.0", - "cfg-if 1.0.0", - "libc", + "regex-automata 0.1.10", ] [[package]] -name = "no-std-net" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" - -[[package]] -name = "nom" -version = "7.1.3" +name = "memchr" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] -name = "ntex" -version = "0.7.17" +name = "memoffset" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8da0767496674cfc59663af137b9487a1af597809ba952be07d742f4f75fef" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "async-channel 2.2.1", - "base64 0.21.4", - "bitflags 2.4.0", - "encoding_rs", - "httparse", - "httpdate", - "log", - "mime", - "nanorand", - "ntex-async-std", - "ntex-bytes", - "ntex-codec", - "ntex-connect", - "ntex-h2", - "ntex-http", - "ntex-io", - "ntex-macros", - "ntex-router", - "ntex-rt", - "ntex-service", - "ntex-tls", - "ntex-util", - "oneshot", - "percent-encoding", - "pin-project-lite 0.2.13", - "polling 3.6.0", - "regex", - "rustls 0.21.7", - "serde", - "serde_json", - "serde_urlencoded", - "sha-1", - "socket2 0.5.6", - "thiserror", - "webpki-roots 0.25.4", + "autocfg", ] [[package]] -name = "ntex-async-std" -version = "0.3.2" +name = "memoffset" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35eb118c94b5bc332965887346b84ad6a2b7311708dd26e1d21a82baff678956" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ - "async-std", - "log", - "ntex-bytes", - "ntex-io", - "ntex-util", - "oneshot", - "pin-project-lite 0.2.13", + "autocfg", ] [[package]] -name = "ntex-bytes" -version = "0.1.27" +name = "memoffset" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffd6ac357a3fd885753ddeb4130ec92474e79d013362532eba4778854466981" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ - "bitflags 2.4.0", - "bytes", - "futures-core", - "serde", + "autocfg", ] [[package]] -name = "ntex-codec" -version = "0.6.2" +name = "mime" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69a7e111d946bb915d712df496728ca2a120b1b5643f66c580f13023bce46fda" -dependencies = [ - "ntex-bytes", -] +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] -name = "ntex-connect" -version = "0.3.4" +name = "minimal-lexical" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9c711a3564135ae0e499882da4a5b6cd8dfdd818dcc57e26e146aec541abe7" -dependencies = [ - "log", - "ntex-async-std", - "ntex-bytes", - "ntex-http", - "ntex-io", - "ntex-rt", - "ntex-service", - "ntex-tls", - "ntex-util", - "rustls 0.21.7", - "thiserror", - "webpki-roots 0.25.4", -] +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] -name = "ntex-h2" -version = "0.4.4" +name = "miniz_oxide" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138b90775e51cfb9e0a6df6b8f12cfb80ee1d23344a02a138385844061c388fb" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ - "bitflags 2.4.0", - "fxhash", - "log", - "nanorand", - "ntex-bytes", - "ntex-codec", - "ntex-connect", - "ntex-http", - "ntex-io", - "ntex-rt", - "ntex-service", - "ntex-util", - "pin-project-lite 0.2.13", - "thiserror", + "adler", ] [[package]] -name = "ntex-http" -version = "0.1.12" +name = "mio" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81e205c980c693cb426f55669078bc311973f7e27a34f7ea4d0ce4069dedd05" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ - "fxhash", - "http", - "itoa", + "libc", "log", - "ntex-bytes", - "serde", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", ] [[package]] -name = "ntex-io" -version = "0.3.17" +name = "mio-serial" +version = "5.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c21a70836a8bfd9a673ee86dcf37d35e23b06449faa70bed25ce7c75ca0e81" +checksum = "20a4c60ca5c9c0e114b3bd66ff4aa5f9b2b175442be51ca6c4365d687a97a2ac" dependencies = [ - "bitflags 2.4.0", "log", - "ntex-bytes", - "ntex-codec", - "ntex-service", - "ntex-util", - "pin-project-lite 0.2.13", + "mio", + "nix 0.26.4", + "serialport", + "winapi", ] [[package]] -name = "ntex-macros" -version = "0.1.3" +name = "nanorand" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50a359f2a10c712b0446675070c22b1437d57a7cf08139f6a229e1e80817ed84" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "getrandom 0.2.10", ] [[package]] -name = "ntex-mqtt" -version = "0.12.16" +name = "native-tls" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b4a66a0bcd070f5af0709e3959d6f96ef002deaebd3aa69e5ff8905ded10bf9" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ - "bitflags 2.4.0", + "lazy_static", + "libc", "log", - "ntex", - "pin-project-lite 0.2.13", - "serde", - "serde_json", - "thiserror", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", ] [[package]] -name = "ntex-router" -version = "0.5.3" +name = "nix" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb9c68c26a87ffca54339be5f95223339db3e7bcc5d64733fef20812970a746f" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ - "http", - "log", - "ntex-bytes", - "regex", - "serde", + "bitflags 1.3.2", + "cc", + "cfg-if 1.0.0", + "libc", + "memoffset 0.6.5", ] [[package]] -name = "ntex-rt" -version = "0.4.13" +name = "nix" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "471b8ce4b4edfd8eddcb4143ebd91022e949b96627e14436bf0beec66ecd6394" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "async-channel 2.2.1", - "async-std", - "futures-core", - "log", - "oneshot", + "bitflags 1.3.2", + "cfg-if 1.0.0", + "libc", + "memoffset 0.7.1", + "pin-utils", ] [[package]] -name = "ntex-service" -version = "1.2.7" +name = "nix" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00ed5da53199c78416207467c565502e191a2c3b3b8f77edfe0560fef117af86" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "pin-project-lite 0.2.13", - "slab", + "bitflags 2.4.0", + "cfg-if 1.0.0", + "libc", + "memoffset 0.9.0", ] [[package]] -name = "ntex-tls" -version = "0.3.3" +name = "no-std-net" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bfa487eb2ee31f0e3e097f17d6a895add0ee2a1ffd83806e5cca5d40e935536" -dependencies = [ - "log", - "ntex-bytes", - "ntex-io", - "ntex-service", - "ntex-util", - "pin-project-lite 0.2.13", - "rustls 0.21.7", -] +checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" [[package]] -name = "ntex-util" -version = "0.3.4" +name = "nom" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3376de7b99ba5209c1d73bf62bb3642f5158a26dac6347321088ea848c84019b" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ - "bitflags 2.4.0", - "futures-core", - "futures-sink", - "futures-timer", - "fxhash", - "log", - "ntex-rt", - "ntex-service", - "pin-project-lite 0.2.13", - "slab", + "memchr", + "minimal-lexical", ] [[package]] @@ -2136,7 +2274,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi", "libc", ] @@ -2156,13 +2294,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] -name = "oneshot" -version = "0.1.6" +name = "oorandom" +version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f6640c6bda7731b1fdbab747981a0f896dd1fedaf9f4a53fa237a04a84431f4" -dependencies = [ - "loom", -] +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "opaque-debug" @@ -2170,12 +2305,50 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +[[package]] +name = "openssl" +version = "0.10.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +dependencies = [ + "bitflags 2.4.0", + "cfg-if 1.0.0", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.33", +] + [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-sys" +version = "0.9.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "option-ext" version = "0.2.0" @@ -2191,12 +2364,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - [[package]] name = "overload" version = "0.1.1" @@ -2238,6 +2405,16 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +[[package]] +name = "pem" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" +dependencies = [ + "base64 0.21.4", + "serde", +] + [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -2305,7 +2482,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap", ] [[package]] @@ -2358,13 +2535,47 @@ dependencies = [ ] [[package]] -name = "pkcs8" -version = "0.10.2" +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "plotters" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" + +[[package]] +name = "plotters-svg" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" dependencies = [ - "der", - "spki", + "plotters-backend", ] [[package]] @@ -2415,21 +2626,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "polling" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" -dependencies = [ - "cfg-if 1.0.0", - "concurrent-queue", - "hermit-abi 0.3.9", - "pin-project-lite 0.2.13", - "rustix 0.38.32", - "tracing", - "windows-sys 0.52.0", -] - [[package]] name = "polyval" version = "0.4.5" @@ -2462,6 +2658,38 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-types" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +dependencies = [ + "prost", +] + [[package]] name = "quinn" version = "0.10.2" @@ -2590,6 +2818,40 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "rcgen" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4954fbc00dcd4d8282c987710e50ba513d351400dbdd00e803a05172a90d8976" +dependencies = [ + "pem", + "ring 0.16.20", + "time 0.3.28", + "yasna", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -2621,14 +2883,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.3.8", + "regex-syntax 0.7.5", ] [[package]] @@ -2642,13 +2904,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.7.5", ] [[package]] @@ -2659,9 +2921,49 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.4", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http 0.2.12", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite 0.2.13", + "rustls-pemfile 1.0.3", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] [[package]] name = "ring" @@ -2767,7 +3069,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" dependencies = [ "bitflags 1.3.2", - "errno", + "errno 0.3.8", "io-lifetimes", "libc", "linux-raw-sys 0.3.8", @@ -2781,7 +3083,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ "bitflags 2.4.0", - "errno", + "errno 0.3.8", "libc", "linux-raw-sys 0.4.13", "windows-sys 0.52.0", @@ -2820,7 +3122,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.4", + "rustls-pemfile 1.0.3", "schannel", "security-framework", ] @@ -2840,9 +3142,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ "base64 0.21.4", ] @@ -2885,16 +3187,19 @@ dependencies = [ ] [[package]] -name = "rustversion" +name = "ryu" version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] -name = "ryu" -version = "1.0.15" +name = "same-file" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] [[package]] name = "schannel" @@ -2929,12 +3234,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - [[package]] name = "scopeguard" version = "1.2.0" @@ -3085,7 +3384,7 @@ version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap 2.0.0", + "indexmap", "itoa", "ryu", "serde", @@ -3093,14 +3392,20 @@ dependencies = [ ] [[package]] -name = "sha-1" -version = "0.10.1" +name = "serialport" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +checksum = "c32634e2bd4311420caa504404a55fad2131292c485c97014cbed89a5899885f" dependencies = [ + "CoreFoundation-sys", + "IOKit-sys", + "bitflags 1.3.2", "cfg-if 1.0.0", - "cpufeatures", - "digest 0.10.7", + "mach2", + "nix 0.26.4", + "regex", + "scopeguard", + "winapi", ] [[package]] @@ -3172,6 +3477,19 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shared_memory" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba8593196da75d9dc4f69349682bd4c2099f8cde114257d1ef7ef1b33d1aba54" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "nix 0.23.2", + "rand 0.8.5", + "win-sys", +] + [[package]] name = "shellexpand" version = "3.1.0" @@ -3234,6 +3552,12 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +[[package]] +name = "snap" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" + [[package]] name = "socket2" version = "0.4.9" @@ -3349,7 +3673,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af91f480ee899ab2d9f8435bfdfc14d08a5754bd9d3fef1f1a1c23336aad6c8b" dependencies = [ - "async-channel 1.9.0", + "async-channel", "cfg-if 1.0.0", "futures-core", "pin-project-lite 0.2.13", @@ -3458,19 +3782,43 @@ dependencies = [ ] [[package]] -name = "termcolor" -version = "1.4.1" +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "system-configuration" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "winapi-util", + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", ] [[package]] -name = "textwrap" -version = "0.16.1" +name = "tempfile" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if 1.0.0", + "fastrand 2.0.2", + "rustix 0.38.32", + "windows-sys 0.52.0", +] [[package]] name = "thiserror" @@ -3590,6 +3938,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -3642,6 +4000,16 @@ dependencies = [ "syn 2.0.33", ] +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + [[package]] name = "tokio-rustls" version = "0.24.1" @@ -3663,6 +4031,30 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-serial" +version = "5.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa6e2e4cf0520a99c5f87d5abb24172b5bd220de57c3181baaaa5440540c64aa" +dependencies = [ + "cfg-if 1.0.0", + "futures", + "log", + "mio-serial", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +dependencies = [ + "futures-core", + "pin-project-lite 0.2.13", + "tokio", +] + [[package]] name = "tokio-tungstenite" version = "0.21.0" @@ -3688,8 +4080,28 @@ dependencies = [ "hashbrown 0.14.0", "pin-project-lite 0.2.13", "tokio", + "tracing", +] + +[[package]] +name = "tokio-vsock" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e336ac4b36df625d5429a735dd5847732fe5f62010e3ce0c50f3705d44730f8" +dependencies = [ + "bytes", + "futures", + "libc", + "tokio", + "vsock", ] +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + [[package]] name = "tracing" version = "0.1.37" @@ -3724,6 +4136,17 @@ dependencies = [ "valuable", ] +[[package]] +name = "tracing-log" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + [[package]] name = "tracing-log" version = "0.2.0" @@ -3735,6 +4158,27 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-loki" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49bbc87d08020d7c2a9f4bb0b7d10da5381d3867f8ae57fcc54621b34567e963" +dependencies = [ + "loki-api", + "reqwest", + "serde", + "serde_json", + "snap", + "tokio", + "tokio-stream", + "tracing", + "tracing-core", + "tracing-log 0.1.4", + "tracing-serde", + "tracing-subscriber", + "url", +] + [[package]] name = "tracing-serde" version = "0.1.3" @@ -3762,10 +4206,16 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.2.0", "tracing-serde", ] +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + [[package]] name = "tungstenite" version = "0.21.0" @@ -3775,7 +4225,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 1.0.0", "httparse", "log", "rand 0.8.5", @@ -3858,6 +4308,16 @@ dependencies = [ "subtle", ] +[[package]] +name = "unix-named-pipe" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ad653da8f36ac5825ba06642b5a3cce14a4e52c6a5fab4a8928d53f4426dae2" +dependencies = [ + "errno 0.2.8", + "libc", +] + [[package]] name = "unsafe-libyaml" version = "0.2.10" @@ -3899,12 +4359,24 @@ dependencies = [ "serde", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "utf-8" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" version = "1.4.1" @@ -3980,6 +4452,12 @@ dependencies = [ "sval_serde", ] +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "vec_map" version = "0.8.2" @@ -3993,10 +4471,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "waker-fn" -version = "1.1.0" +name = "vsock" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dfb6e7a74830912f1f4a7655227c9ded1ea4e9136676311fedf54bedb412f35" +dependencies = [ + "libc", + "nix 0.27.1", +] + +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] [[package]] name = "wasi" @@ -4088,12 +4595,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - [[package]] name = "webpki-roots" version = "0.26.0" @@ -4103,6 +4604,15 @@ dependencies = [ "rustls-pki-types", ] +[[package]] +name = "win-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b7b128a98c1cfa201b09eb49ba285887deb3cbe7466a98850eb1adabb452be5" +dependencies = [ + "windows 0.34.0", +] + [[package]] name = "winapi" version = "0.3.9" @@ -4134,6 +4644,19 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" +dependencies = [ + "windows_aarch64_msvc 0.34.0", + "windows_i686_gnu 0.34.0", + "windows_i686_msvc 0.34.0", + "windows_x86_64_gnu 0.34.0", + "windows_x86_64_msvc 0.34.0", +] + [[package]] name = "windows" version = "0.48.0" @@ -4203,6 +4726,12 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +[[package]] +name = "windows_aarch64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -4215,6 +4744,12 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +[[package]] +name = "windows_i686_gnu" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -4227,6 +4762,12 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +[[package]] +name = "windows_i686_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -4239,6 +4780,12 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +[[package]] +name = "windows_x86_64_gnu" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -4263,6 +4810,12 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +[[package]] +name = "windows_x86_64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -4275,16 +4828,47 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys 0.48.0", +] + +[[package]] +name = "yasna" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" +dependencies = [ + "time 0.3.28", +] + +[[package]] +name = "z-serial" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f113597c6b880587004169f14bc010e4b440981ab2ad669779d3654f9b1c4af1" +dependencies = [ + "cobs", + "futures", + "log", + "tokio", + "tokio-serial", +] + [[package]] name = "zenoh" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "async-trait", "base64 0.21.4", "const_format", "event-listener 4.0.0", - "flume 0.11.0", + "flume", "form_urlencoded", "futures", "git-version", @@ -4318,6 +4902,7 @@ dependencies = [ "zenoh-protocol", "zenoh-result", "zenoh-runtime", + "zenoh-shm", "zenoh-sync", "zenoh-task", "zenoh-transport", @@ -4325,52 +4910,56 @@ dependencies = [ ] [[package]] -name = "zenoh-bridge-mqtt" +name = "zenoh-backend-example" version = "0.11.0-dev" dependencies = [ "async-std", - "clap", - "env_logger", - "lazy_static", - "log", + "async-trait", + "const_format", + "futures", + "git-version", "serde_json", + "tracing", "zenoh", - "zenoh-plugin-mqtt", - "zenoh-plugin-rest", + "zenoh-core", "zenoh-plugin-trait", + "zenoh-result", + "zenoh-util", + "zenoh_backend_traits", ] [[package]] name = "zenoh-buffers" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ + "rand 0.8.5", "zenoh-collections", ] [[package]] name = "zenoh-codec" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ + "criterion", + "rand 0.8.5", "serde", "tracing", "uhlc", "zenoh-buffers", "zenoh-protocol", + "zenoh-shm", + "zenoh-util", ] [[package]] name = "zenoh-collections" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" [[package]] name = "zenoh-config" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ - "flume 0.11.0", + "flume", "json5", "num_cpus", "secrecy", @@ -4388,7 +4977,6 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "async-global-executor", "lazy_static", @@ -4400,7 +4988,6 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "aes 0.8.3", "hmac 0.12.1", @@ -4410,13 +4997,30 @@ dependencies = [ "zenoh-result", ] +[[package]] +name = "zenoh-examples" +version = "0.11.0-dev" +dependencies = [ + "clap", + "flume", + "futures", + "git-version", + "json5", + "rand 0.8.5", + "rustc_version 0.4.0", + "tokio", + "tracing", + "zenoh", + "zenoh-ext", + "zenoh-util", +] + [[package]] name = "zenoh-ext" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "bincode", - "flume 0.11.0", + "flume", "futures", "serde", "tokio", @@ -4431,13 +5035,31 @@ dependencies = [ "zenoh-util", ] +[[package]] +name = "zenoh-ext-examples" +version = "0.11.0-dev" +dependencies = [ + "bincode", + "clap", + "flume", + "futures", + "serde", + "tokio", + "tracing", + "zenoh", + "zenoh-ext", + "zenoh-util", +] + [[package]] name = "zenoh-keyexpr" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ + "ahash", + "criterion", "hashbrown 0.14.0", "keyed-set", + "lazy_static", "rand 0.8.5", "schemars", "serde", @@ -4448,16 +5070,19 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "async-trait", + "rcgen", "zenoh-config", "zenoh-link-commons", "zenoh-link-quic", + "zenoh-link-serial", "zenoh-link-tcp", "zenoh-link-tls", "zenoh-link-udp", + "zenoh-link-unixpipe", "zenoh-link-unixsock_stream", + "zenoh-link-vsock", "zenoh-link-ws", "zenoh-protocol", "zenoh-result", @@ -4466,10 +5091,9 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "async-trait", - "flume 0.11.0", + "flume", "futures", "rustls 0.22.2", "rustls-webpki 0.102.2", @@ -4489,7 +5113,6 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "async-trait", "base64 0.21.4", @@ -4514,10 +5137,30 @@ dependencies = [ "zenoh-util", ] +[[package]] +name = "zenoh-link-serial" +version = "0.11.0-dev" +dependencies = [ + "async-trait", + "futures", + "tokio", + "tokio-util", + "tracing", + "uuid", + "z-serial", + "zenoh-collections", + "zenoh-core", + "zenoh-link-commons", + "zenoh-protocol", + "zenoh-result", + "zenoh-runtime", + "zenoh-sync", + "zenoh-util", +] + [[package]] name = "zenoh-link-tcp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "async-trait", "tokio", @@ -4535,7 +5178,6 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "async-trait", "base64 0.21.4", @@ -4549,7 +5191,7 @@ dependencies = [ "tokio-rustls 0.25.0", "tokio-util", "tracing", - "webpki-roots 0.26.0", + "webpki-roots", "zenoh-config", "zenoh-core", "zenoh-link-commons", @@ -4563,7 +5205,6 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "async-trait", "socket2 0.5.6", @@ -4581,14 +5222,35 @@ dependencies = [ "zenoh-util", ] +[[package]] +name = "zenoh-link-unixpipe" +version = "0.11.0-dev" +dependencies = [ + "advisory-lock", + "async-trait", + "filepath", + "nix 0.27.1", + "rand 0.8.5", + "tokio", + "tokio-util", + "tracing", + "unix-named-pipe", + "zenoh-buffers", + "zenoh-config", + "zenoh-core", + "zenoh-link-commons", + "zenoh-protocol", + "zenoh-result", + "zenoh-runtime", +] + [[package]] name = "zenoh-link-unixsock_stream" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "async-trait", "futures", - "nix", + "nix 0.27.1", "tokio", "tokio-util", "tracing", @@ -4601,10 +5263,28 @@ dependencies = [ "zenoh-sync", ] +[[package]] +name = "zenoh-link-vsock" +version = "0.11.0-dev" +dependencies = [ + "async-trait", + "libc", + "tokio", + "tokio-util", + "tokio-vsock", + "tracing", + "zenoh-core", + "zenoh-link-commons", + "zenoh-protocol", + "zenoh-result", + "zenoh-runtime", + "zenoh-sync", + "zenoh-util", +] + [[package]] name = "zenoh-link-ws" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "async-trait", "futures-util", @@ -4625,7 +5305,6 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "proc-macro2", "quote", @@ -4634,48 +5313,32 @@ dependencies = [ ] [[package]] -name = "zenoh-plugin-mqtt" +name = "zenoh-plugin-example" version = "0.11.0-dev" dependencies = [ - "async-channel 2.2.1", "async-std", - "async-trait", - "base64 0.21.4", - "derivative", - "env_logger", - "flume 0.10.14", + "const_format", "futures", "git-version", - "hex", - "lazy_static", - "log", - "ntex", - "ntex-mqtt", - "ntex-tls", - "regex", - "rustc_version 0.4.0", - "rustls 0.21.7", - "rustls-pemfile 1.0.4", - "secrecy", - "serde", "serde_json", + "tracing", "zenoh", - "zenoh-collections", "zenoh-core", - "zenoh-ext", "zenoh-plugin-trait", + "zenoh-result", + "zenoh-util", ] [[package]] name = "zenoh-plugin-rest" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "anyhow", "async-std", "base64 0.21.4", + "clap", "const_format", - "flume 0.11.0", + "flume", "futures", "git-version", "http-types", @@ -4693,10 +5356,40 @@ dependencies = [ "zenoh-util", ] +[[package]] +name = "zenoh-plugin-storage-manager" +version = "0.11.0-dev" +dependencies = [ + "async-global-executor", + "async-std", + "async-trait", + "const_format", + "crc", + "derive-new", + "flume", + "futures", + "git-version", + "jsonschema", + "libloading", + "rustc_version 0.4.0", + "schemars", + "serde", + "serde_json", + "tracing", + "urlencoding", + "zenoh", + "zenoh-collections", + "zenoh-core", + "zenoh-keyexpr", + "zenoh-plugin-trait", + "zenoh-result", + "zenoh-util", + "zenoh_backend_traits", +] + [[package]] name = "zenoh-plugin-trait" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "const_format", "libloading", @@ -4712,9 +5405,9 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "const_format", + "lazy_static", "rand 0.8.5", "serde", "uhlc", @@ -4726,7 +5419,6 @@ dependencies = [ [[package]] name = "zenoh-result" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "anyhow", ] @@ -4734,7 +5426,6 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "futures", "lazy_static", @@ -4743,10 +5434,20 @@ dependencies = [ "zenoh-result", ] +[[package]] +name = "zenoh-shm" +version = "0.11.0-dev" +dependencies = [ + "serde", + "shared_memory", + "tracing", + "zenoh-buffers", + "zenoh-result", +] + [[package]] name = "zenoh-sync" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "event-listener 4.0.0", "futures", @@ -4754,13 +5455,13 @@ dependencies = [ "zenoh-buffers", "zenoh-collections", "zenoh-core", + "zenoh-result", "zenoh-runtime", ] [[package]] name = "zenoh-task" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "futures", "tokio", @@ -4773,10 +5474,11 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "async-trait", - "flume 0.11.0", + "flume", + "futures", + "futures-util", "lz4_flex", "paste", "rand 0.8.5", @@ -4797,6 +5499,7 @@ dependencies = [ "zenoh-protocol", "zenoh-result", "zenoh-runtime", + "zenoh-shm", "zenoh-sync", "zenoh-task", "zenoh-util", @@ -4805,11 +5508,10 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e" dependencies = [ "async-std", "async-trait", - "flume 0.11.0", + "flume", "home", "humantime", "lazy_static", @@ -4825,6 +5527,42 @@ dependencies = [ "zenoh-result", ] +[[package]] +name = "zenoh_backend_traits" +version = "0.11.0-dev" +dependencies = [ + "async-std", + "async-trait", + "const_format", + "derive_more", + "schemars", + "serde_json", + "zenoh", + "zenoh-plugin-trait", + "zenoh-result", + "zenoh-util", +] + +[[package]] +name = "zenohd" +version = "0.11.0-dev" +dependencies = [ + "clap", + "futures", + "git-version", + "json5", + "lazy_static", + "rand 0.8.5", + "rustc_version 0.4.0", + "tokio", + "tracing", + "tracing-loki", + "tracing-subscriber", + "url", + "zenoh", + "zenoh-util", +] + [[package]] name = "zerocopy" version = "0.7.32" diff --git a/Cargo.toml b/Cargo.toml index b19b663..ce2879e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,13 +31,11 @@ async-trait = "0.1.66" base64 = "0.21.4" clap = "3.2.23" derivative = "2.2.0" -env_logger = "0.10.0" flume = "0.10.14" futures = "0.3.26" git-version = "0.3.5" hex = "0.4.3" lazy_static = "1.4.0" -log = "0.4.17" ntex = "0.7.17" ntex-mqtt = "0.12.16" ntex-tls = "0.3.2" @@ -48,16 +46,18 @@ rustls-pemfile = "1.0.4" secrecy = { version = "0.8.0", features = ["serde", "alloc"] } serde = "1.0.154" serde_json = "1.0.94" -zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = [ +tracing = "0.1" +zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "feat/tracing", features = [ "unstable", ] } -zenoh-collections = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" } -zenoh-core = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" } -zenoh-ext = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = [ +zenoh-collections = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "feat/tracing" } +zenoh-core = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "feat/tracing" } +zenoh-ext = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "feat/tracing", features = [ "unstable", ] } -zenoh-plugin-rest = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false } -zenoh-plugin-trait = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false } +zenoh-plugin-rest = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "feat/tracing", default-features = false } +zenoh-plugin-trait = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "feat/tracing", default-features = false } +zenoh-util = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "feat/tracing" } [profile.release] debug = false diff --git a/zenoh-bridge-mqtt/Cargo.toml b/zenoh-bridge-mqtt/Cargo.toml index f520cc6..4701ffa 100644 --- a/zenoh-bridge-mqtt/Cargo.toml +++ b/zenoh-bridge-mqtt/Cargo.toml @@ -26,14 +26,14 @@ publish = false [dependencies] async-std = { workspace = true, features = ["unstable", "attributes"] } clap = { workspace = true } -env_logger = { workspace = true } lazy_static = { workspace = true } -log = { workspace = true } +tracing = { workspace = true } serde_json = { workspace = true } zenoh = { workspace = true } zenoh-plugin-rest = { workspace = true } zenoh-plugin-trait = { workspace = true } zenoh-plugin-mqtt = { version = "0.11.0-dev", path = "../zenoh-plugin-mqtt/", default-features = false } +zenoh-util = { workspace = true } [[bin]] name = "zenoh-bridge-mqtt" diff --git a/zenoh-bridge-mqtt/src/main.rs b/zenoh-bridge-mqtt/src/main.rs index 0df2e2c..5457c0f 100644 --- a/zenoh-bridge-mqtt/src/main.rs +++ b/zenoh-bridge-mqtt/src/main.rs @@ -187,8 +187,9 @@ r#"--root-ca-certificate=[FILE] 'Path to the certificate of the certificate au #[async_std::main] async fn main() { - env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("z=info")).init(); - log::info!( + zenoh_util::init_log(); + + tracing::info!( "zenoh-bridge-mqtt {}", zenoh_plugin_mqtt::MqttPlugin::PLUGIN_LONG_VERSION ); diff --git a/zenoh-plugin-mqtt/Cargo.toml b/zenoh-plugin-mqtt/Cargo.toml index 035cf45..24f89a5 100644 --- a/zenoh-plugin-mqtt/Cargo.toml +++ b/zenoh-plugin-mqtt/Cargo.toml @@ -37,13 +37,12 @@ async-std = { workspace = true, features = ["unstable", "attributes"] } async-trait = { workspace = true } base64 = { workspace = true } derivative = { workspace = true } -env_logger = { workspace = true } flume = { workspace = true } futures = { workspace = true } git-version = { workspace = true } hex = { workspace = true } lazy_static = { workspace = true } -log = { workspace = true } +tracing = { workspace = true } ntex = { workspace = true, features = ["async-std", "rustls"] } ntex-mqtt = { workspace = true } ntex-tls = { workspace = true } @@ -58,6 +57,7 @@ zenoh-collections = { workspace = true } zenoh-core = { workspace = true } zenoh-ext = { workspace = true } zenoh-plugin-trait = { workspace = true } +zenoh-util = { workspace = true } [build-dependencies] rustc_version = { workspace = true } diff --git a/zenoh-plugin-mqtt/src/lib.rs b/zenoh-plugin-mqtt/src/lib.rs index fa7346b..43a462c 100644 --- a/zenoh-plugin-mqtt/src/lib.rs +++ b/zenoh-plugin-mqtt/src/lib.rs @@ -79,7 +79,7 @@ impl Plugin for MqttPlugin { // Try to initiate login. // Required in case of dynamic lib, otherwise no logs. // But cannot be done twice in case of static link. - let _ = env_logger::try_init(); + zenoh_util::init_log(); let runtime_conf = runtime.config().lock(); let plugin_conf = runtime_conf @@ -115,9 +115,9 @@ async fn run( // Try to initiate login. // Required in case of dynamic lib, otherwise no logs. // But cannot be done twice in case of static link. - let _ = env_logger::try_init(); - log::debug!("MQTT plugin {}", MqttPlugin::PLUGIN_LONG_VERSION); - log::debug!("MQTT plugin {:?}", config); + zenoh_util::init_log(); + tracing::debug!("MQTT plugin {}", MqttPlugin::PLUGIN_LONG_VERSION); + tracing::debug!("MQTT plugin {:?}", config); // init Zenoh Session with provided Runtime let zsession = match zenoh::init(runtime) @@ -128,7 +128,7 @@ async fn run( { Ok(session) => Arc::new(session), Err(e) => { - log::error!("Unable to init zenoh session for MQTT plugin : {:?}", e); + tracing::error!("Unable to init zenoh session for MQTT plugin : {:?}", e); return; } }; @@ -137,7 +137,7 @@ async fn run( let admin_keyexpr_prefix = *KE_PREFIX_ADMIN_SPACE / &zsession.zid().into_keyexpr() / ke_for_sure!("mqtt"); let admin_keyexpr_expr = (&admin_keyexpr_prefix) / ke_for_sure!("**"); - log::debug!("Declare admin space on {}", admin_keyexpr_expr); + tracing::debug!("Declare admin space on {}", admin_keyexpr_expr); let config2 = config.clone(); let _admin_queryable = zsession .declare_queryable(admin_keyexpr_expr) @@ -147,7 +147,9 @@ async fn run( .expect("Failed to create AdminSpace queryable"); if auth_dictionary.is_some() && tls_config.is_none() { - log::warn!("Warning: MQTT client username/password authentication enabled without TLS!"); + tracing::warn!( + "Warning: MQTT client username/password authentication enabled without TLS!" + ); } // Start MQTT Server task @@ -444,13 +446,13 @@ fn create_mqtt_server( fn treat_admin_query(query: Query, admin_keyexpr_prefix: &keyexpr, config: &Config) { let selector = query.selector(); - log::debug!("Query on admin space: {:?}", selector); + tracing::debug!("Query on admin space: {:?}", selector); // get the list of sub-key expressions that will match the same stored keys than // the selector, if those keys had the admin_keyexpr_prefix. let sub_kes = selector.key_expr.strip_prefix(admin_keyexpr_prefix); if sub_kes.is_empty() { - log::error!("Received query for admin space: '{}' - but it's not prefixed by admin_keyexpr_prefix='{}'", selector, admin_keyexpr_prefix); + tracing::error!("Received query for admin space: '{}' - but it's not prefixed by admin_keyexpr_prefix='{}'", selector, admin_keyexpr_prefix); return; } @@ -476,7 +478,7 @@ fn treat_admin_query(query: Query, admin_keyexpr_prefix: &keyexpr, config: &Conf let admin_keyexpr = admin_keyexpr_prefix / ke; use zenoh::prelude::sync::SyncResolve; if let Err(e) = query.reply(Ok(Sample::new(admin_keyexpr, v))).res_sync() { - log::warn!("Error replying to admin query {:?}: {}", query, e); + tracing::warn!("Error replying to admin query {:?}: {}", query, e); } } } @@ -541,13 +543,13 @@ async fn handshake_v3<'a>( handshake.packet().password.as_ref(), ) { Ok(_) => { - log::info!("MQTT client {} connects using v3", client_id); + tracing::info!("MQTT client {} connects using v3", client_id); let session = MqttSessionState::new(client_id, zsession, config, handshake.sink().into()); Ok(handshake.ack(session, false)) } Err(err) => { - log::warn!( + tracing::warn!( "MQTT client {} connect using v3 rejected: {}", client_id, err @@ -572,7 +574,7 @@ async fn control_v3( session: v3::Session>, control: v3::ControlMessage, ) -> Result { - log::trace!( + tracing::trace!( "MQTT client {} sent control: {:?}", session.client_id, control @@ -581,14 +583,14 @@ async fn control_v3( match control { v3::ControlMessage::Ping(ref msg) => Ok(msg.ack()), v3::ControlMessage::Disconnect(msg) => { - log::debug!("MQTT client {} disconnected", session.client_id); + tracing::debug!("MQTT client {} disconnected", session.client_id); session.sink().close(); Ok(msg.ack()) } v3::ControlMessage::Subscribe(mut msg) => { for mut s in msg.iter_mut() { let topic = s.topic().as_str(); - log::debug!( + tracing::debug!( "MQTT client {} subscribes to '{}'", session.client_id, topic @@ -596,7 +598,7 @@ async fn control_v3( match session.state().map_mqtt_subscription(topic).await { Ok(()) => s.confirm(v3::QoS::AtMostOnce), Err(e) => { - log::error!("Subscription to '{}' failed: {}", topic, e); + tracing::error!("Subscription to '{}' failed: {}", topic, e); s.fail() } } @@ -605,7 +607,7 @@ async fn control_v3( } v3::ControlMessage::Unsubscribe(msg) => { for topic in msg.iter() { - log::debug!( + tracing::debug!( "MQTT client {} unsubscribes from '{}'", session.client_id, topic.as_str() @@ -614,12 +616,12 @@ async fn control_v3( Ok(msg.ack()) } v3::ControlMessage::Closed(msg) => { - log::debug!("MQTT client {} closed connection", session.client_id); + tracing::debug!("MQTT client {} closed connection", session.client_id); session.sink().force_close(); Ok(msg.ack()) } v3::ControlMessage::Error(msg) => { - log::warn!( + tracing::warn!( "MQTT client {} Error received: {}", session.client_id, msg.get_ref().err @@ -627,7 +629,7 @@ async fn control_v3( Ok(msg.ack()) } v3::ControlMessage::ProtocolError(ref msg) => { - log::warn!( + tracing::warn!( "MQTT client {}: ProtocolError received: {} => disconnect it", session.client_id, msg.get_ref() @@ -635,7 +637,7 @@ async fn control_v3( Ok(control.disconnect()) } v3::ControlMessage::PeerGone(msg) => { - log::debug!( + tracing::debug!( "MQTT client {}: PeerGone => close connection", session.client_id ); @@ -659,13 +661,13 @@ async fn handshake_v5<'a>( handshake.packet().password.as_ref(), ) { Ok(_) => { - log::info!("MQTT client {} connects using v5", client_id); + tracing::info!("MQTT client {} connects using v5", client_id); let session = MqttSessionState::new(client_id, zsession, config, handshake.sink().into()); Ok(handshake.ack(session)) } Err(err) => { - log::warn!( + tracing::warn!( "MQTT client {} connect using v5 rejected: {}", client_id, err @@ -691,7 +693,7 @@ async fn control_v5( session: v5::Session>, control: v5::ControlMessage, ) -> Result { - log::trace!( + tracing::trace!( "MQTT client {} sent control: {:?}", session.client_id, control @@ -700,7 +702,7 @@ async fn control_v5( use v5::codec::{Disconnect, DisconnectReasonCode}; match control { v5::ControlMessage::Auth(_) => { - log::debug!( + tracing::debug!( "MQTT client {} wants to authenticate... not yet supported!", session.client_id ); @@ -710,14 +712,14 @@ async fn control_v5( } v5::ControlMessage::Ping(msg) => Ok(msg.ack()), v5::ControlMessage::Disconnect(msg) => { - log::debug!("MQTT client {} disconnected", session.client_id); + tracing::debug!("MQTT client {} disconnected", session.client_id); session.sink().close(); Ok(msg.ack()) } v5::ControlMessage::Subscribe(mut msg) => { for mut s in msg.iter_mut() { let topic = s.topic().as_str(); - log::debug!( + tracing::debug!( "MQTT client {} subscribes to '{}'", session.client_id, topic @@ -725,7 +727,7 @@ async fn control_v5( match session.state().map_mqtt_subscription(topic).await { Ok(()) => s.confirm(v5::QoS::AtMostOnce), Err(e) => { - log::error!("Subscription to '{}' failed: {}", topic, e); + tracing::error!("Subscription to '{}' failed: {}", topic, e); s.fail(v5::codec::SubscribeAckReason::ImplementationSpecificError) } } @@ -734,7 +736,7 @@ async fn control_v5( } v5::ControlMessage::Unsubscribe(msg) => { for topic in msg.iter() { - log::debug!( + tracing::debug!( "MQTT client {} unsubscribes from '{}'", session.client_id, topic.as_str() @@ -743,12 +745,12 @@ async fn control_v5( Ok(msg.ack()) } v5::ControlMessage::Closed(msg) => { - log::debug!("MQTT client {} closed connection", session.client_id); + tracing::debug!("MQTT client {} closed connection", session.client_id); session.sink().close(); Ok(msg.ack()) } v5::ControlMessage::Error(msg) => { - log::warn!( + tracing::warn!( "MQTT client {} Error received: {}", session.client_id, msg.get_ref().err @@ -756,7 +758,7 @@ async fn control_v5( Ok(msg.ack(DisconnectReasonCode::UnspecifiedError)) } v5::ControlMessage::ProtocolError(msg) => { - log::warn!( + tracing::warn!( "MQTT client {}: ProtocolError received: {}", session.client_id, msg.get_ref() @@ -765,7 +767,7 @@ async fn control_v5( Ok(msg.reason_code(DisconnectReasonCode::ProtocolError).ack()) } v5::ControlMessage::PeerGone(msg) => { - log::debug!( + tracing::debug!( "MQTT client {}: PeerGone => close connection", session.client_id ); diff --git a/zenoh-plugin-mqtt/src/mqtt_session_state.rs b/zenoh-plugin-mqtt/src/mqtt_session_state.rs index 710c140..cab2e2a 100644 --- a/zenoh-plugin-mqtt/src/mqtt_session_state.rs +++ b/zenoh-plugin-mqtt/src/mqtt_session_state.rs @@ -57,7 +57,7 @@ impl MqttSessionState<'_> { Locality::Any } else { // if topic is NOT allowed, subscribe to publications coming only from this plugin (for MQTT-to-MQTT routing only) - log::debug!( + tracing::debug!( "MQTT Client {}: topic '{}' is not allowed to be routed over Zenoh (see your 'allow' or 'deny' configuration) - re-publish only from MQTT publishers", self.client_id, topic @@ -76,7 +76,7 @@ impl MqttSessionState<'_> { .declare_subscriber(ke) .callback(move |sample| { if let Err(e) = route_zenoh_to_mqtt(sample, &client_id, &config, &tx) { - log::warn!("{}", e); + tracing::warn!("{}", e); } }) .allowed_origin(sub_origin) @@ -85,7 +85,7 @@ impl MqttSessionState<'_> { subs.insert(topic.into(), sub); Ok(()) } else { - log::debug!( + tracing::debug!( "MQTT Client {} already subscribes to {} => ignore", self.client_id, topic @@ -105,7 +105,7 @@ impl MqttSessionState<'_> { Locality::Any } else { // if topic is NOT allowed, publish only to this plugin (for MQTT-to-MQTT routing only) - log::trace!( + tracing::trace!( "MQTT Client {}: topic '{}' is not allowed to be routed over Zenoh (see your 'allow' or 'deny' configuration) - re-publish only to MQTT subscriber", self.client_id, topic @@ -120,7 +120,7 @@ impl MqttSessionState<'_> { }; let encoding = guess_encoding(payload.deref()); // TODO: check allow/deny - log::trace!( + tracing::trace!( "MQTT client {}: route from MQTT '{}' to Zenoh '{}' (encoding={})", self.client_id, topic, @@ -143,7 +143,7 @@ fn route_zenoh_to_mqtt( tx: &Sender<(ByteString, Bytes)>, ) -> ZResult<()> { let topic = ke_to_mqtt_topic_publish(&sample.key_expr, &config.scope)?; - log::trace!( + tracing::trace!( "MQTT client {}: route from Zenoh '{}' to MQTT '{}'", client_id, sample.key_expr, @@ -168,7 +168,7 @@ fn spawn_mqtt_publisher(client_id: String, rx: Receiver<(ByteString, Bytes)>, si Ok((topic, payload)) => { if sink.is_open() { if let Err(e) = sink.publish_at_most_once(topic, payload) { - log::trace!( + tracing::trace!( "Failed to send MQTT message for client {} - {}", client_id, e @@ -177,12 +177,12 @@ fn spawn_mqtt_publisher(client_id: String, rx: Receiver<(ByteString, Bytes)>, si break; } } else { - log::trace!("MQTT sink closed for client {}", client_id); + tracing::trace!("MQTT sink closed for client {}", client_id); break; } } Err(_) => { - log::trace!("MPSC Channel closed for client {}", client_id); + tracing::trace!("MPSC Channel closed for client {}", client_id); break; } }