diff --git a/Cargo.lock b/Cargo.lock index 8b353686b6..ecb67b2a86 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,7 +10,7 @@ name = "aho-corasick" version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -205,7 +205,7 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -394,7 +394,7 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -530,7 +530,7 @@ version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bstr 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "csv-core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", @@ -538,10 +538,10 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.6" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -572,7 +572,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "detach" version = "0.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/holochain/lib3h?branch=bump_tracing#f0fec62aad715118b58c20d2f99bd1f636172b59" [[package]] name = "deunicode" @@ -976,7 +976,7 @@ dependencies = [ "futures-macro 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "futures-task 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -992,7 +992,7 @@ dependencies = [ "futures-core-preview 0.3.0-alpha.17 (registry+https://github.com/rust-lang/crates.io-index)", "futures-io-preview 0.3.0-alpha.17 (registry+https://github.com/rust-lang/crates.io-index)", "futures-sink-preview 0.3.0-alpha.17 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1046,7 +1046,7 @@ dependencies = [ "aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1109,16 +1109,16 @@ dependencies = [ "holochain_net 0.0.43-alpha3", "holochain_persistence_api 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_persistence_file 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing_macros 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing_macros 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_wasm_utils 0.0.43-alpha3", "ignore 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "in_stream 0.0.43-alpha3", "json-patch 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_crypto_api 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_protocol 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_sodium 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", + "lib3h_crypto_api 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_protocol 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_sodium 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "newrelic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1227,10 +1227,10 @@ dependencies = [ "holochain_conductor_lib 0.0.43-alpha3", "holochain_core_types 0.0.43-alpha3", "holochain_locksmith 0.0.43-alpha3", - "holochain_tracing 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing_macros 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing_macros 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_sodium 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", + "lib3h_sodium 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "newrelic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "signal-hook 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1272,8 +1272,8 @@ dependencies = [ "holochain_persistence_lmdb 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_persistence_mem 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_persistence_pickle 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing_macros 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing_macros 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_wasm_utils 0.0.43-alpha3", "hyper 0.12.25 (registry+https://github.com/rust-lang/crates.io-index)", "json-patch 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1281,8 +1281,8 @@ dependencies = [ "jsonrpc-http-server 14.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-ws-server 14.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_sodium 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", + "lib3h 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_sodium 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "newrelic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1315,7 +1315,7 @@ dependencies = [ "holochain_common 0.0.43-alpha3", "holochain_core_types 0.0.43-alpha3", "holochain_locksmith 0.0.43-alpha3", - "holochain_tracing_macros 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing_macros 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_wasm_utils 0.0.43-alpha3", "jsonrpc-core 14.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-lite 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1362,16 +1362,16 @@ dependencies = [ "holochain_persistence_file 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_persistence_lmdb 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_persistence_mem 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing_macros 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing_macros 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_wasm_utils 0.0.43-alpha3", "im 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core 14.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-lite 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_protocol 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_sodium 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", + "lib3h_protocol 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_sodium 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "newrelic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1412,7 +1412,7 @@ dependencies = [ "holochain_logging 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_persistence_api 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_crypto_api 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", + "lib3h_crypto_api 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "mashup 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1441,9 +1441,9 @@ dependencies = [ "holochain_common 0.0.43-alpha3", "holochain_core_types 0.0.43-alpha3", "holochain_persistence_api 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing_macros 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing_macros 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_sodium 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", + "lib3h_sodium 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", "newrelic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1526,7 +1526,7 @@ dependencies = [ "holochain_common 0.0.43-alpha3", "holochain_locksmith 0.0.43-alpha3", "holochain_logging 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing_macros 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing_macros 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "newrelic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1570,16 +1570,16 @@ dependencies = [ "holochain_logging 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_metrics 0.0.43-alpha3", "holochain_persistence_api 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing_macros 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing_macros 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", "in_stream 0.0.43-alpha3", "jsonrpc-core 14.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_crypto_api 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_protocol 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_sodium 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_zombie_actor 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", + "lib3h 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_crypto_api 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_protocol 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_sodium 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_zombie_actor 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "newrelic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1707,11 +1707,11 @@ dependencies = [ "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "hcid 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", "in_stream 0.0.43-alpha3", - "lib3h_crypto_api 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_protocol 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_sodium 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", + "lib3h_crypto_api 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_protocol 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_sodium 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "nanoid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1729,7 +1729,7 @@ dependencies = [ [[package]] name = "holochain_tracing" -version = "0.0.19" +version = "0.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "backtrace 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1745,11 +1745,11 @@ dependencies = [ [[package]] name = "holochain_tracing_macros" -version = "0.0.19" +version = "0.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "newrelic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1906,7 +1906,7 @@ dependencies = [ "globset 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2094,21 +2094,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "lib3h" version = "0.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/holochain/lib3h?branch=bump_tracing#f0fec62aad715118b58c20d2f99bd1f636172b59" dependencies = [ "backtrace 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)", - "detach 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", + "detach 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "hcid 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_persistence_api 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_crypto_api 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_mdns 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_p2p_protocol 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_protocol 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_sodium 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_zombie_actor 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", + "lib3h_crypto_api 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_mdns 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_p2p_protocol 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_protocol 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_sodium 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_zombie_actor 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "nanoid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2127,7 +2127,7 @@ dependencies = [ [[package]] name = "lib3h_crypto_api" version = "0.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/holochain/lib3h?branch=bump_tracing#f0fec62aad715118b58c20d2f99bd1f636172b59" dependencies = [ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2137,11 +2137,11 @@ dependencies = [ [[package]] name = "lib3h_mdns" version = "0.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/holochain/lib3h?branch=bump_tracing#f0fec62aad715118b58c20d2f99bd1f636172b59" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_protocol 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", + "lib3h_protocol 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "nanoid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2153,7 +2153,7 @@ dependencies = [ [[package]] name = "lib3h_p2p_protocol" version = "0.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/holochain/lib3h?branch=bump_tracing#f0fec62aad715118b58c20d2f99bd1f636172b59" dependencies = [ "capnp 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2164,7 +2164,7 @@ dependencies = [ [[package]] name = "lib3h_protocol" version = "0.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/holochain/lib3h?branch=bump_tracing#f0fec62aad715118b58c20d2f99bd1f636172b59" dependencies = [ "backtrace 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2180,10 +2180,10 @@ dependencies = [ [[package]] name = "lib3h_sodium" version = "0.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/holochain/lib3h?branch=bump_tracing#f0fec62aad715118b58c20d2f99bd1f636172b59" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_crypto_api 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", + "lib3h_crypto_api 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "rust_sodium_holochain_fork 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "rust_sodium_holochain_fork-sys 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2192,12 +2192,12 @@ dependencies = [ [[package]] name = "lib3h_zombie_actor" version = "0.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/holochain/lib3h?branch=bump_tracing#f0fec62aad715118b58c20d2f99bd1f636172b59" dependencies = [ "backtrace 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "detach 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "detach 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "holochain_tracing 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2332,11 +2332,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "memchr" -version = "2.3.0" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "memmap" @@ -3400,7 +3397,7 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)", "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3677,7 +3674,7 @@ dependencies = [ "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3965,16 +3962,16 @@ dependencies = [ "holochain_locksmith 0.0.43-alpha3", "holochain_metrics 0.0.43-alpha3", "holochain_persistence_api 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing_macros 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing_macros 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", "im 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "in_stream 0.0.43-alpha3", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_crypto_api 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_protocol 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_sodium 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_zombie_actor 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", + "lib3h 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_crypto_api 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_protocol 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_sodium 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_zombie_actor 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "nanoid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4004,12 +4001,12 @@ dependencies = [ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "holochain_common 0.0.43-alpha3", - "holochain_tracing 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", - "holochain_tracing_macros 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", + "holochain_tracing_macros 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_protocol 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_sodium 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", + "lib3h 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_protocol 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", + "lib3h_sodium 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "newrelic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "sim2h 0.0.43-alpha3", @@ -4294,7 +4291,7 @@ dependencies = [ "holochain_wasm_utils 0.0.43-alpha3", "jsonrpc-ws-server 14.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lib3h_sodium 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)", + "lib3h_sodium 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4314,15 +4311,15 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "thiserror-impl 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror-impl 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "thiserror-impl" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4419,7 +4416,7 @@ dependencies = [ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", "mio-named-pipes 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5083,7 +5080,7 @@ dependencies = [ "cranelift-codegen 0.52.0 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift-entity 0.52.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-clif-fork-frontend 0.52.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmparser 0.45.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5369,11 +5366,11 @@ dependencies = [ "checksum crypto-mac 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0999b4ff4d3446d4ddb19a63e9e00c1876e75cd7000d20e57a693b4b3f08d958" "checksum crypto-mac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" "checksum csv 1.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "00affe7f6ab566df61b4be3ce8cf16bc2576bca0963ceb0955e45d514bf9a279" -"checksum csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9b5cadb6b25c77aeff80ba701712494213f4a8418fcda2ee11b6560c3ad0bf4c" +"checksum csv-core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" "checksum ctor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8ce37ad4184ab2ce004c33bf6379185d3b1c95801cab51026bd271bf68eedc" "checksum derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6d944ac6003ed268757ef1ee686753b57efc5fcf0ebe7b64c9fc81e7e32ff839" "checksum detach 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "891f5117f720f720924586e087b7eb385d816afb467a231c2fec64239de00986" -"checksum detach 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "63222ce1fb32684cbb8b2035dbfd62fbc98faf134286d3be0c43e03ec327b11e" +"checksum detach 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)" = "" "checksum deunicode 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690" "checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" "checksum digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90" @@ -5450,8 +5447,8 @@ dependencies = [ "checksum holochain_persistence_lmdb 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "3d290f8d9fcbd6caaf993baa021abe9735a90f1fbae1bc721dcf96d9e97d763e" "checksum holochain_persistence_mem 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "bf45bd3a7d8e7a0b32ee78f1793d2a6c8b38e3c047a4622f896c5af5dbd21aec" "checksum holochain_persistence_pickle 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "dd09d8cefe9229380445dc616b15077f6ffe94d1afd6082ffd7b51cb11e911cb" -"checksum holochain_tracing 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "df4ee35cd41fc91a56aeb6268858148ae8b27459072d938c476cac39b5e4258b" -"checksum holochain_tracing_macros 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "e2fb0dfa4bb2b392c10ef687641a22637580f23a8a493d9044cd31f6dcabc947" +"checksum holochain_tracing 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)" = "c8474831a222e38f4f091906e269d81d19a5732c99d591ae090f2a75330804f0" +"checksum holochain_tracing_macros 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)" = "97e2a10b4f84be9c5815cc875e7a95ce8bd6983c5dd24e843a742b293f040967" "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e" "checksum http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" "checksum http_req 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23fdb3445813f5f5e7fdb9d93df8f1c7e382237f2656b21c42e93e3a63e25c11" @@ -5481,13 +5478,13 @@ dependencies = [ "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" -"checksum lib3h 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "c70426a5a9a4d00779e9e12641669eb323db00a279ccc4e2b9d1e6dbadeee603" -"checksum lib3h_crypto_api 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "f5b238b8ef3e1af6f25cf5b85b146bf0c13425485092d5649560ef9f40c8725e" -"checksum lib3h_mdns 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "2b65c17a9ff558a6800a0a8ee419a61457327b25cb3a9b09175c16151c524507" -"checksum lib3h_p2p_protocol 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "16e30e5bd0da7cb35af533952f989f88abe691196db9cbf9496969a5f4bde976" -"checksum lib3h_protocol 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "86fbc219f0b9462bfc342b414575b118a6070857993126aba728f3cdcee7426a" -"checksum lib3h_sodium 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "75528d218460e891cd3bed38b18e3474320dee29f46b6e8083b2b5d86df2d05a" -"checksum lib3h_zombie_actor 0.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "a69597b1d78aec859758aa0a23b360b0a81e85445ec50b611e355e0e4d5d1e69" +"checksum lib3h 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)" = "" +"checksum lib3h_crypto_api 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)" = "" +"checksum lib3h_mdns 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)" = "" +"checksum lib3h_p2p_protocol 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)" = "" +"checksum lib3h_protocol 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)" = "" +"checksum lib3h_sodium 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)" = "" +"checksum lib3h_zombie_actor 0.0.38 (git+https://github.com/holochain/lib3h?branch=bump_tracing)" = "" "checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" "checksum libflate 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)" = "d9135df43b1f5d0e333385cb6e7897ecd1a43d7d11b91ac003f4d2c2d2401fdd" "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" @@ -5504,7 +5501,7 @@ dependencies = [ "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" "checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" "checksum md5 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "79c56d6a0b07f9e19282511c83fc5b086364cbae4ba8c7d5f190c3d9b0425a48" -"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223" +"checksum memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53445de381a1f436797497c61d851644d0e8e88e6140f22872ad33a704933978" "checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" "checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" "checksum memory_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" @@ -5706,8 +5703,8 @@ dependencies = [ "checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" "checksum termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -"checksum thiserror 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "205684fd018ca14432b12cce6ea3d46763311a571c3d294e71ba3f01adcf1aad" -"checksum thiserror-impl 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "57e4d2e50ca050ed44fb58309bdce3efa79948f84f9993ad1978de5eebdce5a7" +"checksum thiserror 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ee14bf8e6767ab4c687c9e8bc003879e042a96fd67a3ba5934eadb6536bef4db" +"checksum thiserror-impl 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "a7b51e1fbc44b5a0840be594fbc0f960be09050f2617e61e6aa43bef97cd3ef4" "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" "checksum threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865" "checksum thrift_codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fb61fb3d0a0af14949f3a6949b2639112e13226647112824f4d081533f9b1a8" diff --git a/Cargo.toml b/Cargo.toml index cc50d8b56c..559c4deb56 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,8 +30,17 @@ exclude = [ ] [patch.crates-io] -#lib3h = "=0.0.38" -#lib3h_protocol = "=0.0.38" -#lib3h_crypto_api = "=0.0.38" -#lib3h_sodium = "=0.0.38" -#lib3h_zombie_actor = "=0.0.38" +lib3h = { git = "https://github.com/holochain/lib3h", branch ="bump_tracing" } +lib3h_protocol = { git = "https://github.com/holochain/lib3h", branch ="bump_tracing" } +lib3h_crypto_api = { git = "https://github.com/holochain/lib3h", branch ="bump_tracing" } +lib3h_sodium = { git = "https://github.com/holochain/lib3h", branch ="bump_tracing" } +lib3h_zombie_actor = { git = "https://github.com/holochain/lib3h", branch ="bump_tracing" } +#lib3h = "=0.0.37" +#lib3h_protocol = "=0.0.37" +#lib3h_crypto_api = "=0.0.37" +#lib3h_sodium = "=0.0.37" +#lib3h_zombie_actor = "=0.0.37" + +#holochain_tracing = { path = "../holochain-tracing/crates/tracing" } +#holochain_tracing_macros = { path = "../holochain-tracing/crates/tracing_macros" } + diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 8164fbf259..16cb42dad7 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -15,8 +15,8 @@ holochain_conductor_lib = { version = "=0.0.43-alpha3", path = "../conductor_lib holochain_net = { version = "=0.0.43-alpha3", path = "../net" } holochain_dpki = { version = "=0.0.43-alpha3", path = "../dpki" } holochain_locksmith = { version = "=0.0.43-alpha3", path = "../locksmith" } -holochain_tracing = "=0.0.19" -holochain_tracing_macros = "=0.0.19" +holochain_tracing = "=0.0.20" +holochain_tracing_macros = "=0.0.20" newrelic="0.2" sim2h = { version = "=0.0.43-alpha3", path = "../sim2h" } lib3h_crypto_api = "=0.0.38" diff --git a/crates/conductor_api/Cargo.toml b/crates/conductor_api/Cargo.toml index 1f239ff665..f2513dfdd3 100644 --- a/crates/conductor_api/Cargo.toml +++ b/crates/conductor_api/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" holochain_core_types = { version = "=0.0.43-alpha3", path = "../core_types" } holochain_wasm_utils = { version = "=0.0.43-alpha3", path = "../wasm_utils" } holochain_locksmith = { version = "=0.0.43-alpha3", path = "../locksmith" } -holochain_tracing_macros = "=0.0.19" +holochain_tracing_macros = "=0.0.20" holochain_common = { version = "=0.0.43-alpha3", path = "../common" } newrelic="0.2" jsonrpc-core = "=14.0.1" diff --git a/crates/conductor_lib/Cargo.toml b/crates/conductor_lib/Cargo.toml index 1a13bdbd3d..ee8cfe4790 100644 --- a/crates/conductor_lib/Cargo.toml +++ b/crates/conductor_lib/Cargo.toml @@ -22,8 +22,8 @@ holochain_persistence_lmdb = "=0.0.17" holochain_common = { version = "=0.0.43-alpha3", path = "../common" } holochain_dpki = { version = "=0.0.43-alpha3", path = "../dpki" } holochain_net = { version = "=0.0.43-alpha3", path = "../net" } -holochain_tracing = "=0.0.19" -holochain_tracing_macros = "=0.0.19" +holochain_tracing = "=0.0.20" +holochain_tracing_macros = "=0.0.20" lib3h = "=0.0.38" lib3h_sodium = "=0.0.38" holochain_metrics = { version = "=0.0.43-alpha3", path = "../metrics" } diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 8bf7d16e5f..d87038c749 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -40,8 +40,8 @@ holochain_core_types = { version = "=0.0.43-alpha3", path = "../core_types" } holochain_dpki = { version = "=0.0.43-alpha3", path = "../dpki" } holochain_locksmith = { version = "=0.0.43-alpha3", path = "../locksmith" } holochain_metrics = { version = "=0.0.43-alpha3", path = "../metrics" } -holochain_tracing = "=0.0.19" -holochain_tracing_macros = "=0.0.19" +holochain_tracing = "=0.0.20" +holochain_tracing_macros = "=0.0.20" log = "=0.4.8" holochain_logging = "=0.0.7" boolinator = "=2.4.0" diff --git a/crates/core/src/network/handler/mod.rs b/crates/core/src/network/handler/mod.rs index 3e38bbf62b..71364d6e75 100644 --- a/crates/core/src/network/handler/mod.rs +++ b/crates/core/src/network/handler/mod.rs @@ -144,18 +144,20 @@ pub fn create_handler(c: &Arc, my_dna_address: String) -> NetHandler { return Ok(()); } let message = message.unwrap(); - let mut span = ht::SpanWrap::from(message.clone()) - .follower(&context.tracer, "received message from handler") - .unwrap_or_else(|| { - context - .tracer - .span("create_handler (missing history)") - .start() - .into() + let _spanguard = message + .span_context + .as_ref() + // This span has context, create a follow if tracing is on. + .and_then(|c| ht::follow_encoded_tag(&Some((*context.tracer).clone()), + c, here!({}), ht::debug_tag("message", &message.data))) + // No context so if tracing is on then this trace was never started + .or_else(|| { + let s = context.tracer + .span("Trace was never started in Sim2h!") + .tag(ht::debug_tag("message", &message.data)) + .start(); + Some(ht::push_span(s.into())) }); - span.event(format!("message.data: {:?}", message.data)); - // Set this as the root span for autotrace - let _guard = ht::push_span(span); match message.data { Lib3hServerProtocol::FailureResult(failure_data) => { if !is_my_dna(&my_dna_address, &failure_data.space_address.to_string()) { diff --git a/crates/dpki/Cargo.toml b/crates/dpki/Cargo.toml index 5939107470..63895db45e 100644 --- a/crates/dpki/Cargo.toml +++ b/crates/dpki/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" lazy_static = "=1.4.0" base64 = "=0.10.1" holochain_core_types = { version = "=0.0.43-alpha3", path = "../core_types" } -holochain_tracing_macros = "=0.0.19" +holochain_tracing_macros = "=0.0.20" newrelic="0.2" lib3h_sodium = "=0.0.38" holochain_persistence_api = "=0.0.17" diff --git a/crates/holochain/Cargo.toml b/crates/holochain/Cargo.toml index 95fad06f48..6e5ce38071 100644 --- a/crates/holochain/Cargo.toml +++ b/crates/holochain/Cargo.toml @@ -14,8 +14,8 @@ holochain_conductor_lib = { version = "=0.0.43-alpha3", path = "../conductor_lib lib3h_sodium = "=0.0.38" holochain_common = { version = "=0.0.43-alpha3", path = "../common" } holochain_locksmith = { version = "=0.0.43-alpha3", path = "../locksmith" } -holochain_tracing = "=0.0.19" -holochain_tracing_macros = "=0.0.19" +holochain_tracing = "=0.0.20" +holochain_tracing_macros = "=0.0.20" structopt = "=0.2.15" tiny_http = "=0.6.2" lazy_static = "=1.4.0" diff --git a/crates/metrics/Cargo.toml b/crates/metrics/Cargo.toml index f841ff5b55..0a11df7fdc 100644 --- a/crates/metrics/Cargo.toml +++ b/crates/metrics/Cargo.toml @@ -12,7 +12,7 @@ shrinkwraprs = "=0.2.1" serde = { version = "=1.0.104", features = ["rc"] } serde_derive = "=1.0.104" holochain_locksmith = { version = "=0.0.43-alpha3", path = "../locksmith" } -holochain_tracing_macros = "=0.0.19" +holochain_tracing_macros = "=0.0.20" holochain_common = { version = "=0.0.43-alpha3", path = "../common" } lazy_static = "=1.4.0" num-traits = "=0.2.6" diff --git a/crates/net/Cargo.toml b/crates/net/Cargo.toml index e1f766729f..e181e83d29 100644 --- a/crates/net/Cargo.toml +++ b/crates/net/Cargo.toml @@ -23,14 +23,14 @@ lib3h_protocol = "=0.0.38" lib3h = "=0.0.38" lib3h_zombie_actor = "=0.0.38" detach = "=0.0.19" -holochain_tracing = "=0.0.19" +holochain_tracing = "=0.0.20" holochain_metrics = { version = "=0.0.43-alpha3", path = "../metrics" } holochain_conductor_lib_api = { version = "=0.0.43-alpha3", path = "../conductor_api" } holochain_core_types = { version = "=0.0.43-alpha3", path = "../core_types" } holochain_locksmith = { version = "=0.0.43-alpha3", path = "../locksmith" } holochain_json_derive = "=0.0.23" holochain_json_api = "=0.0.23" -holochain_tracing_macros = "=0.0.19" +holochain_tracing_macros = "=0.0.20" holochain_persistence_api = "=0.0.17" holochain_common = { version = "=0.0.43-alpha3", path = "../common" } in_stream = { version = "=0.0.43-alpha3", path = "../in_stream" } diff --git a/crates/sim2h/Cargo.toml b/crates/sim2h/Cargo.toml index edc0e9527c..45c8b5b71f 100644 --- a/crates/sim2h/Cargo.toml +++ b/crates/sim2h/Cargo.toml @@ -22,12 +22,12 @@ lib3h_crypto_api = "=0.0.38" lib3h_sodium = "=0.0.38" lib3h_protocol = "=0.0.38" lib3h_zombie_actor = "=0.0.38" -holochain_tracing = "=0.0.19" +holochain_tracing = "=0.0.20" holochain_core_types = { version = "=0.0.43-alpha3", path = "../core_types" } holochain_locksmith = { version = "=0.0.43-alpha3", path = "../locksmith" } holochain_metrics = { version = "=0.0.43-alpha3", path = "../metrics" } holochain_common = { version = "=0.0.43-alpha3", path = "../common" } -holochain_tracing_macros = "=0.0.19" +holochain_tracing_macros = "=0.0.20" im = { version = "=14.0.0", features = ["serde"] } in_stream = { version = "=0.0.43-alpha3", path = "../in_stream" } uuid = { version = "0.4", features = ["v4"] } diff --git a/crates/sim2h/src/connection_mgr.rs b/crates/sim2h/src/connection_mgr.rs index 04097f02a9..885e16ac73 100644 --- a/crates/sim2h/src/connection_mgr.rs +++ b/crates/sim2h/src/connection_mgr.rs @@ -26,7 +26,7 @@ pub enum ConMgrEvent { #[derive(Debug)] enum ConMgrCommand { Connect(Lib3hUri, TcpWss), - SendData(Lib3hUri, WsFrame), + SendData(Lib3hUri, ht::SpanWrap), Disconnect(Lib3hUri), } @@ -38,7 +38,13 @@ type CmdRecv = tokio::sync::mpsc::UnboundedReceiver; pub type ConnectionMgrEventRecv = EvtRecv; /// internal websocket polling loop -async fn wss_task(uri: Lib3hUri, mut wss: TcpWss, evt_send: EvtSend, mut cmd_recv: CmdRecv) { +async fn wss_task( + uri: Lib3hUri, + mut wss: TcpWss, + evt_send: EvtSend, + mut cmd_recv: CmdRecv, + tracer: Option, +) { let mut frame = None; // TODO - this should be done with tokio tcp streams && selecting @@ -59,7 +65,8 @@ async fn wss_task(uri: Lib3hUri, mut wss: TcpWss, evt_send: EvtSend, mut cmd_rec did_work = true; match cmd { ConMgrCommand::SendData(_uri, frame) => { - if let Err(e) = wss.write(frame) { + let _spanguard = ht::follow(&tracer, &frame, here!(())); + if let Err(e) = wss.write(frame.data) { error!("socket write error {} {:?}", uri, e); let _ = evt_send .send(ConMgrEvent::Disconnect(uri.clone(), Some(e.into()))); @@ -134,9 +141,14 @@ async fn wss_task(uri: Lib3hUri, mut wss: TcpWss, evt_send: EvtSend, mut cmd_rec } /// internal actually spawn the above wss_task into the tokio runtime -fn spawn_wss_task(uri: Lib3hUri, wss: TcpWss, evt_send: EvtSend) -> CmdSend { +fn spawn_wss_task( + uri: Lib3hUri, + wss: TcpWss, + evt_send: EvtSend, + tracer: Option, +) -> CmdSend { let (cmd_send, cmd_recv) = tokio::sync::mpsc::unbounded_channel(); - tokio::task::spawn(wss_task(uri, wss, evt_send, cmd_recv)); + tokio::task::spawn(wss_task(uri, wss, evt_send, cmd_recv, tracer)); cmd_send } @@ -175,12 +187,15 @@ pub struct ConnectionMgr { evt_recv_from_children: EvtRecv, connection_count: ConnectionCount, wss_map: std::collections::HashMap, + tracer: Option, } impl ConnectionMgr { /// spawn a new connection manager task, returning a handle for controlling it /// and a receiving channel for any incoming data - pub fn new() -> (ConnectionMgrHandle, ConnectionMgrEventRecv, ConnectionCount) { + pub fn new( + tracer: Option, + ) -> (ConnectionMgrHandle, ConnectionMgrEventRecv, ConnectionCount) { let (evt_p_send, evt_p_recv) = tokio::sync::mpsc::unbounded_channel(); let (evt_c_send, evt_c_recv) = tokio::sync::mpsc::unbounded_channel(); let (cmd_send, cmd_recv) = tokio::sync::mpsc::unbounded_channel(); @@ -198,6 +213,7 @@ impl ConnectionMgr { evt_recv_from_children: evt_c_recv, connection_count: connection_count.clone(), wss_map: std::collections::HashMap::new(), + tracer, }; tokio::task::spawn(con_mgr_task(con_mgr, weak_ref_dummy)); @@ -250,6 +266,7 @@ impl ConnectionMgr { uri.clone(), wss, self.evt_send_from_children.clone(), + self.tracer.clone(), ); if let Some(old) = self.wss_map.insert(uri.clone(), cmd_send) { error!("REPLACING ACTIVE CONNECTION: {}", uri); @@ -353,7 +370,7 @@ impl ConnectionMgrHandle { } /// send data to a managed websocket connection - pub fn send_data(&self, uri: Lib3hUri, frame: WsFrame) { + pub fn send_data(&self, uri: Lib3hUri, frame: ht::SpanWrap) { if let Err(e) = self.send_cmd.send(ConMgrCommand::SendData(uri, frame)) { error!("failed to send on channel - shutting down? {:?}", e); } diff --git a/crates/sim2h/src/lib.rs b/crates/sim2h/src/lib.rs index fac1a20ee9..89e8936e9e 100644 --- a/crates/sim2h/src/lib.rs +++ b/crates/sim2h/src/lib.rs @@ -1,4 +1,5 @@ #![feature(vec_remove_item)] +#![feature(proc_macro_hygiene)] #![feature(label_break_value)] #![allow(clippy::redundant_clone)] @@ -258,6 +259,7 @@ impl Sim2hHandle { &self.connection_mgr } + #[autotrace] /// send a message to another connected agent pub fn send(&self, agent: AgentId, uri: Lib3hUri, msg: &WireMessage) { debug!(">>OUT>> {} to {}", msg.message_type(), uri); @@ -265,8 +267,12 @@ impl Sim2hHandle { .lock() .log_out(agent, uri.clone(), msg.clone()); let payload: Opaque = msg.clone().into(); - self.connection_mgr - .send_data(uri, payload.as_bytes().into()); + let payload: ht::SpanWrap = ht::wrap_with_tag( + payload.as_bytes().into(), + here!(()), + ht::debug_tag("Message", msg), + ); + self.connection_mgr.send_data(uri, payload); } /// get access to our im_state object @@ -275,6 +281,7 @@ impl Sim2hHandle { } /// forward a message to be handled + #[autotrace] pub fn handle_message(&self, uri: Lib3hUri, message: WireMessage, signer: AgentId) { // dispatch to correct handler let sim2h_handle = self.clone(); @@ -298,8 +305,23 @@ impl Sim2hHandle { }; // you have to be in a space to proceed further - let tracer = self.tracer.clone().unwrap_or_else(|| ht::null_tracer()); + let tracer = self.tracer.clone(); tokio::task::spawn(async move { + let _spanguard: Option> = tracer + .as_ref() + .and_then(|_| message.try_get_span()) + .and_then(|msgs| { + msgs.iter() + .map(|msg| { + ht::follow_encoded_tag( + &tracer, + msg, + here!(()), + ht::debug_tag("HandleMessageTask", message.clone()), + ) + }) + .collect() + }); // -- right now each agent can only be part of a single space :/ -- let (agent_id, space_hash) = 'got_info: { @@ -325,9 +347,21 @@ impl Sim2hHandle { match message { WireMessage::ClientToLib3h(span_wrap) => { - let span = ht::SpanWrap::from(span_wrap.clone()) - .follower(&tracer, "handle_joined - ClientToLib3h"); - let _spanguard = span.map(|span| ht::push_span(span)); + let _spanguard = span_wrap + .span_context + .as_ref() + // This span has context, create a follow if tracing is on. + .and_then(|c| ht::follow_encoded(&tracer, c, here!({}))) + // No context so if tracing is on then this trace was never started + .or_else(|| { + tracer.map(|t| { + let s = t + .span("Trace was never started in Conductor!") + .tag(ht::debug_tag("ClientToLib3h", &span_wrap.data)) + .start(); + ht::push_span(s.into()) + }) + }); match span_wrap.data.clone() { ClientToLib3h::LeaveSpace(_data) => { // for now, just disconnect on LeaveSpace @@ -358,7 +392,7 @@ impl Sim2hHandle { uri, signer, space_hash, - query_data, + span_wrap.swapped(query_data), ); } message @ _ => { @@ -368,9 +402,21 @@ impl Sim2hHandle { } } WireMessage::Lib3hToClientResponse(span_wrap) => { - let span = ht::SpanWrap::from(span_wrap.clone()) - .follower(&tracer, "handle_joined - Lib3hToClientResponse"); - let _spanguard = span.map(|span| ht::push_span(span)); + let _spanguard = span_wrap + .span_context + .as_ref() + // This span has context, create a follow if tracing is on. + .and_then(|c| ht::follow_encoded(&tracer, c, here!({}))) + // No context so if tracing is on then this trace was never started + .or_else(|| { + tracer.map(|t| { + let s = t + .span("Trace was never started in Conductor!") + .tag(ht::debug_tag("Lib3hToClientResponse", &span_wrap.data)) + .start(); + ht::push_span(s.into()) + }) + }); match span_wrap.data.clone() { Lib3hToClientResponse::HandleSendDirectMessageResult(dm_data) => { return spawn_handle_message_send_dm_result( @@ -694,6 +740,7 @@ fn spawn_handle_message_publish_entry( }); } +#[autotrace] fn spawn_handle_message_list_data( sim2h_handle: Sim2hHandle, _uri: Lib3hUri, @@ -864,8 +911,13 @@ fn spawn_handle_message_query_entry( _uri: Lib3hUri, signer: AgentId, space_hash: MonoRef, - query_data: QueryEntryData, + span_wrap: ht::EncodedSpanWrap, ) { + // Avoid cloning data + let (span_wrap, query_data) = { + let s = span_wrap.swapped(()); + (s, span_wrap.data) + }; if signer != query_data.requester_agent_id || query_data.space_address != *space_hash { error!( "space mismatch - agent is in {}, message is for {}", @@ -893,10 +945,8 @@ fn spawn_handle_message_query_entry( } Some(url) => url, }; - let span = ht::top_follower("inner"); let query_message = WireMessage::Lib3hToClient( - span.wrap(Lib3hToClient::HandleQueryEntry(query_data)) - .into(), + span_wrap.swapped(Lib3hToClient::HandleQueryEntry(query_data)), ); sim2h_handle.send((&*query_target).clone(), url.clone(), &query_message); }); @@ -1046,7 +1096,7 @@ pub struct Sim2h { } #[autotrace] -#[holochain_tracing_macros::newrelic_autotrace(SIM2H)] +//#[holochain_tracing_macros::newrelic_autotrace(SIM2H)] impl Sim2h { /// create a new Sim2h server instance pub fn new( @@ -1060,7 +1110,8 @@ impl Sim2h { let (metric_gen, metric_task) = MetricsTimerGenerator::new(); - let (connection_mgr, connection_mgr_evt_recv, connection_count) = ConnectionMgr::new(); + let (connection_mgr, connection_mgr_evt_recv, connection_count) = + ConnectionMgr::new(tracer.clone()); let (wss_send, wss_recv) = crossbeam_channel::unbounded(); let sim2h_handle = Sim2hHandle::new( @@ -1230,6 +1281,22 @@ impl Sim2h { Ok((signed_message.provenance.source().into(), wire_message)) })() { Ok((source, wire_message)) => { + let _spanguard: Option> = sim2h_handle + .tracer + .as_ref() + .and_then(|_| wire_message.try_get_span()) + .and_then(|msgs| { + msgs.iter() + .map(|msg| { + ht::follow_encoded_tag( + &sim2h_handle.tracer, + msg, + here!(()), + ht::debug_tag("HandlePayload", wire_message.clone()), + ) + }) + .collect() + }); sim2h_handle.handle_message(url, wire_message, source) } Err(error) => { @@ -1309,6 +1376,7 @@ impl Sim2h { } } +#[autotrace] async fn missing_aspects_resync(sim2h_handle: Sim2hHandle, _schedule_guard: ScheduleGuard) { let gossip_full_start = std::time::Instant::now(); @@ -1360,10 +1428,20 @@ async fn missing_aspects_resync(sim2h_handle: Sim2hHandle, _schedule_guard: Sche None => continue, Some(uri) => uri, }; + let (_spanguard, span) = ht::with_top(|span|(None, span.follower(here!({})))) + .unwrap_or_else(|| + { + let nt = ht::null_tracer(); + let s: ht::Span = sim2h_handle.tracer.as_ref().unwrap_or_else(|| &nt) + .span(format!("Starting trace in sim2h but not linked?! {}", here!({}))) + .start() + .into(); + let f = s.follower(here!({})); + (Some(ht::push_span(s)), f) + }); let wire_message = WireMessage::Lib3hToClient( - ht::top_follower("inner") - .wrap(Lib3hToClient::HandleFetchEntry(FetchEntryData { + span.wrap(Lib3hToClient::HandleFetchEntry(FetchEntryData { request_id: "".to_string(), space_address: (&**space_hash).clone(), provider_agent_id: (&*query_agent).clone(), diff --git a/crates/sim2h/src/wire_message.rs b/crates/sim2h/src/wire_message.rs index 25bf8742d3..84b3d8d955 100644 --- a/crates/sim2h/src/wire_message.rs +++ b/crates/sim2h/src/wire_message.rs @@ -108,6 +108,17 @@ impl WireMessage { WireMessage::Err(_) => "[Error] {:?}", }) } + + pub fn try_get_span(&self) -> Option> { + match self { + WireMessage::ClientToLib3h(s) => s.span_context.as_ref().map(|s| vec![s]), + WireMessage::ClientToLib3hResponse(s) => s.span_context.as_ref().map(|s| vec![s]), + WireMessage::Lib3hToClient(s) => s.span_context.as_ref().map(|s| vec![s]), + WireMessage::Lib3hToClientResponse(s) => s.span_context.as_ref().map(|s| vec![s]), + WireMessage::MultiSend(m) => m.iter().map(|s| s.span_context.as_ref()).collect(), + _ => None, + } + } } fn get_multi_type(list: Vec<&Lib3hToClient>) -> &str { diff --git a/crates/sim2h_server/Cargo.toml b/crates/sim2h_server/Cargo.toml index 358c0140ea..a44d58bbc5 100644 --- a/crates/sim2h_server/Cargo.toml +++ b/crates/sim2h_server/Cargo.toml @@ -15,8 +15,8 @@ repository = "https://github.com/holochain/sim2h" crossbeam-channel = "=0.3.8" sim2h = { version = "=0.0.43-alpha3", path = "../sim2h" } holochain_common = { version = "=0.0.43-alpha3", path = "../common" } -holochain_tracing = "=0.0.19" -holochain_tracing_macros = "=0.0.19" +holochain_tracing = "=0.0.20" +holochain_tracing_macros = "=0.0.20" newrelic="0.2" detach = "=0.0.19" futures = "=0.3.2" diff --git a/crates/stress/Cargo.toml b/crates/stress/Cargo.toml index 642ee064e4..a977e33aa2 100644 --- a/crates/stress/Cargo.toml +++ b/crates/stress/Cargo.toml @@ -17,7 +17,7 @@ hcid = "=0.0.6" lib3h_crypto_api = "=0.0.38" lib3h_protocol = "=0.0.38" lib3h_sodium = "=0.0.38" -holochain_tracing = "=0.0.19" +holochain_tracing = "=0.0.20" log = "=0.4.8" nanoid = "=0.2.0" native-tls = "=0.2.3"